diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-01-19 12:43:58 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-01-19 12:43:58 +0100 |
| commit | 2f95cfb8ed2a2e4dda2aee4f1f6f003587f9005c (patch) | |
| tree | b788f0bcbc56b155e35f2af195f1dd0273c8da11 /addons/purchase | |
| parent | fdb585caf597b5a77d241087260ac42e3c3fb94e (diff) | |
| parent | f99c4f2b48b29f19a0d2ee1cd999008c92ab2a89 (diff) | |
[MERGE] forward port branch saas-16 up to f99c4f2b48b
Diffstat (limited to 'addons/purchase')
| -rw-r--r-- | addons/purchase/models/account_invoice.py | 4 | ||||
| -rw-r--r-- | addons/purchase/security/purchase_security.xml | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/addons/purchase/models/account_invoice.py b/addons/purchase/models/account_invoice.py index 195829b82e2..b059e825628 100644 --- a/addons/purchase/models/account_invoice.py +++ b/addons/purchase/models/account_invoice.py @@ -95,7 +95,9 @@ class AccountInvoice(models.Model): def _onchange_currency_id(self): if self.currency_id: for line in self.invoice_line_ids.filtered(lambda r: r.purchase_line_id): - line.price_unit = line.purchase_id.currency_id.with_context(date=self.date_invoice).compute(line.purchase_line_id.price_unit, self.currency_id, round=False) + if line.purchase_id.currency_id != self.currency_id: + line.price_unit = line.purchase_id.currency_id.with_context(date=self.date_invoice)\ + .compute(line.purchase_line_id.price_unit, self.currency_id, round=False) @api.onchange('invoice_line_ids') def _onchange_origin(self): diff --git a/addons/purchase/security/purchase_security.xml b/addons/purchase/security/purchase_security.xml index 9327210daf9..8b4f7f2227d 100644 --- a/addons/purchase/security/purchase_security.xml +++ b/addons/purchase/security/purchase_security.xml @@ -61,7 +61,7 @@ <record id="portal_purchase_order_user_rule" model="ir.rule"> <field name="name">Portal Purchase Orders</field> <field name="model_id" ref="purchase.model_purchase_order"/> - <field name="domain_force">[('message_partner_ids','child_of',[user.commercial_partner_id.id])]</field> + <field name="domain_force">['|', ('message_partner_ids','child_of',[user.commercial_partner_id.id]),('partner_id', 'child_of', [user.commercial_partner_id.id])]</field> <field name="groups" eval="[(4, ref('base.group_portal'))]"/> <field name="perm_unlink" eval="1"/> <field name="perm_write" eval="1"/> @@ -72,7 +72,7 @@ <record id="portal_purchase_order_line_rule" model="ir.rule"> <field name="name">Portal Purhcase Orders Line</field> <field name="model_id" ref="purchase.model_purchase_order_line"/> - <field name="domain_force">[('order_id.message_partner_ids','child_of',[user.commercial_partner_id.id])]</field> + <field name="domain_force">['|',('order_id.message_partner_ids','child_of',[user.commercial_partner_id.id]),('order_id.partner_id','child_of',[user.commercial_partner_id.id])]</field> <field name="groups" eval="[(4, ref('base.group_portal'))]"/> </record> </data> |