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 b96a3c24742d2862094e2a7e4fd94da046198a61..c67ff96e19cb17cc5dab543f40baa41c2278d073 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 @@ -68,14 +68,14 @@ <value> <string>if paysheet is None:\n paysheet = context\n \n -portal_simulation = context.getPortalObject().portal_simulation\n +portal_simulation = paysheet.getPortalObject().portal_simulation\n \n params = {\n \'node_uid\' : paysheet.getSourceSectionUid(),\n \'mirror_section_uid\' : paysheet.getSourceSectionUid(),\n \'section_uid\' : paysheet.getDestinationSectionUid(),\n \'tax_category_uid\' :\\\n - context.portal_categories.tax_category.employee_share.getUid(),\n + paysheet.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 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 fef73d61894f35668b7dfc946dd44665f096d9b9..60ea64ab612b96309b14ad9d484338537104997b 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 @@ -68,14 +68,14 @@ <value> <string>if paysheet is None:\n paysheet = context\n \n -portal_simulation = context.getPortalObject().portal_simulation\n +portal_simulation = paysheet.getPortalObject().portal_simulation\n \n params = {\n \'node_uid\' : paysheet.getSourceSectionUid(),\n \'mirror_section_uid\' : paysheet.getSourceSectionUid(),\n \'section_uid\' : paysheet.getDestinationSectionUid(),\n \'tax_category_uid\' :\\\n - context.portal_categories.tax_category.employee_share.getUid(),\n + paysheet.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 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 2fe5bd0808970d30e14fa48f7d959a3062daa422..9dee2b3300adb3ea6f95980187050f02d6d3def2 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 @@ -68,24 +68,27 @@ <value> <string>if paysheet is None:\n paysheet = context\n \n -portal_simulation = context.getPortalObject().portal_simulation\n +portal_simulation = paysheet.getPortalObject().portal_simulation\n \n params = {\n \'section_uid\' : paysheet.getDestinationSectionUid(),\n \'node_uid\' : paysheet.getSourceSectionUid(),\n \'tax_category_uid\' :\\\n - context.portal_categories.tax_category.employee_share.getUid(),\n + paysheet.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 \'precision\' : paysheet.getPriceCurrencyValue().getQuantityPrecision(),\n \'resource_category\' : [\'base_amount/deductible_tax\', \n - \'base_amount/non_deductible_tax\'],\n + \'base_amount/non_deductible_tax\'],\n }\n \n deductible_tax = portal_simulation.getInventoryAssetPrice(**params)\n -over_time = context.PaySheetTransaction_getYearToDateOvertimeAmount()\n -return context.PaySheetTransaction_getYearToDateGrossSalary() - over_time - deductible_tax\n +over_time = paysheet.PaySheetTransaction_getYearToDateOvertimeAmount()\n +gross_salary = paysheet.PaySheetTransaction_getYearToDateGrossSalary() \n +net_pay = gross_salary - over_time - deductible_tax\n +\n +return net_pay\n </string> </value> </item> <item> @@ -138,6 +141,8 @@ return context.PaySheetTransaction_getYearToDateGrossSalary() - over_time - dedu <string>_apply_</string> <string>deductible_tax</string> <string>over_time</string> + <string>gross_salary</string> + <string>net_pay</string> </tuple> </value> </item> 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 30d3632ec1fbaed7e18e3ee9ae8cf90c9e543dac..61db3b4a902301f63f89e10585843989139d61b0 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 @@ -68,14 +68,14 @@ <value> <string>if paysheet is None:\n paysheet = context\n \n -portal_simulation = context.getPortalObject().portal_simulation\n +portal_simulation = paysheet.getPortalObject().portal_simulation\n \n params = {\n \'node_uid\' : paysheet.getSourceSectionUid(),\n \'mirror_section_uid\' : paysheet.getSourceSectionUid(),\n \'section_uid\' : paysheet.getDestinationSectionUid(),\n \'tax_category_uid\' :\\\n - context.portal_categories.tax_category.employee_share.getUid(),\n + paysheet.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 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 cc4cb77d15abb89b0892241078abd81553a596ba..06e5641071194edbf3cf564a55172ff73ebc300c 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 @@ -83,10 +83,10 @@ paysheet_list = accounting_module.searchFolder( **search_params)\n \n yearly_work_time = 0\n for paysheet in paysheet_list:\n - annotation_line = context.getAnnotationLineFromReference(\\\n + annotation_line = paysheet.getAnnotationLineFromReference(\\\n reference=\'overtime_small_rate\')\n nb_heures_supp = annotation_line.getQuantity()\n - annotation_line = context.getAnnotationLineFromReference(\\\n + annotation_line = paysheet.getAnnotationLineFromReference(\\\n reference=\'overtime_big_rate\')\n nb_heures_supp += annotation_line.getQuantity()\n yearly_work_time += nb_heures_supp \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 038637886c93b6c9c9ff562e37b8e39ebf705694..632555b791253b9314051908dad1ac2e75c56606 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 @@ -68,13 +68,13 @@ <value> <string>if paysheet is None:\n paysheet = context\n \n -portal_simulation = context.getPortalObject().portal_simulation\n +portal_simulation = paysheet.getPortalObject().portal_simulation\n \n params = {\n \'section_uid\' : paysheet.getDestinationSectionUid(),\n \'node_uid\' : paysheet.getSourceSectionUid(),\n \'tax_category_uid\' :\\\n - context.portal_categories.tax_category.employee_share.getUid(),\n + paysheet.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 @@ -85,10 +85,12 @@ params = {\n \n \n deductible_tax = portal_simulation.getInventoryAssetPrice(**params)\n -over_time = context.PaySheetTransaction_getYearToDateOvertimeAmount()\n -gross_salary = context.PaySheetTransaction_getYearToDateGrossSalary()\n +over_time = paysheet.PaySheetTransaction_getYearToDateOvertimeAmount()\n +gross_salary = paysheet.PaySheetTransaction_getYearToDateGrossSalary()\n \n -return gross_salary - over_time - deductible_tax\n +taxable_net_pay = gross_salary - over_time - deductible_tax\n +\n +return taxable_net_pay\n </string> </value> </item> <item> @@ -142,6 +144,7 @@ return gross_salary - over_time - deductible_tax\n <string>deductible_tax</string> <string>over_time</string> <string>gross_salary</string> + <string>taxable_net_pay</string> </tuple> </value> </item> 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 7acf6a94ef03da79dc9ff40eb595b1bc9802ae14..a595bafe0e5456ee5bd27c297bf4215182970e94 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 @@ -83,7 +83,7 @@ paysheet_list = accounting_module.searchFolder( **search_params)\n \n yearly_work_time = 0\n for paysheet in paysheet_list:\n - annotation_line = context.getAnnotationLineFromReference(\\\n + annotation_line = paysheet.getAnnotationLineFromReference(\\\n reference=\'work_time_annotation_line\')\n nb_heures = annotation_line.getQuantity()\n yearly_work_time += nb_heures\n diff --git a/bt5/erp5_payroll/bt/change_log b/bt5/erp5_payroll/bt/change_log index a7801c5c817ed97782a6f6b76715d4a2f1c6d912..6fbbde4cf0c58e585dfde44d55c9ff4e77b29072 100644 --- a/bt5/erp5_payroll/bt/change_log +++ b/bt5/erp5_payroll/bt/change_log @@ -1,3 +1,6 @@ +2008-02-14 fabien +* correct some script : context was used instead paysheet, so results were wrong + 2008-01-24 fabien * set version number to 2.1 : this bt is the second version of payroll. diff --git a/bt5/erp5_payroll/bt/revision b/bt5/erp5_payroll/bt/revision index cbd6012bc6f6c4ceb791c8b2ae7ff8d5978d3875..e0d1ea1e9ac39d1d0d9353874b9ca7b440121f23 100644 --- a/bt5/erp5_payroll/bt/revision +++ b/bt5/erp5_payroll/bt/revision @@ -1 +1 @@ -204 \ No newline at end of file +205 \ No newline at end of file