diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-08-09 14:53:59 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-08-09 14:53:59 +0200 |
| commit | f6ce242b0f0d606feae56d4e44cb69f5f9e25663 (patch) | |
| tree | 943fe52c7920ae8e7b056e82fbee94c48378398b | |
| parent | 9269e876fd62e51360d695342f0634dffdf6f87d (diff) | |
| parent | 7321c8e2600c8f1bb53bc4ad593933b5f57c00f9 (diff) | |
[MERGE] forward port branch saas-11.3 up to 7321c8e2600
| -rw-r--r-- | addons/account/models/account_payment.py | 5 | ||||
| -rw-r--r-- | addons/point_of_sale/wizard/pos_details.xml | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/addons/account/models/account_payment.py b/addons/account/models/account_payment.py index ebd507f1aae..0dd087aee42 100644 --- a/addons/account/models/account_payment.py +++ b/addons/account/models/account_payment.py @@ -603,7 +603,10 @@ class account_payment(models.Model): move.line_ids.remove_move_reconcile() move.button_cancel() move.unlink() - rec.state = 'cancelled' + rec.write({ + 'state': 'cancelled', + 'move_name': False, + }) @api.multi def unlink(self): diff --git a/addons/point_of_sale/wizard/pos_details.xml b/addons/point_of_sale/wizard/pos_details.xml index 596ba509825..6a10896b6fd 100644 --- a/addons/point_of_sale/wizard/pos_details.xml +++ b/addons/point_of_sale/wizard/pos_details.xml @@ -10,7 +10,7 @@ <field name="end_date"/> </group> <group> - <field name="pos_config_ids" colspan="4" nolabel="1" /> + <field name="pos_config_ids" mode="tree" colspan="4" nolabel="1" /> </group> <footer> <button name="generate_report" string="Print" type="object" class="btn-primary"/> |