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

[nobody at svn.erp5.org]

Author: fabien
Date: Tue Mar 31 15:10:47 2009
New Revision: 26206

URL: http://svn.erp5.org?rev=26206&view=rev
Log:
remove destination_decision from the getODTDataDict, this is not used currently.
This permit to print paysheets with company that don't have logo.

Modified:
    erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getODTDataDict.xml
    erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAsODTStyles.xml
    erp5/trunk/bt5/erp5_payroll/bt/revision

Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getODTDataDict.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getODTDataDict.xml?rev=26206&r1=26205&r2=26206&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getODTDataDict.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getODTDataDict.xml [utf8] Tue Mar 31 15:10:47 2009
@@ -356,13 +356,6 @@
           getEmail(destination_administration.getProperty(\'email_text\', \'\')),\n
   \'destination_administration_vatid\':\n
           getVatId(destination_administration.getProperty(\'vat_code\', \'\')),\n
-\n
-  \'destination_decision_title\': context.getDestinationDecisionTitle() or \'\',\n
-  \'destination_decision_telfax\': getPhoneAndFax(context.getDestinationDecision() and\n
-      context.getDestinationDecisionValue().getTelephoneText() or \'\',\n
-      context.getDestinationDecision() and context.getDestinationDecisionValue().getFaxText() or \'\'),\n
-  \'destination_decision_email\': getEmail(context.getDestinationDecision() and\n
-      context.getDestinationDecisionValue().getEmailText() or \'\'),\n
 \n
   \'reference\': context.getReference() or \'\',\n
   \'start_date\': getOrderedDate(context.getStartDate()) or \'\',\n

Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAsODTStyles.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAsODTStyles.xml?rev=26206&r1=26205&r2=26206&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAsODTStyles.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAsODTStyles.xml [utf8] Tue Mar 31 15:10:47 2009
@@ -323,9 +323,9 @@
                     my_period  python: unicode(here.Base_translateString(orig_period,\n
                                                                 mapping = {\'start_date\': date_renderer(here.getStartDate()),\n
                                                                            \'stop_date\': date_renderer(here.getStopDate())}), \'utf-8\');\n
-                    image_path python: here.getPortalType().startswith(\'Pay Sheet Transaction\') and data_dict[\'destination_section_image_path\'] or (data_dict[\'destination_decision_image_path\'] or data_dict[\'destination_section_image_path\']);\n
-                    image_width python: here.getPortalType().startswith(\'Pay Sheet Transaction\') and data_dict[\'destination_section_image_width\'] or (data_dict[\'destination_decision_image_width\'] or data_dict[\'destination_section_image_width\']);\n
-                    image_height python: here.getPortalType().startswith(\'Pay Sheet Transaction\') and data_dict[\'destination_section_image_height\'] or (data_dict[\'destination_decision_image_height\'] or data_dict[\'destination_section_image_height\'])">\n
+                    image_path python: here.getPortalType().startswith(\'Pay Sheet Transaction\') and data_dict[\'destination_section_image_path\'] or data_dict[\'destination_section_image_path\'];\n
+                    image_width python: here.getPortalType().startswith(\'Pay Sheet Transaction\') and data_dict[\'destination_section_image_width\'] or data_dict[\'destination_section_image_width\'];\n
+                    image_height python: here.getPortalType().startswith(\'Pay Sheet Transaction\') and data_dict[\'destination_section_image_height\'] or data_dict[\'destination_section_image_height\']">\n
         <table:table table:name="Tableau4" table:style-name="Tableau4">\n
           <table:table-column table:style-name="Tableau4.A"/>\n
           <table:table-column table:style-name="Tableau4.B"/>\n

Modified: erp5/trunk/bt5/erp5_payroll/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/revision?rev=26206&r1=26205&r2=26206&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/revision [utf8] Tue Mar 31 15:10:47 2009
@@ -1,1 +1,1 @@
-379
+383