changeset b34ab4c46dd1 in modules/sale:default
details: https://hg.tryton.org/modules/sale?cmd=changeset;node=b34ab4c46dd1
description:
Rename move state from cancel to cancelled
issue8927
review297851002
diffstat:
sale.py | 8 ++++----
stock.py | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
diffs (69 lines):
diff -r 8958400808a1 -r b34ab4c46dd1 sale.py
--- a/sale.py Sat Jun 06 10:23:14 2020 +0100
+++ b/sale.py Sat Jun 06 10:30:11 2020 +0100
@@ -1204,7 +1204,7 @@
skip_ids = set(x.id for x in self.moves_ignored)
skip_ids.update(x.id for x in self.moves_recreated)
for move in self.moves:
- if move.state == 'cancel' \
+ if move.state == 'cancelled' \
and move.id not in skip_ids:
return True
return False
@@ -1366,7 +1366,7 @@
if self.moves:
dates = filter(
None, (m.effective_date or m.planned_date for m in self.moves
- if m.state != 'cancel'))
+ if m.state != 'cancelled'))
return min(dates, default=None)
if self.product and self.quantity is not None and self.quantity > 0:
date = self.sale.sale_date if self.sale else None
@@ -1607,7 +1607,7 @@
return
moved_quantity = 0
for move in self.moves:
- if move.state != 'cancel':
+ if move.state != 'cancelled':
moved_quantity += Uom.compute_qty(
move.uom, move.quantity, self.unit)
if self.quantity < 0:
@@ -1772,7 +1772,7 @@
skips = set(line.moves_ignored)
skips.update(line.moves_recreated)
for move in line.moves:
- if move.state == 'cancel' and move not in skips:
+ if move.state == 'cancelled' and move not in skips:
moves.append(move.id)
return {
'recreate_moves': moves,
diff -r 8958400808a1 -r b34ab4c46dd1 stock.py
--- a/stock.py Sat Jun 06 10:23:14 2020 +0100
+++ b/stock.py Sat Jun 06 10:30:11 2020 +0100
@@ -35,7 +35,7 @@
SaleLine = Pool().get('sale.line')
for shipment in shipments:
for move in shipment.outgoing_moves:
- if (move.state == 'cancel'
+ if (move.state == 'cancelled'
and isinstance(move.origin, SaleLine)):
raise AccessError(
gettext('sale.msg_sale_move_reset_draft',
@@ -68,7 +68,7 @@
SaleLine = Pool().get('sale.line')
for shipment in shipments:
for move in shipment.incoming_moves:
- if (move.state == 'cancel'
+ if (move.state == 'cancelled'
and isinstance(move.origin, SaleLine)):
raise AccessError(
gettext('sale.msg_sale_move_reset_draft',
@@ -164,7 +164,7 @@
@classmethod
@ModelView.button
- @Workflow.transition('cancel')
+ @Workflow.transition('cancelled')
@process_sale_move
def cancel(cls, moves):
super(Move, cls).cancel(moves)
