odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

Forward port of branch saas-3 up to c3f5289

This commit is contained in:
Martin Trigaux 2014-09-02 13:59:55 +02:00
parent b707719891 c3f52899dd
commit 9a7f48a0e2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/l10n_ma/l10n_ma_tax.xml
View File

@ -738,7 +738,7 @@
<!-- account chart -->
<record id="l10n_kzc_temp_chart" model="account.chart.template">
<field name="name">compta Kazacube</field>
<field name="name">Plan comptable marocain</field>
<field name="account_root_id" ref="pcg_0"/>
<field name="tax_code_root_id" ref="vat_ma_tax_root"/>
<field name="bank_account_view_id" ref="pcg_514"/>

2
addons/web/static/src/js/view_form.js
View File

@ -3647,7 +3647,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
}
self.floating = false;
}
if (used && self.get("value") === false && ! self.no_ed && (self.options.no_create === false || self.options.no_create === undefined)) {
if (used && self.get("value") === false && ! self.no_ed && ! (self.options && (self.options.no_create || self.options.no_quick_create))) {
self.ed_def.reject();
self.uned_def.reject();
self.ed_def = $.Deferred();