Skip to content

erp5
erp5
Commit cfdb32b6 authored by Jérome Perrin's avatar Jérome Perrin
Browse files
Options

Fix matrixbox. Add price & quantity as editable field in the same cell, and 

remove matrixbox properties specific to mapped values.



git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@8226 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 7aea1659
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 110 additions and 740 deletions
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewQuantity.xml
View file @ cfdb32b6
...@@ -77,7 +77,6 @@ ...@@ -77,7 +77,6 @@
<key> <string>bottom</string> </key> <key> <string>bottom</string> </key>
<value> <value>
<list> <list>
<string>mapped_value_property_list</string>
<string>matrixbox</string> <string>matrixbox</string>
</list> </list>
</value> </value>
...@@ -92,9 +91,8 @@ ...@@ -92,9 +91,8 @@
<key> <string>hidden</string> </key> <key> <string>hidden</string> </key>
<value> <value>
<list> <list>
<string>membership_criterion_base_category_list</string>
<string>matrixbox_membership_criterion_category_list</string>
<string>matrixbox_quantity</string> <string>matrixbox_quantity</string>
<string>matrixbox_price</string>
</list> </list>
</value> </value>
</item> </item>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewQuantity/matrixbox.xml
View file @ cfdb32b6
...@@ -172,7 +172,9 @@ ...@@ -172,7 +172,9 @@
</item> </item>
<item> <item>
<key> <string>tabs</string> </key> <key> <string>tabs</string> </key>
<value> <string></string> </value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
...@@ -222,7 +224,7 @@ ...@@ -222,7 +224,7 @@
</item> </item>
<item> <item>
<key> <string>cell_portal_type</string> </key> <key> <string>cell_portal_type</string> </key>
<value> <string>Mapped Value</string> </value> <value> <string>Pay Sheet Cell</string> </value>
</item> </item>
<item> <item>
<key> <string>columns</string> </key> <key> <string>columns</string> </key>
...@@ -260,8 +262,8 @@ ...@@ -260,8 +262,8 @@
<string>Base Salary</string> <string>Base Salary</string>
</tuple> </tuple>
<tuple> <tuple>
<string>membership_criterion_category_list</string> <string>price</string>
<string>membership_criterion_category_list</string> <string>Rate</string>
</tuple> </tuple>
</list> </list>
</value> </value>
...@@ -297,16 +299,7 @@ ...@@ -297,16 +299,7 @@
<item> <item>
<key> <string>global_attributes</string> </key> <key> <string>global_attributes</string> </key>
<value> <value>
<list> <list/>
<tuple>
<string>mapped_value_property_list</string>
<string>mapped_value_property_list</string>
</tuple>
<tuple>
<string>membership_criterion_base_category_list</string>
<string>membership_criterion_base_category_list</string>
</tuple>
</list>
</value> </value>
</item> </item>
<item> <item>
...@@ -345,7 +338,7 @@ ...@@ -345,7 +338,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>paysheetline_quantity_matrixbox</string> </value> <value> <string>Cells</string> </value>
</item> </item>
<item> <item>
<key> <string>update_cell_range</string> </key> <key> <string>update_cell_range</string> </key>
...@@ -387,7 +380,7 @@ ...@@ -387,7 +380,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>python: here.PaySheetLine_getCellRangeItemList()[1]</string> </value> <value> <string>python: here.PaySheetLine_asCellRange(matrixbox=1)[1]</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
...@@ -406,7 +399,26 @@ ...@@ -406,7 +399,26 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>python: here.PaySheetLine_getCellRangeItemList()[0]</string> </value> <value> <string>python: here.PaySheetLine_asCellRange(matrixbox=1)[0]</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<tuple>
<tuple>
<string>Products.Formulator.TALESField</string>
<string>TALESMethod</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: [] # here.PaySheetLine_asCellRange(matrixbox=1)[2]</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewQuantity/matrixbox_quantity.xml
View file @ cfdb32b6
...@@ -173,7 +173,7 @@ ...@@ -173,7 +173,7 @@
</item> </item>
<item> <item>
<key> <string>css_class</string> </key> <key> <string>css_class</string> </key>
<value> <string></string> </value> <value> <string>figure</string> </value>
</item> </item>
<item> <item>
<key> <string>default</string> </key> <key> <string>default</string> </key>
...@@ -223,10 +223,18 @@ ...@@ -223,10 +223,18 @@
<key> <string>hidden</string> </key> <key> <string>hidden</string> </key>
<value> <int>0</int> </value> <value> <int>0</int> </value>
</item> </item>
<item>
<key> <string>input_style</string> </key>
<value> <string>-1 234.5</string> </value>
</item>
<item> <item>
<key> <string>not_viewable</string> </key> <key> <string>not_viewable</string> </key>
<value> <int>0</int> </value> <value> <int>0</int> </value>
</item> </item>
<item>
<key> <string>precision</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>read_only</string> </key> <key> <string>read_only</string> </key>
<value> <int>0</int> </value> <value> <int>0</int> </value>
...@@ -237,7 +245,7 @@ ...@@ -237,7 +245,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>paysheetline_quantity_matrixbox_quantity</string> </value> <value> <string>Quantity</string> </value>
</item> </item>
<item> <item>
<key> <string>viewable_expression</string> </key> <key> <string>viewable_expression</string> </key>
......
bt5/erp5_payroll/bt/change_log
View file @ cfdb32b6
2006-06-29 jerome
* fix matrix box in PaySheetLine_viewQuantity
2006-06-19 Kevin 2006-06-19 Kevin
* Fix wrong paysheet month. * Fix wrong paysheet month.
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7