From c6d4dcd2ab0c48a7f1e86a070625458c58a275cd Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 8 Nov 2012 16:18:10 +0100 Subject: [PATCH 01/10] [FIX] Fix form view bounce effect bzr revid: fme@openerp.com-20121108151810-c5p3rsha9x8kg6lv --- addons/web/static/src/js/view_form.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 55f5b580015..b3a970bc72d 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -201,7 +201,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM this.$el.find(".oe_form_group_row,.oe_form_field,label").on('click', function (e) { if(self.get("actual_mode") == "view") { var $button = self.options.$buttons.find(".oe_form_button_edit"); - $button.effect('bounce', {distance: 18, times: 5}, 150); + $button.css('box-sizing', 'content-box').effect('bounce', {distance: 18, times: 5}, 150); e.stopPropagation(); instance.web.bus.trigger('click', e); } From 3a5421309b569d13073e1c3cfce0ee0fe9bcafcb Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 8 Nov 2012 15:57:05 +0100 Subject: [PATCH 02/10] [FIX] breakage of m2m (tag) fields in editable (o2m) listviews e.g. quotation form view, "Order Lines" table, add a tax (or more) to a line, save, then try to edit the line. Issue: the listview mostly uses a single-level structure for its display, each record is a trivial map of {name: value}. For the M2O the expected value can be complex-ish (a name_get which holds all the interesting stuff) but not so for the m2m. An m2m value is just a list of ids (Array), the list view would overwrite that with the concatenated name_get strings to get something kind-of displayable. Except editable serializes the record it has and passes that as-is to the embedded formview. The corresponding widget (FieldMany2ManyTags) most definitely does not expect a big string to be shoved up its fat ass. So use a different but just as disgusting hack: instead of *replacing* the ids array with the string, add the string to the record after very slightly munging the original name, that way the form is happy because it gets the value it expects, and the Many2Many column can override _format to use the value of the munged/fake column as "stuff it passes to whatever is in charge of formatting fields for display" when the original field is asked for. NOTE: redundant work is done as every line will do its own name_get, potentially on the same ids over and over again. Having a short-lived backend cache may allow not name_get-ing ids we've already fetched during the same table display... bzr revid: xmo@openerp.com-20121108145705-uphw76z4q4krcpnl --- addons/web/static/src/js/view_list.js | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js index f11a9a2e3ac..03a48297eca 100644 --- a/addons/web/static/src/js/view_list.js +++ b/addons/web/static/src/js/view_list.js @@ -1000,7 +1000,8 @@ instance.web.ListView.List = instance.web.Class.extend( /** @lends instance.web. } else if (column.type === 'many2many') { value = record.get(column.id); // non-resolved (string) m2m values are arrays - if (value instanceof Array && !_.isEmpty(value)) { + if (value instanceof Array && !_.isEmpty(value) + && !record.get(column.id + '__display')) { var ids; // they come in two shapes: if (value[0] instanceof Array) { @@ -1016,8 +1017,13 @@ instance.web.ListView.List = instance.web.Class.extend( /** @lends instance.web. } new instance.web.Model(column.relation) .call('name_get', [ids]).done(function (names) { - record.set(column.id, _(names).pluck(1).join(', ')); - }) + // FIXME: nth horrible hack in this poor listview + record.set(column.id + '__display', + _(names).pluck(1).join(', ')); + record.set(column.id, ids); + }); + // temp empty value + record.set(column.id, false); } } return column.format(record.toForm().data, { @@ -2015,6 +2021,7 @@ instance.web.list.columns = new instance.web.Registry({ 'field.handle': 'instance.web.list.Handle', 'button': 'instance.web.list.Button', 'field.many2onebutton': 'instance.web.list.Many2OneButton', + 'field.many2many': 'instance.web.list.Many2Many' }); instance.web.list.columns.for_ = function (id, field, node) { var description = _.extend({tag: node.tag}, field, node.attrs); @@ -2208,5 +2215,14 @@ instance.web.list.Many2OneButton = instance.web.list.Column.extend({ return QWeb.render('Many2OneButton.cell', {'widget': this}); }, }); +instance.web.list.Many2Many = instance.web.list.Column.extend({ + _format: function (row_data, options) { + if (row_data[this.id].value) { + // If value, use __display version for printing + row_data[this.id] = row_data[this.id + '__display']; + } + return this._super(row_data, options); + } +}); }; // vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax: From e0094e20dec331e60cc203489c3517f9e7b71781 Mon Sep 17 00:00:00 2001 From: "vta vta@openerp.com" <> Date: Thu, 8 Nov 2012 16:22:31 +0100 Subject: [PATCH 03/10] [FIX] Issue when triggering 'write_completed' on AbstractFormPopup, argument not passed. bzr revid: vta@openerp.com-20121108152231-cdtdxa1q9rl4eyre --- addons/web/static/src/js/view_form.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index b3a970bc72d..08a9a36266d 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -4444,8 +4444,8 @@ instance.web.form.AbstractFormPopup = instance.web.Widget.extend({ }; this.dataset.write_function = function(id, data, options, sup) { var fct = self.options.write_function || sup; - return fct.call(this, id, data, options).done(function() { - self.trigger('write_completed saved'); + return fct.call(this, id, data, options).done(function(r) { + self.trigger('write_completed saved', r); }); }; this.dataset.parent_view = this.options.parent_view; From 788e8edf810b54d03af38f6c3d5a27a2642f91de Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 8 Nov 2012 16:35:44 +0100 Subject: [PATCH 04/10] [FIX] don't resize & reposition invisible or readonly fields in editable listview the datetime field doesn't setup its internal widget if the field is readonly, so accessing it blows up bzr revid: xmo@openerp.com-20121108153544-o2uvpfeoofu2tx12 --- addons/web/static/src/js/view_list_editable.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js index 3711bba16c1..37ce8c4f8b4 100644 --- a/addons/web/static/src/js/view_list_editable.js +++ b/addons/web/static/src/js/view_list_editable.js @@ -242,7 +242,9 @@ openerp.web.list_editable = function (instance) { if (!this.editor.is_editing()) { return; } for(var i=0, len=this.fields_for_resize.length; i Date: Thu, 8 Nov 2012 16:42:15 +0100 Subject: [PATCH 05/10] [FIX] Many2OneButton, don't subscribe to write_complete event. bzr revid: vta@openerp.com-20121108154215-4b3sk7nh41xfrl62 --- addons/web/static/src/js/view_form.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 08a9a36266d..906f1d8fe36 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -3251,7 +3251,7 @@ instance.web.form.Many2OneButton = instance.web.form.AbstractField.extend({ this.build_context(), {title: this.string} ); - this.popup.on('create_completed write_completed', self, function(r) { + this.popup.on('create_completed', self, function(r) { self.set_value(r); }); }, From edaa35737b815b37648d75df7f6228d38ee90ca9 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Thu, 8 Nov 2012 17:40:53 +0100 Subject: [PATCH 06/10] [FIX] hr_timesheet_sheet: typo in javascript code bzr revid: nicolas.vanhoren@openerp.com-20121108164053-pcs8qq98ged4hyj7 --- addons/hr_timesheet_sheet/static/src/js/timesheet.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/hr_timesheet_sheet/static/src/js/timesheet.js b/addons/hr_timesheet_sheet/static/src/js/timesheet.js index f4d150190b4..efff48d93b8 100644 --- a/addons/hr_timesheet_sheet/static/src/js/timesheet.js +++ b/addons/hr_timesheet_sheet/static/src/js/timesheet.js @@ -110,7 +110,7 @@ openerp.hr_timesheet_sheet = function(instance) { return new instance.web.Model("hr.analytic.timesheet").call("multi_on_change_account_id", [[], account_ids, new instance.web.CompoundContext({'user_id': self.get('user_id')})]).then(function(accounts_defaults) { accounts = _(accounts).chain().map(function(lines, account_id) { - account_defaults = _.extend({}, default_get, accounts_defaults[account_id]); + account_defaults = _.extend({}, default_get, (accounts_defaults[account_id] || {}).value || {}); // group by days account_id = account_id === "false" ? false : Number(account_id); var index = _.groupBy(lines, "date"); From a824da4be3d14eed86abdf22992c5eccf948fd9b Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Thu, 8 Nov 2012 18:59:10 +0100 Subject: [PATCH 07/10] [FIX] do_load_state: propagate _push_me flag bzr revid: chs@openerp.com-20121108175910-qd2xho4srhhbjs5q --- addons/web/static/src/js/views.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index 2f35ccf89b8..53132e454d1 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -200,7 +200,12 @@ instance.web.ActionManager = instance.web.Widget.extend({ action_loaded; if (state.action) { if (_.isString(state.action) && instance.web.client_actions.contains(state.action)) { - var action_client = {type: "ir.actions.client", tag: state.action, params: state}; + var action_client = { + type: "ir.actions.client", + tag: state.action, + params: state, + _push_me: state._push_me, + }; this.null_action(); action_loaded = this.do_action(action_client); } else { From 0528e00788a7cca36353a2996ab58568bdd8be78 Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Fri, 9 Nov 2012 04:39:46 +0000 Subject: [PATCH 08/10] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20121109043946-6epxgg88lp1lykye --- addons/google_base_account/i18n/mn.po | 4 +- addons/l10n_fr_rib/i18n/es.po | 136 ++++++++++++++++++++ addons/l10n_multilang/i18n/es.po | 177 ++++++++++++++++++++++++++ addons/mrp/i18n/sl.po | 4 +- addons/pad_project/i18n/es.po | 39 ++++++ addons/plugin/i18n/es.po | 23 ++++ 6 files changed, 379 insertions(+), 4 deletions(-) create mode 100644 addons/l10n_fr_rib/i18n/es.po create mode 100644 addons/l10n_multilang/i18n/es.po create mode 100644 addons/pad_project/i18n/es.po create mode 100644 addons/plugin/i18n/es.po diff --git a/addons/google_base_account/i18n/mn.po b/addons/google_base_account/i18n/mn.po index 417eab16b09..940a83c37d7 100644 --- a/addons/google_base_account/i18n/mn.po +++ b/addons/google_base_account/i18n/mn.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-11-08 04:47+0000\n" -"X-Generator: Launchpad (build 16232)\n" +"X-Launchpad-Export-Date: 2012-11-09 04:39+0000\n" +"X-Generator: Launchpad (build 16250)\n" #. module: google_base_account #: field:res.users,gmail_user:0 diff --git a/addons/l10n_fr_rib/i18n/es.po b/addons/l10n_fr_rib/i18n/es.po new file mode 100644 index 00000000000..e0accc79fcb --- /dev/null +++ b/addons/l10n_fr_rib/i18n/es.po @@ -0,0 +1,136 @@ +# Spanish translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-02-08 00:36+0000\n" +"PO-Revision-Date: 2012-11-08 16:01+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Spanish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-11-09 04:39+0000\n" +"X-Generator: Launchpad (build 16250)\n" + +#. module: l10n_fr_rib +#: constraint:res.partner.bank:0 +msgid "" +"\n" +"Please define BIC/Swift code on bank for bank type IBAN Account to make " +"valid payments" +msgstr "" +"\n" +"Por favor defina el código BIC/Swift del banco para una cuenta de tipo IBAN " +"para realizar pagos válidos" + +#. module: l10n_fr_rib +#: model:res.partner.bank.type,name:l10n_fr_rib.bank_rib +msgid "RIB and optional IBAN" +msgstr "CC e IBAN opcional" + +#. module: l10n_fr_rib +#: field:res.partner.bank,rib_acc_number:0 +msgid "RIB account number" +msgstr "Número de la cuenta" + +#. module: l10n_fr_rib +#: field:res.partner.bank,bank_code:0 +msgid "Bank Code" +msgstr "Código de banco" + +#. module: l10n_fr_rib +#: code:addons/l10n_fr_rib/bank.py:54 +#, python-format +msgid "The RIB key %s does not correspond to the other codes: %s %s %s." +msgstr "La clave de la CC %s no se corresponde con otros códigos: %s %s %s." + +#. module: l10n_fr_rib +#: model:res.partner.bank.type.field,name:l10n_fr_rib.rib_office_field +msgid "office" +msgstr "oficina" + +#. module: l10n_fr_rib +#: field:res.bank,rib_code:0 +msgid "RIB Bank Code" +msgstr "Código CC" + +#. module: l10n_fr_rib +#: code:addons/l10n_fr_rib/bank.py:58 +#, python-format +msgid "The IBAN %s is not valid." +msgstr "El IBAN %s no es válido." + +#. module: l10n_fr_rib +#: model:ir.model,name:l10n_fr_rib.model_res_partner_bank +msgid "Bank Accounts" +msgstr "Cuentas bancarias" + +#. module: l10n_fr_rib +#: field:res.partner.bank,office:0 +msgid "Office Code" +msgstr "Código de oficina" + +#. module: l10n_fr_rib +#: model:res.partner.bank.type.field,name:l10n_fr_rib.rib_bic_field +msgid "bank_bic" +msgstr "Número BIC" + +#. module: l10n_fr_rib +#: model:res.partner.bank.type.field,name:l10n_fr_rib.rib_bank_code_field +msgid "bank_code" +msgstr "código bancario" + +#. module: l10n_fr_rib +#: model:res.partner.bank.type.field,name:l10n_fr_rib.rib_key_field +msgid "key" +msgstr "clave" + +#. module: l10n_fr_rib +#: model:res.partner.bank.type.field,name:l10n_fr_rib.rib_rib_acc_number_field +msgid "rib_acc_number" +msgstr "Número CC" + +#. module: l10n_fr_rib +#: help:res.partner.bank,key:0 +msgid "" +"The key is a number allowing to check the correctness of the other codes." +msgstr "" +"La clave es un número que permite comprobar si el resto de códigos son " +"correctos." + +#. module: l10n_fr_rib +#: field:res.partner.bank,key:0 +msgid "Key" +msgstr "Clave" + +#. module: l10n_fr_rib +#: code:addons/l10n_fr_rib/bank.py:53 +#: code:addons/l10n_fr_rib/bank.py:58 +#, python-format +msgid "Error" +msgstr "Error" + +#. module: l10n_fr_rib +#: model:res.partner.bank.type,format_layout:l10n_fr_rib.bank_rib +msgid "%(bank_name)s: %(bank_code)s %(office)s %(rib_acc_number)s %(key)s" +msgstr "%(bank_name)s: %(bank_code)s %(office)s %(rib_acc_number)s %(key)s" + +#. module: l10n_fr_rib +#: constraint:res.partner.bank:0 +msgid "The RIB and/or IBAN is not valid" +msgstr "La CC y/o IBAN no es válida" + +#. module: l10n_fr_rib +#: model:ir.model,name:l10n_fr_rib.model_res_bank +msgid "Bank" +msgstr "Banco" + +#. module: l10n_fr_rib +#: model:res.partner.bank.type.field,name:l10n_fr_rib.rib_acc_number_field +msgid "acc_number" +msgstr "Número cuenta" diff --git a/addons/l10n_multilang/i18n/es.po b/addons/l10n_multilang/i18n/es.po new file mode 100644 index 00000000000..4ba54992c5b --- /dev/null +++ b/addons/l10n_multilang/i18n/es.po @@ -0,0 +1,177 @@ +# Spanish translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-02-08 01:06+0000\n" +"PO-Revision-Date: 2012-11-08 14:29+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Spanish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-11-09 04:39+0000\n" +"X-Generator: Launchpad (build 16250)\n" + +#. module: l10n_multilang +#: model:ir.model,name:l10n_multilang.model_account_fiscal_position_template +msgid "Template for Fiscal Position" +msgstr "Plantilla para posición fiscal" + +#. module: l10n_multilang +#: sql_constraint:account.account:0 +msgid "The code of the account must be unique per company !" +msgstr "¡El código de la cuenta debe ser único por compañía!" + +#. module: l10n_multilang +#: constraint:account.account.template:0 +msgid "" +"Configuration Error!\n" +"You can not define children to an account with internal type different of " +"\"View\"! " +msgstr "" +"Error de configuración!\n" +"¡No puede definir hijos para una cuenta con el tipo interno distinto de " +"\"Vista\"! " + +#. module: l10n_multilang +#: model:ir.model,name:l10n_multilang.model_account_analytic_journal +msgid "Analytic Journal" +msgstr "Diario analítico" + +#. module: l10n_multilang +#: constraint:account.account.template:0 +msgid "Error ! You can not create recursive account templates." +msgstr "¡Error! No puede crear plantillas de cuentas recursivas." + +#. module: l10n_multilang +#: model:ir.model,name:l10n_multilang.model_account_journal +msgid "Journal" +msgstr "Diario" + +#. module: l10n_multilang +#: model:ir.model,name:l10n_multilang.model_account_chart_template +msgid "Templates for Account Chart" +msgstr "Plantillas para el plan contable" + +#. module: l10n_multilang +#: sql_constraint:account.tax:0 +msgid "The description must be unique per company!" +msgstr "¡La descripción debe ser única por compañia!" + +#. module: l10n_multilang +#: constraint:account.tax.code.template:0 +msgid "Error ! You can not create recursive Tax Codes." +msgstr "¡Error! No puede crear códigos de impuestos recursivos." + +#. module: l10n_multilang +#: model:ir.model,name:l10n_multilang.model_account_tax_template +msgid "account.tax.template" +msgstr "Plantilla de impuestos" + +#. module: l10n_multilang +#: model:ir.model,name:l10n_multilang.model_account_tax +msgid "account.tax" +msgstr "Impuesto" + +#. module: l10n_multilang +#: model:ir.model,name:l10n_multilang.model_account_account +msgid "Account" +msgstr "Cuenta" + +#. module: l10n_multilang +#: model:ir.model,name:l10n_multilang.model_wizard_multi_charts_accounts +msgid "wizard.multi.charts.accounts" +msgstr "Asistente de plan de cuentas" + +#. module: l10n_multilang +#: constraint:account.journal:0 +msgid "" +"Configuration error! The currency chosen should be shared by the default " +"accounts too." +msgstr "" +"¡Error de configuración! La moneda elegida debería ser también la misma en " +"las cuentas por defecto" + +#. module: l10n_multilang +#: model:ir.model,name:l10n_multilang.model_account_account_template +msgid "Templates for Accounts" +msgstr "Plantillas para cuentas" + +#. module: l10n_multilang +#: help:account.chart.template,spoken_languages:0 +msgid "" +"State here the languages for which the translations of templates could be " +"loaded at the time of installation of this localization module and copied in " +"the final object when generating them from templates. You must provide the " +"language codes separated by ';'" +msgstr "" +"Indique aquí los idiomas para los que las traducciones de las plantillas " +"pueden ser cargadas en el momento de la instalación de este módulo de " +"localización y copiados en el objeto final cuando se generen desde las " +"plantillas. Debe proveer los códigos de idioma separados por ';'." + +#. module: l10n_multilang +#: constraint:account.account:0 +msgid "Error ! You can not create recursive accounts." +msgstr "¡Error! No se pueden crear cuentas recursivas." + +#. module: l10n_multilang +#: constraint:account.account:0 +msgid "" +"Configuration Error! \n" +"You can not select an account type with a deferral method different of " +"\"Unreconciled\" for accounts with internal type \"Payable/Receivable\"! " +msgstr "" +"¡Error de configuración! \n" +"¡No puede seleccionar un tipo de cuenta con un método de cierre diferente de " +"\"Reconciliado\" para las cuentas con tipo interno \"A pagar/A cobrar\"! " + +#. module: l10n_multilang +#: sql_constraint:account.journal:0 +msgid "The name of the journal must be unique per company !" +msgstr "¡El nombre del diaro debe ser único por compañía!" + +#. module: l10n_multilang +#: model:ir.model,name:l10n_multilang.model_account_analytic_account +msgid "Analytic Account" +msgstr "Cuenta analítica" + +#. module: l10n_multilang +#: sql_constraint:account.journal:0 +msgid "The code of the journal must be unique per company !" +msgstr "¡El código del diario debe ser único por compañía!" + +#. module: l10n_multilang +#: model:ir.model,name:l10n_multilang.model_account_fiscal_position +msgid "Fiscal Position" +msgstr "Posición fiscal" + +#. module: l10n_multilang +#: constraint:account.account:0 +msgid "" +"Configuration Error! \n" +"You can not define children to an account with internal type different of " +"\"View\"! " +msgstr "" +"¡Error de configuración! \n" +"¡No puede definir hijos en una cuenta con tipo interno distinto a \"Vista\"! " + +#. module: l10n_multilang +#: constraint:account.analytic.account:0 +msgid "Error! You can not create recursive analytic accounts." +msgstr "¡Error! No puede crear cuentas analíticas recursivas." + +#. module: l10n_multilang +#: model:ir.model,name:l10n_multilang.model_account_tax_code_template +msgid "Tax Code Template" +msgstr "Plantilla códigos de impuestos" + +#. module: l10n_multilang +#: field:account.chart.template,spoken_languages:0 +msgid "Spoken Languages" +msgstr "Idiomas hablados" diff --git a/addons/mrp/i18n/sl.po b/addons/mrp/i18n/sl.po index e36798b6ded..c36878f4d1d 100644 --- a/addons/mrp/i18n/sl.po +++ b/addons/mrp/i18n/sl.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-11-08 04:47+0000\n" -"X-Generator: Launchpad (build 16232)\n" +"X-Launchpad-Export-Date: 2012-11-09 04:39+0000\n" +"X-Generator: Launchpad (build 16250)\n" #. module: mrp #: view:mrp.routing.workcenter:0 diff --git a/addons/pad_project/i18n/es.po b/addons/pad_project/i18n/es.po new file mode 100644 index 00000000000..f0dbb565158 --- /dev/null +++ b/addons/pad_project/i18n/es.po @@ -0,0 +1,39 @@ +# Spanish translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-02-08 00:36+0000\n" +"PO-Revision-Date: 2012-11-08 12:44+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Spanish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-11-09 04:39+0000\n" +"X-Generator: Launchpad (build 16250)\n" + +#. module: pad_project +#: constraint:project.task:0 +msgid "Error ! Task end-date must be greater then task start-date" +msgstr "" +"¡Error! La fecha final de la tarea debe ser mayor que la fecha de inicio" + +#. module: pad_project +#: model:ir.model,name:pad_project.model_project_task +msgid "Task" +msgstr "Tarea" + +#. module: pad_project +#: view:project.task:0 +msgid "Pad" +msgstr "Pad" + +#. module: pad_project +#: constraint:project.task:0 +msgid "Error ! You cannot create recursive tasks." +msgstr "¡Error! No se pueden crear tareas recursivas." diff --git a/addons/plugin/i18n/es.po b/addons/plugin/i18n/es.po new file mode 100644 index 00000000000..8111105ef1f --- /dev/null +++ b/addons/plugin/i18n/es.po @@ -0,0 +1,23 @@ +# Spanish translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-02-08 00:36+0000\n" +"PO-Revision-Date: 2012-11-08 11:25+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Spanish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-11-09 04:39+0000\n" +"X-Generator: Launchpad (build 16250)\n" + +#. module: plugin +#: model:ir.model,name:plugin.model_plugin_handler +msgid "plugin.handler" +msgstr "Manejador del plug-in" From 71d81fff4d1a7086b988fad462a11df0eebaeec9 Mon Sep 17 00:00:00 2001 From: Tejas Tank Date: Fri, 9 Nov 2012 12:00:02 +0530 Subject: [PATCH 09/10] [IMP] Set api key in demo file and remove key from pad.py bzr revid: tta@openerp.com-20121109063002-ej4bmzzxut5j12e7 --- addons/pad/pad.py | 2 +- addons/pad/pad_demo.xml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/addons/pad/pad.py b/addons/pad/pad.py index e5b36e5f64c..932fc5a21a4 100644 --- a/addons/pad/pad.py +++ b/addons/pad/pad.py @@ -19,7 +19,7 @@ class pad_common(osv.osv_memory): pad = { "server" : company.pad_server, - "key" : company.pad_key or "4DxmsNIbnQUVQMW9S9tx2oLOSjFdrx1l", + "key" : company.pad_key, } # make sure pad server in the form of http://hostname diff --git a/addons/pad/pad_demo.xml b/addons/pad/pad_demo.xml index 407f90e8242..0213e3410cf 100644 --- a/addons/pad/pad_demo.xml +++ b/addons/pad/pad_demo.xml @@ -4,6 +4,10 @@ pad.openerp.com + + + 4DxmsNIbnQUVQMW9S9tx2oLOSjFdrx1l + From 8be63a00435d7757ccb1cba171700041efca3672 Mon Sep 17 00:00:00 2001 From: Tejas Tank Date: Fri, 9 Nov 2012 12:21:44 +0530 Subject: [PATCH 10/10] [FIX] Corrected etherpad rending issue. bzr revid: tta@openerp.com-20121109065144-hut93odny1ur16db --- addons/pad/static/src/js/pad.js | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/pad/static/src/js/pad.js b/addons/pad/static/src/js/pad.js index 7c6b2a639c1..929d62681c8 100644 --- a/addons/pad/static/src/js/pad.js +++ b/addons/pad/static/src/js/pad.js @@ -14,6 +14,7 @@ openerp.pad = function(instance) { object_id: self.view.datarecord.id }}).done(function(data) { if(data&&data.url){ + self.set({value: data.url}); _super(data.url); self.renderElement(); }