Skip to content

erp5
erp5
Commit 65e856c1 authored by Nicolas Delaby's avatar Nicolas Delaby
Browse files
Options

Convert Strings in unicode 

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@20711 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent e538c12f
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 30 deletions
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_getODTDataDict.xml
View file @ 65e856c1
...@@ -155,6 +155,13 @@ def getSubLineList(obj):\n ...@@ -155,6 +155,13 @@ def getSubLineList(obj):\n
sub_list.extend(getSubLineList(x))\n sub_list.extend(getSubLineList(x))\n
return sub_list\n return sub_list\n
\n \n
def unicodeDict(d):\n
for k, v in d.items():\n
if isinstance(v, str):\n
d.update({k:unicode(v, \'utf8\')})\n
return d\n
\n
\n
for line in getSubLineList(context):\n for line in getSubLineList(context):\n
prod_desc = line.getResource() is not None and line.getResourceValue().getDescription() or \'\'\n prod_desc = line.getResource() is not None and line.getResourceValue().getDescription() or \'\'\n
desc = getProductAndLineDesc(prod_desc, line.getDescription())\n desc = getProductAndLineDesc(prod_desc, line.getDescription())\n
...@@ -190,7 +197,7 @@ for line in getSubLineList(context):\n ...@@ -190,7 +197,7 @@ for line in getSubLineList(context):\n
\'total_price\': line.getTotalPrice() or \'\',\n \'total_price\': line.getTotalPrice() or \'\',\n
}\n }\n
total_price += line.getTotalPrice() or 0.0\n total_price += line.getTotalPrice() or 0.0\n
line_list.append(line_dict.copy())\n line_list.append(unicodeDict(line_dict.copy()))\n
\n \n
data_dict = {\n data_dict = {\n
\'source_section_title\': context.getSourceSectionTitle() or \'\',\n \'source_section_title\': context.getSourceSectionTitle() or \'\',\n
...@@ -202,13 +209,13 @@ data_dict = {\n ...@@ -202,13 +209,13 @@ data_dict = {\n
\'source_section_email\': getEmail(context.getSourceSection() and context.getSourceSectionValue().getEmailText() or \'\'),\n \'source_section_email\': getEmail(context.getSourceSection() and context.getSourceSectionValue().getEmailText() or \'\'),\n
\n \n
\'source_decision_title\': context.getSourceDecisionTitle() or \'\',\n \'source_decision_title\': context.getSourceDecisionTitle() or \'\',\n
\'source_decision_address\': unicode(getOneLineAddress(\n \'source_decision_address\':getOneLineAddress(\n
context.getSourceDecision() and context.getSourceDecisionValue().getDefaultAddressText() or \'\',\n context.getSourceDecision() and context.getSourceDecisionValue().getDefaultAddressText() or \'\',\n
context.getSourceDecision() and context.getSourceDecisionValue().getDefaultAddressRegionTitle() or \'\'), \'utf8\'),\n context.getSourceDecision() and context.getSourceDecisionValue().getDefaultAddressRegionTitle() or \'\'),\n
\'source_decision_telfax\': getPhoneAndFax(context.getSourceDecision() and context.getSourceDecisionValue().getTelephoneText() or \'\',\n \'source_decision_telfax\': getPhoneAndFax(context.getSourceDecision() and context.getSourceDecisionValue().getTelephoneText() or \'\',\n
context.getSourceDecision() and context.getSourceDecisionValue().getFaxText() or \'\'),\n context.getSourceDecision() and context.getSourceDecisionValue().getFaxText() or \'\'),\n
\'source_decision_email\': getEmail(context.getSourceDecision() and context.getSourceDecisionValue().getEmailText() or \'\'),\n \'source_decision_email\': getEmail(context.getSourceDecision() and context.getSourceDecisionValue().getEmailText() or \'\'),\n
\'source_decision_vatid\': unicode(getVatId(context.getSourceDecision() and context.getSourceDecisionValue().getVatCode() or \'\'), \'utf8\'),\n \'source_decision_vatid\': getVatId(context.getSourceDecision() and context.getSourceDecisionValue().getVatCode() or \'\'),\n
\n \n
\'destination_title\': context.getDestinationTitle() or \'\',\n \'destination_title\': context.getDestinationTitle() or \'\',\n
\'destination_address\': getOneLineAddress(\n \'destination_address\': getOneLineAddress(\n
...@@ -218,16 +225,16 @@ data_dict = {\n ...@@ -218,16 +225,16 @@ data_dict = {\n
context.getDestination() and context.getDestinationValue().getFaxText() or \'\'),\n context.getDestination() and context.getDestinationValue().getFaxText() or \'\'),\n
\'destination_email\': getEmail(context.getDestination() and context.getDestinationValue().getEmailText() or \'\'),\n \'destination_email\': getEmail(context.getDestination() and context.getDestinationValue().getEmailText() or \'\'),\n
\n \n
\'destination_section_title\': unicode(context.getDestinationSectionTitle() or \'\', \'utf8\'),\n \'destination_section_title\': context.getDestinationSectionTitle() or \'\',\n
\'destination_section_image_path\': context.getDestinationSectionValue() is not None and context.getDestinationSectionValue().getDefaultImagePath() or \'\',\n \'destination_section_image_path\': context.getDestinationSectionValue() is not None and context.getDestinationSectionValue().getDefaultImagePath() or \'\',\n
\'destination_section_address\': unicode(getOneLineAddress(\n \'destination_section_address\': getOneLineAddress(\n
context.getDestinationSection() and context.getDestinationSectionValue().getDefaultAddressText() or \'\',\n context.getDestinationSection() and context.getDestinationSectionValue().getDefaultAddressText() or \'\',\n
context.getDestinationSection() and context.getDestinationSectionValue().getDefaultAddressRegionTitle() or \'\'), \'utf8\'),\n context.getDestinationSection() and context.getDestinationSectionValue().getDefaultAddressRegionTitle() or \'\'),\n
\'destination_section_telfax\': unicode(getPhoneAndFax(\n \'destination_section_telfax\': getPhoneAndFax(\n
context.getDestinationSection() and context.getDestinationSectionValue().getTelephoneText() or \'\',\n context.getDestinationSection() and context.getDestinationSectionValue().getTelephoneText() or \'\',\n
context.getDestinationSection() and context.getDestinationSectionValue().getTelephoneText() or \'\'), \'utf8\'),\n context.getDestinationSection() and context.getDestinationSectionValue().getTelephoneText() or \'\'),\n
\'destination_section_email\': unicode(getEmail(context.getDestinationSection() and context.getDestinationSectionValue().getEmailText() or \'\'), \'utf8\'),\n \'destination_section_email\': getEmail(context.getDestinationSection() and context.getDestinationSectionValue().getEmailText() or \'\'),\n
\'destination_section_vatid\': unicode(getVatId(context.getDestinationSection() and context.getDestinationSectionValue().getVatCode() or \'\'), \'utf8\'),\n \'destination_section_vatid\': getVatId(context.getDestinationSection() and context.getDestinationSectionValue().getVatCode() or \'\'),\n
\n \n
\'destination_decision_title\': context.getDestinationDecisionTitle() or \'\',\n \'destination_decision_title\': context.getDestinationDecisionTitle() or \'\',\n
\'destination_decision_telfax\': getPhoneAndFax(context.getDestinationDecision() and context.getDestinationDecisionValue().getTelephoneText() or \'\',\n \'destination_decision_telfax\': getPhoneAndFax(context.getDestinationDecision() and context.getDestinationDecisionValue().getTelephoneText() or \'\',\n
...@@ -249,7 +256,7 @@ data_dict = {\n ...@@ -249,7 +256,7 @@ data_dict = {\n
\'line_list\': line_list,\n \'line_list\': line_list,\n
}\n }\n
\n \n
return data_dict\n return unicodeDict(data_dict)\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
...@@ -316,6 +323,7 @@ return data_dict\n ...@@ -316,6 +323,7 @@ return data_dict\n
<string>total_price</string> <string>total_price</string>
<string>total_vat</string> <string>total_vat</string>
<string>getSubLineList</string> <string>getSubLineList</string>
<string>unicodeDict</string>
<string>_getiter_</string> <string>_getiter_</string>
<string>line</string> <string>line</string>
<string>None</string> <string>None</string>
...@@ -323,7 +331,6 @@ return data_dict\n ...@@ -323,7 +331,6 @@ return data_dict\n
<string>desc</string> <string>desc</string>
<string>line_dict</string> <string>line_dict</string>
<string>_inplacevar_</string> <string>_inplacevar_</string>
<string>unicode</string>
<string>data_dict</string> <string>data_dict</string>
</tuple> </tuple>
</value> </value>
......
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_getODTDataDict.xml
View file @ 65e856c1
...@@ -155,6 +155,12 @@ def getSubLineList(obj):\n ...@@ -155,6 +155,12 @@ def getSubLineList(obj):\n
sub_list.extend(getSubLineList(x))\n sub_list.extend(getSubLineList(x))\n
return sub_list\n return sub_list\n
\n \n
def unicodeDict(d):\n
for k, v in d.items():\n
if isinstance(v, str):\n
d.update({k:unicode(v, \'utf8\')})\n
return d\n
\n
for line in getSubLineList(context):\n for line in getSubLineList(context):\n
prod_desc = line.getResource() is not None and line.getResourceValue().getDescription() or \'\'\n prod_desc = line.getResource() is not None and line.getResourceValue().getDescription() or \'\'\n
desc = getProductAndLineDesc(prod_desc, line.getDescription())\n desc = getProductAndLineDesc(prod_desc, line.getDescription())\n
...@@ -173,26 +179,26 @@ for line in getSubLineList(context):\n ...@@ -173,26 +179,26 @@ for line in getSubLineList(context):\n
\'total_price\': line.getTotalPrice() or \'\',\n \'total_price\': line.getTotalPrice() or \'\',\n
}\n }\n
total_price += line.getTotalPrice() or 0.0\n total_price += line.getTotalPrice() or 0.0\n
line_list.append(line_dict.copy())\n line_list.append(unicodeDict(line_dict.copy()))\n
\n \n
data_dict = {\n data_dict = {\n
\'source_section_title\': context.getSourceSectionTitle() or \'\',\n \'source_section_title\': context.getSourceSectionTitle() or \'\',\n
\'source_section_address\': unicode(getOneLineAddress(\n \'source_section_address\': getOneLineAddress(\n
context.getSourceSection() and context.getSourceSectionValue().getDefaultAddressText() or \'\',\n context.getSourceSection() and context.getSourceSectionValue().getDefaultAddressText() or \'\',\n
context.getSourceSection() and context.getSourceSectionValue().getDefaultAddressRegionTitle() or \'\'), \'utf8\'),\n context.getSourceSection() and context.getSourceSectionValue().getDefaultAddressRegionTitle() or \'\'),\n
\'source_section_telfax\': getPhoneAndFax(context.getSourceSection() and context.getSourceSectionValue().getTelephoneText() or \'\',\n \'source_section_telfax\': getPhoneAndFax(context.getSourceSection() and context.getSourceSectionValue().getTelephoneText() or \'\',\n
context.getSourceSection() and context.getSourceSectionValue().getFaxText() or \'\'),\n context.getSourceSection() and context.getSourceSectionValue().getFaxText() or \'\'),\n
\'source_section_email\': getEmail(context.getSourceSection() and context.getSourceSectionValue().getEmailText() or \'\'),\n \'source_section_email\': getEmail(context.getSourceSection() and context.getSourceSectionValue().getEmailText() or \'\'),\n
\'source_section_vatid\': unicode(getVatId(context.getSourceSection() and context.getSourceSectionValue().getVatCode() or \'\'), \'utf8\'),\n \'source_section_vatid\': getVatId(context.getSourceSection() and context.getSourceSectionValue().getVatCode() or \'\'),\n
\n \n
\'source_decision_title\': context.getSourceDecisionTitle() or \'\',\n \'source_decision_title\': context.getSourceDecisionTitle() or \'\',\n
\'source_decision_address\': unicode(getOneLineAddress(\n \'source_decision_address\': getOneLineAddress(\n
context.getSourceDecision() and context.getSourceDecisionValue().getDefaultAddressText() or \'\',\n context.getSourceDecision() and context.getSourceDecisionValue().getDefaultAddressText() or \'\',\n
context.getSourceDecision() and context.getSourceDecisionValue().getDefaultAddressRegionTitle() or \'\'), \'utf8\'),\n context.getSourceDecision() and context.getSourceDecisionValue().getDefaultAddressRegionTitle() or \'\'),\n
\'source_decision_telfax\': getPhoneAndFax(context.getSourceDecision() and context.getSourceDecisionValue().getTelephoneText() or \'\',\n \'source_decision_telfax\': getPhoneAndFax(context.getSourceDecision() and context.getSourceDecisionValue().getTelephoneText() or \'\',\n
context.getSourceDecision() and context.getSourceDecisionValue().getFaxText() or \'\'),\n context.getSourceDecision() and context.getSourceDecisionValue().getFaxText() or \'\'),\n
\'source_decision_email\': getEmail(context.getSourceDecision() and context.getSourceDecisionValue().getEmailText() or \'\'),\n \'source_decision_email\': getEmail(context.getSourceDecision() and context.getSourceDecisionValue().getEmailText() or \'\'),\n
\'source_decision_vatid\': unicode(getVatId(context.getSourceDecision() and context.getSourceDecisionValue().getVatCode() or \'\'), \'utf8\'),\n \'source_decision_vatid\': getVatId(context.getSourceDecision() and context.getSourceDecisionValue().getVatCode() or \'\'),\n
\n \n
\'destination_title\': context.getDestinationTitle() or \'\',\n \'destination_title\': context.getDestinationTitle() or \'\',\n
\'destination_address\': getOneLineAddress(\n \'destination_address\': getOneLineAddress(\n
...@@ -202,16 +208,16 @@ data_dict = {\n ...@@ -202,16 +208,16 @@ data_dict = {\n
context.getDestination() and context.getDestinationValue().getFaxText() or \'\'),\n context.getDestination() and context.getDestinationValue().getFaxText() or \'\'),\n
\'destination_email\': getEmail(context.getDestination() and context.getDestinationValue().getEmailText() or \'\'),\n \'destination_email\': getEmail(context.getDestination() and context.getDestinationValue().getEmailText() or \'\'),\n
\n \n
\'destination_section_title\': unicode(context.getDestinationSectionTitle() or \'\', \'utf8\'),\n \'destination_section_title\': context.getDestinationSectionTitle() or \'\',\n
\'destination_section_image_path\': context.getDestinationSectionValue() is not None and context.getDestinationSectionValue().getDefaultImagePath() or \'\',\n \'destination_section_image_path\': context.getDestinationSectionValue() is not None and context.getDestinationSectionValue().getDefaultImagePath() or \'\',\n
\'destination_section_address\': unicode(getOneLineAddress(\n \'destination_section_address\': getOneLineAddress(\n
context.getDestinationSection() and context.getDestinationSectionValue().getDefaultAddressText() or \'\',\n context.getDestinationSection() and context.getDestinationSectionValue().getDefaultAddressText() or \'\',\n
context.getDestinationSection() and context.getDestinationSectionValue().getDefaultAddressRegionTitle() or \'\'), \'utf8\'),\n context.getDestinationSection() and context.getDestinationSectionValue().getDefaultAddressRegionTitle() or \'\'),\n
\'destination_section_telfax\': unicode(getPhoneAndFax(\n \'destination_section_telfax\': getPhoneAndFax(\n
context.getDestinationSection() and context.getDestinationSectionValue().getTelephoneText() or \'\',\n context.getDestinationSection() and context.getDestinationSectionValue().getTelephoneText() or \'\',\n
context.getDestinationSection() and context.getDestinationSectionValue().getTelephoneText() or \'\'), \'utf8\'),\n context.getDestinationSection() and context.getDestinationSectionValue().getTelephoneText() or \'\'),\n
\'destination_section_email\': unicode(getEmail(context.getDestinationSection() and context.getDestinationSectionValue().getEmailText() or \'\'), \'utf8\'),\n \'destination_section_email\': getEmail(context.getDestinationSection() and context.getDestinationSectionValue().getEmailText() or \'\'),\n
\'destination_section_vatid\': unicode(getVatId(context.getDestinationSection() and context.getDestinationSectionValue().getVatCode() or \'\'), \'utf8\'),\n \'destination_section_vatid\': getVatId(context.getDestinationSection() and context.getDestinationSectionValue().getVatCode() or \'\'),\n
\n \n
\'destination_decision_title\': context.getDestinationDecisionTitle() or \'\',\n \'destination_decision_title\': context.getDestinationDecisionTitle() or \'\',\n
\'destination_decision_telfax\': getPhoneAndFax(context.getDestinationDecision() and context.getDestinationDecisionValue().getTelephoneText() or \'\',\n \'destination_decision_telfax\': getPhoneAndFax(context.getDestinationDecision() and context.getDestinationDecisionValue().getTelephoneText() or \'\',\n
...@@ -233,7 +239,7 @@ data_dict = {\n ...@@ -233,7 +239,7 @@ data_dict = {\n
\'line_list\': line_list,\n \'line_list\': line_list,\n
}\n }\n
\n \n
return data_dict\n return unicodeDict(data_dict)\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
...@@ -300,6 +306,7 @@ return data_dict\n ...@@ -300,6 +306,7 @@ return data_dict\n
<string>total_price</string> <string>total_price</string>
<string>total_vat</string> <string>total_vat</string>
<string>getSubLineList</string> <string>getSubLineList</string>
<string>unicodeDict</string>
<string>_getiter_</string> <string>_getiter_</string>
<string>line</string> <string>line</string>
<string>None</string> <string>None</string>
...@@ -307,7 +314,6 @@ return data_dict\n ...@@ -307,7 +314,6 @@ return data_dict\n
<string>desc</string> <string>desc</string>
<string>line_dict</string> <string>line_dict</string>
<string>_inplacevar_</string> <string>_inplacevar_</string>
<string>unicode</string>
<string>data_dict</string> <string>data_dict</string>
</tuple> </tuple>
</value> </value>
......
bt5/erp5_trade/bt/revision
View file @ 65e856c1
331 332
\ No newline at end of file \ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7