From d51df15b1a681cd19ea624c2c2f192a5510669c9 Mon Sep 17 00:00:00 2001 From: Jonatan Cloutier Date: Thu, 14 Feb 2013 16:12:07 -0500 Subject: [PATCH 01/16] Add common pattern to fiscal_template bzr revid: jonatan.cloutier@savoirfairelinux.com-20130214211207-599wcf0b9rxii5sg --- addons/l10n_ca/__openerp__.py | 4 ++-- addons/l10n_ca/fiscal_templates_en.xml | 12 ++++++------ addons/l10n_ca/fiscal_templates_fr.xml | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/addons/l10n_ca/__openerp__.py b/addons/l10n_ca/__openerp__.py index 05279b6ef8e..945327a06bc 100644 --- a/addons/l10n_ca/__openerp__.py +++ b/addons/l10n_ca/__openerp__.py @@ -20,7 +20,7 @@ ############################################################################## { 'name': 'Canada - Accounting', - 'version': '1.0', + 'version': '1.1', 'author': 'Savoir-faire Linux', 'website': 'http://www.savoirfairelinux.com', 'category': 'Localization/Account Charts', @@ -49,7 +49,7 @@ Canadian accounting charts and localizations. 'account_chart_template_fr.xml', 'account_tax_fr.xml', 'fiscal_templates_fr.xml', - 'l10n_ca_wizard.xml', + 'l10n_ca_wizard.xml' ], 'demo': [], 'installable': True, diff --git a/addons/l10n_ca/fiscal_templates_en.xml b/addons/l10n_ca/fiscal_templates_en.xml index 68e881c3541..a3bab5b89dd 100644 --- a/addons/l10n_ca/fiscal_templates_en.xml +++ b/addons/l10n_ca/fiscal_templates_en.xml @@ -5,17 +5,17 @@ - Provincial Regime + Provincial Regime (PROV) - Harmonized Provinces Regime (12%) + Harmonized Provinces Regime (12%) (BC) - Harmonized Provinces Regime (13%) + Harmonized Provinces Regime (13%) (ON, NB, NL) @@ -25,17 +25,17 @@ - Harmonized Provinces Regime (15%) + Harmonized Provinces Regime (15%) (NS) - Non-Harmonized Provinces Regime + Non-Harmonized Provinces Regime (AB, MB, SK, PE, NT, NU, YT) - International Regime + International Regime (INTL) diff --git a/addons/l10n_ca/fiscal_templates_fr.xml b/addons/l10n_ca/fiscal_templates_fr.xml index 3ba13d6642e..b01ab0985ea 100644 --- a/addons/l10n_ca/fiscal_templates_fr.xml +++ b/addons/l10n_ca/fiscal_templates_fr.xml @@ -5,7 +5,7 @@ - Régime Provincial + Régime Provincial (PROV) @@ -30,12 +30,12 @@ - Régime Provinces Non-Harmonisées + Régime Provinces Non-Harmonisées (AB, MB, SK, PE, NT, NU, YT) - Régime International + Régime International (INTL) From 06a42734269b2c42743f9a398f0375d5eff24f9d Mon Sep 17 00:00:00 2001 From: Jonatan Cloutier Date: Thu, 14 Feb 2013 16:16:10 -0500 Subject: [PATCH 02/16] fix SK and MB tax calculation bzr revid: jonatan.cloutier@savoirfairelinux.com-20130214211610-w0b6hyanps00qkqj --- addons/l10n_ca/account_tax_en.xml | 8 ++------ addons/l10n_ca/account_tax_fr.xml | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/addons/l10n_ca/account_tax_en.xml b/addons/l10n_ca/account_tax_en.xml index 1ff884ac361..4b15ebaa316 100644 --- a/addons/l10n_ca/account_tax_en.xml +++ b/addons/l10n_ca/account_tax_en.xml @@ -12,7 +12,6 @@ GSTPST_MB_SALE sale 1 - 1 percent @@ -39,7 +38,7 @@ PST for sales - 7% PST sale - 0.700000 + 0.070000 percent 2 @@ -152,7 +151,6 @@ GSTPST_SK_SALE sale 1 - 1 percent @@ -281,7 +279,6 @@ GSTPST_MB_PURC purchase 1 - 1 percent @@ -308,7 +305,7 @@ PST for purchases - 7% PST purchase - 0.700000 + 0.070000 percent 2 @@ -421,7 +418,6 @@ GSTPST_SK_PURC purchase 1 - 1 percent diff --git a/addons/l10n_ca/account_tax_fr.xml b/addons/l10n_ca/account_tax_fr.xml index b344feeec83..8c4f87b25b3 100644 --- a/addons/l10n_ca/account_tax_fr.xml +++ b/addons/l10n_ca/account_tax_fr.xml @@ -12,7 +12,6 @@ TPSTVP_MB_SALE sale 1 - 1 percent @@ -39,7 +38,7 @@ TVP sur les ventes - 7% TVP sale - 0.700000 + 0.070000 percent 2 @@ -152,7 +151,6 @@ TPSTVP_SK_SALE sale 1 - 1 percent @@ -281,7 +279,6 @@ TPSTVP_MB_PURC purchase 1 - 1 percent @@ -308,7 +305,7 @@ TVP sur les achats - 7% TVP purchase - 0.700000 + 0.070000 percent 2 @@ -421,7 +418,6 @@ TPSTVP_SK_PURC purchase 1 - 1 percent From ef8b1bbde70bc32c3fb2367b271a6a2297b6c36f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Wed, 20 Feb 2013 12:41:07 +0100 Subject: [PATCH 03/16] [FIX] improve l10n_lu financial report labels bzr revid: stephane.bidoul@acsone.eu-20130220114107-uxxubknx3v6wg7qq --- addons/l10n_lu/account_financial_report.xml | 30 ++++++++++----------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/addons/l10n_lu/account_financial_report.xml b/addons/l10n_lu/account_financial_report.xml index b39b0ceb15f..62a7a8c8d7e 100644 --- a/addons/l10n_lu/account_financial_report.xml +++ b/addons/l10n_lu/account_financial_report.xml @@ -84,7 +84,7 @@ - 2. Concessions, brevets, licences, marques, ainsi que droits et valeurs similaires s’ils ont été + 2. Concessions, brevets, licences, marques, ainsi que droits et valeurs similaires s’ils ont été 115 detail_flat @@ -256,7 +256,7 @@ - I. Stocks + I. Stocks 153 detail_flat @@ -292,7 +292,7 @@ - 4. Acomptes versés + 4. Acomptes versés 161 no_detail @@ -301,7 +301,7 @@ - II. Créances + II. Créances 163 detail_flat @@ -364,7 +364,7 @@ - 3. Créances sur des entreprises avec lesquelles la société a un + 3. Créances sur des entreprises avec lesquelles la société a un lien de participation 177 detail_flat @@ -436,7 +436,7 @@ - 2. Actions propres ou parts propres + 2. Actions propres ou parts propres 193 no_detail @@ -445,7 +445,7 @@ - 3. Autres valeurs mobilières + 3. Autres valeurs mobilières 195 no_detail @@ -963,7 +963,7 @@ - CHARGES + A. CHARGES 641 detail_flat @@ -972,7 +972,7 @@ - 1. Consommation de marchandises et de matières premières et consommables + 1. Consommation de marchandises et de matières premières et consommables 601 no_detail @@ -1044,7 +1044,7 @@ - a) sur frais d'établissement et sur immobilisations corporelles + a) sur frais d'établissement et sur immobilisations corporelles et incorporelles 617 no_detail @@ -1071,7 +1071,7 @@ - 6. Corrections de valeur sur immobilisations financières et aj + 6. Corrections de valeur sur immobilisations financières et ajustement de juste valeur sur immobilisations financières 623 no_detail @@ -1080,7 +1080,7 @@ - 7. Corrections de valeur et ajustement de juste valeur sur élém + 7. Corrections de valeur et ajustement de juste valeur sur éléments financiers de l'actif circulant. Moins-values de cessions des valeurs mobilières 625 no_detail @@ -1143,7 +1143,7 @@ - PRODUITS + B. PRODUITS 737 detail_flat @@ -1161,7 +1161,7 @@ - 2. Variation des stocks de produits finis, et de produits et de commandes en cours + 2. Variation des stocks de produits finis, et de produits et de commandes en cours 703 no_detail @@ -1188,7 +1188,7 @@ - a) sur frais d'établissement et sur immobilisations corporelles + a) sur frais d'établissement et sur immobilisations corporelles et incorporelles 709 no_detail From e147f5779cdd2193f4d2bf43d43e79fce0d5ec73 Mon Sep 17 00:00:00 2001 From: Jonatan Cloutier Date: Wed, 27 Feb 2013 11:36:41 -0500 Subject: [PATCH 04/16] fix quebec taxes calculations bzr revid: jonatan.cloutier@savoirfairelinux.com-20130227163641-jp61202fihnuxt9u --- addons/l10n_ca/account_tax_en.xml | 2 -- addons/l10n_ca/account_tax_fr.xml | 2 -- 2 files changed, 4 deletions(-) diff --git a/addons/l10n_ca/account_tax_en.xml b/addons/l10n_ca/account_tax_en.xml index 4b15ebaa316..afe505f27f5 100644 --- a/addons/l10n_ca/account_tax_en.xml +++ b/addons/l10n_ca/account_tax_en.xml @@ -105,7 +105,6 @@ GSTTVQ_SALE sale 1 - 1 percent @@ -372,7 +371,6 @@ GSTTVQ_PURC purchase 1 - 1 percent diff --git a/addons/l10n_ca/account_tax_fr.xml b/addons/l10n_ca/account_tax_fr.xml index 8c4f87b25b3..c34f329be3a 100644 --- a/addons/l10n_ca/account_tax_fr.xml +++ b/addons/l10n_ca/account_tax_fr.xml @@ -105,7 +105,6 @@ TPSTVQ_SALE sale 1 - 1 percent @@ -372,7 +371,6 @@ TPSTVQ_PURC purchase 1 - 1 percent From 8f6e543d708ee22707ad34bfe78fa99ae68b7efd Mon Sep 17 00:00:00 2001 From: Olivier LAURENT Date: Mon, 25 Mar 2013 17:43:13 +0100 Subject: [PATCH 05/16] [FIX] report_webkit: Wrong Report template file path throws 'Coercing to Unicode' error : (Maintenance Case : 583490) cf. http://bazaar.launchpad.net/~openerp-dev/openobject-addons/7.0-opw-583490-rgo/revision/8519 bzr revid: olivier.laurent@acsone.eu-20130325164313-ccnkn06x16ar32qz --- addons/report_webkit/webkit_report.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/report_webkit/webkit_report.py b/addons/report_webkit/webkit_report.py index b6c273f8852..99e1aa31058 100644 --- a/addons/report_webkit/webkit_report.py +++ b/addons/report_webkit/webkit_report.py @@ -220,7 +220,7 @@ class WebKitParser(report_sxw): if report_xml.report_file : path = addons.get_module_resource(*report_xml.report_file.split(os.path.sep)) - if os.path.exists(path) : + if path and os.path.exists(path) : template = file(path).read() if not template and report_xml.report_webkit_data : template = report_xml.report_webkit_data From 396eec00aa9dab575b74c94b51673ff3a7f7fa44 Mon Sep 17 00:00:00 2001 From: Olivier LAURENT Date: Mon, 25 Mar 2013 17:49:07 +0100 Subject: [PATCH 06/16] [FIX] path declaration must be OS independant => use '/' as neutral path separator lp bug: https://launchpad.net/bugs/1159702 fixed bzr revid: olivier.laurent@acsone.eu-20130325164907-4j1ki08mxp0a6y4o --- addons/report_webkit/webkit_report.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/report_webkit/webkit_report.py b/addons/report_webkit/webkit_report.py index 99e1aa31058..32dd1a50995 100644 --- a/addons/report_webkit/webkit_report.py +++ b/addons/report_webkit/webkit_report.py @@ -219,7 +219,7 @@ class WebKitParser(report_sxw): template = False if report_xml.report_file : - path = addons.get_module_resource(*report_xml.report_file.split(os.path.sep)) + path = addons.get_module_resource(*report_xml.report_file.split('/')) if path and os.path.exists(path) : template = file(path).read() if not template and report_xml.report_webkit_data : From de5b79545ecd690a0bb685976e2422425fb53e5e Mon Sep 17 00:00:00 2001 From: "Pinakin Nayi (OpenERP)" Date: Fri, 31 May 2013 11:59:46 +0530 Subject: [PATCH 07/16] [FIX]account : account invoice balance is double the total bzr revid: pna@tinyerp.com-20130531062946-i0rhy98n8bjk9nh4 --- addons/account/account_invoice_view.xml | 2 +- addons/account/product_view.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index 046350f302e..fa72efc74f0 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -352,7 +352,7 @@ diff --git a/addons/account/product_view.xml b/addons/account/product_view.xml index 44d53839700..2c540cb6ee6 100644 --- a/addons/account/product_view.xml +++ b/addons/account/product_view.xml @@ -11,11 +11,11 @@ - + - + From c3f7fbbf1f0cd994b8edd5821a9fec4c76c71f2e Mon Sep 17 00:00:00 2001 From: "nicolas.bessi@camptocamp.com" <> Date: Fri, 31 May 2013 09:36:31 +0200 Subject: [PATCH 08/16] [FIX] project name search if aa id != project id lp bug: https://launchpad.net/bugs/1186146 fixed bzr revid: nicolas.bessi@camptocamp.com-20130531073631-dthwxiyp8mnmtkfr --- addons/project/project.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/project/project.py b/addons/project/project.py index 31d69a3df43..53606acb6a1 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -85,7 +85,7 @@ class project(osv.osv): if context and context.get('user_preference'): cr.execute("""SELECT project.id FROM project_project project LEFT JOIN account_analytic_account account ON account.id = project.analytic_account_id - LEFT JOIN project_user_rel rel ON rel.project_id = project.analytic_account_id + LEFT JOIN project_user_rel rel ON rel.project_id = project.id WHERE (account.user_id = %s or rel.uid = %s)"""%(user, user)) return [(r[0]) for r in cr.fetchall()] return super(project, self).search(cr, user, args, offset=offset, limit=limit, order=order, From 40ea4556de472df956b54977d392e854edbf3dd7 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Fri, 31 May 2013 09:47:45 +0200 Subject: [PATCH 09/16] [FIX] base, res_company: typo in default paraStyle tagname bzr revid: qdp-launchpad@openerp.com-20130531074745-ycfvlzrvlkrli33h --- openerp/addons/base/res/res_company.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py index 20e94b3e631..ea6d9921f75 100644 --- a/openerp/addons/base/res/res_company.py +++ b/openerp/addons/base/res/res_company.py @@ -274,7 +274,7 @@ class res_company(osv.osv): - + @@ -312,7 +312,7 @@ class res_company(osv.osv): - + From 2d51566f666b9219b767d56f6e8bb1cf1907891b Mon Sep 17 00:00:00 2001 From: "Dharti Ratani (Open ERP)" Date: Fri, 31 May 2013 14:53:11 +0530 Subject: [PATCH 10/16] [FIX]Hide the margin in SO if you see SO as a customer through portal, if 'Display margin on sale orders' is activated bzr revid: dhr@tinyerp.com-20130531092311-rgtlbv55ai4223pk --- addons/sale_margin/sale_margin_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/sale_margin/sale_margin_view.xml b/addons/sale_margin/sale_margin_view.xml index 88647ea3c46..be16429526a 100644 --- a/addons/sale_margin/sale_margin_view.xml +++ b/addons/sale_margin/sale_margin_view.xml @@ -9,7 +9,7 @@ - + From 03d39c542972f1bc70a15ed0726dc9130e6ef2e8 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Fri, 31 May 2013 13:46:12 +0200 Subject: [PATCH 11/16] [IMP/FIX] report, trml2pdf: added the support of registerFontFamily tag to allow the mapping of different fonts for bold, italic or boldItalic bzr revid: qdp-launchpad@openerp.com-20130531114612-ofcn1swt5o5cc7oc --- openerp/report/render/rml2pdf/trml2pdf.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/openerp/report/render/rml2pdf/trml2pdf.py b/openerp/report/render/rml2pdf/trml2pdf.py index 243cc02a0b3..793c6d573fe 100644 --- a/openerp/report/render/rml2pdf/trml2pdf.py +++ b/openerp/report/render/rml2pdf/trml2pdf.py @@ -277,11 +277,24 @@ class _rml_doc(object): fname = font.get('fontFile').encode('ascii') if name not in pdfmetrics._fonts: pdfmetrics.registerFont(TTFont(name, fname)) + #by default, we map the fontName to each style (bold, italic, bold and italic), so that + #if there isn't any font defined for one of these style (via a font family), the system + #will fallback on the normal font. addMapping(name, 0, 0, name) #normal addMapping(name, 0, 1, name) #italic addMapping(name, 1, 0, name) #bold addMapping(name, 1, 1, name) #italic and bold + #if registerFontFamily is defined, we register the mapping of the fontName to use for each style. + for font_family in node.findall('registerFontFamily'): + family_name = font_family.get('normal').encode('ascii') + if font_family.get('italic'): + addMapping(family_name, 0, 1, font_family.get('italic').encode('ascii')) + if font_family.get('bold'): + addMapping(family_name, 1, 0, font_family.get('bold').encode('ascii')) + if font_family.get('boldItalic'): + addMapping(family_name, 1, 1, font_family.get('boldItalic').encode('ascii')) + def setTTFontMapping(self,face, fontname, filename, mode='all'): from reportlab.lib.fonts import addMapping from reportlab.pdfbase import pdfmetrics From b430036c7f516a9215f00ca55f64360b29cb07fd Mon Sep 17 00:00:00 2001 From: "Pinakin Nayi (OpenERP)" Date: Fri, 31 May 2013 17:17:16 +0530 Subject: [PATCH 12/16] [FIX]crm : delete with super user to avoid access rules because if there is any user (not have delete access of lead) than also merge opportunity bzr revid: pna@tinyerp.com-20130531114716-5as9flbu2506reh0 --- addons/crm/crm_lead.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index f8d7c2b1b63..a9748251c15 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -674,7 +674,8 @@ class crm_lead(base_stage, format_address, osv.osv): # Write merged data into first opportunity self.write(cr, uid, [highest.id], merged_data, context=context) # Delete tail opportunities - self.unlink(cr, uid, [x.id for x in tail_opportunities], context=context) + # Delete with super user to avoid access rights issues + self.unlink(cr, SUPERUSER_ID, [x.id for x in tail_opportunities], context=context) return highest.id From dfe1a7ca3445438888cde49d68bad34e4aa8194f Mon Sep 17 00:00:00 2001 From: "Dhruti Shastri (OpenERP)" Date: Fri, 31 May 2013 17:34:53 +0530 Subject: [PATCH 13/16] [hr_hlidays] : Calender view display False value if no user_id bzr revid: dhs@tinyerp.com-20130531120453-56m4n4h4bxrca2x5 --- addons/hr_holidays/hr_holidays_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml index f8b4ad07b77..41dd39df31b 100644 --- a/addons/hr_holidays/hr_holidays_view.xml +++ b/addons/hr_holidays/hr_holidays_view.xml @@ -40,8 +40,8 @@ Leave Request hr.holidays - - + + From 9705c37dfa282975da59e58a43e4ea759bc16a1b Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Sat, 1 Jun 2013 05:59:28 +0000 Subject: [PATCH 14/16] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20130601055923-2o80qu13ofm2jkfh bzr revid: launchpad_translations_on_behalf_of_openerp-20130531070111-eqt2i0xb3xqrth7p bzr revid: launchpad_translations_on_behalf_of_openerp-20130601055928-uap5zeq41e0317xt --- addons/base_gengo/i18n/tr.po | 18 ++-- addons/web_diagram/i18n/zh_TW.po | 99 +++++++++++++++++++ addons/web_kanban/i18n/zh_TW.po | 161 +++++++++++++++++++++++++++++++ 3 files changed, 270 insertions(+), 8 deletions(-) create mode 100644 addons/web_diagram/i18n/zh_TW.po create mode 100644 addons/web_kanban/i18n/zh_TW.po diff --git a/addons/base_gengo/i18n/tr.po b/addons/base_gengo/i18n/tr.po index 5d53c60bc0b..466e0a17a2d 100644 --- a/addons/base_gengo/i18n/tr.po +++ b/addons/base_gengo/i18n/tr.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-03-07 08:37+0000\n" -"PO-Revision-Date: 2013-02-06 10:44+0000\n" -"Last-Translator: Ahmet Altınışık \n" +"PO-Revision-Date: 2013-05-31 11:30+0000\n" +"Last-Translator: Ercan SORMAZ \n" "Language-Team: Turkish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-28 05:33+0000\n" -"X-Generator: Launchpad (build 16546)\n" +"X-Launchpad-Export-Date: 2013-06-01 05:59+0000\n" +"X-Generator: Launchpad (build 16660)\n" #. module: base_gengo #: view:res.company:0 @@ -96,7 +96,7 @@ msgstr "" #. module: base_gengo #: selection:ir.translation,gengo_translation:0 msgid "Translation By Machine" -msgstr "" +msgstr "Makine Tarafından Çeviri" #. module: base_gengo #: view:res.company:0 @@ -116,12 +116,12 @@ msgstr "" #. module: base_gengo #: field:ir.translation,gengo_translation:0 msgid "Gengo Translation Service Level" -msgstr "" +msgstr "Genge Çeviri Hizmet Düzeyi" #. module: base_gengo #: view:res.company:0 msgid "Add your comments here for translator...." -msgstr "" +msgstr "Çevirmen için buraya yorum ekleyin...." #. module: base_gengo #: selection:ir.translation,gengo_translation:0 @@ -134,6 +134,8 @@ msgid "" "You can select here the service level you want for an automatic translation " "using Gengo." msgstr "" +"Genge otomatik çeviri servisi için istediğiniz hizmet düzeyini buradan " +"seçebilirsiniz" #. module: base_gengo #: field:base.gengo.translations,restart_send_job:0 @@ -213,7 +215,7 @@ msgstr "" #. module: base_gengo #: view:res.company:0 msgid "Gengo Parameters" -msgstr "" +msgstr "Gengo Parametreleri" #. module: base_gengo #: view:base.gengo.translations:0 diff --git a/addons/web_diagram/i18n/zh_TW.po b/addons/web_diagram/i18n/zh_TW.po new file mode 100644 index 00000000000..803407db1ac --- /dev/null +++ b/addons/web_diagram/i18n/zh_TW.po @@ -0,0 +1,99 @@ +# Chinese (Traditional) translation for openerp-web +# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 +# This file is distributed under the same license as the openerp-web package. +# FIRST AUTHOR , 2013. +# +msgid "" +msgstr "" +"Project-Id-Version: openerp-web\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2013-03-07 08:39+0000\n" +"PO-Revision-Date: 2013-05-31 06:39+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Chinese (Traditional) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2013-06-01 05:59+0000\n" +"X-Generator: Launchpad (build 16660)\n" + +#. module: web_diagram +#. openerp-web +#: code:addons/web_diagram/static/src/js/diagram.js:252 +#: code:addons/web_diagram/static/src/js/diagram.js:317 +#, python-format +msgid "Open: " +msgstr "" + +#. module: web_diagram +#. openerp-web +#: code:addons/web_diagram/static/src/js/diagram.js:215 +#, python-format +msgid "" +"Deleting this node cannot be undone.\n" +"It will also delete all connected transitions.\n" +"\n" +"Are you sure ?" +msgstr "" + +#. module: web_diagram +#. openerp-web +#: code:addons/web_diagram/static/src/xml/base_diagram.xml:13 +#, python-format +msgid "New Node" +msgstr "" + +#. module: web_diagram +#. openerp-web +#: code:addons/web_diagram/static/src/js/diagram.js:310 +#: code:addons/web_diagram/static/src/js/diagram.js:329 +#, python-format +msgid "Transition" +msgstr "" + +#. module: web_diagram +#. openerp-web +#: code:addons/web_diagram/static/src/js/diagram.js:11 +#, python-format +msgid "Diagram" +msgstr "" + +#. module: web_diagram +#. openerp-web +#: code:addons/web_diagram/static/src/js/diagram.js:244 +#: code:addons/web_diagram/static/src/js/diagram.js:278 +#, python-format +msgid "Activity" +msgstr "" + +#. module: web_diagram +#. openerp-web +#: code:addons/web_diagram/static/src/js/diagram.js:420 +#, python-format +msgid "%d / %d" +msgstr "" + +#. module: web_diagram +#. openerp-web +#: code:addons/web_diagram/static/src/js/diagram.js:283 +#: code:addons/web_diagram/static/src/js/diagram.js:335 +#, python-format +msgid "Create:" +msgstr "" + +#. module: web_diagram +#. openerp-web +#: code:addons/web_diagram/static/src/js/diagram.js:185 +#, python-format +msgid "Are you sure?" +msgstr "" + +#. module: web_diagram +#. openerp-web +#: code:addons/web_diagram/static/src/js/diagram.js:233 +#, python-format +msgid "" +"Deleting this transition cannot be undone.\n" +"\n" +"Are you sure ?" +msgstr "" diff --git a/addons/web_kanban/i18n/zh_TW.po b/addons/web_kanban/i18n/zh_TW.po new file mode 100644 index 00000000000..a099d204440 --- /dev/null +++ b/addons/web_kanban/i18n/zh_TW.po @@ -0,0 +1,161 @@ +# Chinese (Traditional) translation for openerp-web +# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 +# This file is distributed under the same license as the openerp-web package. +# FIRST AUTHOR , 2013. +# +msgid "" +msgstr "" +"Project-Id-Version: openerp-web\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2013-03-07 08:39+0000\n" +"PO-Revision-Date: 2013-05-31 06:43+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Chinese (Traditional) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2013-06-01 05:59+0000\n" +"X-Generator: Launchpad (build 16660)\n" + +#. module: web_kanban +#. openerp-web +#: code:addons/web_kanban/static/src/js/kanban.js:686 +#, python-format +msgid "Edit column" +msgstr "" + +#. module: web_kanban +#. openerp-web +#: code:addons/web_kanban/static/src/xml/web_kanban.xml:80 +#, python-format +msgid "Show more... (" +msgstr "" + +#. module: web_kanban +#. openerp-web +#: code:addons/web_kanban/static/src/js/kanban.js:10 +#, python-format +msgid "Kanban" +msgstr "" + +#. module: web_kanban +#. openerp-web +#: code:addons/web_kanban/static/src/js/kanban.js:539 +#, python-format +msgid "Undefined" +msgstr "" + +#. module: web_kanban +#. openerp-web +#: code:addons/web_kanban/static/src/js/kanban.js:705 +#, python-format +msgid "Are you sure to remove this column ?" +msgstr "" + +#. module: web_kanban +#. openerp-web +#: code:addons/web_kanban/static/src/xml/web_kanban.xml:47 +#, python-format +msgid "Edit" +msgstr "" + +#. module: web_kanban +#. openerp-web +#: code:addons/web_kanban/static/src/js/kanban.js:192 +#, python-format +msgid "Add column" +msgstr "" + +#. module: web_kanban +#. openerp-web +#: code:addons/web_kanban/static/src/js/kanban.js:1082 +#, python-format +msgid "Create: " +msgstr "" + +#. module: web_kanban +#. openerp-web +#: code:addons/web_kanban/static/src/xml/web_kanban.xml:24 +#, python-format +msgid "Add a new column" +msgstr "" + +#. module: web_kanban +#. openerp-web +#: code:addons/web_kanban/static/src/js/kanban.js:677 +#: code:addons/web_kanban/static/src/xml/web_kanban.xml:45 +#, python-format +msgid "Fold" +msgstr "" + +#. module: web_kanban +#. openerp-web +#: code:addons/web_kanban/static/src/xml/web_kanban.xml:98 +#, python-format +msgid "Add" +msgstr "" + +#. module: web_kanban +#. openerp-web +#: code:addons/web_kanban/static/src/xml/web_kanban.xml:35 +#, python-format +msgid "Quick create" +msgstr "" + +#. module: web_kanban +#. openerp-web +#: code:addons/web_kanban/static/src/js/kanban.js:918 +#, python-format +msgid "Are you sure you want to delete this record ?" +msgstr "" + +#. module: web_kanban +#. openerp-web +#: code:addons/web_kanban/static/src/js/kanban.js:677 +#, python-format +msgid "Unfold" +msgstr "" + +#. module: web_kanban +#. openerp-web +#: code:addons/web_kanban/static/src/xml/web_kanban.xml:99 +#, python-format +msgid "Cancel" +msgstr "" + +#. module: web_kanban +#. openerp-web +#: code:addons/web_kanban/static/src/xml/web_kanban.xml:80 +#, python-format +msgid "remaining)" +msgstr "" + +#. module: web_kanban +#. openerp-web +#: code:addons/web_kanban/static/src/js/kanban.js:421 +#, python-format +msgid "An error has occured while moving the record to this group: " +msgstr "" + +#. module: web_kanban +#. openerp-web +#: code:addons/web_kanban/static/src/xml/web_kanban.xml:22 +#: code:addons/web_kanban/static/src/xml/web_kanban.xml:98 +#, python-format +msgid "or" +msgstr "" + +#. module: web_kanban +#. openerp-web +#: code:addons/web_kanban/static/src/xml/web_kanban.xml:40 +#: code:addons/web_kanban/static/src/xml/web_kanban.xml:55 +#, python-format +msgid "99+" +msgstr "" + +#. module: web_kanban +#. openerp-web +#: code:addons/web_kanban/static/src/xml/web_kanban.xml:48 +#, python-format +msgid "Delete" +msgstr "" From 232e24b7a45105267ea5fe22f9d410470e529b3c Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Mon, 3 Jun 2013 11:30:48 +0200 Subject: [PATCH 15/16] [FIX] trml2pdf: reportlab 2.4.4 doesn't support the previous syntax (sname in self.default_style) bzr revid: qdp-launchpad@openerp.com-20130603093048-4iwgnb4hxhsxrazc --- openerp/report/render/rml2pdf/trml2pdf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/report/render/rml2pdf/trml2pdf.py b/openerp/report/render/rml2pdf/trml2pdf.py index 793c6d573fe..2052b128ad9 100644 --- a/openerp/report/render/rml2pdf/trml2pdf.py +++ b/openerp/report/render/rml2pdf/trml2pdf.py @@ -160,7 +160,7 @@ class _rml_styles(object,): for style in node.findall('paraStyle'): sname = style.get('name') self.styles[sname] = self._para_style_update(style) - if sname in self.default_style: + if self.default_style.has_key(sname): for key, value in self.styles[sname].items(): setattr(self.default_style[sname], key, value) else: From 480310a029047ed4d75f9991de3341b003c0ba69 Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Tue, 4 Jun 2013 06:27:25 +0000 Subject: [PATCH 16/16] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20130604062725-756lijc06mik58o7 --- addons/auth_signup/i18n/hr.po | 10 +++++----- addons/fleet/i18n/de.po | 32 ++++++++++++++++---------------- addons/stock/i18n/fr.po | 8 ++++---- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/addons/auth_signup/i18n/hr.po b/addons/auth_signup/i18n/hr.po index 394cbc09b1d..85487ddd2d2 100644 --- a/addons/auth_signup/i18n/hr.po +++ b/addons/auth_signup/i18n/hr.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-03-07 08:37+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2013-06-03 17:51+0000\n" +"Last-Translator: Damir Tušek \n" "Language-Team: Croatian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-28 05:32+0000\n" -"X-Generator: Launchpad (build 16546)\n" +"X-Launchpad-Export-Date: 2013-06-04 06:27+0000\n" +"X-Generator: Launchpad (build 16660)\n" #. module: auth_signup #: field:res.partner,signup_type:0 @@ -73,7 +73,7 @@ msgstr "Promjena lozinke" #: code:addons/auth_signup/static/src/js/auth_signup.js:117 #, python-format msgid "Please enter a password and confirm it." -msgstr "Molim upišite lozinku i potvrdu." +msgstr "Unesite loziniku i potvrdite unos" #. module: auth_signup #. openerp-web diff --git a/addons/fleet/i18n/de.po b/addons/fleet/i18n/de.po index 8671bb78f86..0e2c5a0f1aa 100644 --- a/addons/fleet/i18n/de.po +++ b/addons/fleet/i18n/de.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-03-07 08:39+0000\n" -"PO-Revision-Date: 2013-05-30 10:57+0000\n" +"PO-Revision-Date: 2013-06-03 11:30+0000\n" "Last-Translator: Armin GREGOR \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-05-31 07:00+0000\n" +"X-Launchpad-Export-Date: 2013-06-04 06:27+0000\n" "X-Generator: Launchpad (build 16660)\n" #. module: fleet @@ -35,7 +35,7 @@ msgstr "Ersatz Kälteklimakompressor" #. module: fleet #: help:fleet.vehicle,vin_sn:0 msgid "Unique number written on the vehicle motor (VIN/SN number)" -msgstr "Eindeutige Fahrzeug-Identifizierungsnummer (FIN)" +msgstr "Fahrgestellnummer" #. module: fleet #: selection:fleet.service.type,category:0 @@ -162,7 +162,7 @@ msgstr "Batterie Inspektion" #. module: fleet #: field:fleet.vehicle,company_id:0 msgid "Company" -msgstr "Unternehmen" +msgstr "Firma" #. module: fleet #: view:fleet.vehicle.log.contract:0 @@ -749,7 +749,7 @@ msgstr "Aktueller Fahrzeugzustand" #. module: fleet #: selection:fleet.vehicle,transmission:0 msgid "Manual" -msgstr "Betriebsanleitung" +msgstr "Handbuch" #. module: fleet #: model:fleet.service.type,name:fleet.type_service_52 @@ -929,7 +929,7 @@ msgstr "Kaufdatum des Fahrzeugs" #. module: fleet #: view:fleet.vehicle.model:0 msgid "Models" -msgstr "Modell" +msgstr "Modelle" #. module: fleet #: view:fleet.vehicle.log.contract:0 @@ -1067,7 +1067,7 @@ msgstr "Kraftstoffart" #. module: fleet #: model:fleet.service.type,name:fleet.type_service_22 msgid "Fuel Injector Replacement" -msgstr "Ersatz Einfüllstutzen" +msgstr "Ersatz Einspritzdüse" #. module: fleet #: model:ir.actions.act_window,name:fleet.fleet_vehicle_state_act @@ -1113,7 +1113,7 @@ msgstr "Datum Vertragsbeginn" #. module: fleet #: selection:fleet.vehicle,fuel_type:0 msgid "Electric" -msgstr "Elektrisch" +msgstr "Elektrik" #. module: fleet #: field:fleet.vehicle,tag_ids:0 @@ -1186,7 +1186,7 @@ msgstr "Ersatz Lichtmaschine" #. module: fleet #: model:fleet.service.type,name:fleet.type_service_3 msgid "A/C Diagnosis" -msgstr "Diagnose Batterie" +msgstr "Diagnose Klimaanlage" #. module: fleet #: model:fleet.service.type,name:fleet.type_service_23 @@ -1211,7 +1211,7 @@ msgstr "Ersatz Wärmepumpe" #. module: fleet #: view:fleet.vehicle:0 msgid "show all the costs for this vehicle" -msgstr "gesamte Kostenübersicht der Fahrzeuge" +msgstr "gesamte Kostenübersicht des Fahrzeugs" #. module: fleet #: view:fleet.vehicle.odometer:0 @@ -1546,7 +1546,7 @@ msgstr "Achsvermessung" #. module: fleet #: model:fleet.vehicle.tag,name:fleet.vehicle_tag_purchased msgid "Purchased" -msgstr "Ersatzteil" +msgstr "Eingekauft" #. module: fleet #: view:fleet.vehicle.log.contract:0 @@ -1764,7 +1764,7 @@ msgstr "Preis" #: field:fleet.vehicle.cost,odometer:0 #: field:fleet.vehicle.odometer,value:0 msgid "Odometer Value" -msgstr "Tachostand" +msgstr "Kilometerstand" #. module: fleet #: view:fleet.vehicle:0 @@ -1822,7 +1822,7 @@ msgstr "Schreiben Sie hier alle erforderlichen Zusatzinformationen auf." #. module: fleet #: model:fleet.service.type,name:fleet.type_service_29 msgid "Ignition Coil Replacement" -msgstr "Ersatz Zündkerzen" +msgstr "Ersatz Zündspule" #. module: fleet #: model:fleet.service.type,name:fleet.type_service_service_16 @@ -1832,7 +1832,7 @@ msgstr "Optionen" #. module: fleet #: model:fleet.service.type,name:fleet.type_contract_repairing msgid "Repairing" -msgstr "Reparieren" +msgstr "Wird repariert" #. module: fleet #: model:ir.actions.act_window,name:fleet.action_fleet_reporting_costs @@ -1870,7 +1870,7 @@ msgstr "Getriebe" #. module: fleet #: field:fleet.vehicle,vin_sn:0 msgid "Chassis Number" -msgstr "Fahrzeuqinformationsnummer" +msgstr "Fahrgestellnummer" #. module: fleet #: help:fleet.vehicle,color:0 @@ -2026,7 +2026,7 @@ msgstr "Reifenwechsel" #. module: fleet #: model:fleet.service.type,name:fleet.type_service_42 msgid "Starter Replacement" -msgstr "Erstinspektion" +msgstr "Ersatz Anlasser" #. module: fleet #: view:fleet.vehicle.cost:0 diff --git a/addons/stock/i18n/fr.po b/addons/stock/i18n/fr.po index 357fa2994e7..361b5332894 100644 --- a/addons/stock/i18n/fr.po +++ b/addons/stock/i18n/fr.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-03-07 08:37+0000\n" -"PO-Revision-Date: 2013-05-30 16:02+0000\n" -"Last-Translator: Numérigraphe \n" +"PO-Revision-Date: 2013-06-03 22:36+0000\n" +"Last-Translator: Fabien (Open ERP) \n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-05-31 07:01+0000\n" +"X-Launchpad-Export-Date: 2013-06-04 06:27+0000\n" "X-Generator: Launchpad (build 16660)\n" #. module: stock @@ -3531,7 +3531,7 @@ msgstr "À facturer" #. module: stock #: field:stock.inventory,date_done:0 msgid "Date done" -msgstr "Date de réalisation" +msgstr "Date de fin" #. module: stock #: code:addons/stock/stock.py:1121