diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_viewAsODT.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_viewAsODT.xml index 2b68c8bed65fe54eef6cf38d4f377d211c876409..f9f37b9346c409b919d70dbabca6c14155f942f4 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_viewAsODT.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_viewAsODT.xml @@ -494,9 +494,11 @@ AAA=</string> </value> tal:content=\'python:line_dict["description"]\'\n tal:attributes=\'text:style-name left_style_name\'>desc</text:p>\n </table:table-cell>\n - <table:table-cell table:style-name=\'Tableau1.A3\' office:value-type=\'float\'>\n + <table:table-cell table:style-name=\'Tableau1.A3\'\n + office:value-type=\'float\'\n + tal:attributes=\'office:value line_dict/total_quantity\'> \n <text:p text:style-name=\'Table_20_Contents\'\n - tal:content=\'python:line_dict["total_quantity"]\'\n + tal:content=\'line_dict/total_quantity\'\n tal:attributes=\'text:style-name right_style_name\'>qty</text:p>\n </table:table-cell>\n <table:table-cell table:style-name=\'Tableau1.A3\' office:value-type=\'string\'>\n @@ -509,12 +511,16 @@ AAA=</string> </value> tal:content=\'python:line_dict["stop_date"]\'\n tal:attributes=\'text:style-name style_name\'>stop_date</text:p>\n </table:table-cell>\n - <table:table-cell table:style-name=\'Tableau1.A3\' office:value-type=\'float\'>\n + <table:table-cell table:style-name=\'Tableau1.A3\'\n + office:value-type=\'float\'\n + tal:attributes="office:value line_dict/base_price">\n <text:p text:style-name=\'Table_20_Contents\'\n tal:content=\'python:line_dict["base_price"]\'\n tal:attributes=\'text:style-name right_style_name\'>base_price</text:p>\n </table:table-cell>\n - <table:table-cell table:style-name=\'Tableau1.A3\' office:value-type=\'float\'>\n + <table:table-cell table:style-name=\'Tableau1.A3\'\n + office:value-type=\'float\'\n + tal:attributes=\'office:value line_dict/total_price\'>\n <text:p text:style-name=\'Table_20_Contents\'\n tal:content=\'python:line_dict["total_price"]\'\n tal:attributes=\'text:style-name right_style_name\'>total_price</text:p>\n @@ -561,7 +567,9 @@ AAA=</string> </value> <text:p text:style-name=\'Table_20_Heading\'><span tal:replace=\'en_string\'/>:</text:p>\n <text:p text:style-name=\'Table_20_Heading\' tal:condition=\'python:my_string!=en_string\'><span tal:replace=\'my_string\'/>:</text:p>\n </table:table-cell>\n - <table:table-cell table:style-name=\'Tableau3.E2\' office:value-type=\'float\'>\n + <table:table-cell table:style-name=\'Tableau3.E2\'\n + office:value-type=\'float\'\n + tal:attributes=\'office:value data_dict/total_price_novat\'>\n <text:p text:style-name=\'Table_20_Contents_20_Right\' tal:content=\'python:data_dict["total_price_novat"]\'>800.000,00</text:p>\n </table:table-cell>\n </table:table-row>\n @@ -679,7 +687,8 @@ AAA=</string> </value> <text:p text:style-name=\'P4\'/>\n </office:text>\n </office:body>\n -</office:document-content> +</office:document-content>\n + ]]></string> </value> </item> diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision index 43f9cb64132d45b9914202fd5b6153004aa5d34a..c0220a2ad4043e4791604d21ada3f04a1352acdb 100644 --- a/bt5/erp5_trade/bt/revision +++ b/bt5/erp5_trade/bt/revision @@ -1 +1 @@ -396 \ No newline at end of file +397 \ No newline at end of file