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

[nobody at svn.erp5.org]

Author: kevin
Date: Wed Oct 25 17:14:30 2006
New Revision: 10939

URL: http://svn.erp5.org?rev=10939&view=rev
Log:
Take care of description on preview update.

Modified:
    erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_initializePreview.xml
    erp5/trunk/bt5/erp5_payroll/bt/change_log
    erp5/trunk/bt5/erp5_payroll/bt/revision
    erp5/trunk/bt5/erp5_payroll/bt/version

Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_initializePreview.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_initializePreview.xml?rev=10939&r1=10938&r2=10939&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_initializePreview.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_initializePreview.xml Wed Oct 25 17:14:30 2006
@@ -140,6 +140,7 @@
                             , \'employer_share\': None\n
                             , \'employee_share\': None\n
                             , \'base\'          : None\n
+                            , \'description\'   : None\n
                             }\n
 \n
 \n
@@ -190,6 +191,7 @@
   employee_share = line[\'employee_share\']\n
   employer_share = line[\'employer_share\']\n
   base           = line[\'base\']\n
+  description    = line[\'description\']\n
   if salary_range not in [None, \'\']                                and \\\n
      service_id   not in [None, \'\']                                and \\\n
      base         not in [None, \'\']                                and \\\n
@@ -201,6 +203,7 @@
     new_dict = { \'employer_share\': employer_share\n
                , \'employee_share\': employee_share\n
                , \'base\'          : base\n
+               , \'description\'   : description\n
                }\n
     update_kw[line_uid] = new_dict\n
 \n
@@ -264,6 +267,7 @@
         , salary_range       = salary_range\n
         , salary_range_title = context.portal_categories.resolveCategory(salary_range).getTitleOrId()\n
         , tax_category       = preview_line_item[\'tax_categories\']\n
+        , description        = preview_line_item[\'description\']\n
         )\n
   preview_line_list.append(o)\n
 \n
@@ -365,6 +369,7 @@
                             <string>employee_share</string>
                             <string>employer_share</string>
                             <string>base</string>
+                            <string>description</string>
                             <string>salary_range_id</string>
                             <string>line_uid</string>
                             <string>new_dict</string>

Modified: erp5/trunk/bt5/erp5_payroll/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/change_log?rev=10939&r1=10938&r2=10939&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/change_log (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/change_log Wed Oct 25 17:14:30 2006
@@ -1,7 +1,8 @@
 2006-10-25 Kevin
 * Do not define base category twice.
 * New portal types and forms dedicated to Payroll Service.
-* Migration of all old service to the new Payroll Servicetype.
+* Migration of all old service to the new Payroll Service type.
+* Take care of description on preview update.
 
 2006-10-24 Kevin
 * So much things changed since the 0.1 version. Bump version to 0.2.

Modified: erp5/trunk/bt5/erp5_payroll/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/revision?rev=10939&r1=10938&r2=10939&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/revision (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/revision Wed Oct 25 17:14:30 2006
@@ -1,1 +1,1 @@
-93
+95

Modified: erp5/trunk/bt5/erp5_payroll/bt/version
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/version?rev=10939&r1=10938&r2=10939&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/version (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/version Wed Oct 25 17:14:30 2006
@@ -1,1 +1,1 @@
-0.2.2
+0.2.3