From 1b6e42307c5e94f9a6868cf7f9c9002fbe3d4f04 Mon Sep 17 00:00:00 2001
From: Fabien Morin <fabien@nexedi.com>
Date: Mon, 7 Jan 2008 11:00:50 +0000
Subject: [PATCH] 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
---
 .../PaySheetTransaction_getYearToDateBaseSalary.xml             | 2 +-
 .../PaySheetTransaction_getYearToDateGrossSalary.xml            | 2 +-
 .../erp5_payroll/PaySheetTransaction_getYearToDateNetPay.xml    | 2 +-
 .../PaySheetTransaction_getYearToDateOvertimeAmount.xml         | 2 +-
 .../PaySheetTransaction_getYearToDateOvertimeHours.xml          | 2 +-
 .../PaySheetTransaction_getYearToDateTaxableNetPay.xml          | 2 +-
 .../PaySheetTransaction_getYearToDateWorkTimeSalary.xml         | 2 +-
 bt5/erp5_payroll/bt/revision                                    | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateBaseSalary.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateBaseSalary.xml
index 973f796834..b96a3c2474 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateBaseSalary.xml
+++ b/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
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateGrossSalary.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateGrossSalary.xml
index 220c24fc46..fef73d6189 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateGrossSalary.xml
+++ b/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
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateNetPay.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateNetPay.xml
index 504de74da8..2fe5bd0808 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateNetPay.xml
+++ b/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
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateOvertimeAmount.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateOvertimeAmount.xml
index 79f189815e..30d3632ec1 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateOvertimeAmount.xml
+++ b/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
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateOvertimeHours.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateOvertimeHours.xml
index f5d19309d3..cc4cb77d15 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateOvertimeHours.xml
+++ b/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
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateTaxableNetPay.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateTaxableNetPay.xml
index c56ddb0ccf..038637886c 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateTaxableNetPay.xml
+++ b/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
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateWorkTimeSalary.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateWorkTimeSalary.xml
index beeb2c7173..7acf6a94ef 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateWorkTimeSalary.xml
+++ b/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
diff --git a/bt5/erp5_payroll/bt/revision b/bt5/erp5_payroll/bt/revision
index 8e24a69a05..73181427a2 100644
--- a/bt5/erp5_payroll/bt/revision
+++ b/bt5/erp5_payroll/bt/revision
@@ -1 +1 @@
-198
\ No newline at end of file
+199
\ No newline at end of file
-- 
2.30.9