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 973f7968346fb5ae5ffa38a268fd6666567267d5..b96a3c24742d2862094e2a7e4fd94da046198a61 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 220c24fc46d2ffa59871ef05f19e4f88fdb9e437..fef73d61894f35668b7dfc946dd44665f096d9b9 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 504de74da8085a4ba8811dc9139efc68c15c6a74..2fe5bd0808970d30e14fa48f7d959a3062daa422 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 79f189815e5f3a35edc1625d7cc9094b56662287..30d3632ec1fbaed7e18e3ee9ae8cf90c9e543dac 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 f5d19309d36a7f003d6a185d9357c77f6c5903b5..cc4cb77d15abb89b0892241078abd81553a596ba 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 c56ddb0ccf6c1f8bee07cd0992f4d26628520fcc..038637886c93b6c9c9ff562e37b8e39ebf705694 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 beeb2c7173aad74a22e95bc7e060011a060b48b7..7acf6a94ef03da79dc9ff40eb595b1bc9802ae14 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 8e24a69a053265b21f1ba4d1c8429aa2c0dffa67..73181427a2868edd79f087fb2c0ac0fce92314b6 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