diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_viewAsODTStyles.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_viewAsODTStyles.xml index 5cea6f83f0df36c4abc51501c74e832de29c865b..0067f2fd061af8c013560825945d09768db975cf 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_viewAsODTStyles.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_viewAsODTStyles.xml @@ -326,9 +326,9 @@ AAA=</string> </value> orig_of string:of;\n en_of python: unicode(here.Base_translateString(orig_of, lang=default_language), \'utf-8\');\n my_of python: unicode(here.Base_translateString(orig_of), \'utf-8\');\n - image_path python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_image_path\'] or data_dict[\'source_decision_image_path\'];\n - image_width python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_image_width\'] or data_dict[\'source_decision_image_width\'];\n - image_height python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_image_height\'] or data_dict[\'source_decision_image_height\']">\n + image_path python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_image_path\'] or (data_dict[\'source_decision_image_path\'] or data_dict[\'source_section_image_path\']);\n + image_width python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_image_width\'] or (data_dict[\'source_decision_image_width\'] or data_dict[\'source_section_image_width\']);\n + image_height python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_image_height\'] or (data_dict[\'source_decision_image_height\'] or data_dict[\'source_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 diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewAsODTStyles.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewAsODTStyles.xml index 2eda552413d978823e000d67ac975921ccba32a6..c16e564f4f102525ead8bd2c25078cb1c7078d80 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewAsODTStyles.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewAsODTStyles.xml @@ -326,9 +326,9 @@ AAA=</string> </value> orig_of string:of;\n en_of python: unicode(here.Base_translateString(orig_of, lang=default_language), \'utf-8\');\n my_of python: unicode(here.Base_translateString(orig_of), \'utf-8\');\n - image_path python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_image_path\'] or data_dict[\'source_decision_image_path\'];\n - image_width python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_image_width\'] or data_dict[\'source_decision_image_width\'];\n - image_height python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_image_height\'] or data_dict[\'source_decision_image_height\']">\n + image_path python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_image_path\'] or (data_dict[\'source_decision_image_path\'] or data_dict[\'source_section_image_path\']);\n + image_width python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_image_width\'] or (data_dict[\'source_decision_image_width\'] or data_dict[\'source_section_image_width\']);\n + image_height python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_image_height\'] or (data_dict[\'source_decision_image_height\'] or data_dict[\'source_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 diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision index 4754f24761375d44117927d26feadc16d867f3b6..a8114de9cfe66ff415376d115728191c625c1076 100644 --- a/bt5/erp5_trade/bt/revision +++ b/bt5/erp5_trade/bt/revision @@ -1 +1 @@ -461 \ No newline at end of file +462 \ No newline at end of file