From 2b683f39d260e89e74ba6e9339254612e34d453b Mon Sep 17 00:00:00 2001
From: Fabien Morin <fabien@nexedi.com>
Date: Mon, 8 Jun 2009 15:09:46 +0000
Subject: [PATCH] - Now we use Pay Sheet Model Cell in Pay Sheet Model Line -
change descriptions : 'movement' term was not correct here, they are not
movements but cells - add quantity and price on Model Line - add Trade Phase
on Model Line - remove editable checkbox on model line. This is useless since
we can add model lines in the paysheet. Editable lines will be the model
lines in the paysheet. - remove my_source_annotation_line_reference and
my_source_title. This is now defined on the business process
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@27432 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../erp5_payroll/PaySheetModelLine_view.xml | 6 +-
.../PaySheetModelLine_view/matrixbox.xml | 8 +-
.../my_base_contribution_list.xml | 10 ++-
.../my_create_paysheet_line.xml | 8 ++
.../{my_source_title.xml => my_price.xml} | 77 ++++++++++---------
...ion_line_reference.xml => my_quantity.xml} | 39 +++++++---
.../{my_editable.xml => my_trade_phase.xml} | 8 +-
.../my_variation_category_list.xml | 14 +++-
bt5/erp5_payroll/bt/revision | 2 +-
9 files changed, 105 insertions(+), 67 deletions(-)
rename bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/{my_source_title.xml => my_price.xml} (68%)
rename bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/{my_source_annotation_line_reference.xml => my_quantity.xml} (74%)
rename bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/{my_editable.xml => my_trade_phase.xml} (91%)
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view.xml
index 197e1deb2d..55ac352ffa 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view.xml
@@ -105,9 +105,10 @@
<string>my_int_index</string>
<string>my_reference</string>
<string>my_resource_title</string>
- <string>my_source_annotation_line_reference</string>
- <string>my_source_title</string>
<string>my_calculation_script_id</string>
+ <string>my_price</string>
+ <string>my_quantity</string>
+ <string>my_trade_phase</string>
</list>
</value>
</item>
@@ -119,7 +120,6 @@
<string>my_base_contribution_list</string>
<string>my_base_application_list</string>
<string>my_create_paysheet_line</string>
- <string>my_editable</string>
</list>
</value>
</item>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/matrixbox.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/matrixbox.xml
index fa01ddae45..5202767233 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/matrixbox.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/matrixbox.xml
@@ -13,14 +13,14 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
- <string>title</string>
<string>cell_base_id</string>
<string>cell_portal_type</string>
- <string>lines</string>
<string>columns</string>
- <string>tabs</string>
<string>editable_attributes</string>
<string>global_attributes</string>
+ <string>lines</string>
+ <string>tabs</string>
+ <string>title</string>
</list>
</value>
</item>
@@ -105,7 +105,7 @@
</item>
<item>
<key> <string>cell_portal_type</string> </key>
- <value> <string>Pay Sheet Cell</string> </value>
+ <value> <string>Pay Sheet Model Cell</string> </value>
</item>
<item>
<key> <string>columns</string> </key>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_base_contribution_list.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_base_contribution_list.xml
index c7621fdf92..3a7de17d91 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_base_contribution_list.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_base_contribution_list.xml
@@ -14,8 +14,8 @@
<value>
<list>
<string>description</string>
- <string>title</string>
<string>items</string>
+ <string>title</string>
</list>
</value>
</item>
@@ -84,7 +84,7 @@
<dictionary>
<item>
<key> <string>description</string> </key>
- <value> <string>This movement will contribute to the selected bases.</string> </value>
+ <value> <string>This cell will contribute to the selected bases.</string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
@@ -94,6 +94,12 @@
<key> <string>form_id</string> </key>
<value> <string>Base_viewPayrollFieldLibrary</string> </value>
</item>
+ <item>
+ <key> <string>items</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_create_paysheet_line.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_create_paysheet_line.xml
index 3c120a706d..3a1d3cb049 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_create_paysheet_line.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_create_paysheet_line.xml
@@ -56,6 +56,10 @@
<key> <string>tales</string> </key>
<value>
<dictionary>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
@@ -68,6 +72,10 @@
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
</dictionary>
</value>
</item>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_source_title.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_price.xml
similarity index 68%
rename from bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_source_title.xml
rename to bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_price.xml
index 5d9b57a64c..bdd3fe5364 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_source_title.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_price.xml
@@ -15,16 +15,13 @@
<list>
<string>title</string>
<string>description</string>
- <string>base_category</string>
- <string>portal_type</string>
- <string>catalog_index</string>
- <string>proxy_listbox_ids</string>
+ <string>enabled</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>my_source_title</string> </value>
+ <value> <string>my_price</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
@@ -60,6 +57,16 @@
<key> <string>tales</string> </key>
<value>
<dictionary>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
@@ -72,6 +79,10 @@
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
</dictionary>
</value>
</item>
@@ -80,46 +91,20 @@
<value>
<dictionary>
<item>
- <key> <string>base_category</string> </key>
- <value> <string>source</string> </value>
- </item>
- <item>
- <key> <string>catalog_index</string> </key>
- <value> <string>title</string> </value>
+ <key> <string>description</string> </key>
+ <value> <string>The price paid for the one unit of quantity</string> </value>
</item>
<item>
- <key> <string>description</string> </key>
- <value> <string>The Organisation that will collect the corresponding tax.</string> </value>
+ <key> <string>enabled</string> </key>
+ <value> <int>1</int> </value>
</item>
<item>
<key> <string>field_id</string> </key>
- <value> <string>my_relation_field</string> </value>
+ <value> <string>my_price</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
- <value> <string>Base_viewPayrollFieldLibrary</string> </value>
- </item>
- <item>
- <key> <string>portal_type</string> </key>
- <value>
- <list>
- <tuple>
- <string>Organisation</string>
- <string>Organisation</string>
- </tuple>
- </list>
- </value>
- </item>
- <item>
- <key> <string>proxy_listbox_ids</string> </key>
- <value>
- <list>
- <tuple>
- <string>OrganisationModule_viewOrganisationList/listbox</string>
- <string>Organisations</string>
- </tuple>
- </list>
- </value>
+ <value> <string>PaySheetTransaction_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
@@ -127,7 +112,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Payroll Service Provider</string> </value>
+ <value> <string>Hourly Rate</string> </value>
</item>
</dictionary>
</value>
@@ -135,4 +120,20 @@
</dictionary>
</pickle>
</record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string>python: not here.getVariationCategoryList()</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
</ZopeData>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_source_annotation_line_reference.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_quantity.xml
similarity index 74%
rename from bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_source_annotation_line_reference.xml
rename to bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_quantity.xml
index 234b661333..160ac5123c 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_source_annotation_line_reference.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_quantity.xml
@@ -13,14 +13,13 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
- <string>description</string>
- <string>title</string>
+ <string>enabled</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>my_source_annotation_line_reference</string> </value>
+ <value> <string>my_quantity</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
@@ -56,6 +55,12 @@
<key> <string>tales</string> </key>
<value>
<dictionary>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
@@ -76,29 +81,41 @@
<value>
<dictionary>
<item>
- <key> <string>description</string> </key>
- <value> <string>The Payroll Service Provider will be the one defined in the Annotation Line with this reference.</string> </value>
+ <key> <string>enabled</string> </key>
+ <value> <int>1</int> </value>
</item>
<item>
<key> <string>field_id</string> </key>
- <value> <string>my_string_field</string> </value>
+ <value> <string>my_work_time_annotation_line_quantity</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
- <value> <string>Base_viewPayrollFieldLibrary</string> </value>
+ <value> <string>AnnotationLine_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>Annotation Line Reference for Payroll Service Provider</string> </value>
- </item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string>python: not here.getVariationCategoryList()</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
</ZopeData>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_editable.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_trade_phase.xml
similarity index 91%
rename from bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_editable.xml
rename to bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_trade_phase.xml
index 57df386133..40f0d6a620 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_editable.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_trade_phase.xml
@@ -19,7 +19,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>my_editable</string> </value>
+ <value> <string>my_trade_phase</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
@@ -76,11 +76,11 @@
<dictionary>
<item>
<key> <string>field_id</string> </key>
- <value> <string>my_checkbox</string> </value>
+ <value> <string>my_category</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
- <value> <string>Base_viewPayrollFieldLibrary</string> </value>
+ <value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
@@ -88,7 +88,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Editable</string> </value>
+ <value> <string>Trade Phase</string> </value>
</item>
</dictionary>
</value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_variation_category_list.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_variation_category_list.xml
index e0a0e89b26..213fe7b88a 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_variation_category_list.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_variation_category_list.xml
@@ -13,12 +13,12 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
- <string>hash_script_id</string>
<string>description</string>
- <string>title</string>
+ <string>hash_script_id</string>
+ <string>items</string>
<string>required</string>
<string>size</string>
- <string>items</string>
+ <string>title</string>
</list>
</value>
</item>
@@ -87,7 +87,7 @@
<dictionary>
<item>
<key> <string>description</string> </key>
- <value> <string>The variations that are applied to this pay sheet movement.</string> </value>
+ <value> <string>The variations that are applied to this pay sheet cell.</string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
@@ -101,6 +101,12 @@
<key> <string>hash_script_id</string> </key>
<value> <string>Base_getMultiListFieldPropertyDictList</string> </value>
</item>
+ <item>
+ <key> <string>items</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
<item>
<key> <string>required</string> </key>
<value> <int>0</int> </value>
diff --git a/bt5/erp5_payroll/bt/revision b/bt5/erp5_payroll/bt/revision
index 9ec873d37d..2ae9f6c7cb 100644
--- a/bt5/erp5_payroll/bt/revision
+++ b/bt5/erp5_payroll/bt/revision
@@ -1 +1 @@
-438
\ No newline at end of file
+441
\ No newline at end of file
--
2.30.9