Commit 1b6e4230 authored by Fabien Morin's avatar Fabien Morin

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
parent 9df321a0
...@@ -78,7 +78,7 @@ params = {\n ...@@ -78,7 +78,7 @@ params = {\n
context.portal_categories.tax_category.employee_share.getUid(),\n context.portal_categories.tax_category.employee_share.getUid(),\n
\'to_date\' : paysheet.getStartDate(),\n \'to_date\' : paysheet.getStartDate(),\n
\'from_date\' : DateTime(paysheet.getStartDate().year(), 1, 1),\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 \'precision\' : paysheet.getPriceCurrencyValue().getQuantityPrecision(),\n
\'resource_category\' : [\'base_amount/base_salary\',]\n \'resource_category\' : [\'base_amount/base_salary\',]\n
#\'src__\' : 1\n #\'src__\' : 1\n
......
...@@ -78,7 +78,7 @@ params = {\n ...@@ -78,7 +78,7 @@ params = {\n
context.portal_categories.tax_category.employee_share.getUid(),\n context.portal_categories.tax_category.employee_share.getUid(),\n
\'to_date\' : paysheet.getStartDate(),\n \'to_date\' : paysheet.getStartDate(),\n
\'from_date\' : DateTime(paysheet.getStartDate().year(), 1, 1),\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 \'precision\' : paysheet.getPriceCurrencyValue().getQuantityPrecision(),\n
\'resource_category\' : [\'base_amount/gross_salary\',]\n \'resource_category\' : [\'base_amount/gross_salary\',]\n
#\'src__\' : 1\n #\'src__\' : 1\n
......
...@@ -77,7 +77,7 @@ params = {\n ...@@ -77,7 +77,7 @@ params = {\n
context.portal_categories.tax_category.employee_share.getUid(),\n context.portal_categories.tax_category.employee_share.getUid(),\n
\'to_date\' : paysheet.getStartDate(),\n \'to_date\' : paysheet.getStartDate(),\n
\'from_date\' : DateTime(paysheet.getStartDate().year(), 1, 1),\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 \'precision\' : paysheet.getPriceCurrencyValue().getQuantityPrecision(),\n
\'resource_category\' : [\'base_amount/deductible_tax\', \n \'resource_category\' : [\'base_amount/deductible_tax\', \n
\'base_amount/non_deductible_tax\'],\n \'base_amount/non_deductible_tax\'],\n
......
...@@ -78,7 +78,7 @@ params = {\n ...@@ -78,7 +78,7 @@ params = {\n
context.portal_categories.tax_category.employee_share.getUid(),\n context.portal_categories.tax_category.employee_share.getUid(),\n
\'to_date\' : paysheet.getStartDate(),\n \'to_date\' : paysheet.getStartDate(),\n
\'from_date\' : DateTime(paysheet.getStartDate().year(), 1, 1),\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 \'precision\' : paysheet.getPriceCurrencyValue().getQuantityPrecision(),\n
\'resource_category\' : [\'base_amount/over_time\',]\n \'resource_category\' : [\'base_amount/over_time\',]\n
#\'src__\' : 1\n #\'src__\' : 1\n
......
...@@ -76,7 +76,7 @@ search_params = \\\n ...@@ -76,7 +76,7 @@ search_params = \\\n
\'portal_type\' : \'Pay Sheet Transaction\',\n \'portal_type\' : \'Pay Sheet Transaction\',\n
\'delivery.start_date\' : {\'range\': "minmax", \'query\': (from_date, to_date)},\n \'delivery.start_date\' : {\'range\': "minmax", \'query\': (from_date, to_date)},\n
\'delivery.source_section_uid\' : context.getSourceSectionUid(),\n \'delivery.source_section_uid\' : context.getSourceSectionUid(),\n
# \'simulation_state\' : [\'confirmed\', \'stopped\', \'delivered\'],\n \'simulation_state\' : [\'confirmed\', \'stopped\', \'delivered\'],\n
}\n }\n
\n \n
paysheet_list = accounting_module.searchFolder( **search_params)\n paysheet_list = accounting_module.searchFolder( **search_params)\n
......
...@@ -77,7 +77,7 @@ params = {\n ...@@ -77,7 +77,7 @@ params = {\n
context.portal_categories.tax_category.employee_share.getUid(),\n context.portal_categories.tax_category.employee_share.getUid(),\n
\'to_date\' : paysheet.getStartDate(),\n \'to_date\' : paysheet.getStartDate(),\n
\'from_date\' : DateTime(paysheet.getStartDate().year(), 1, 1),\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 \'precision\' : paysheet.getPriceCurrencyValue().getQuantityPrecision(),\n
\'resource_category\' : [\'base_amount/deductible_tax\', ],\n \'resource_category\' : [\'base_amount/deductible_tax\', ],\n
}\n }\n
......
...@@ -76,7 +76,7 @@ search_params = \\\n ...@@ -76,7 +76,7 @@ search_params = \\\n
\'portal_type\' : \'Pay Sheet Transaction\',\n \'portal_type\' : \'Pay Sheet Transaction\',\n
\'delivery.start_date\' : {\'range\': "minmax", \'query\': (from_date, to_date)},\n \'delivery.start_date\' : {\'range\': "minmax", \'query\': (from_date, to_date)},\n
\'delivery.source_section_uid\' : context.getSourceSectionUid(),\n \'delivery.source_section_uid\' : context.getSourceSectionUid(),\n
# \'simulation_state\' : [\'confirmed\', \'stopped\', \'delivered\'],\n \'simulation_state\' : [\'confirmed\', \'stopped\', \'delivered\'],\n
}\n }\n
\n \n
paysheet_list = accounting_module.searchFolder( **search_params)\n paysheet_list = accounting_module.searchFolder( **search_params)\n
......
198 199
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment