[Erp5-report] r33790 yusuke - in /erp5/trunk/bt5/erp5_payroll: PortalTypeTemplateItem/porta...

[nobody at svn.erp5.org]

Author: yusuke
Date: Wed Mar 17 11:20:47 2010
New Revision: 33790

URL: http://svn.erp5.org?rev=33790&view=rev
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.

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

Modified:
    erp5/trunk/bt5/erp5_payroll/PortalTypeTemplateItem/portal_types/Pay%20Sheet%20Model.xml
    erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_applyModel.xml
    erp5/trunk/bt5/erp5_payroll/bt/change_log
    erp5/trunk/bt5/erp5_payroll/bt/revision

Modified: erp5/trunk/bt5/erp5_payroll/PortalTypeTemplateItem/portal_types/Pay%20Sheet%20Model.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/PortalTypeTemplateItem/portal_types/Pay%2520Sheet%2520Model.xml?rev=33790&r1=33789&r2=33790&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/PortalTypeTemplateItem/portal_types/Pay%20Sheet%20Model.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/PortalTypeTemplateItem/portal_types/Pay%20Sheet%20Model.xml [utf8] Wed Mar 17 11:20:47 2010
@@ -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>

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=33790&r1=33789&r2=33790&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_applyModel.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_applyModel.xml [utf8] Wed Mar 17 11:20:47 2010
@@ -104,12 +104,13 @@
 \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

Modified: erp5/trunk/bt5/erp5_payroll/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/change_log?rev=33790&r1=33789&r2=33790&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/change_log [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/change_log [utf8] Wed Mar 17 11:20:47 2010
@@ -1,3 +1,7 @@
+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.
 

Modified: erp5/trunk/bt5/erp5_payroll/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/revision?rev=33790&r1=33789&r2=33790&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/revision [utf8] Wed Mar 17 11:20:47 2010
@@ -1,1 +1,1 @@
-555
+559