- forget to multiply by 100 the displayed percentage

- add a "Model Inheritance" column in PaySheetModelModule_viewPaySheetModelList listbox

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@18348 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getLineListAsDict.xml

@@ -81,7 +81,7 @@ def addProperties(line, line_dict, property_list):\n
     #XXX this is a hack wich should be removed when the OOoTemplate will be\n
     # rewireted\n
     if line_dict[property] is not None and property.endswith(\'_price\'):\n
-      line_dict[property] = \'%s %%\' % line_dict[property]\n
+      line_dict[property] = \'%s %%\' % (float(line_dict[property])*100)\n
   return line_dict\n
 \n
 line_dict_list = []\n

bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModelModule_viewPaySheetModelList.xml

@@ -59,6 +59,7 @@
             <value>
               <list>
                 <string>bottom</string>
+                <string>hidden</string>
               </list>
             </value>
         </item>
@@ -74,6 +75,14 @@
                       </list>
                     </value>
                 </item>
+                <item>
+                    <key>                 <string>hidden</string> </key>
+                    <value>
+                      <list>
+                        <string>listbox_specialise_title_list</string>
+                      </list>
+                    </value>
+                </item>
               </dictionary>
             </value>
         </item>

bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModelModule_viewPaySheetModelList/listbox.xml

@@ -90,13 +90,17 @@
                     </value>
                 </item>
                 <item>
-                    <key> <string>columns</string> </key>
+                    <key>                 <string>columns</string> </key>
                     <value>
                       <list>
                         <tuple>
                           <string>title</string>
                           <string>Title</string>
                         </tuple>
+                        <tuple>
+                          <string>specialise_title_list</string>
+                          <string>Model Inheritance</string>
+                        </tuple>
                         <tuple>
                           <string>description</string>
                           <string>Description</string>
@@ -141,13 +145,17 @@
                     <value> <int>0</int> </value>
                 </item>
                 <item>
-                    <key> <string>search_columns</string> </key>
+                    <key>                 <string>search_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
                           <string>title</string>
                           <string>Title</string>
                         </tuple>
+                        <tuple>
+                          <string>specialise_title_list</string>
+                          <string>Model Inheritance</string>
+                        </tuple>
                         <tuple>
                           <string>description</string>
                           <string>Description</string>
@@ -172,11 +180,11 @@
                     </value>
                 </item>
                 <item>
-                    <key> <string>selection_name</string> </key>
+                    <key>                 <string>selection_name</string> </key>
                     <value> <string>paysheet_model_selection</string> </value>
                 </item>
                 <item>
-                    <key> <string>sort</string> </key>
+                    <key>                 <string>sort</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -187,13 +195,17 @@
                     </value>
                 </item>
                 <item>
-                    <key> <string>sort_columns</string> </key>
+                    <key>                 <string>sort_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
                           <string>title</string>
                           <string>Title</string>
                         </tuple>
+                        <tuple>
+                          <string>specialise_title_list</string>
+                          <string>Model Inheritance</string>
+                        </tuple>
                         <tuple>
                           <string>description</string>
                           <string>Description</string>
@@ -222,7 +234,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key> <string>title</string> </key>
+                    <key>                 <string>title</string> </key>
                     <value> <string>Contents</string> </value>
                 </item>
                 <item>

bt5/erp5_payroll/bt/revision

-193
+195
\ No newline at end of file