From 818a9a2682d53c132641c195b39626565d022174 Mon Sep 17 00:00:00 2001
From: Fabien Morin <fabien@nexedi.com>
Date: Mon, 22 Jun 2009 13:11:53 +0000
Subject: [PATCH] - remove calculation_script_id from the listbox and add
 reference - change variable name from create_paysheet_line to create_line

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@27736 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../erp5_payroll/PaySheetModelLine_view.xml   |   2 +-
 .../PaySheetModelLine_view/my_create_line.xml | 139 ++++++++++++++++++
 .../erp5_payroll/PaySheetModel_view.xml       |   3 +-
 .../PaySheetModel_view/listbox.xml            |  18 +--
 .../listbox_create_line.xml}                  |   4 +-
 ...heet_line.xml => listbox_create_line_.xml} |   6 +-
 bt5/erp5_payroll/bt/revision                  |   2 +-
 7 files changed, 155 insertions(+), 19 deletions(-)
 create mode 100644 bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_create_line.xml
 rename bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/{PaySheetModelLine_view/my_create_paysheet_line.xml => PaySheetModel_view/listbox_create_line.xml} (96%)
 rename bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/{listbox_create_paysheet_line.xml => listbox_create_line_.xml} (94%)

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 2fef5cfccf..eecd336745 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
@@ -118,7 +118,7 @@
                         <string>my_variation_category_list</string>
                         <string>my_base_contribution_list</string>
                         <string>my_base_application_list</string>
-                        <string>my_create_paysheet_line</string>
+                        <string>my_create_line</string>
                       </list>
                     </value>
                 </item>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_create_line.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_create_line.xml
new file mode 100644
index 0000000000..e879cb3f17
--- /dev/null
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_create_line.xml
@@ -0,0 +1,139 @@
+<?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>default</string>
+                <string>description</string>
+                <string>title</string>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>my_create_line</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>default</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <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>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string>Usefull for intermediated lines. By default, Pay Sheet Lines are created (checked).</string> </value>
+                </item>
+                <item>
+                    <key> <string>field_id</string> </key>
+                    <value> <string>my_checkbox</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>Create Line</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>here/isCreateLine</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view.xml
index 6bba1f6ee9..1825dc1416 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view.xml
@@ -88,7 +88,7 @@
                     <key> <string>hidden</string> </key>
                     <value>
                       <list>
-                        <string>listbox_create_paysheet_line</string>
+                        <string>listbox_create_line_</string>
                         <string>listbox_int_index</string>
                         <string>listbox_float_index</string>
                       </list>
@@ -105,6 +105,7 @@
                         <string>my_price_currency</string>
                         <string>my_specialise_title_list</string>
                         <string>my_default_calculation_script_id</string>
+                        <string>listbox_create_line</string>
                       </list>
                     </value>
                 </item>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/listbox.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/listbox.xml
index f9f002abd1..6bf40cdc8f 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/listbox.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/listbox.xml
@@ -85,11 +85,7 @@
                       <list>
                         <tuple>
                           <string>int_index</string>
-                          <string>Calculation Order</string>
-                        </tuple>
-                        <tuple>
-                          <string>float_index</string>
-                          <string>PaySheet Order</string>
+                          <string>Payslip Order</string>
                         </tuple>
                         <tuple>
                           <string>title</string>
@@ -100,16 +96,16 @@
                           <string>Service</string>
                         </tuple>
                         <tuple>
-                          <string>calculation_script_id</string>
-                          <string>Model Line Calculation Script</string>
+                          <string>reference</string>
+                          <string>Reference</string>
                         </tuple>
                         <tuple>
                           <string>description</string>
                           <string>Description</string>
                         </tuple>
                         <tuple>
-                          <string>create_paysheet_line</string>
-                          <string>Create Pay Sheet Line</string>
+                          <string>create_line</string>
+                          <string>Create Line</string>
                         </tuple>
                       </list>
                     </value>
@@ -127,8 +123,8 @@
                           <string>int_index</string>
                         </tuple>
                         <tuple>
-                          <string>float_index</string>
-                          <string>float_index</string>
+                          <string>create_line</string>
+                          <string>Create Line</string>
                         </tuple>
                       </list>
                     </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/PaySheetModel_view/listbox_create_line.xml
similarity index 96%
rename from bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_create_paysheet_line.xml
rename to bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/listbox_create_line.xml
index 3a1d3cb049..1075397891 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/PaySheetModel_view/listbox_create_line.xml
@@ -20,7 +20,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>my_create_paysheet_line</string> </value>
+            <value> <string>listbox_create_line</string> </value>
         </item>
         <item>
             <key> <string>message_values</string> </key>
@@ -101,7 +101,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>Create Pay Sheet Line</string> </value>
+                    <value> <string>Create Line</string> </value>
                 </item>
               </dictionary>
             </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/listbox_create_paysheet_line.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/listbox_create_line_.xml
similarity index 94%
rename from bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/listbox_create_paysheet_line.xml
rename to bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/listbox_create_line_.xml
index 597f30d271..0af28fd192 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/listbox_create_paysheet_line.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/listbox_create_line_.xml
@@ -20,7 +20,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>listbox_create_paysheet_line</string> </value>
+            <value> <string>listbox_create_line_</string> </value>
         </item>
         <item>
             <key> <string>message_values</string> </key>
@@ -103,7 +103,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>Create Pay Sheet Line</string> </value>
+                    <value> <string>Create Line</string> </value>
                 </item>
               </dictionary>
             </value>
@@ -122,7 +122,7 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>cell/isCreatePaysheetLine</string> </value>
+            <value> <string>cell/isCreateLine</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_payroll/bt/revision b/bt5/erp5_payroll/bt/revision
index 8cb9d84396..b1eab89dbc 100644
--- a/bt5/erp5_payroll/bt/revision
+++ b/bt5/erp5_payroll/bt/revision
@@ -1 +1 @@
-475
\ No newline at end of file
+477
\ No newline at end of file
-- 
2.30.9