add simulaiton state parameter to calculate the year to date amounts (this was...

add simulaiton state parameter to calculate the year to date amounts (this was not required for experimental steps, but now it's the final step, and all year to date amounts will be wrong if there is not this parameter)

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@18609 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateBaseSalary.xml

@@ -78,7 +78,7 @@ params = {\n
         context.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\'    : [\'confirmed\', \'stopped\', \'delivered\'],\n
     \'precision\' : paysheet.getPriceCurrencyValue().getQuantityPrecision(),\n
     \'resource_category\' : [\'base_amount/base_salary\',]\n
     #\'src__\' : 1\n

bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateGrossSalary.xml

@@ -78,7 +78,7 @@ params = {\n
         context.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\'    : [\'confirmed\', \'stopped\', \'delivered\'],\n
     \'precision\' : paysheet.getPriceCurrencyValue().getQuantityPrecision(),\n
     \'resource_category\' : [\'base_amount/gross_salary\',]\n
     #\'src__\' : 1\n

bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateNetPay.xml

@@ -77,7 +77,7 @@ params = {\n
         context.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\'    : [\'confirmed\', \'stopped\', \'delivered\'],\n
     \'precision\' : paysheet.getPriceCurrencyValue().getQuantityPrecision(),\n
     \'resource_category\' : [\'base_amount/deductible_tax\', \n
         \'base_amount/non_deductible_tax\'],\n

bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateOvertimeAmount.xml

@@ -78,7 +78,7 @@ params = {\n
         context.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\'    : [\'confirmed\', \'stopped\', \'delivered\'],\n
     \'precision\' : paysheet.getPriceCurrencyValue().getQuantityPrecision(),\n
     \'resource_category\' : [\'base_amount/over_time\',]\n
     #\'src__\' : 1\n

bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateOvertimeHours.xml

@@ -76,7 +76,7 @@ search_params = \\\n
    \'portal_type\'         : \'Pay Sheet Transaction\',\n
    \'delivery.start_date\' : {\'range\': "minmax", \'query\': (from_date, to_date)},\n
    \'delivery.source_section_uid\' : context.getSourceSectionUid(),\n
-#   \'simulation_state\'    : [\'confirmed\', \'stopped\', \'delivered\'],\n
+   \'simulation_state\'    : [\'confirmed\', \'stopped\', \'delivered\'],\n
   }\n
 \n
 paysheet_list = accounting_module.searchFolder( **search_params)\n

bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateTaxableNetPay.xml

@@ -77,7 +77,7 @@ params = {\n
         context.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\'    : [\'confirmed\', \'stopped\', \'delivered\'],\n
     \'precision\' : paysheet.getPriceCurrencyValue().getQuantityPrecision(),\n
     \'resource_category\' : [\'base_amount/deductible_tax\', ],\n
   }\n

bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateWorkTimeSalary.xml

@@ -76,7 +76,7 @@ search_params = \\\n
    \'portal_type\'         : \'Pay Sheet Transaction\',\n
    \'delivery.start_date\' : {\'range\': "minmax", \'query\': (from_date, to_date)},\n
    \'delivery.source_section_uid\' : context.getSourceSectionUid(),\n
-#   \'simulation_state\'    : [\'confirmed\', \'stopped\', \'delivered\'],\n
+   \'simulation_state\'    : [\'confirmed\', \'stopped\', \'delivered\'],\n
   }\n
 \n
 paysheet_list = accounting_module.searchFolder( **search_params)\n

bt5/erp5_payroll/bt/revision

-198
+199
\ No newline at end of file