Commit 16ff36f1 authored by Jérome Perrin's avatar Jérome Perrin

invoicing,trade,mrp,payroll,trade: simplify translation

"unicode" does not exist on python3 and on python2 it was not needed
anymore here.
parent a6c371f7
......@@ -252,14 +252,14 @@
<style:master-page style:name="Standard" style:page-layout-name="pm1">
<style:header tal:define="default_language python:test(request.get('international_form'), 'en', here.Localizer.get_selected_language());
orig_title string:Invoice;
en_title python: unicode(here.Base_translateString(orig_title, lang=default_language), 'utf-8');
my_title python: unicode(here.Base_translateString(orig_title), 'utf-8');
en_title python: here.Base_translateString(orig_title, lang=default_language);
my_title python: here.Base_translateString(orig_title);
orig_page string:Page;
en_page python: unicode(here.Base_translateString(orig_page, lang=default_language), 'utf-8');
my_page python: unicode(here.Base_translateString(orig_page), 'utf-8');
en_page python: here.Base_translateString(orig_page, lang=default_language);
my_page python: here.Base_translateString(orig_page);
orig_of string:of;
en_of python: unicode(here.Base_translateString(orig_of, lang=default_language), 'utf-8');
my_of python: unicode(here.Base_translateString(orig_of), 'utf-8');
en_of python: here.Base_translateString(orig_of, lang=default_language);
my_of python: here.Base_translateString(orig_of);
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']);
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']);
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'])">
......
......@@ -254,14 +254,14 @@
<style:master-page style:name="Standard" style:page-layout-name="pm1">
<style:header tal:define="default_language python:test(request.get('international_form'), 'en', here.Localizer.get_selected_language());
orig_title string:Invoice;
en_title python: unicode(here.Base_translateString(orig_title, lang=default_language), 'utf-8');
my_title python: unicode(here.Base_translateString(orig_title), 'utf-8');
en_title python: here.Base_translateString(orig_title, lang=default_language);
my_title python: here.Base_translateString(orig_title);
orig_page string:Page;
en_page python: unicode(here.Base_translateString(orig_page, lang=default_language), 'utf-8');
my_page python: unicode(here.Base_translateString(orig_page), 'utf-8');
en_page python: here.Base_translateString(orig_page, lang=default_language);
my_page python: here.Base_translateString(orig_page);
orig_of string:of;
en_of python: unicode(here.Base_translateString(orig_of, lang=default_language), 'utf-8');
my_of python: unicode(here.Base_translateString(orig_of), 'utf-8');
en_of python: here.Base_translateString(orig_of, lang=default_language);
my_of python: here.Base_translateString(orig_of);
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']);
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']);
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'])">
......
......@@ -249,14 +249,14 @@
<style:master-page style:name="Standard" style:page-layout-name="pm1">
<style:header tal:define="default_language python:test(request.get('international_form'), 'en', here.Localizer.get_selected_language());
orig_title string:Order;
en_title python: unicode(here.Base_translateString(orig_title, lang=default_language), 'utf-8');
my_title python: unicode(here.Base_translateString(orig_title), 'utf-8');
en_title python: here.Base_translateString(orig_title, lang=default_language);
my_title python: here.Base_translateString(orig_title);
orig_page string:Page;
en_page python: unicode(here.Base_translateString(orig_page, lang=default_language), 'utf-8');
my_page python: unicode(here.Base_translateString(orig_page), 'utf-8');
en_page python: here.Base_translateString(orig_page, lang=default_language);
my_page python: here.Base_translateString(orig_page);
orig_of string:of;
en_of python: unicode(here.Base_translateString(orig_of, lang=default_language), 'utf-8');
my_of python: unicode(here.Base_translateString(orig_of), 'utf-8');
en_of python: here.Base_translateString(orig_of, lang=default_language);
my_of python: here.Base_translateString(orig_of);
image_path python: here.getPortalType().startswith('Purchase') and data_dict['destination_section_image_path'] or data_dict['source_decision_image_path'];
image_width python: here.getPortalType().startswith('Purchase') and data_dict['destination_section_image_width'] or data_dict['source_decision_image_width'];
image_height python: here.getPortalType().startswith('Purchase') and data_dict['destination_section_image_height'] or data_dict['source_decision_image_height']">
......
......@@ -245,14 +245,14 @@
<office:master-styles>
<style:master-page style:name="Standard" style:page-layout-name="pm1">
<style:header tal:define="orig_title string:Packing List;
en_title python: unicode(here.Base_translateString(orig_title, lang='en'), 'utf-8');
my_title python: unicode(here.Base_translateString(orig_title), 'utf-8');
en_title python: here.Base_translateString(orig_title, lang='en');
my_title python: here.Base_translateString(orig_title);
orig_page string:Page;
en_page python: unicode(here.Base_translateString(orig_page, lang='en'), 'utf-8');
my_page python: unicode(here.Base_translateString(orig_page), 'utf-8');
en_page python: here.Base_translateString(orig_page, lang='en');
my_page python: here.Base_translateString(orig_page);
orig_of string:of;
en_of python: unicode(here.Base_translateString(orig_of, lang='en'), 'utf-8');
my_of python: unicode(here.Base_translateString(orig_of), 'utf-8');
en_of python: here.Base_translateString(orig_of, lang='en');
my_of python: here.Base_translateString(orig_of);
image_path python: here.getPortalType().startswith('Purchase') and data_dict['destination_section_image_path'] or data_dict['source_section_image_path'];
image_width python: here.getPortalType().startswith('Purchase') and data_dict['destination_section_image_width'] or data_dict['source_section_image_width'];
image_height python: here.getPortalType().startswith('Purchase') and data_dict['destination_section_image_height'] or data_dict['source_section_image_height']">
......
<office:document-content xmlns:draw='urn:oasis:names:tc:opendocument:xmlns:drawing:1.0' xmlns:office='urn:oasis:names:tc:opendocument:xmlns:office:1.0' xmlns:text='urn:oasis:names:tc:opendocument:xmlns:text:1.0' xmlns:ooo='http://openoffice.org/2004/office' xmlns:number='urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0' xmlns:dc='http://purl.org/dc/elements/1.1/' xmlns:meta='urn:oasis:names:tc:opendocument:xmlns:meta:1.0' xmlns:table='urn:oasis:names:tc:opendocument:xmlns:table:1.0' xmlns:dr3d='urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0' xmlns:fo='urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0' xmlns:style='urn:oasis:names:tc:opendocument:xmlns:style:1.0' xmlns:xforms='http://www.w3.org/2002/xforms' xmlns:form='urn:oasis:names:tc:opendocument:xmlns:form:1.0' xmlns:script='urn:oasis:names:tc:opendocument:xmlns:script:1.0' xmlns:ooow='http://openoffice.org/2004/writer' xmlns:svg='urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0' xmlns:chart='urn:oasis:names:tc:opendocument:xmlns:chart:1.0' xmlns:dom='http://www.w3.org/2001/xml-events' xmlns:xlink='http://www.w3.org/1999/xlink' xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns:oooc='http://openoffice.org/2004/calc' xmlns:math='http://www.w3.org/1998/Math/MathML' xmlns:tal='http://xml.zope.org/namespaces/tal' xmlns:i18n='http://xml.zope.org/namespaces/i18n' xmlns:metal='http://xml.zope.org/namespaces/metal' tal:attributes='dummy python:request.RESPONSE.setHeader("Content-Type", "text/html;; charset=utf-8")' office:version='1.0' tal:define="global frame_width python:25.8; render_prefix render_prefix|nothing" metal:define-macro="master" i18n:domain="erp5_ui">
<tal:block metal:use-macro="here/style_macros/macros/style_macro"/>
<office:body tal:define="unicode python: unicode if bytes==str else lambda t, encoding: t;">
<office:body>
<office:spreadsheet>
<table:table table:style-name='ta1' table:print='false' tal:attributes="table:name here/getTitle" i18n:attributes="table:name">
......
<office:document-content xmlns:draw='urn:oasis:names:tc:opendocument:xmlns:drawing:1.0' xmlns:office='urn:oasis:names:tc:opendocument:xmlns:office:1.0' xmlns:text='urn:oasis:names:tc:opendocument:xmlns:text:1.0' xmlns:ooo='http://openoffice.org/2004/office' xmlns:number='urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0' xmlns:dc='http://purl.org/dc/elements/1.1/' xmlns:meta='urn:oasis:names:tc:opendocument:xmlns:meta:1.0' xmlns:table='urn:oasis:names:tc:opendocument:xmlns:table:1.0' xmlns:dr3d='urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0' xmlns:fo='urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0' xmlns:style='urn:oasis:names:tc:opendocument:xmlns:style:1.0' xmlns:xforms='http://www.w3.org/2002/xforms' xmlns:form='urn:oasis:names:tc:opendocument:xmlns:form:1.0' xmlns:script='urn:oasis:names:tc:opendocument:xmlns:script:1.0' xmlns:ooow='http://openoffice.org/2004/writer' xmlns:svg='urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0' xmlns:chart='urn:oasis:names:tc:opendocument:xmlns:chart:1.0' xmlns:dom='http://www.w3.org/2001/xml-events' xmlns:xlink='http://www.w3.org/1999/xlink' xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns:oooc='http://openoffice.org/2004/calc' xmlns:math='http://www.w3.org/1998/Math/MathML' xmlns:tal='http://xml.zope.org/namespaces/tal' xmlns:i18n='http://xml.zope.org/namespaces/i18n' xmlns:metal='http://xml.zope.org/namespaces/metal' tal:attributes='dummy python:request.RESPONSE.setHeader("Content-Type", "text/html;; charset=utf-8")' office:version='1.0' tal:define="global frame_width python:25.8; global landscape python: int(request.get('landscape', 0) or 0)" metal:define-macro="master" i18n:domain="erp5_ui">
<tal:block metal:use-macro="here/style_macros/macros/style_macro"/>
<office:body tal:define="unicode python: unicode if bytes==str else lambda t, encoding: t">
<office:body>
<office:spreadsheet>
<tal:block tal:define="rendered_report_item_list rendered_report_item_list | python:[];
report_item_list python: rendered_report_item_list or [];
dummy python: request.set('here', here);
unicode python: unicode if bytes==str else lambda t, encoding: t;
global sheet_per_report_section python: request.get('sheet_per_report_section', False); ">
<tal:block tal:condition="not: report_item_list">
<tal:block tal:condition="python: form.meta_type == 'ERP5 Report'">
......
......@@ -4,7 +4,6 @@
quantity_renderer nocall:here/Base_viewFieldLibrary/my_view_mode_money_quantity/render_pdf;
gross_category python:'base_amount/payroll/report/salary/gross';
price_renderer nocall:here/PaySheetTransaction_viewFieldLibrary/my_price/render_pdf;
unicode python: unicode if bytes==str else lambda t, encoding: t;
default_language python:test(request.get('international_form'), 'en', here.Localizer.get_selected_language())">
<office:scripts/>
<office:font-face-decls>
......@@ -330,27 +329,27 @@
<table:covered-table-cell/>
</table:table-row>
<table:table-row>
<table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Designation; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
<table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Designation; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
<text:p text:style-name='Item_20_Table_20_Title_20_Left'><span tal:replace='orig_message'/></text:p>
<text:p text:style-name='Item_20_Table_20_Title_20_Left' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
</table:table-cell>
<table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Base; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
<table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Base; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
<text:p text:style-name='Item_20_Table_20_Title_20_Left'><span tal:replace='orig_message'/></text:p>
<text:p text:style-name='Item_20_Table_20_Title_20_Left' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
</table:table-cell>
<table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Employee Share Rate; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
<table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Employee Share Rate; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
<text:p text:style-name='Item_20_Table_20_Title_20_Left'><span tal:replace='orig_message'/></text:p>
<text:p text:style-name='Item_20_Table_20_Title_20_Left' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
</table:table-cell>
<table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Employee Share; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
<table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Employee Share; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
<text:p text:style-name='Item_20_Table_20_Title_20_Left'><span tal:replace='orig_message'/></text:p>
<text:p text:style-name='Item_20_Table_20_Title_20_Left' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
</table:table-cell>
<table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Employer Share Rate; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
<table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Employer Share Rate; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
<text:p text:style-name='Item_20_Table_20_Title_20_Left'><span tal:replace='orig_message'/></text:p>
<text:p text:style-name='Item_20_Table_20_Title_20_Left' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
</table:table-cell>
<table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Employer Share; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
<table:table-cell table:style-name='Tableau1.A2' office:value-type='string' tal:define='orig_string string:Employer Share; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
<text:p text:style-name='Item_20_Table_20_Title_20_Left'><span tal:replace='orig_message'/></text:p>
<text:p text:style-name='Item_20_Table_20_Title_20_Left' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/></text:p>
</table:table-cell>
......@@ -557,7 +556,7 @@
<table:table-cell table:style-name='Tableau3.A1' office:value-type='string'>
<text:p text:style-name='Table_20_Contents'/>
</table:table-cell>
<table:table-cell table:style-name='Tableau3.D2' office:value-type='string' tal:define='orig_string string:Net payable; orig_message python:unicode(here.Base_translateString(orig_string, lang=default_language),"utf-8"); translated_message python:unicode(here.Base_translateString(orig_string),"utf-8")'>
<table:table-cell table:style-name='Tableau3.D2' office:value-type='string' tal:define='orig_string string:Net payable; orig_message python:here.Base_translateString(orig_string, lang=default_language); translated_message python:here.Base_translateString(orig_string)'>
<text:p text:style-name='Table_20_Heading'><span tal:replace='orig_message'/>:</text:p>
<text:p text:style-name='Table_20_Heading' tal:condition='python:translated_message != orig_message'><span tal:replace='translated_message'/>:</text:p>
</table:table-cell>
......
......@@ -260,15 +260,15 @@
<style:header tal:define="default_language python:test(request.get('international_form'), 'en', here.Localizer.get_selected_language());
date_renderer nocall:here/Base_viewFieldLibrary/my_date_time_field/render_pdf;
orig_title python: 'Payslip';
en_title python: unicode(here.Base_translateString(orig_title, lang=default_language), 'utf-8');
my_title python: unicode(here.Base_translateString(orig_title), 'utf-8');
en_title python: here.Base_translateString(orig_title, lang=default_language);
my_title python: here.Base_translateString(orig_title);
orig_period python: 'From ${start_date} to ${stop_date}';
en_period python: unicode(here.Base_translateString(orig_period, lang=default_language,
en_period python: here.Base_translateString(orig_period, lang=default_language,
mapping = {'start_date': date_renderer(here.getStartDate()),
'stop_date': date_renderer(here.getStopDate())}), 'utf-8');
my_period python: unicode(here.Base_translateString(orig_period,
'stop_date': date_renderer(here.getStopDate())});
my_period python: here.Base_translateString(orig_period,
mapping = {'start_date': date_renderer(here.getStartDate()),
'stop_date': date_renderer(here.getStopDate())}), 'utf-8');
'stop_date': date_renderer(here.getStopDate())});
image_path python: here.getPortalType().startswith('Pay Sheet Transaction') and data_dict['destination_section_image_path'] or data_dict['destination_section_image_path'];
image_width python: here.getPortalType().startswith('Pay Sheet Transaction') and data_dict['destination_section_image_width'] or data_dict['destination_section_image_width'];
image_height python: here.getPortalType().startswith('Pay Sheet Transaction') and data_dict['destination_section_image_height'] or data_dict['destination_section_image_height']">
......
......@@ -248,14 +248,14 @@
<style:master-page style:name="Standard" style:page-layout-name="pm1">
<style:header tal:define="default_language python:test(request.get('international_form'), 'en', here.Localizer.get_selected_language());
orig_title python: data_dict['report_title'];
en_title python: unicode(here.Base_translateString(orig_title, lang=default_language), 'utf-8');
my_title python: unicode(here.Base_translateString(orig_title), 'utf-8');
en_title python: here.Base_translateString(orig_title, lang=default_language);
my_title python: here.Base_translateString(orig_title);
orig_page string:Page;
en_page python: unicode(here.Base_translateString(orig_page, lang=default_language), 'utf-8');
my_page python: unicode(here.Base_translateString(orig_page), 'utf-8');
en_page python: here.Base_translateString(orig_page, lang=default_language);
my_page python: here.Base_translateString(orig_page);
orig_of string:of;
en_of python: unicode(here.Base_translateString(orig_of, lang=default_language), 'utf-8');
my_of python: unicode(here.Base_translateString(orig_of), 'utf-8');
en_of python: here.Base_translateString(orig_of, lang=default_language);
my_of python: here.Base_translateString(orig_of);
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']);
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']);
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'])">
......
......@@ -252,14 +252,14 @@
<style:master-page style:name="Standard" style:page-layout-name="pm1">
<style:header tal:define="default_language python:test(request.get('international_form'), 'en', here.Localizer.get_selected_language());
orig_title python: data_dict['report_title'];
en_title python: unicode(here.Base_translateString(orig_title, lang=default_language), 'utf-8');
my_title python: unicode(here.Base_translateString(orig_title), 'utf-8');
en_title python: here.Base_translateString(orig_title, lang=default_language);
my_title python: here.Base_translateString(orig_title);
orig_page string:Page;
en_page python: unicode(here.Base_translateString(orig_page, lang=default_language), 'utf-8');
my_page python: unicode(here.Base_translateString(orig_page), 'utf-8');
en_page python: here.Base_translateString(orig_page, lang=default_language);
my_page python: here.Base_translateString(orig_page);
orig_of string:of;
en_of python: unicode(here.Base_translateString(orig_of, lang=default_language), 'utf-8');
my_of python: unicode(here.Base_translateString(orig_of), 'utf-8');
en_of python: here.Base_translateString(orig_of, lang=default_language);
my_of python: here.Base_translateString(orig_of);
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']);
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']);
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'])">
......
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