[Erp5-report] r25985 - in /erp5/trunk/bt5/erp5_payroll: SkinTemplateItem/portal_skins/erp5_...

[nobody at svn.erp5.org]

Author: fabien
Date: Wed Mar 11 15:59:42 2009
New Revision: 25985

URL: http://svn.erp5.org?rev=25985&view=rev
Log:
fix params for getInventoryAssetPrice to be able to calculate year to date amount.
remove confirmed state from the search

Modified:
    erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateBaseContributionTotalPrice.xml
    erp5/trunk/bt5/erp5_payroll/bt/revision

Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateBaseContributionTotalPrice.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateBaseContributionTotalPrice.xml?rev=25985&r1=25984&r2=25985&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateBaseContributionTotalPrice.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateBaseContributionTotalPrice.xml [utf8] Wed Mar 11 15:59:42 2009
@@ -88,9 +88,9 @@
         portal.portal_categories.tax_category.employee_share.getUid(),\n
     \'to_date\' : paysheet.getStartDate(),\n
     \'from_date\' : DateTime(paysheet.getStartDate().year(), 1, 1),\n
-    \'simulation_state\'    : [\'confirmed\', \'stopped\', \'delivered\'],\n
+    \'simulation_state\'    : [\'stopped\', \'delivered\'],\n
     \'precision\' : paysheet.getPriceCurrencyValue().getQuantityPrecision(),\n
-    \'base_contribution_uid\' : base_contribution_uid_list,\n
+    \'parent_base_contribution_uid\' : base_contribution_uid_list,\n
     #\'src__\' : 1\n
   }\n
 \n

Modified: erp5/trunk/bt5/erp5_payroll/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/revision?rev=25985&r1=25984&r2=25985&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/revision [utf8] Wed Mar 11 15:59:42 2009
@@ -1,1 +1,1 @@
-362
+364