[Erp5-report] r21433 - in /erp5/trunk/bt5/erp5_payroll: SkinTemplateItem/portal_skins/erp5_...

[nobody at svn.erp5.org]

Author: jerome
Date: Mon Jun  9 16:37:03 2008
New Revision: 21433

URL: http://svn.erp5.org?rev=21433&view=rev
Log:
Use new feature from r21432 to prevent copying lines without anything defined when applying the model.

Modified:
    erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_applyModel.xml
    erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_copySubObject.xml
    erp5/trunk/bt5/erp5_payroll/bt/revision

Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_applyModel.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_applyModel.xml?rev=21433&r1=21432&r2=21433&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_applyModel.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_applyModel.xml Mon Jun  9 16:37:03 2008
@@ -99,9 +99,13 @@
   paysheet.setResource(getPropertyFromModel(model, \'price_currency\'))\n
 \n
 # copy model sub objects into paysheet\n
-portal_type_list = [\'Annotation Line\', \'Payment Condition\', \n
-                    \'Pay Sheet Model Ratio Line\']\n
-paysheet.PaySheetTransaction_copySubObject(portal_type_list)\n
+paysheet.PaySheetTransaction_copySubObject(\n
+                  \'Annotation Line\',\n
+                  property_list=(\'quantity\', \'source\', \'resource\'))\n
+paysheet.PaySheetTransaction_copySubObject(\n
+                  \'Pay Sheet Model Ratio Line\',\n
+                  property_list=(\'quantity\',))\n
+paysheet.PaySheetTransaction_copySubObject(\'Payment Condition\')\n
 \n
 if not batch_mode:\n
   return context.Base_redirect(form_id,\n
@@ -164,7 +168,6 @@
                             <string>None</string>
                             <string>dict</string>
                             <string>getPropertyFromModel</string>
-                            <string>portal_type_list</string>
                           </tuple>
                         </value>
                     </item>

Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_copySubObject.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_copySubObject.xml?rev=21433&r1=21432&r2=21433&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_copySubObject.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_copySubObject.xml Mon Jun  9 16:37:03 2008
@@ -69,7 +69,8 @@
 portal_type_list) in the paysheet.\n
 \'\'\'\n
 \n
-sub_object_list = context.getInheritedObjectValueList(portal_type_list)\n
+sub_object_list = context.getInheritedObjectValueList(\n
+                         portal_type_list, property_list=property_list)\n
 \n
 # Erase existing sub objects with same reference\n
 delete_id_list = []\n
@@ -113,7 +114,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>portal_type_list=[]</string> </value>
+            <value> <string>portal_type_list=[], property_list=()</string> </value>
         </item>
         <item>
             <key> <string>errors</string> </key>
@@ -133,13 +134,14 @@
                   <dictionary>
                     <item>
                         <key> <string>co_argcount</string> </key>
-                        <value> <int>1</int> </value>
+                        <value> <int>2</int> </value>
                     </item>
                     <item>
                         <key> <string>co_varnames</string> </key>
                         <value>
                           <tuple>
                             <string>portal_type_list</string>
+                            <string>property_list</string>
                             <string>_getattr_</string>
                             <string>context</string>
                             <string>sub_object_list</string>
@@ -166,6 +168,7 @@
             <value>
               <tuple>
                 <list/>
+                <tuple/>
               </tuple>
             </value>
         </item>

Modified: erp5/trunk/bt5/erp5_payroll/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/revision?rev=21433&r1=21432&r2=21433&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/revision (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/revision Mon Jun  9 16:37:03 2008
@@ -1,1 +1,1 @@
-259
+261