[Erp5-report] r19317 - in /erp5/trunk/bt5/erp5_payroll: SkinTemplateItem/portal_skins/erp5_...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Feb 14 17:46:35 CET 2008
Author: fabien
Date: Thu Feb 14 17:46:34 2008
New Revision: 19317
URL: http://svn.erp5.org?rev=19317&view=rev
Log:
2008-02-14 fabien
* correct some year to date calcul scripts : context was used instead paysheet, so results were calculated using the current paysheet instead of using all the previous.
Modified:
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateBaseSalary.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateGrossSalary.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateNetPay.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateOvertimeAmount.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateOvertimeHours.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateTaxableNetPay.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateWorkTimeSalary.xml
erp5/trunk/bt5/erp5_payroll/bt/change_log
erp5/trunk/bt5/erp5_payroll/bt/revision
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateBaseSalary.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateBaseSalary.xml?rev=19317&r1=19316&r2=19317&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateBaseSalary.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateBaseSalary.xml Thu Feb 14 17:46:34 2008
@@ -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
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateGrossSalary.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateGrossSalary.xml?rev=19317&r1=19316&r2=19317&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateGrossSalary.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateGrossSalary.xml Thu Feb 14 17:46:34 2008
@@ -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
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateNetPay.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateNetPay.xml?rev=19317&r1=19316&r2=19317&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateNetPay.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateNetPay.xml Thu Feb 14 17:46:34 2008
@@ -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 @@
<string>_apply_</string>
<string>deductible_tax</string>
<string>over_time</string>
+ <string>gross_salary</string>
+ <string>net_pay</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateOvertimeAmount.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateOvertimeAmount.xml?rev=19317&r1=19316&r2=19317&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateOvertimeAmount.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateOvertimeAmount.xml Thu Feb 14 17:46:34 2008
@@ -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
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateOvertimeHours.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateOvertimeHours.xml?rev=19317&r1=19316&r2=19317&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateOvertimeHours.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateOvertimeHours.xml Thu Feb 14 17:46:34 2008
@@ -83,10 +83,10 @@
\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
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateTaxableNetPay.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateTaxableNetPay.xml?rev=19317&r1=19316&r2=19317&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateTaxableNetPay.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateTaxableNetPay.xml Thu Feb 14 17:46:34 2008
@@ -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 @@
\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 @@
<string>deductible_tax</string>
<string>over_time</string>
<string>gross_salary</string>
+ <string>taxable_net_pay</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateWorkTimeSalary.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateWorkTimeSalary.xml?rev=19317&r1=19316&r2=19317&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateWorkTimeSalary.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateWorkTimeSalary.xml Thu Feb 14 17:46:34 2008
@@ -83,7 +83,7 @@
\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
Modified: erp5/trunk/bt5/erp5_payroll/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/change_log?rev=19317&r1=19316&r2=19317&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/change_log (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/change_log Thu Feb 14 17:46:34 2008
@@ -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.
Modified: erp5/trunk/bt5/erp5_payroll/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/revision?rev=19317&r1=19316&r2=19317&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/revision (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/revision Thu Feb 14 17:46:34 2008
@@ -1,1 +1,1 @@
-204
+205
More information about the Erp5-report
mailing list