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

[nobody at svn.erp5.org]

Author: fabien
Date: Thu Feb  5 11:14:38 2009
New Revision: 25456

URL: http://svn.erp5.org?rev=25456&view=rev
Log:
copy the price_currency into the ressource on apply model

Modified:
    erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_applyModel.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=25456&r1=25455&r2=25456&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] Thu Feb  5 11:14:38 2009
@@ -61,7 +61,7 @@
 # copy categories\n
 category_list = [\n
   \'destination_section\', \'source_section\', \'source_payment\',\n
-  \'destination_payment\', \'price_currency\', \'ressource\',\n
+  \'destination_payment\', \'price_currency\',\n
 ]\n
 new_category_dict = {}\n
 \n
@@ -87,6 +87,11 @@
     v = getPropertyFromModel(model, category)\n
     if v:\n
       new_category_dict[category] = v\n
+\n
+# copy the price_currency into the ressource :\n
+price_currency = getPropertyFromModel(model, category)\n
+if price_currency:\n
+  new_category_dict[\'resource\'] = price_currency\n
 \n
 def copyPaymentCondition(paysheet, model):\n
   filter_dict = {\'portal_type\': \'Payment Condition\'}\n
@@ -172,6 +177,7 @@
                             <string>category</string>
                             <string>v</string>
                             <string>_write_</string>
+                            <string>price_currency</string>
                             <string>copyPaymentCondition</string>
                             <string>filter_dict</string>
                             <string>list</string>

Modified: erp5/trunk/bt5/erp5_payroll/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/revision?rev=25456&r1=25455&r2=25456&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/revision [utf8] Thu Feb  5 11:14:38 2009
@@ -1,1 +1,1 @@
-352
+353