diff options
| -rw-r--r-- | addons/account/models/account.py | 2 | ||||
| -rw-r--r-- | addons/account/views/account_view.xml | 4 | ||||
| -rw-r--r-- | addons/l10n_co/data/account.account.template.csv | 2 | ||||
| -rw-r--r-- | addons/l10n_cr/data/account_template_data.xml | 2 | ||||
| -rw-r--r-- | addons/mass_mailing/models/mass_mailing.py | 2 | ||||
| -rw-r--r-- | addons/point_of_sale/models/pos_order.py | 2 | ||||
| -rw-r--r-- | odoo/addons/base/res/res_country_data.xml | 1 |
7 files changed, 9 insertions, 6 deletions
diff --git a/addons/account/models/account.py b/addons/account/models/account.py index 276ae945916..800e52e7539 100644 --- a/addons/account/models/account.py +++ b/addons/account/models/account.py @@ -178,6 +178,8 @@ class AccountAccount(models.Model): def onchange_internal_type(self): if self.internal_type in ('receivable', 'payable'): self.reconcile = True + if self.internal_type == 'liquidity': + self.reconcile = False @api.onchange('code') def onchange_code(self): diff --git a/addons/account/views/account_view.xml b/addons/account/views/account_view.xml index 0f378b05e4f..88f2e59073f 100644 --- a/addons/account/views/account_view.xml +++ b/addons/account/views/account_view.xml @@ -22,8 +22,8 @@ <field name="company_id" options="{'no_create': True}" groups="base.group_multi_company"/> <field name="currency_id" options="{'no_create': True}" groups="base.group_multi_currency"/> <field name="internal_type" invisible="1" readonly="1"/> - <label for="reconcile"/> - <div> + <label for="reconcile" attrs="{'invisible': [('internal_type','=','liquidity')]}"/> + <div attrs="{'invisible': [('internal_type','=','liquidity')]}"> <field name="reconcile"/> <button name="action_open_reconcile" class="oe_link" type="object" string=" -> Reconcile" attrs="{'invisible': [('reconcile', '=', False)]}"/> </div> diff --git a/addons/l10n_co/data/account.account.template.csv b/addons/l10n_co/data/account.account.template.csv index b68f925a074..6eb0e2372ac 100644 --- a/addons/l10n_co/data/account.account.template.csv +++ b/addons/l10n_co/data/account.account.template.csv @@ -1,5 +1,5 @@ id,code,name,reconcile,user_type_id:id,chart_template_id:id -co_puc_110505,110505,Caja General,TRUE,account.data_account_type_liquidity,l10n_co_chart_template_generic +co_puc_110505,110505,Caja General,FALSE,account.data_account_type_liquidity,l10n_co_chart_template_generic co_puc_120535,120535,Comercio al Por Mayor y al Por Menor,FALSE,account.data_account_type_current_assets,l10n_co_chart_template_generic co_puc_129595,129595,Diversas,FALSE,account.data_account_type_current_assets,l10n_co_chart_template_generic co_puc_130505,130505,Nacionales,TRUE,account.data_account_type_receivable,l10n_co_chart_template_generic diff --git a/addons/l10n_cr/data/account_template_data.xml b/addons/l10n_cr/data/account_template_data.xml index ba4ac297c0e..fcc4426b84a 100644 --- a/addons/l10n_cr/data/account_template_data.xml +++ b/addons/l10n_cr/data/account_template_data.xml @@ -8,7 +8,7 @@ <field name="code">0-111301</field> <field name="name">0-Cuenta PayPal 1</field> <field name="user_type_id" ref="account.data_account_type_liquidity"/> - <field name="reconcile" eval="True"/> + <field name="reconcile" eval="False"/> <field name="chart_template_id" ref="account_chart_template_0"/> </record> <record id="account_account_template_0_111401" model="account.account.template"> diff --git a/addons/mass_mailing/models/mass_mailing.py b/addons/mass_mailing/models/mass_mailing.py index 00dfa06838b..77af88fdf63 100644 --- a/addons/mass_mailing/models/mass_mailing.py +++ b/addons/mass_mailing/models/mass_mailing.py @@ -164,7 +164,7 @@ class MassMailingCampaign(models.Model): mass_mailing_ids = fields.One2many( 'mail.mass_mailing', 'mass_mailing_campaign_id', string='Mass Mailings') - unique_ab_testing = fields.Boolean(string='Allow A/B Testing', default=True, + unique_ab_testing = fields.Boolean(string='Allow A/B Testing', default=False, help='If checked, recipients will be mailed only once for the whole campaign. ' 'This lets you send different mailings to randomly selected recipients and test ' 'the effectiveness of the mailings, without causing duplicate messages.') diff --git a/addons/point_of_sale/models/pos_order.py b/addons/point_of_sale/models/pos_order.py index cc32abc6fd3..99e25ff8db0 100644 --- a/addons/point_of_sale/models/pos_order.py +++ b/addons/point_of_sale/models/pos_order.py @@ -464,7 +464,7 @@ class PosOrder(models.Model): def _filtered_for_reconciliation(self): filter_states = ['invoiced', 'done'] - if self.env['ir.config_parameter'].get_param('point_of_sale.order_reconcile_mode', 'all') == 'partner_only': + if self.env['ir.config_parameter'].sudo().get_param('point_of_sale.order_reconcile_mode', 'all') == 'partner_only': return self.filtered(lambda order: order.state in filter_states and order.partner_id) return self.filtered(lambda order: order.state in filter_states) diff --git a/odoo/addons/base/res/res_country_data.xml b/odoo/addons/base/res/res_country_data.xml index b78d2a0e9aa..9e171e32411 100644 --- a/odoo/addons/base/res/res_country_data.xml +++ b/odoo/addons/base/res/res_country_data.xml @@ -1733,6 +1733,7 @@ <field file="base/static/img/country_flags/vn.png" name="image" type="base64" /> <field name="currency_id" ref="VND" /> <field eval="84" name="phone_code" /> + <field eval="'%(street)s\n%(street2)s\n%(city)s\n%(name)s %(zip)s %(country_name)s'" name="address_format" /> </record> <record id="vu" model="res.country"> <field name="name">Vanuatu</field> |