Commit 05a14454 authored by Jérome Perrin's avatar Jérome Perrin

xml changes

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@21388 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent baf156b1
...@@ -42,6 +42,12 @@ ...@@ -42,6 +42,12 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>action</string> </key> <key> <string>action</string> </key>
<value> <string>Base_edit</string> </value> <value> <string>Base_edit</string> </value>
......
...@@ -42,6 +42,12 @@ ...@@ -42,6 +42,12 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>action</string> </key> <key> <string>action</string> </key>
<value> <string>Base_edit</string> </value> <value> <string>Base_edit</string> </value>
......
...@@ -42,6 +42,12 @@ ...@@ -42,6 +42,12 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>action</string> </key> <key> <string>action</string> </key>
<value> <string>Base_edit</string> </value> <value> <string>Base_edit</string> </value>
......
...@@ -100,6 +100,12 @@ return cell_range\n ...@@ -100,6 +100,12 @@ return cell_range\n
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>matrixbox=0, **kw</string> </value> <value> <string>matrixbox=0, **kw</string> </value>
......
...@@ -42,6 +42,12 @@ ...@@ -42,6 +42,12 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>action</string> </key> <key> <string>action</string> </key>
<value> <string>Base_edit</string> </value> <value> <string>Base_edit</string> </value>
......
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string>The organisation that recieves the service.</string> </value> <value> <string>The organisation that receives the service.</string> </value>
</item> </item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
......
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Sort Index</string> </value> <value> <string>PaySheet Order</string> </value>
</item> </item>
</dictionary> </dictionary>
</value> </value>
......
...@@ -42,6 +42,12 @@ ...@@ -42,6 +42,12 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>action</string> </key> <key> <string>action</string> </key>
<value> <string>Base_edit</string> </value> <value> <string>Base_edit</string> </value>
......
...@@ -135,6 +135,12 @@ else:\n ...@@ -135,6 +135,12 @@ else:\n
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>matrixbox=0, base_id=\'movement\', **kw</string> </value> <value> <string>matrixbox=0, base_id=\'movement\', **kw</string> </value>
......
...@@ -80,6 +80,12 @@ ...@@ -80,6 +80,12 @@
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>*args,**kw</string> </value> <value> <string>*args,**kw</string> </value>
......
...@@ -42,6 +42,12 @@ ...@@ -42,6 +42,12 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>action</string> </key> <key> <string>action</string> </key>
<value> <string>Base_doSelect</string> </value> <value> <string>Base_doSelect</string> </value>
......
...@@ -42,6 +42,12 @@ ...@@ -42,6 +42,12 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>action</string> </key> <key> <string>action</string> </key>
<value> <string>Base_edit</string> </value> <value> <string>Base_edit</string> </value>
......
...@@ -100,6 +100,12 @@ return category_list\n ...@@ -100,6 +100,12 @@ return category_list\n
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>matrixbox=0, base_id=\'movement\',**kw</string> </value> <value> <string>matrixbox=0, base_id=\'movement\',**kw</string> </value>
......
...@@ -42,6 +42,12 @@ ...@@ -42,6 +42,12 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>action</string> </key> <key> <string>action</string> </key>
<value> <string>Base_edit</string> </value> <value> <string>Base_edit</string> </value>
......
...@@ -262,7 +262,7 @@ ...@@ -262,7 +262,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Settings Categories</string> </value> <value> <string>Salary Ranges</string> </value>
</item> </item>
<item> <item>
<key> <string>unicode</string> </key> <key> <string>unicode</string> </key>
......
...@@ -42,6 +42,12 @@ ...@@ -42,6 +42,12 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>action</string> </key> <key> <string>action</string> </key>
<value> <string>Base_edit</string> </value> <value> <string>Base_edit</string> </value>
......
...@@ -120,6 +120,12 @@ if not batch_mode:\n ...@@ -120,6 +120,12 @@ if not batch_mode:\n
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>form_id=\'view\', batch_mode=0</string> </value> <value> <string>form_id=\'view\', batch_mode=0</string> </value>
......
...@@ -105,6 +105,12 @@ for model, sub_object_id_list in sub_object_by_model.items():\n ...@@ -105,6 +105,12 @@ for model, sub_object_id_list in sub_object_by_model.items():\n
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>portal_type_list=[]</string> </value> <value> <string>portal_type_list=[]</string> </value>
......
...@@ -101,6 +101,12 @@ if not(kw.has_key(\'skip_redirect\') and kw[\'skip_redirect\'] == True):\n ...@@ -101,6 +101,12 @@ if not(kw.has_key(\'skip_redirect\') and kw[\'skip_redirect\'] == True):\n
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>listbox=[], **kw</string> </value> <value> <string>listbox=[], **kw</string> </value>
......
...@@ -128,6 +128,12 @@ return amount\n ...@@ -128,6 +128,12 @@ return amount\n
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>base_participation_list=None, category_list=None</string> </value> <value> <string>base_participation_list=None, category_list=None</string> </value>
......
...@@ -95,6 +95,7 @@ line_list = []\n ...@@ -95,6 +95,7 @@ line_list = []\n
object_dict_list = []\n object_dict_list = []\n
id = 0\n id = 0\n
\n \n
context.log(model_line_list)\n
for model_line in model_line_list:\n for model_line in model_line_list:\n
base_category_list = model_line.getVariationBaseCategoryList()\n base_category_list = model_line.getVariationBaseCategoryList()\n
base_application_list = model_line.getBaseAmountTitleList()\n base_application_list = model_line.getBaseAmountTitleList()\n
...@@ -108,9 +109,20 @@ for model_line in model_line_list:\n ...@@ -108,9 +109,20 @@ for model_line in model_line_list:\n
cartesian_product = cartesianProduct(list_of_list)\n cartesian_product = cartesianProduct(list_of_list)\n
\n \n
previous_share = None\n previous_share = None\n
\n
object_dict = {}\n object_dict = {}\n
\n
if cartesian_product == [[]]:\n
context.log(\'rien\')\n
\n
share_dict = {}\n
if 0:\n
share_dict[cell.getTaxCategory()+\'_price\'] = 0\n
share_dict[cell.getTaxCategory()+\'_quantity\'] = 0\n
continue\n
\n
for tuple in cartesian_product:\n for tuple in cartesian_product:\n
context.log(tuple)\n
\n
share_dict = {}\n share_dict = {}\n
cell = model_line.getCell(*tuple)\n cell = model_line.getCell(*tuple)\n
if cell is None:\n if cell is None:\n
...@@ -301,8 +313,8 @@ return line_list\n ...@@ -301,8 +313,8 @@ return line_list\n
<string>None</string> <string>None</string>
<string>previous_share</string> <string>previous_share</string>
<string>object_dict</string> <string>object_dict</string>
<string>tuple</string>
<string>share_dict</string> <string>share_dict</string>
<string>tuple</string>
<string>_apply_</string> <string>_apply_</string>
<string>cell</string> <string>cell</string>
<string>quantity</string> <string>quantity</string>
......
...@@ -128,6 +128,12 @@ return line_dict_list\n ...@@ -128,6 +128,12 @@ return line_dict_list\n
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
......
...@@ -76,9 +76,9 @@ ...@@ -76,9 +76,9 @@
column_list = []\n column_list = []\n
editable_column_list = [(\'base\', \'Base\'),]\n editable_column_list = [(\'base\', \'Base\'),]\n
\n \n
not_editable_column_list = [(\'int_index\', \'Sort Index\'),\n not_editable_column_list = [(\'int_index\', \'PaySheet Order\'),\n
(\'title\', \'Title\'),\n (\'title\', \'Title\'),\n
(\'source_section_title\', \'Source\'),\n (\'source_section_title\', \'Payroll Service Provider\'),\n
(\'slice\', \'Slice\'),]\n (\'slice\', \'Slice\'),]\n
\n \n
if not editable:\n if not editable:\n
...@@ -111,6 +111,12 @@ return column_list\n ...@@ -111,6 +111,12 @@ return column_list\n
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>editable=0</string> </value> <value> <string>editable=0</string> </value>
......
...@@ -122,6 +122,12 @@ return column_list\n ...@@ -122,6 +122,12 @@ return column_list\n
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>editable=0</string> </value> <value> <string>editable=0</string> </value>
......
...@@ -218,6 +218,12 @@ return line_list\n ...@@ -218,6 +218,12 @@ return line_list\n
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>**kw</string> </value> <value> <string>**kw</string> </value>
......
...@@ -108,6 +108,12 @@ else:\n ...@@ -108,6 +108,12 @@ else:\n
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>line_number=None</string> </value> <value> <string>line_number=None</string> </value>
......
...@@ -100,6 +100,12 @@ return portal_simulation.getInventoryAssetPrice(**params)\n ...@@ -100,6 +100,12 @@ return portal_simulation.getInventoryAssetPrice(**params)\n
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>paysheet=None</string> </value> <value> <string>paysheet=None</string> </value>
......
...@@ -100,6 +100,12 @@ return portal_simulation.getInventoryAssetPrice(**params)\n ...@@ -100,6 +100,12 @@ return portal_simulation.getInventoryAssetPrice(**params)\n
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>paysheet=None</string> </value> <value> <string>paysheet=None</string> </value>
......
...@@ -104,6 +104,12 @@ return net_pay\n ...@@ -104,6 +104,12 @@ return net_pay\n
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>paysheet=None</string> </value> <value> <string>paysheet=None</string> </value>
......
...@@ -106,6 +106,12 @@ return yearly_work_time\n ...@@ -106,6 +106,12 @@ return yearly_work_time\n
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
......
...@@ -106,6 +106,12 @@ return taxable_net_pay\n ...@@ -106,6 +106,12 @@ return taxable_net_pay\n
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>paysheet=None</string> </value> <value> <string>paysheet=None</string> </value>
......
...@@ -108,6 +108,12 @@ return movement_list\n ...@@ -108,6 +108,12 @@ return movement_list\n
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>explanation_uid=None, **kw</string> </value> <value> <string>explanation_uid=None, **kw</string> </value>
......
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
<list> <list>
<tuple> <tuple>
<string>int_index</string> <string>int_index</string>
<string>Sort Index</string> <string>PaySheet Order</string>
</tuple> </tuple>
<tuple> <tuple>
<string>title</string> <string>title</string>
...@@ -155,7 +155,7 @@ ...@@ -155,7 +155,7 @@
</tuple> </tuple>
<tuple> <tuple>
<string>source_section_title</string> <string>source_section_title</string>
<string>Source</string> <string>Payroll Service Provider</string>
</tuple> </tuple>
</list> </list>
</value> </value>
......
...@@ -124,6 +124,12 @@ return printed\n ...@@ -124,6 +124,12 @@ return printed\n
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
......
...@@ -42,6 +42,12 @@ ...@@ -42,6 +42,12 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>action</string> </key> <key> <string>action</string> </key>
<value> <string>Base_doSelect</string> </value> <value> <string>Base_doSelect</string> </value>
......
...@@ -42,6 +42,12 @@ ...@@ -42,6 +42,12 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>action</string> </key> <key> <string>action</string> </key>
<value> <string>Base_edit</string> </value> <value> <string>Base_edit</string> </value>
...@@ -88,7 +94,6 @@ ...@@ -88,7 +94,6 @@
<value> <value>
<list> <list>
<string>my_title</string> <string>my_title</string>
<string>my_source_title</string>
<string>my_quantity_unit</string> <string>my_quantity_unit</string>
<string>my_product_line</string> <string>my_product_line</string>
<string>my_base_amount_list</string> <string>my_base_amount_list</string>
......
<?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/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_source_title</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>field_id</string> </key>
<value> <string>my_source_title</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>PayrollService_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
...@@ -42,6 +42,12 @@ ...@@ -42,6 +42,12 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>action</string> </key> <key> <string>action</string> </key>
<value> <string>Base_edit</string> </value> <value> <string>Base_edit</string> </value>
......
248 249
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment