[Erp5-report] r27863 - in /erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_p...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Jul 2 11:02:54 CEST 2009
Author: fabien
Date: Thu Jul 2 11:02:53 2009
New Revision: 27863
URL: http://svn.erp5.org?rev=27863&view=rev
Log:
- update listbox of PaySheetTransaction_view to have more "more_columns"
- rename my_default_calculation_script_id to my_calculation_script_id to be
consistent with script in lines
- change system preference title (it was set to BPM because of copy/paste
mistake)
Removed:
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_default_calculation_script_id.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_viewFieldLibrary/my_default_calculation_script_id.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_defaultCalculationScript.xml
Removed: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_default_calculation_script_id.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_default_calculation_script_id.xml?rev=27862&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_default_calculation_script_id.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_default_calculation_script_id.xml (removed)
@@ -1,104 +1,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <tuple>
- <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>delegated_list</string> </key>
- <value>
- <list>
- <string>description</string>
- <string>title</string>
- </list>
- </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>my_default_calculation_script_id</string> </value>
- </item>
- <item>
- <key> <string>message_values</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>external_validator_failed</string> </key>
- <value> <string>The input failed the external validator.</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>overrides</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>field_id</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>form_id</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>target</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>tales</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>field_id</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>form_id</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>target</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>values</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>description</string> </key>
- <value> <string>The default script used to calculated the withhold amount for each line.</string> </value>
- </item>
- <item>
- <key> <string>field_id</string> </key>
- <value> <string>my_string_field</string> </value>
- </item>
- <item>
- <key> <string>form_id</string> </key>
- <value> <string>Base_viewPayrollFieldLibrary</string> </value>
- </item>
- <item>
- <key> <string>target</string> </key>
- <value> <string>Click to edit the target</string> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string>Default Calculation Script</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
Removed: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_viewFieldLibrary/my_default_calculation_script_id.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_viewFieldLibrary/my_default_calculation_script_id.xml?rev=27862&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_viewFieldLibrary/my_default_calculation_script_id.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_viewFieldLibrary/my_default_calculation_script_id.xml (removed)
@@ -1,104 +1,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <tuple>
- <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>delegated_list</string> </key>
- <value>
- <list>
- <string>title</string>
- <string>description</string>
- </list>
- </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>my_default_calculation_script_id</string> </value>
- </item>
- <item>
- <key> <string>message_values</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>external_validator_failed</string> </key>
- <value> <string>The input failed the external validator.</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>overrides</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>field_id</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>form_id</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>target</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>tales</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>field_id</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>form_id</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>target</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>values</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>description</string> </key>
- <value> <string>The default script used to calculated the withhold amount for each line.</string> </value>
- </item>
- <item>
- <key> <string>field_id</string> </key>
- <value> <string>my_string_field</string> </value>
- </item>
- <item>
- <key> <string>form_id</string> </key>
- <value> <string>Base_viewFieldLibrary</string> </value>
- </item>
- <item>
- <key> <string>target</string> </key>
- <value> <string>Click to edit the target</string> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string>Default Calculation Script</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
Removed: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_defaultCalculationScript.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_defaultCalculationScript.xml?rev=27862&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_defaultCalculationScript.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_defaultCalculationScript.xml (removed)
@@ -1,208 +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>Script_magic</string> </key>
- <value> <int>3</int> </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 encoding="cdata"><![CDATA[
-
-precision = context.getPriceCurrencyValue().getQuantityPrecision()\n
-\n
-quantity = cell.getQuantity()\n
-price = cell.getPrice()\n
-if price is None:\n
- price = 1\n
-\n
-model_line = cell.getParentValue()\n
-\n
-if model_line.isEditable():\n
- return dict(quantity=quantity,\n
- price=price)\n
-\n
-base_application = 0\n
-tax_category_list = cell.getVariationCategoryList(base_category_list= \\\n
- \'tax_category\')\n
-if tax_category_list != []:\n
- tax_category = tax_category_list[0]\n
-else:\n
- tax_category = None\n
-\n
-# get the application amount for this cell\n
-for base in cell.getBaseApplicationList():\n
- if base_amount_dict.has_key(base) and base_amount_dict[base].has_key(tax_category):\n
- base_application += base_amount_dict[base][tax_category]\n
-\n
-if not len(cell.getBaseApplicationList()):\n
- base_application = quantity\n
-salary_range_list = cell.getVariationCategoryList(\\\n
- base_category_list=\'salary_range\')\n
-if len(salary_range_list):\n
- salary_range = salary_range_list[0] # a cell can have only one salary_range\n
- # category\n
-else:\n
- salary_range = None\n
-\n
-model_slice_min = 0\n
-model_slice_max = 0\n
-if salary_range:\n
- model = context.getSpecialiseValue().getEffectiveModel(\\\n
- start_date=context.getStartDate(),\n
- stop_date=context.getStopDate())\n
- cell = model.getCell(salary_range)\n
- if cell is None:\n
- context.log("Warning ! Can\'t find cell corresponding to : %s" %\n
- salary_range)\n
- else:\n
- model_slice_min = cell.getQuantityRangeMin()\n
- model_slice_max = cell.getQuantityRangeMax()\n
-\n
- if not quantity and base_application-model_slice_min>0:\n
- if base_application <= model_slice_max:\n
- quantity = base_application-model_slice_min\n
- elif model_slice_max:\n
- quantity = model_slice_max-model_slice_min\n
- else:\n
- quantity = base_application\n
-\n
-else:\n
- quantity = base_application\n
-\n
-return {\'quantity\':quantity, \'price\':price}\n
-
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_code</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
- <key> <string>_params</string> </key>
- <value> <string>base_amount_dict, cell</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>2</int> </value>
- </item>
- <item>
- <key> <string>co_varnames</string> </key>
- <value>
- <tuple>
- <string>base_amount_dict</string>
- <string>cell</string>
- <string>_getattr_</string>
- <string>context</string>
- <string>precision</string>
- <string>quantity</string>
- <string>price</string>
- <string>None</string>
- <string>model_line</string>
- <string>dict</string>
- <string>base_application</string>
- <string>tax_category_list</string>
- <string>_getitem_</string>
- <string>tax_category</string>
- <string>_getiter_</string>
- <string>base</string>
- <string>_inplacevar_</string>
- <string>len</string>
- <string>salary_range_list</string>
- <string>salary_range</string>
- <string>model_slice_min</string>
- <string>model_slice_max</string>
- <string>model</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_defaultCalculationScript</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