[Erp5-report] r19318 - in /erp5/trunk/bt5/erp5_payroll: SkinTemplateItem/portal_skins/erp5_...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Feb 14 18:05:48 CET 2008
Author: fabien
Date: Thu Feb 14 18:05:46 2008
New Revision: 19318
URL: http://svn.erp5.org?rev=19318&view=rev
Log:
use portal instead contex to access portal_categories, this avoid aquisition problems (thanks to Jerome).
Modified:
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementList.xml
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_getYearToDateTaxableNetPay.xml
erp5/trunk/bt5/erp5_payroll/bt/revision
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementList.xml?rev=19318&r1=19317&r2=19318&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementList.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementList.xml Thu Feb 14 18:05:46 2008
@@ -78,7 +78,7 @@
from Products.ERP5Type.Message import Message\n
N_ = lambda msg, **kw: Message(\'erp5_ui\', msg, **kw)\n
\n
-\n
+portal = context.getPortalObject();\n
paysheet_line_list = context.contentValues(portal_type=\'Pay Sheet Line\')\n
if context.getPriceCurrencyValue():\n
precision = context.getPriceCurrencyValue().getQuantityPrecision()\n
@@ -131,7 +131,7 @@
for item in tuple:\n
# the dict key is the base category and value is the category path\n
tuple_dict[item.split(\'/\')[0]] = \\\n
- context.portal_categories.restrictedTraverse(item).getTitle()\n
+ portal.portal_categories.restrictedTraverse(item).getTitle()\n
tuple_dict[item.split(\'/\')[0]+\'_relative_url\']=item\n
\n
# we want to display as lines as a paysheet line as slices\n
@@ -250,6 +250,7 @@
<string>N_</string>
<string>_getattr_</string>
<string>context</string>
+ <string>portal</string>
<string>paysheet_line_list</string>
<string>precision</string>
<string>line_list</string>
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=19318&r1=19317&r2=19318&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 18:05:46 2008
@@ -68,14 +68,15 @@
<value> <string>if paysheet is None:\n
paysheet = context\n
\n
-portal_simulation = paysheet.getPortalObject().portal_simulation\n
+portal = context.getPortalObject();\n
+portal_simulation = portal.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
- paysheet.portal_categories.tax_category.employee_share.getUid(),\n
+ portal.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
@@ -131,6 +132,7 @@
<string>None</string>
<string>context</string>
<string>_getattr_</string>
+ <string>portal</string>
<string>portal_simulation</string>
<string>DateTime</string>
<string>params</string>
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=19318&r1=19317&r2=19318&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 18:05:46 2008
@@ -68,14 +68,15 @@
<value> <string>if paysheet is None:\n
paysheet = context\n
\n
-portal_simulation = paysheet.getPortalObject().portal_simulation\n
+portal = context.getPortalObject();\n
+portal_simulation = portal.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
- paysheet.portal_categories.tax_category.employee_share.getUid(),\n
+ portal.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
@@ -131,6 +132,7 @@
<string>None</string>
<string>context</string>
<string>_getattr_</string>
+ <string>portal</string>
<string>portal_simulation</string>
<string>DateTime</string>
<string>params</string>
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=19318&r1=19317&r2=19318&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 18:05:46 2008
@@ -68,13 +68,14 @@
<value> <string>if paysheet is None:\n
paysheet = context\n
\n
-portal_simulation = paysheet.getPortalObject().portal_simulation\n
+portal = context.getPortalObject();\n
+portal_simulation = portal.portal_simulation\n
\n
params = {\n
\'section_uid\' : paysheet.getDestinationSectionUid(),\n
\'node_uid\' : paysheet.getSourceSectionUid(),\n
\'tax_category_uid\' :\\\n
- paysheet.portal_categories.tax_category.employee_share.getUid(),\n
+ portal.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
@@ -135,6 +136,7 @@
<string>None</string>
<string>context</string>
<string>_getattr_</string>
+ <string>portal</string>
<string>portal_simulation</string>
<string>DateTime</string>
<string>params</string>
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=19318&r1=19317&r2=19318&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 18:05:46 2008
@@ -68,14 +68,15 @@
<value> <string>if paysheet is None:\n
paysheet = context\n
\n
-portal_simulation = paysheet.getPortalObject().portal_simulation\n
+portal = context.getPortalObject();\n
+portal_simulation = portal.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
- paysheet.portal_categories.tax_category.employee_share.getUid(),\n
+ portal.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
@@ -131,6 +132,7 @@
<string>None</string>
<string>context</string>
<string>_getattr_</string>
+ <string>portal</string>
<string>portal_simulation</string>
<string>DateTime</string>
<string>params</string>
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=19318&r1=19317&r2=19318&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 18:05:46 2008
@@ -68,13 +68,14 @@
<value> <string>if paysheet is None:\n
paysheet = context\n
\n
-portal_simulation = paysheet.getPortalObject().portal_simulation\n
+portal = context.getPortalObject();\n
+portal_simulation = portal.portal_simulation\n
\n
params = {\n
\'section_uid\' : paysheet.getDestinationSectionUid(),\n
\'node_uid\' : paysheet.getSourceSectionUid(),\n
\'tax_category_uid\' :\\\n
- paysheet.portal_categories.tax_category.employee_share.getUid(),\n
+ portal.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
@@ -137,6 +138,7 @@
<string>None</string>
<string>context</string>
<string>_getattr_</string>
+ <string>portal</string>
<string>portal_simulation</string>
<string>DateTime</string>
<string>params</string>
Modified: erp5/trunk/bt5/erp5_payroll/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/revision?rev=19318&r1=19317&r2=19318&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/revision (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/revision Thu Feb 14 18:05:46 2008
@@ -1,1 +1,1 @@
-205
+206
More information about the Erp5-report
mailing list