2010-03-17 yusuke

* Pay Sheet Model must also be of amount_generator group.
* fixed a incorrect argument passing between PaySheetTransaction_applyModel and PaySheetTransaction_copySubObject.

XXX However, is the function copy sub objects, already implemented in other method?

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

bt5/erp5_payroll/PortalTypeTemplateItem/portal_types/Pay%20Sheet%20Model.xml

@@ -55,7 +55,9 @@
         <item>
             <key> <string>group_list</string> </key>
             <value>
-              <tuple/>
+              <tuple>
+                <string>amount_generator</string>
+              </tuple>
             </value>
         </item>
         <item>
@@ -64,11 +66,15 @@
         </item>
         <item>
             <key> <string>init_script</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>permission</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>title</string> </key>

bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_applyModel.xml

@@ -104,12 +104,13 @@ if len(paysheet.contentIds(filter=filter_dict)) == 0:\n
 \n
 # copy model sub objects into paysheet\n
 paysheet.PaySheetTransaction_copySubObject(\n
-                  \'Annotation Line\',\n
+                  portal_type_list=(\'Annotation Line\',),\n
                   property_list=(\'quantity\', \'source\', \'resource\'))\n
 paysheet.PaySheetTransaction_copySubObject(\n
-                  \'Pay Sheet Model Ratio Line\',\n
+                  portal_type_list=(\'Pay Sheet Model Ratio Line\',),\n
                   property_list=(\'quantity\',))\n
-paysheet.PaySheetTransaction_copySubObject(\'Payment Condition\')\n
+paysheet.PaySheetTransaction_copySubObject(\n
+                  portal_type_list=(\'Payment Condition\',))\n
 \n
 paysheet.edit(**new_category_dict)\n
 \n

bt5/erp5_payroll/bt/change_log

+2010-03-17 yusuke
+* Pay Sheet Model must also be of amount_generator group.
+* fixed a incorrect argument passing between PaySheetTransaction_applyModel and PaySheetTransaction_copySubObject.
+
 2010-03-02 yusei
 * Remove short title.
 

bt5/erp5_payroll/bt/revision

-555
+559
\ No newline at end of file