[MERGE] forward port branch saas-11.3 up to 7321c8e260

2019-08-09 14:53:59 +02:00
parent 9269e876fd 7321c8e260
commit f6ce242b0f
2 changed files with 5 additions and 2 deletions
@@ -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):
@@ -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"/>