From 0bd0fee898ae396f55f901c4a6baf370efa9c908 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> Date: Mon, 30 Jun 2008 09:03:50 +0000 Subject: [PATCH] The tax line's resource title should be not translated. At least not with erp5_ui domain git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@22067 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../portal_skins/erp5_trade/Order_viewAsODT.xml | 7 ++----- bt5/erp5_trade/bt/revision | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) 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 f9f37b9346..e42217865c 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 @@ -587,11 +587,8 @@ AAA=</string> </value> <table:table-cell table:style-name=\'Tableau3.D3\'\n office:value-type=\'string\'>\n <tal:block tal:repeat="vat python: data_dict[\'vat_list\']">\n - <tal:block tal:define=\'orig_string python:vat.getResourceTitle(); en_string python:unicode(here.Base_translateString(orig_string, lang="en"),"utf-8"); my_string python:unicode(here.Base_translateString(orig_string),"utf-8")\'>\n - <text:p text:style-name=\'Table_20_Heading\'><span tal:replace=\'en_string\'/>:</text:p>\n - <text:p text:style-name=\'Table_20_Heading\'\n - tal:condition=\'python:my_string != en_string\'><span tal:replace=\'my_string\'/>:</text:p>\n - </tal:block>\n + <text:p text:style-name=\'Table_20_Heading\'><span\n + tal:replace=\'vat/getResourceTitle\'/>:</text:p>\n </tal:block>\n <text:p text:style-name=\'Table_20_Heading\'\n tal:define=\'orig_string string:TAX; en_string python:unicode(here.Base_translateString(orig_string, lang="en"),"utf-8"); my_string python:unicode(here.Base_translateString(orig_string),"utf-8")\'><span tal:replace="python: \'Total %s\' % (my_string)"/>:</text:p>\n diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision index c0220a2ad4..93168a9d7c 100644 --- a/bt5/erp5_trade/bt/revision +++ b/bt5/erp5_trade/bt/revision @@ -1 +1 @@ -397 \ No newline at end of file +398 \ No newline at end of file -- 2.30.9