[Erp5-report] r18100 - /erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payr...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Dec 6 22:46:26 CET 2007
Author: fabien
Date: Thu Dec 6 22:46:25 2007
New Revision: 18100
URL: http://svn.erp5.org?rev=18100&view=rev
Log:
lot of changes, incuding :
- rename base_amount_current_value_dict in base_amount_dict
- change this previous dict to stock values of all tax_category
- now, Pay Sheet Model Line could use only tax_category (without any slice)
- add a comment in PaySheetTransaction_getMovementList
- add uses of cartesian_product witch is more efficient and more evolutive
- enhance PaySheetTransaction_getYearToDateNetPay script (over_time is not take
into account in french payroll)
- add PaySheetTransaction_getYearToDateBaseSalary script
- add PaySheetTransaction_getYearToDateOvertimeAmount script
- rename PaySheetTransaction_getYearToDateOverTimeHours in
PaySheetTransaction_getYearToDateOvertimeHours.xml
- remove all reverse() : before this commit, there were some reverse() to have the Matrixbox displayed with slice on the left column and the tax_category on
the head line. Now it's in the default order, and it's less confused.
- typo
Removed:
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateOverTimeHours.xml
Removed: 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=18099&view=auto
==============================================================================
--- 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 (removed)
@@ -1,172 +1,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <tuple>
- <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>Python_magic</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
- <key> <string>Script_magic</string> </key>
- <value> <int>3</int> </value>
- </item>
- <item>
- <key> <string>__ac_local_roles__</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
- <key> <string>_bind_names</string> </key>
- <value>
- <object>
- <klass>
- <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_asgns</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>name_container</string> </key>
- <value> <string>container</string> </value>
- </item>
- <item>
- <key> <string>name_context</string> </key>
- <value> <string>context</string> </value>
- </item>
- <item>
- <key> <string>name_m_self</string> </key>
- <value> <string>script</string> </value>
- </item>
- <item>
- <key> <string>name_subpath</string> </key>
- <value> <string>traverse_subpath</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
- <item>
- <key> <string>_body</string> </key>
- <value> <string>portal = context.getPortalObject()\n
-accounting_module = portal.accounting_module\n
-\n
-from_date=DateTime(context.getStartDate().year(), 1, 1)\n
-to_date=context.getStartDate()\n
-\n
-search_params = \\\n
- { \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
- }\n
-\n
-paysheet_list = accounting_module.searchFolder( **search_params)\n
-\n
-yearly_work_time = 0\n
-for paysheet in paysheet_list:\n
- yearly_work_time += paysheet.getOvertimeAnnotationLineQuantity(0)\n
-\n
-return yearly_work_time\n
-</string> </value>
- </item>
- <item>
- <key> <string>_code</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
- <key> <string>_filepath</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
- <key> <string>_params</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>errors</string> </key>
- <value>
- <tuple/>
- </value>
- </item>
- <item>
- <key> <string>func_code</string> </key>
- <value>
- <object>
- <klass>
- <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>co_argcount</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>co_varnames</string> </key>
- <value>
- <tuple>
- <string>_getattr_</string>
- <string>context</string>
- <string>portal</string>
- <string>accounting_module</string>
- <string>DateTime</string>
- <string>from_date</string>
- <string>to_date</string>
- <string>search_params</string>
- <string>_apply_</string>
- <string>paysheet_list</string>
- <string>yearly_work_time</string>
- <string>_getiter_</string>
- <string>paysheet</string>
- <string>_inplacevar_</string>
- </tuple>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
- <item>
- <key> <string>func_defaults</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>PaySheetTransaction_getYearToDateOverTimeHours</string> </value>
- </item>
- <item>
- <key> <string>warnings</string> </key>
- <value>
- <tuple/>
- </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
More information about the Erp5-report
mailing list