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

bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewQuantity.xml

@@ -77,7 +77,6 @@
                     <key> <string>bottom</string> </key>
                     <value>
                       <list>
-                        <string>mapped_value_property_list</string>
                         <string>matrixbox</string>
                       </list>
                     </value>
@@ -92,9 +91,8 @@
                     <key> <string>hidden</string> </key>
                     <value>
                       <list>
-                        <string>membership_criterion_base_category_list</string>
-                        <string>matrixbox_membership_criterion_category_list</string>
                         <string>matrixbox_quantity</string>
+                        <string>matrixbox_price</string>
                       </list>
                     </value>
                 </item>

bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewQuantity/matrixbox.xml

@@ -172,7 +172,9 @@
                 </item>
                 <item>
                     <key> <string>tabs</string> </key>
-                    <value> <string></string> </value>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+                    </value>
                 </item>
                 <item>
                     <key> <string>title</string> </key>
@@ -222,7 +224,7 @@
                 </item>
                 <item>
                     <key> <string>cell_portal_type</string> </key>
-                    <value> <string>Mapped Value</string> </value>
+                    <value> <string>Pay Sheet Cell</string> </value>
                 </item>
                 <item>
                     <key> <string>columns</string> </key>
@@ -260,8 +262,8 @@
                           <string>Base Salary</string>
                         </tuple>
                         <tuple>
-                          <string>membership_criterion_category_list</string>
-                          <string>membership_criterion_category_list</string>
+                          <string>price</string>
+                          <string>Rate</string>
                         </tuple>
                       </list>
                     </value>
@@ -297,16 +299,7 @@
                 <item>
                     <key> <string>global_attributes</string> </key>
                     <value>
-                      <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>
+                      <list/>
                     </value>
                 </item>
                 <item>
@@ -345,7 +338,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>paysheetline_quantity_matrixbox</string> </value>
+                    <value> <string>Cells</string> </value>
                 </item>
                 <item>
                     <key> <string>update_cell_range</string> </key>
@@ -387,7 +380,7 @@
       <dictionary>
         <item>
             <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>
       </dictionary>
     </pickle>
@@ -406,7 +399,26 @@
       <dictionary>
         <item>
             <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>
       </dictionary>
     </pickle>

bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewQuantity/matrixbox_quantity.xml

@@ -173,7 +173,7 @@
                 </item>
                 <item>
                     <key> <string>css_class</string> </key>
-                    <value> <string></string> </value>
+                    <value> <string>figure</string> </value>
                 </item>
                 <item>
                     <key> <string>default</string> </key>
@@ -223,10 +223,18 @@
                     <key> <string>hidden</string> </key>
                     <value> <int>0</int> </value>
                 </item>
+                <item>
+                    <key> <string>input_style</string> </key>
+                    <value> <string>-1 234.5</string> </value>
+                </item>
                 <item>
                     <key> <string>not_viewable</string> </key>
                     <value> <int>0</int> </value>
                 </item>
+                <item>
+                    <key> <string>precision</string> </key>
+                    <value> <string></string> </value>
+                </item>
                 <item>
                     <key> <string>read_only</string> </key>
                     <value> <int>0</int> </value>
@@ -237,7 +245,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>paysheetline_quantity_matrixbox_quantity</string> </value>
+                    <value> <string>Quantity</string> </value>
                 </item>
                 <item>
                     <key> <string>viewable_expression</string> </key>

bt5/erp5_payroll/bt/change_log

+2006-06-29 jerome
+* fix matrix box in PaySheetLine_viewQuantity
+
 2006-06-19 Kevin
 * Fix wrong paysheet month.