diff --git a/modules/account_invoice_stock/tests/scenario_account_invoice_stock.rst b/modules/account_invoice_stock/tests/scenario_account_invoice_stock.rst
index 4c823b2b4f..3ac43ac677 100644
--- a/modules/account_invoice_stock/tests/scenario_account_invoice_stock.rst
+++ b/modules/account_invoice_stock/tests/scenario_account_invoice_stock.rst
@@ -112,7 +112,7 @@ Ship the products::
>>> shipment.click('assign_force')
>>> shipment.click('pick')
>>> shipment.click('pack')
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> shipment.state
'done'
diff --git a/modules/account_stock_anglo_saxon/tests/scenario_account_stock_anglo_saxon.rst b/modules/account_stock_anglo_saxon/tests/scenario_account_stock_anglo_saxon.rst
index 2d8677df0c..fd9face77e 100644
--- a/modules/account_stock_anglo_saxon/tests/scenario_account_stock_anglo_saxon.rst
+++ b/modules/account_stock_anglo_saxon/tests/scenario_account_stock_anglo_saxon.rst
@@ -171,7 +171,7 @@ Receive 9 products::
>>> shipment.incoming_moves.append(move)
>>> move.quantity = 5.0
>>> shipment.click('receive')
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> shipment.state
'done'
>>> stock_in.reload()
@@ -252,7 +252,7 @@ Send 5 products::
>>> shipment.click('pack')
>>> shipment.state
'packed'
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> shipment.state
'done'
>>> stock_out.reload()
@@ -380,7 +380,7 @@ Now we will use a product with different unit of measure::
0.0
>>> shipment.incoming_moves.append(move)
>>> shipment.click('receive')
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> set_user(accountant)
>>> purchase.reload()
diff --git a/modules/account_stock_anglo_saxon/tests/scenario_account_stock_anglo_saxon_with_drop_shipment.rst b/modules/account_stock_anglo_saxon/tests/scenario_account_stock_anglo_saxon_with_drop_shipment.rst
index 958d4dfe89..85a9836f02 100644
--- a/modules/account_stock_anglo_saxon/tests/scenario_account_stock_anglo_saxon_with_drop_shipment.rst
+++ b/modules/account_stock_anglo_saxon/tests/scenario_account_stock_anglo_saxon_with_drop_shipment.rst
@@ -192,7 +192,7 @@ Receive 50 products::
>>> set_user(stock_user)
>>> shipment.click('ship')
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> shipment.state
'done'
>>> set_user(account_user)
diff --git a/modules/account_stock_continental/tests/scenario_account_stock_continental.rst b/modules/account_stock_continental/tests/scenario_account_stock_continental.rst
index a00267bcd2..0964693581 100644
--- a/modules/account_stock_continental/tests/scenario_account_stock_continental.rst
+++ b/modules/account_stock_continental/tests/scenario_account_stock_continental.rst
@@ -141,7 +141,7 @@ Receive 9 products::
>>> shipment.incoming_moves.append(move)
>>> move.quantity = 5.0
>>> shipment.click('receive')
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> shipment.state
'done'
>>> stock_in.reload()
@@ -213,7 +213,7 @@ Send 5 products::
>>> shipment.click('pack')
>>> shipment.state
'packed'
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> shipment.state
'done'
>>> stock_out.reload()
@@ -315,7 +315,7 @@ Create Drop Shipment Move::
>>> shipment, = sale.drop_shipments
>>> shipment.click('ship')
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> shipment.state
'done'
@@ -367,7 +367,7 @@ Create Drop Shipment Move::
>>> shipment, = sale.drop_shipments
>>> shipment.click('ship')
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> shipment.state
'done'
diff --git a/modules/account_stock_eu/tests/scenario_account_stock_eu_arrival.rst b/modules/account_stock_eu/tests/scenario_account_stock_eu_arrival.rst
index 9a00fdf9d1..53e1da4ec6 100644
--- a/modules/account_stock_eu/tests/scenario_account_stock_eu_arrival.rst
+++ b/modules/account_stock_eu/tests/scenario_account_stock_eu_arrival.rst
@@ -134,7 +134,7 @@ Receive products from Belgium::
>>> move.unit_price = Decimal('100.0000')
>>> move.currency = eur
>>> shipment.click('receive')
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> shipment.state
'done'
@@ -156,7 +156,7 @@ Receive products from France::
>>> move.unit_price = Decimal('90.0000')
>>> move.currency = eur
>>> shipment.click('receive')
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> shipment.state
'done'
@@ -196,7 +196,7 @@ Receive products from US::
>>> move.unit_price = Decimal('120.0000')
>>> move.currency = usd
>>> shipment.click('receive')
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> shipment.state
'done'
@@ -218,7 +218,7 @@ Receive returned products from France::
>>> move.unit_price = Decimal('150.0000')
>>> move.currency = eur
>>> shipment.click('receive')
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> shipment.state
'done'
diff --git a/modules/account_stock_eu/tests/scenario_account_stock_eu_dispatch.rst b/modules/account_stock_eu/tests/scenario_account_stock_eu_dispatch.rst
index 9bb7d3a6d0..34a84a83a6 100644
--- a/modules/account_stock_eu/tests/scenario_account_stock_eu_dispatch.rst
+++ b/modules/account_stock_eu/tests/scenario_account_stock_eu_dispatch.rst
@@ -137,7 +137,7 @@ Send products to Belgium::
>>> shipment.click('wait')
>>> shipment.click('pick')
>>> shipment.click('pack')
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> shipment.state
'done'
@@ -161,7 +161,7 @@ Send products to particular to France::
>>> shipment.click('wait')
>>> shipment.click('pick')
>>> shipment.click('pack')
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> shipment.state
'done'
@@ -205,7 +205,7 @@ Send products to US::
>>> shipment.click('wait')
>>> shipment.click('pick')
>>> shipment.click('pack')
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> shipment.state
'done'
@@ -229,7 +229,7 @@ Send returned products to France::
>>> move.currency = eur
>>> shipment.click('wait')
>>> shipment.click('assign_force')
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> shipment.state
'done'
diff --git a/modules/account_stock_shipment_cost/tests/scenario_account_stock_shipment_cost.rst b/modules/account_stock_shipment_cost/tests/scenario_account_stock_shipment_cost.rst
index 7b9ae7595c..1ff7f3dba8 100644
--- a/modules/account_stock_shipment_cost/tests/scenario_account_stock_shipment_cost.rst
+++ b/modules/account_stock_shipment_cost/tests/scenario_account_stock_shipment_cost.rst
@@ -112,7 +112,7 @@ Ship twice 10 unit of the product::
>>> shipment1.click('assign_force')
>>> shipment1.click('pick')
>>> shipment1.click('pack')
- >>> shipment1.click('done')
+ >>> shipment1.click('do')
>>> shipment1.state
'done'
@@ -121,7 +121,7 @@ Ship twice 10 unit of the product::
>>> shipment2.click('assign_force')
>>> shipment2.click('pick')
>>> shipment2.click('pack')
- >>> shipment2.click('done')
+ >>> shipment2.click('do')
>>> shipment2.state
'done'
diff --git a/modules/account_stock_shipment_cost_weight/tests/scenario_account_stock_shipment_cost_weight.rst b/modules/account_stock_shipment_cost_weight/tests/scenario_account_stock_shipment_cost_weight.rst
index 1736df8842..6691c9b179 100644
--- a/modules/account_stock_shipment_cost_weight/tests/scenario_account_stock_shipment_cost_weight.rst
+++ b/modules/account_stock_shipment_cost_weight/tests/scenario_account_stock_shipment_cost_weight.rst
@@ -112,7 +112,7 @@ Ship 20 units of the product in two shipments::
>>> shipment1.click('assign_force')
>>> shipment1.click('pick')
>>> shipment1.click('pack')
- >>> shipment1.click('done')
+ >>> shipment1.click('do')
>>> shipment1.state
'done'
@@ -123,7 +123,7 @@ Ship 20 units of the product in two shipments::
>>> shipment2.click('assign_force')
>>> shipment2.click('pick')
>>> shipment2.click('pack')
- >>> shipment2.click('done')
+ >>> shipment2.click('do')
>>> shipment2.state
'done'
diff --git a/modules/carrier_carriage/stock.py b/modules/carrier_carriage/stock.py
index c735e3ccbb..0017350550 100644
--- a/modules/carrier_carriage/stock.py
+++ b/modules/carrier_carriage/stock.py
@@ -182,7 +182,7 @@ class _ShipmentOutMixin(_ShipmentMixin):
@classmethod
@ModelView.button
@Workflow.transition('done')
- def done(cls, shipments):
+ def do(cls, shipments):
pool = Pool()
Carriage = pool.get('stock.shipment.carriage')
has_cost_sale = hasattr(Carriage, 'cost_sale')
@@ -197,7 +197,7 @@ class _ShipmentOutMixin(_ShipmentMixin):
carriage.cost_sale_currency_used)
carriages.append(carriage)
Carriage.save(carriages)
- super().done(shipments)
+ super().do(shipments)
class ShipmentOut(_ShipmentOutMixin, metaclass=PoolMeta):
diff --git a/modules/carrier_carriage/tests/scenario_carrier_carriage.rst b/modules/carrier_carriage/tests/scenario_carrier_carriage.rst
index d4e19b03c1..04c6b3b96a 100644
--- a/modules/carrier_carriage/tests/scenario_carrier_carriage.rst
+++ b/modules/carrier_carriage/tests/scenario_carrier_carriage.rst
@@ -143,7 +143,7 @@ Send products::
>>> shipment.click('assign_force')
>>> shipment.click('pick')
>>> shipment.click('pack')
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> shipment.state
'done'
diff --git a/modules/carrier_percentage/tests/scenario_carrier_percentage_with_purchase_shipment_cost.rst b/modules/carrier_percentage/tests/scenario_carrier_percentage_with_purchase_shipment_cost.rst
index 496f273419..5caf5dae18 100644
--- a/modules/carrier_percentage/tests/scenario_carrier_percentage_with_purchase_shipment_cost.rst
+++ b/modules/carrier_percentage/tests/scenario_carrier_percentage_with_purchase_shipment_cost.rst
@@ -187,7 +187,7 @@ Send products::
>>> shipment.click('pack')
>>> shipment.state
'packed'
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> shipment.state
'done'
diff --git a/modules/carrier_weight/tests/scenario_carrier_weight.rst b/modules/carrier_weight/tests/scenario_carrier_weight.rst
index 13a3080780..6e43e36648 100644
--- a/modules/carrier_weight/tests/scenario_carrier_weight.rst
+++ b/modules/carrier_weight/tests/scenario_carrier_weight.rst
@@ -204,7 +204,7 @@ Send products::
>>> shipment.click('pack')
>>> shipment.state
'packed'
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> shipment.state
'done'
diff --git a/modules/commission/tests/scenario_commission_stock.rst b/modules/commission/tests/scenario_commission_stock.rst
index c39e43ae48..f082c2a42c 100644
--- a/modules/commission/tests/scenario_commission_stock.rst
+++ b/modules/commission/tests/scenario_commission_stock.rst
@@ -146,7 +146,7 @@ Ship in two steps::
>>> shipment.click('assign_force')
>>> shipment.click('pick')
>>> shipment.click('pack')
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> shipment.state
'done'
@@ -155,7 +155,7 @@ Ship in two steps::
>>> shipment.click('assign_force')
>>> shipment.click('pick')
>>> shipment.click('pack')
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> shipment.state
'done'
diff --git a/modules/product_cost_warehouse/tests/scenario_account_stock_continental.rst b/modules/product_cost_warehouse/tests/scenario_account_stock_continental.rst
index dbcd232519..ca9e963783 100644
--- a/modules/product_cost_warehouse/tests/scenario_account_stock_continental.rst
+++ b/modules/product_cost_warehouse/tests/scenario_account_stock_continental.rst
@@ -125,7 +125,7 @@ Transfer 1 product between warehouses::
>>> accounts['stock'].balance
Decimal('0.00')
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> shipment.state
'done'
>>> accounts['stock'].reload()
diff --git a/modules/product_cost_warehouse/tests/scenario_product_cost_warehouse.rst b/modules/product_cost_warehouse/tests/scenario_product_cost_warehouse.rst
index 16c33e2e6c..71433490c4 100644
--- a/modules/product_cost_warehouse/tests/scenario_product_cost_warehouse.rst
+++ b/modules/product_cost_warehouse/tests/scenario_product_cost_warehouse.rst
@@ -181,7 +181,7 @@ Transfer 1 product between warehouses::
>>> move.cost_price
Decimal('90.0000')
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> shipment.state
'done'
>>> move, = shipment.incoming_moves
diff --git a/modules/product_kit/tests/scenario_product_kit_purchase.rst b/modules/product_kit/tests/scenario_product_kit_purchase.rst
index e858afae9d..1d917264d6 100644
--- a/modules/product_kit/tests/scenario_product_kit_purchase.rst
+++ b/modules/product_kit/tests/scenario_product_kit_purchase.rst
@@ -231,7 +231,7 @@ Receive partial shipment::
... m.product: m for m in shipment.incoming_moves}
>>> product2move[product2].quantity = 2.0
>>> shipment.click('receive')
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> shipment.state
'done'
diff --git a/modules/product_kit/tests/scenario_product_kit_sale.rst b/modules/product_kit/tests/scenario_product_kit_sale.rst
index f20d532713..ebb2809098 100644
--- a/modules/product_kit/tests/scenario_product_kit_sale.rst
+++ b/modules/product_kit/tests/scenario_product_kit_sale.rst
@@ -215,7 +215,7 @@ Ship partially::
>>> shipment.click('assign_force')
>>> shipment.click('pick')
>>> shipment.click('pack')
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> shipment.state
'done'
diff --git a/modules/production/CHANGELOG b/modules/production/CHANGELOG
index fb2a317e68..132e68a703 100644
--- a/modules/production/CHANGELOG
+++ b/modules/production/CHANGELOG
@@ -1,3 +1,4 @@
+* Rename 'done' button to 'do'
* Fill production number only in waiting state
Version 7.0.0 - 2023-10-30
diff --git a/modules/production/production.py b/modules/production/production.py
index 6bcfb769d2..16d8e48c8f 100644
--- a/modules/production/production.py
+++ b/modules/production/production.py
@@ -228,7 +228,7 @@ class Production(ShipmentAssignMixin, Workflow, ModelSQL, ModelView):
'invisible': Eval('state') != 'assigned',
'depends': ['state'],
},
- 'done': {
+ 'do': {
'invisible': Eval('state') != 'running',
'depends': ['state'],
},
@@ -772,7 +772,7 @@ class Production(ShipmentAssignMixin, Workflow, ModelSQL, ModelView):
@ModelView.button
@Workflow.transition('done')
@set_employee('done_by')
- def done(cls, productions):
+ def do(cls, productions):
pool = Pool()
Move = pool.get('stock.move')
Date = pool.get('ir.date')
@@ -873,7 +873,7 @@ class Production_Lot(metaclass=PoolMeta):
@classmethod
@ModelView.button
@Workflow.transition('done')
- def done(cls, productions):
+ def do(cls, productions):
pool = Pool()
Lot = pool.get('stock.lot')
Move = pool.get('stock.move')
@@ -888,4 +888,4 @@ class Production_Lot(metaclass=PoolMeta):
moves.append(move)
Lot.save(lots)
Move.save(moves)
- super().done(productions)
+ super().do(productions)
diff --git a/modules/production/production.xml b/modules/production/production.xml
index 57c5d3e6f9..07530934eb 100644
--- a/modules/production/production.xml
+++ b/modules/production/production.xml
@@ -242,8 +242,8 @@ this repository contains the full copyright notices and license terms. -->
production
- done
- Done
+ do
+ Complete
Are you sure you want to complete the production?
diff --git a/modules/production/tests/scenario_production.rst b/modules/production/tests/scenario_production.rst
index 128fb22464..4bfe0fc984 100644
--- a/modules/production/tests/scenario_production.rst
+++ b/modules/production/tests/scenario_production.rst
@@ -171,7 +171,7 @@ Do the production::
{'done'}
>>> for input_ in production.inputs:
... assertEqual(input_.effective_date, today)
- >>> production.click('done')
+ >>> production.click('do')
>>> output, = production.outputs
>>> output.state
'done'
@@ -197,7 +197,7 @@ Make a production with effective date yesterday and running the day before::
>>> production.reload()
>>> for input_ in production.inputs:
... assertEqual(input_.effective_date, before_yesterday)
- >>> production.click('done')
+ >>> production.click('do')
>>> production.reload()
>>> output, = production.outputs
>>> assertEqual(output.effective_date, yesterday)
diff --git a/modules/production/tests/scenario_production_by_product.rst b/modules/production/tests/scenario_production_by_product.rst
index 53524491ec..343724b7e9 100644
--- a/modules/production/tests/scenario_production_by_product.rst
+++ b/modules/production/tests/scenario_production_by_product.rst
@@ -91,7 +91,7 @@ Make a production::
>>> production.click('wait')
>>> production.click('assign_force')
>>> production.click('run')
- >>> production.click('done')
+ >>> production.click('do')
Check output price::
diff --git a/modules/production/tests/scenario_production_lot_number.rst b/modules/production/tests/scenario_production_lot_number.rst
index 541158dcf2..900820b884 100644
--- a/modules/production/tests/scenario_production_lot_number.rst
+++ b/modules/production/tests/scenario_production_lot_number.rst
@@ -60,7 +60,7 @@ Make a production::
>>> production.click('wait')
>>> production.click('assign_force')
>>> production.click('run')
- >>> production.click('done')
+ >>> production.click('do')
>>> production.state
'done'
diff --git a/modules/production/tests/scenario_production_lot_trace.rst b/modules/production/tests/scenario_production_lot_trace.rst
index ba17cac570..22ca78a033 100644
--- a/modules/production/tests/scenario_production_lot_trace.rst
+++ b/modules/production/tests/scenario_production_lot_trace.rst
@@ -74,7 +74,7 @@ Make a production::
>>> production.click('wait')
>>> production.click('assign_force')
>>> production.click('run')
- >>> production.click('done')
+ >>> production.click('do')
>>> production.state
'done'
diff --git a/modules/production/tests/scenario_production_no_list_price.rst b/modules/production/tests/scenario_production_no_list_price.rst
index a65b6d7113..d1c6638265 100644
--- a/modules/production/tests/scenario_production_no_list_price.rst
+++ b/modules/production/tests/scenario_production_no_list_price.rst
@@ -71,7 +71,7 @@ Make a production::
>>> output.quantity = 2
>>> output.save()
>>> _ = output.duplicate()
- >>> production.click('done')
+ >>> production.click('do')
Check output price::
diff --git a/modules/production/tests/scenario_production_set_cost.rst b/modules/production/tests/scenario_production_set_cost.rst
index 2c4d308852..3de046bd89 100644
--- a/modules/production/tests/scenario_production_set_cost.rst
+++ b/modules/production/tests/scenario_production_set_cost.rst
@@ -74,7 +74,7 @@ Make a production with 2 unused component::
>>> output.currency = company.currency
>>> output.from_location = production.location
>>> output.to_location = production.warehouse.storage_location
- >>> production.click('done')
+ >>> production.click('do')
Check output price::
diff --git a/modules/production/tests/scenario_production_waste.rst b/modules/production/tests/scenario_production_waste.rst
index 8e60698c73..9006f95193 100644
--- a/modules/production/tests/scenario_production_waste.rst
+++ b/modules/production/tests/scenario_production_waste.rst
@@ -81,7 +81,7 @@ Create outputs including waste products::
>>> waste_output.product = product
>>> waste_output.from_location = production.location
>>> waste_output.to_location = lost_found_loc
- >>> production.click('done')
+ >>> production.click('do')
>>> production.cost
Decimal('20.0000')
>>> output, = [o for o in production.outputs
diff --git a/modules/production/view/production_form.xml b/modules/production/view/production_form.xml
index 0a607e4e75..904e1dfbd4 100644
--- a/modules/production/view/production_form.xml
+++ b/modules/production/view/production_form.xml
@@ -56,6 +56,6 @@ this repository contains the full copyright notices and license terms. -->
-
+
diff --git a/modules/production_outsourcing/production.py b/modules/production_outsourcing/production.py
index bc7a7eb095..c6bddbfa24 100644
--- a/modules/production_outsourcing/production.py
+++ b/modules/production_outsourcing/production.py
@@ -224,7 +224,7 @@ class Production(metaclass=PoolMeta):
@classmethod
@ModelView.button
@Workflow.transition('done')
- def done(cls, productions):
+ def do(cls, productions):
pool = Pool()
Warning = pool.get('res.user.warning')
@@ -242,4 +242,4 @@ class Production(metaclass=PoolMeta):
warning_name,
gettext('production_outsourcing.msg_pending_purchase_done',
productions=names))
- super(Production, cls).done(productions)
+ super().do(productions)
diff --git a/modules/production_outsourcing/tests/scenario_production_outsourcing.rst b/modules/production_outsourcing/tests/scenario_production_outsourcing.rst
index df102dfba5..0de7f84aa4 100644
--- a/modules/production_outsourcing/tests/scenario_production_outsourcing.rst
+++ b/modules/production_outsourcing/tests/scenario_production_outsourcing.rst
@@ -147,7 +147,7 @@ Try to do the production with pending purchase::
>>> production.click('wait')
>>> production.click('assign_force')
>>> production.click('run')
- >>> production.click('done')
+ >>> production.click('do')
Traceback (most recent call last):
...
PurchaseWarning: ...
@@ -161,4 +161,4 @@ Validate the purchase::
Do the production::
- >>> production.click('done')
+ >>> production.click('do')
diff --git a/modules/production_work/production.py b/modules/production_work/production.py
index 39b983f2b6..0b65081c41 100644
--- a/modules/production_work/production.py
+++ b/modules/production_work/production.py
@@ -94,7 +94,7 @@ class Production(metaclass=PoolMeta):
@classmethod
@ModelView.button
@Workflow.transition('done')
- def done(cls, productions):
+ def do(cls, productions):
pool = Pool()
Work = pool.get('production.work')
for production in productions:
@@ -104,7 +104,7 @@ class Production(metaclass=PoolMeta):
gettext('production_work.msg_do_finished_work',
production=production.rec_name,
work=work.rec_name))
- super(Production, cls).done(productions)
+ super().do(productions)
Work.set_state([w for p in productions for w in p.works])
@classmethod
diff --git a/modules/production_work/tests/scenario_production_work.rst b/modules/production_work/tests/scenario_production_work.rst
index dde707ed0a..6bbb6e55f2 100644
--- a/modules/production_work/tests/scenario_production_work.rst
+++ b/modules/production_work/tests/scenario_production_work.rst
@@ -273,7 +273,7 @@ Check production cost::
Do the production::
- >>> production.click('done')
+ >>> production.click('do')
>>> production.state
'done'
diff --git a/modules/purchase/stock.py b/modules/purchase/stock.py
index 4aecefdb81..f401ce62c5 100644
--- a/modules/purchase/stock.py
+++ b/modules/purchase/stock.py
@@ -107,8 +107,8 @@ class ShipmentInReturn(metaclass=PoolMeta):
@ModelView.button
@Workflow.transition('done')
@process_purchase('moves')
- def done(cls, shipments):
- super(ShipmentInReturn, cls).done(shipments)
+ def do(cls, shipments):
+ super().do(shipments)
def process_purchase_move(without_shipment=False):
diff --git a/modules/purchase/tests/scenario_purchase.rst b/modules/purchase/tests/scenario_purchase.rst
index 3166ff6957..191dce3989 100644
--- a/modules/purchase/tests/scenario_purchase.rst
+++ b/modules/purchase/tests/scenario_purchase.rst
@@ -263,7 +263,7 @@ Validate Shipments::
>>> shipment.save()
>>> assertEqual(shipment.origins, purchase.rec_name)
>>> shipment.click('receive')
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> purchase.reload()
>>> purchase.shipment_state
'received'
@@ -345,7 +345,7 @@ Check Return Shipments::
>>> move_return.quantity
4.0
>>> ship_return.click('assign_try')
- >>> ship_return.click('done')
+ >>> ship_return.click('do')
>>> ship_return.state
'done'
>>> return_.reload()
@@ -408,14 +408,14 @@ Checking Shipments::
... incoming_move = Move(id=move.id)
... mix_shipment.incoming_moves.append(incoming_move)
>>> mix_shipment.click('receive')
- >>> mix_shipment.click('done')
+ >>> mix_shipment.click('do')
>>> mix.reload()
>>> len(mix.shipments)
1
>>> mix_return.click('wait')
>>> mix_return.click('assign_try')
- >>> mix_return.click('done')
+ >>> mix_return.click('do')
>>> move_return, = mix_return.moves
>>> move_return.product.rec_name
'product'
@@ -475,14 +475,14 @@ Checking Shipments::
... incoming_move = Move(id=move.id)
... mix_shipment.incoming_moves.append(incoming_move)
>>> mix_shipment.click('receive')
- >>> mix_shipment.click('done')
+ >>> mix_shipment.click('do')
>>> mix.reload()
>>> len(mix.shipments)
1
>>> mix_return.click('wait')
>>> mix_return.click('assign_try')
- >>> mix_return.click('done')
+ >>> mix_return.click('do')
>>> move_return, = mix_return.moves
>>> move_return.product.rec_name
'product'
@@ -553,7 +553,7 @@ linked to invoices::
>>> for move in shipment.inventory_moves:
... move.quantity = 5.0
>>> shipment.click('receive')
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> purchase.reload()
>>> invoice, = purchase.invoices
>>> invoice_line, = invoice.lines
@@ -587,7 +587,7 @@ correctly linked to invoices::
>>> for move in shipment.inventory_moves:
... move.quantity = 8.0
>>> shipment.click('receive')
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> purchase.reload()
>>> invoice, = purchase.invoices
>>> invoice_line, = invoice.lines
diff --git a/modules/purchase_shipment_cost/tests/scenario_purchase_shipment_cost_with_account_stock_anglo_saxon.rst b/modules/purchase_shipment_cost/tests/scenario_purchase_shipment_cost_with_account_stock_anglo_saxon.rst
index 1c0be77369..4c2570bdec 100644
--- a/modules/purchase_shipment_cost/tests/scenario_purchase_shipment_cost_with_account_stock_anglo_saxon.rst
+++ b/modules/purchase_shipment_cost/tests/scenario_purchase_shipment_cost_with_account_stock_anglo_saxon.rst
@@ -157,7 +157,7 @@ Receive 4 products::
>>> move, = shipment.incoming_moves
>>> move.unit_price
Decimal('5.7500')
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> shipment.state
'done'
>>> stock_in.reload()
diff --git a/modules/quality/production.py b/modules/quality/production.py
index ec5ccdcfdb..675a8e60aa 100644
--- a/modules/quality/production.py
+++ b/modules/quality/production.py
@@ -15,7 +15,7 @@ class Production(ControlledMixin, metaclass=PoolMeta):
pattern['company'] = self.company.id
if operation == 'run':
pattern['products'] = {m.product.id for m in self.inputs}
- elif operation == 'done':
+ elif operation == 'do':
pattern['products'] = {m.product.id for m in self.outputs}
return pattern
@@ -27,6 +27,6 @@ class Production(ControlledMixin, metaclass=PoolMeta):
@classmethod
@ModelView.button
- @ControlledMixin.control('done', 'quality.wizard_production_inspect_done')
- def done(cls, productions):
- return super().done(productions)
+ @ControlledMixin.control('do', 'quality.wizard_production_inspect_do')
+ def do(cls, productions):
+ return super().do(productions)
diff --git a/modules/quality/quality.py b/modules/quality/quality.py
index 3c6971f245..c0b3d10153 100644
--- a/modules/quality/quality.py
+++ b/modules/quality/quality.py
@@ -167,17 +167,17 @@ class Control(DeactivableMixin, MatchMixin, ModelSQL, ModelView):
operations = fields.MultiSelection([
('stock.shipment.in:receive', "Supplier Shipment Received"),
- ('stock.shipment.in:done', "Supplier Shipment Done"),
+ ('stock.shipment.in:do', "Supplier Shipment Done"),
('stock.shipment.out:pick', "Customer Shipment Picked"),
('stock.shipment.out:pack', "Customer Shipment Packed"),
('stock.shipment.out.return:receive',
"Customer Shipment Return Received"),
- ('stock.shipment.out.return:done',
+ ('stock.shipment.out.return:do',
"Customer Shipment Return Done"),
('stock.shipment.internal:ship', "Internal Shipment Shipped"),
- ('stock.shipment.internal:done', "Internal Shipment Done"),
+ ('stock.shipment.internal:do', "Internal Shipment Done"),
('production:run', "Production Run"),
- ('production:done', "Production Done"),
+ ('production:do', "Production Done"),
], "Operations",
help="The operations for which the control is performed.")
frequency = fields.Float(
@@ -203,6 +203,32 @@ class Control(DeactivableMixin, MatchMixin, ModelSQL, ModelView):
points = fields.One2Many(
'quality.control.point', 'control', "Points", required=True)
+ @classmethod
+ def __register__(cls, module):
+ table = cls.__table__()
+ transaction = Transaction()
+ cursor = transaction.connection.cursor()
+ update = transaction.connection.cursor()
+
+ super().__register__(module)
+
+ # Migration from 7.0: rename done button to do
+ for old, new in [
+ ('stock.shipment.in:done', 'stock.shipment.in:do'),
+ ('stock.shipment.out.return:done',
+ 'stock.shipment.out.return:do'),
+ ('stock.shipment.internal:done',
+ 'stock.shipment.internal:do'),
+ ('production:done', 'production:do'),
+ ]:
+ cursor.execute(*table.select(
+ table.id, table.operations,
+ where=table.operations.like(f'%{old}%')))
+ for id_, operations in cursor:
+ update.execute(*table.update(
+ [table.operations],
+ operations.replace(old, new)))
+
@classmethod
def default_frequency(cls):
return 1
diff --git a/modules/quality/stock.py b/modules/quality/stock.py
index 354ea4ce6a..2059a1f80b 100644
--- a/modules/quality/stock.py
+++ b/modules/quality/stock.py
@@ -30,9 +30,9 @@ class ShipmentIn(ControlledShipmentMixin, metaclass=PoolMeta):
@classmethod
@ModelView.button
@ControlledMixin.control(
- 'done', 'quality.wizard_stock_shipment_in_inspect_done')
- def done(cls, shipments):
- return super().done(shipments)
+ 'do', 'quality.wizard_stock_shipment_in_inspect_do')
+ def do(cls, shipments):
+ return super().do(shipments)
class ShipmentOut(ControlledShipmentMixin, metaclass=PoolMeta):
@@ -66,9 +66,9 @@ class ShipmentOutReturn(ControlledShipmentMixin, metaclass=PoolMeta):
@classmethod
@ModelView.button
@ControlledMixin.control(
- 'done', 'quality.wizard_stock_shipment_out_return_inspect_done')
- def done(cls, shipments):
- return super().done(shipments)
+ 'do', 'quality.wizard_stock_shipment_out_return_inspect_do')
+ def do(cls, shipments):
+ return super().do(shipments)
class ShipmentInternal(ControlledShipmentMixin, metaclass=PoolMeta):
@@ -84,6 +84,6 @@ class ShipmentInternal(ControlledShipmentMixin, metaclass=PoolMeta):
@classmethod
@ModelView.button
@ControlledMixin.control(
- 'done', 'quality.wizard_stock_shipment_internal_inspect_done')
- def done(cls, shipments):
- return super().done(shipments)
+ 'do', 'quality.wizard_stock_shipment_internal_inspect_do')
+ def do(cls, shipments):
+ return super().do(shipments)
diff --git a/modules/quality/stock.xml b/modules/quality/stock.xml
index 1a6e0d9555..0dce879ff3 100644
--- a/modules/quality/stock.xml
+++ b/modules/quality/stock.xml
@@ -14,15 +14,15 @@ this repository contains the full copyright notices and license terms. -->
-
+
Inspect Done
quality.inspect
stock.shipment.in
-
+
form_action
stock.shipment.in,-1
-
+
@@ -70,15 +70,15 @@ this repository contains the full copyright notices and license terms. -->
-
+
Inspect Done
quality.inspect
stock.shipment.out.return
-
+
form_action
stock.shipment.out.return,-1
-
+
@@ -98,15 +98,15 @@ this repository contains the full copyright notices and license terms. -->
-
+
Inspect Done
quality.inspect
stock.shipment.internal
-
+
form_action
stock.shipment.internal,-1
-
+
diff --git a/modules/sale/stock.py b/modules/sale/stock.py
index a47aca99e6..cd028330b2 100644
--- a/modules/sale/stock.py
+++ b/modules/sale/stock.py
@@ -53,8 +53,8 @@ class ShipmentOut(metaclass=PoolMeta):
@ModelView.button
@Workflow.transition('done')
@process_sale('outgoing_moves')
- def done(cls, shipments):
- super(ShipmentOut, cls).done(shipments)
+ def do(cls, shipments):
+ super().do(shipments)
@classmethod
@ModelView.button
diff --git a/modules/sale/tests/scenario_sale.rst b/modules/sale/tests/scenario_sale.rst
index 551976a0f6..b3f2e01083 100644
--- a/modules/sale/tests/scenario_sale.rst
+++ b/modules/sale/tests/scenario_sale.rst
@@ -260,7 +260,7 @@ Validate Shipments::
>>> shipment.click('assign_try')
>>> shipment.click('pick')
>>> shipment.click('pack')
- >>> shipment.click('done')
+ >>> shipment.click('do')
Open customer invoice::
@@ -356,7 +356,7 @@ Ship 3 products::
>>> shipment.click('assign_try')
>>> shipment.click('pick')
>>> shipment.click('pack')
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> shipment.state
'done'
@@ -496,7 +496,7 @@ Checking Shipments::
>>> mix_shipment.click('assign_try')
>>> mix_shipment.click('pick')
>>> mix_shipment.click('pack')
- >>> mix_shipment.click('done')
+ >>> mix_shipment.click('do')
>>> move_shipment, = mix_shipment.outgoing_moves
>>> move_shipment.product.rec_name
'product'
@@ -644,7 +644,7 @@ to invoices::
>>> shipment.click('assign_try')
>>> shipment.click('pick')
>>> shipment.click('pack')
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> sale.reload()
>>> invoice, = sale.invoices
>>> invoice_line, = invoice.lines
diff --git a/modules/sale_advance_payment/tests/scenario_sale_advance_payment_on_shipment.rst b/modules/sale_advance_payment/tests/scenario_sale_advance_payment_on_shipment.rst
index 02d6734892..b34a87587e 100644
--- a/modules/sale_advance_payment/tests/scenario_sale_advance_payment_on_shipment.rst
+++ b/modules/sale_advance_payment/tests/scenario_sale_advance_payment_on_shipment.rst
@@ -134,7 +134,7 @@ Make a partial shipment::
>>> shipment.click('assign_force')
>>> shipment.click('pick')
>>> shipment.click('pack')
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> sale.reload()
>>> len(sale.shipments)
@@ -152,7 +152,7 @@ Ship backorder::
>>> shipment.click('assign_force')
>>> shipment.click('pick')
>>> shipment.click('pack')
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> sale.reload()
>>> len(sale.shipments)
diff --git a/modules/sale_gift_card/tests/scenario_sale_gift_card_goods.rst b/modules/sale_gift_card/tests/scenario_sale_gift_card_goods.rst
index a484771989..37399695b3 100644
--- a/modules/sale_gift_card/tests/scenario_sale_gift_card_goods.rst
+++ b/modules/sale_gift_card/tests/scenario_sale_gift_card_goods.rst
@@ -116,7 +116,7 @@ Ship the gift card::
>>> shipment.click('assign_force')
>>> shipment.click('pick')
>>> shipment.click('pack')
- >>> shipment.click('done')
+ >>> shipment.click('do')
Traceback (most recent call last):
...
MoveGiftCardValidationError: ...
@@ -126,4 +126,4 @@ Ship the gift card::
>>> gift_card.value
Decimal('20.00')
>>> move.save()
- >>> shipment.click('done')
+ >>> shipment.click('do')
diff --git a/modules/sale_shipment_cost/stock.py b/modules/sale_shipment_cost/stock.py
index b0b78bbe49..a8f406392e 100644
--- a/modules/sale_shipment_cost/stock.py
+++ b/modules/sale_shipment_cost/stock.py
@@ -216,12 +216,12 @@ class ShipmentOut(ShipmentCostSaleMixin, metaclass=PoolMeta):
@classmethod
@ModelView.button
@Workflow.transition('done')
- def done(cls, shipments):
+ def do(cls, shipments):
for shipment in shipments:
shipment.cost_sale = shipment.cost_sale_used
shipment.cost_sale_currency = shipment.cost_sale_currency_used
cls.save(shipments)
- super().done(shipments)
+ super().do(shipments)
@classmethod
@ModelView.button
diff --git a/modules/sale_shipment_cost/tests/scenario_sale_shipment_cost.rst b/modules/sale_shipment_cost/tests/scenario_sale_shipment_cost.rst
index 9377972fb4..83e6876e2e 100644
--- a/modules/sale_shipment_cost/tests/scenario_sale_shipment_cost.rst
+++ b/modules/sale_shipment_cost/tests/scenario_sale_shipment_cost.rst
@@ -162,7 +162,7 @@ Send products::
>>> shipment.click('pack')
>>> shipment.state
'packed'
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> shipment.state
'done'
@@ -185,7 +185,7 @@ Send missing products::
>>> shipment.click('assign_force')
>>> shipment.click('pick')
>>> shipment.click('pack')
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> sale.reload()
>>> len(sale.invoices)
2
@@ -274,7 +274,7 @@ Send products::
>>> shipment.click('assign_force')
>>> shipment.click('pick')
>>> shipment.click('pack')
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> shipment.state
'done'
@@ -318,7 +318,7 @@ Send products::
>>> shipment.click('assign_force')
>>> shipment.click('pick')
>>> shipment.click('pack')
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> shipment.state
'done'
diff --git a/modules/sale_shipment_cost/tests/scenario_sale_shipment_cost_stock.rst b/modules/sale_shipment_cost/tests/scenario_sale_shipment_cost_stock.rst
index 0bbd9744fb..9133c685da 100644
--- a/modules/sale_shipment_cost/tests/scenario_sale_shipment_cost_stock.rst
+++ b/modules/sale_shipment_cost/tests/scenario_sale_shipment_cost_stock.rst
@@ -113,7 +113,7 @@ Sell product with no shipment cost::
>>> shipment.click('assign_force')
>>> shipment.click('pick')
>>> shipment.click('pack')
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> shipment.state
'done'
>>> move, = shipment.outgoing_moves
@@ -145,7 +145,7 @@ Sell product with cost on shipment::
>>> shipment.click('assign_force')
>>> shipment.click('pick')
>>> shipment.click('pack')
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> shipment.state
'done'
>>> move, = shipment.outgoing_moves
@@ -180,7 +180,7 @@ Sell product with cost on order::
>>> shipment.click('assign_force')
>>> shipment.click('pick')
>>> shipment.click('pack')
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> shipment.state
'done'
>>> move, = shipment.outgoing_moves
diff --git a/modules/sale_shipment_grouping/tests/scenario_sale_shipment_grouping.rst b/modules/sale_shipment_grouping/tests/scenario_sale_shipment_grouping.rst
index b091f438ab..b94adb1525 100644
--- a/modules/sale_shipment_grouping/tests/scenario_sale_shipment_grouping.rst
+++ b/modules/sale_shipment_grouping/tests/scenario_sale_shipment_grouping.rst
@@ -149,7 +149,7 @@ Check the shipments::
... shipment.click('assign_try')
... shipment.click('pick')
... shipment.click('pack')
- ... shipment.click('done')
+ ... shipment.click('do')
Now we'll use the same scenario with the grouped customer::
diff --git a/modules/sale_shipment_tolerance/tests/scenario_sale_over_shipment_tolerance.rst b/modules/sale_shipment_tolerance/tests/scenario_sale_over_shipment_tolerance.rst
index 1a836fd965..1fe31b10aa 100644
--- a/modules/sale_shipment_tolerance/tests/scenario_sale_over_shipment_tolerance.rst
+++ b/modules/sale_shipment_tolerance/tests/scenario_sale_over_shipment_tolerance.rst
@@ -107,7 +107,7 @@ Over ship 12 products::
>>> shipment.click('assign_force')
>>> shipment.click('pick')
>>> shipment.click('pack')
- >>> shipment.click('done')
+ >>> shipment.click('do')
No new shipment as shipped inside tolerance::
diff --git a/modules/sale_shipment_tolerance/tests/scenario_sale_under_shipment_tolerance.rst b/modules/sale_shipment_tolerance/tests/scenario_sale_under_shipment_tolerance.rst
index dbf348a33c..da557ae440 100644
--- a/modules/sale_shipment_tolerance/tests/scenario_sale_under_shipment_tolerance.rst
+++ b/modules/sale_shipment_tolerance/tests/scenario_sale_under_shipment_tolerance.rst
@@ -82,7 +82,7 @@ Under ship 5 products::
>>> shipment.click('assign_force')
>>> shipment.click('pick')
>>> shipment.click('pack')
- >>> shipment.click('done')
+ >>> shipment.click('do')
Under ship 4 products::
@@ -93,7 +93,7 @@ Under ship 4 products::
>>> shipment.click('assign_force')
>>> shipment.click('pick')
>>> shipment.click('pack')
- >>> shipment.click('done')
+ >>> shipment.click('do')
No new shipment as shipped inside tolerance::
diff --git a/modules/sale_supply/stock.py b/modules/sale_supply/stock.py
index 08d2858990..2c09bbf222 100644
--- a/modules/sale_supply/stock.py
+++ b/modules/sale_supply/stock.py
@@ -13,8 +13,8 @@ class ShipmentIn(metaclass=PoolMeta):
@classmethod
@ModelView.button
@Workflow.transition('done')
- def done(cls, shipments):
- super(ShipmentIn, cls).done(shipments)
+ def do(cls, shipments):
+ super().do(shipments)
# Assigned sale move lines
for shipment in shipments:
diff --git a/modules/sale_supply/tests/scenario_sale_supply.rst b/modules/sale_supply/tests/scenario_sale_supply.rst
index ef94675c0d..9df21e69ce 100644
--- a/modules/sale_supply/tests/scenario_sale_supply.rst
+++ b/modules/sale_supply/tests/scenario_sale_supply.rst
@@ -180,7 +180,7 @@ Receive 100 products::
>>> shipment.incoming_moves.append(move)
>>> move.quantity = 100
>>> shipment.click('receive')
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> shipment.state
'done'
>>> set_user(sale_user)
@@ -251,7 +251,7 @@ not create a new purchase request::
>>> changing_template.save()
>>> set_user(stock_user)
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> set_user(purchase_user)
>>> len(PurchaseRequest.find([('product', '=', changing_product.id)]))
0
diff --git a/modules/sale_supply_drop_shipment/CHANGELOG b/modules/sale_supply_drop_shipment/CHANGELOG
index 97b1ede56a..6f08c35333 100644
--- a/modules/sale_supply_drop_shipment/CHANGELOG
+++ b/modules/sale_supply_drop_shipment/CHANGELOG
@@ -1,3 +1,4 @@
+* Rename 'done' button to 'do'
Version 7.0.0 - 2023-10-30
--------------------------
diff --git a/modules/sale_supply_drop_shipment/stock.py b/modules/sale_supply_drop_shipment/stock.py
index d8a9a09823..ac29b78a31 100644
--- a/modules/sale_supply_drop_shipment/stock.py
+++ b/modules/sale_supply_drop_shipment/stock.py
@@ -203,7 +203,7 @@ class ShipmentDrop(
'invisible': Eval('state') != 'waiting',
'depends': ['state'],
},
- 'done': {
+ 'do': {
'invisible': Eval('state') != 'shipped',
'depends': ['state'],
},
@@ -504,7 +504,7 @@ class ShipmentDrop(
@ModelView.button
@Workflow.transition('done')
@process_sale('customer_moves')
- def done(cls, shipments):
+ def do(cls, shipments):
pool = Pool()
Move = pool.get('stock.move')
Date = pool.get('ir.date')
diff --git a/modules/sale_supply_drop_shipment/stock.xml b/modules/sale_supply_drop_shipment/stock.xml
index 48c4221f39..6eae621e83 100644
--- a/modules/sale_supply_drop_shipment/stock.xml
+++ b/modules/sale_supply_drop_shipment/stock.xml
@@ -163,8 +163,8 @@ this repository contains the full copyright notices and license terms. -->
stock.shipment.drop
- done
- Done
+ do
+ Complete
Are you sure you want to complete the shipment?
diff --git a/modules/sale_supply_drop_shipment/tests/scenario_sale_supply_drop_shipment.rst b/modules/sale_supply_drop_shipment/tests/scenario_sale_supply_drop_shipment.rst
index c4b278e1c6..bbb3ff4d3b 100644
--- a/modules/sale_supply_drop_shipment/tests/scenario_sale_supply_drop_shipment.rst
+++ b/modules/sale_supply_drop_shipment/tests/scenario_sale_supply_drop_shipment.rst
@@ -211,7 +211,7 @@ Receiving only 100 products::
... if s.state == 'shipped']
>>> set_user(stock_user)
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> shipment.state
'done'
>>> move, = shipment.customer_moves
@@ -364,7 +364,7 @@ from stock::
>>> shipment.click('assign_force')
>>> shipment.click('pick')
>>> shipment.click('pack')
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> set_user(sale_user)
>>> sale.reload()
diff --git a/modules/sale_supply_drop_shipment/view/shipment_drop_form.xml b/modules/sale_supply_drop_shipment/view/shipment_drop_form.xml
index 0931ccd123..4ac11bf1c0 100644
--- a/modules/sale_supply_drop_shipment/view/shipment_drop_form.xml
+++ b/modules/sale_supply_drop_shipment/view/shipment_drop_form.xml
@@ -35,6 +35,6 @@ this repository contains the full copyright notices and license terms. -->
-
+
diff --git a/modules/sale_supply_production/production.py b/modules/sale_supply_production/production.py
index e0ced886f6..1d59d7eb9e 100644
--- a/modules/sale_supply_production/production.py
+++ b/modules/sale_supply_production/production.py
@@ -79,8 +79,8 @@ class Production(metaclass=PoolMeta):
@ModelView.button
@Workflow.transition('done')
@process_sale_supply
- def done(cls, productions):
- super().done(productions)
+ def do(cls, productions):
+ super().do(productions)
for production in productions:
production.assign_supplied()
diff --git a/modules/sale_supply_production/tests/scenario_sale_supply_production.rst b/modules/sale_supply_production/tests/scenario_sale_supply_production.rst
index cba50781ce..0cf30655df 100644
--- a/modules/sale_supply_production/tests/scenario_sale_supply_production.rst
+++ b/modules/sale_supply_production/tests/scenario_sale_supply_production.rst
@@ -146,7 +146,7 @@ Start the production::
Finish the production::
- >>> production.click('done')
+ >>> production.click('do')
>>> shipment.reload()
>>> move, = shipment.outgoing_moves
diff --git a/modules/stock/CHANGELOG b/modules/stock/CHANGELOG
index 72e89a1a99..956f69d052 100644
--- a/modules/stock/CHANGELOG
+++ b/modules/stock/CHANGELOG
@@ -1,3 +1,4 @@
+* Rename 'done' button to 'do'
* Add location name fields to move
* Unify shipment assignation scheduled jobs
* Fill shipment number only in waiting state
diff --git a/modules/stock/shipment.py b/modules/stock/shipment.py
index f8742c72f2..e21e6288c0 100644
--- a/modules/stock/shipment.py
+++ b/modules/stock/shipment.py
@@ -477,7 +477,7 @@ class ShipmentIn(
'invisible': Eval('state') != 'draft',
'depends': ['state'],
},
- 'done': {
+ 'do': {
'invisible': Eval('state') != 'received',
'depends': ['state'],
},
@@ -730,13 +730,13 @@ class ShipmentIn(
to_do = [s for s in shipments
if s.warehouse_storage == s.warehouse_input]
if to_do:
- cls.done(to_do)
+ cls.do(to_do)
@classmethod
@ModelView.button
@Workflow.transition('done')
@set_employee('done_by')
- def done(cls, shipments):
+ def do(cls, shipments):
pool = Pool()
Move = pool.get('stock.move')
Date = pool.get('ir.date')
@@ -898,7 +898,7 @@ class ShipmentInReturn(ShipmentAssignMixin, Workflow, ModelSQL, ModelView):
'tryton-back', 'tryton-forward'),
'depends': ['state'],
},
- 'done': {
+ 'do': {
'invisible': Eval('state') != 'assigned',
'depends': ['state'],
},
@@ -1045,7 +1045,7 @@ class ShipmentInReturn(ShipmentAssignMixin, Workflow, ModelSQL, ModelView):
@ModelView.button
@Workflow.transition('done')
@set_employee('done_by')
- def done(cls, shipments):
+ def do(cls, shipments):
pool = Pool()
Move = pool.get('stock.move')
Date = pool.get('ir.date')
@@ -1349,7 +1349,7 @@ class ShipmentOut(
'depends': [
'state', 'warehouse_storage', 'warehouse_output'],
},
- 'done': {
+ 'do': {
'invisible': Eval('state') != 'packed',
},
'assign_wizard': {
@@ -1682,7 +1682,7 @@ class ShipmentOut(
@ModelView.button
@Workflow.transition('done')
@set_employee('done_by')
- def done(cls, shipments):
+ def do(cls, shipments):
pool = Pool()
Move = pool.get('stock.move')
Date = pool.get('ir.date')
@@ -1989,7 +1989,7 @@ class ShipmentOutReturn(
'invisible': Eval('state') != 'draft',
'depends': ['state'],
},
- 'done': {
+ 'do': {
'invisible': Eval('state') != 'received',
'depends': ['state'],
},
@@ -2185,13 +2185,13 @@ class ShipmentOutReturn(
to_do = [s for s in shipments
if s.warehouse_storage == s.warehouse_input]
if to_do:
- cls.done(to_do)
+ cls.do(to_do)
@classmethod
@ModelView.button
@Workflow.transition('done')
@set_employee('done_by')
- def done(cls, shipments):
+ def do(cls, shipments):
pool = Pool()
Move = pool.get('stock.move')
Date = pool.get('ir.date')
@@ -2496,7 +2496,7 @@ class ShipmentInternal(
| ~Eval('transit_location')),
'depends': ['state', 'transit_location'],
},
- 'done': {
+ 'do': {
'invisible': If(
~Eval('transit_location'),
Eval('state') != 'assigned',
@@ -2844,7 +2844,7 @@ class ShipmentInternal(
@ModelView.button
@Workflow.transition('done')
@set_employee('done_by')
- def done(cls, shipments):
+ def do(cls, shipments):
pool = Pool()
Move = pool.get('stock.move')
Date = pool.get('ir.date')
diff --git a/modules/stock/shipment.xml b/modules/stock/shipment.xml
index 4052f2cafe..ba28d49901 100644
--- a/modules/stock/shipment.xml
+++ b/modules/stock/shipment.xml
@@ -569,8 +569,8 @@ this repository contains the full copyright notices and license terms. -->
stock.shipment.in
- done
- Done
+ do
+ Complete
@@ -630,8 +630,8 @@ this repository contains the full copyright notices and license terms. -->
stock.shipment.out
- done
- Done
+ do
+ Complete
Are you sure you want to complete the shipment?
@@ -701,8 +701,8 @@ this repository contains the full copyright notices and license terms. -->
stock.shipment.internal
- done
- Done
+ do
+ Complete
@@ -784,8 +784,8 @@ this repository contains the full copyright notices and license terms. -->
stock.shipment.out.return
- done
- Done
+ do
+ Complete
@@ -833,8 +833,8 @@ this repository contains the full copyright notices and license terms. -->
stock.shipment.in.return
- done
- Done
+ do
+ Complete
Are you sure you want to complete the shipment?
diff --git a/modules/stock/tests/scenario_stock_reporting.rst b/modules/stock/tests/scenario_stock_reporting.rst
index e0acc609b8..61f126f895 100644
--- a/modules/stock/tests/scenario_stock_reporting.rst
+++ b/modules/stock/tests/scenario_stock_reporting.rst
@@ -78,7 +78,7 @@ Receive a bunch of products::
>>> move.currency = company.currency
>>> shipment_in.save()
>>> shipment_in.click('receive')
- >>> shipment_in.click('done')
+ >>> shipment_in.click('do')
Testing the report::
@@ -114,7 +114,7 @@ Add two shipment lines of same product and go through the workflow::
>>> shipment_out.click('assign_try')
>>> shipment_out.click('pick')
>>> shipment_out.click('pack')
- >>> shipment_out.click('done')
+ >>> shipment_out.click('do')
Testing the reports::
@@ -152,7 +152,7 @@ Create an internal shipment::
>>> shipment_internal.save()
>>> shipment_internal.click('wait')
>>> shipment_internal.click('assign_try')
- >>> shipment_internal.click('done')
+ >>> shipment_internal.click('do')
Testing the report::
diff --git a/modules/stock/tests/scenario_stock_shipment_in.rst b/modules/stock/tests/scenario_stock_shipment_in.rst
index 71a1b26533..8a71f15863 100644
--- a/modules/stock/tests/scenario_stock_shipment_in.rst
+++ b/modules/stock/tests/scenario_stock_shipment_in.rst
@@ -83,7 +83,7 @@ Change inventory quantity and try to finish::
>>> inventory_move, = shipment.inventory_moves
>>> inventory_move.quantity = 11
- >>> shipment.click('done')
+ >>> shipment.click('do')
Traceback (most recent call last):
...
ShipmentCheckQuantityWarning: ...
@@ -100,7 +100,7 @@ Add extra product to inventory and try to finish::
>>> move.quantity = 1
>>> move.from_location = input_loc
>>> move.to_location = storage_loc
- >>> shipment.click('done')
+ >>> shipment.click('do')
Traceback (most recent call last):
...
ShipmentCheckQuantityWarning: ...
@@ -110,7 +110,7 @@ Add extra product to inventory and try to finish::
Finish the shipment::
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> shipment.state
'done'
>>> len(shipment.incoming_moves)
diff --git a/modules/stock/tests/scenario_stock_shipment_internal.rst b/modules/stock/tests/scenario_stock_shipment_internal.rst
index e6e7997259..bd7ee48c63 100644
--- a/modules/stock/tests/scenario_stock_shipment_internal.rst
+++ b/modules/stock/tests/scenario_stock_shipment_internal.rst
@@ -119,7 +119,7 @@ Create Internal Shipment from lost_found location::
>>> lost_found_shipment.click('assign_try')
>>> lost_found_shipment.state
'assigned'
- >>> lost_found_shipment.click('done')
+ >>> lost_found_shipment.click('do')
>>> lost_found_shipment.state
'done'
@@ -129,7 +129,7 @@ Check that now we can finish the older shipment::
>>> assertEqual(shipment.assigned_by, employee)
>>> shipment.done_by
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> shipment.state
'done'
>>> assertEqual(shipment.done_by, employee)
diff --git a/modules/stock/tests/scenario_stock_shipment_internal_transit.rst b/modules/stock/tests/scenario_stock_shipment_internal_transit.rst
index 5bf663103b..91ddd55733 100644
--- a/modules/stock/tests/scenario_stock_shipment_internal_transit.rst
+++ b/modules/stock/tests/scenario_stock_shipment_internal_transit.rst
@@ -96,7 +96,7 @@ Create Internal Shipment with lead time::
>>> shipment.outgoing_moves[0].state
'done'
>>> assertEqual(shipment.outgoing_moves[0].effective_date, yesterday)
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> shipment.incoming_moves[0].state
'done'
>>> assertEqual(shipment.incoming_moves[0].effective_date, today)
diff --git a/modules/stock/tests/scenario_stock_shipment_out.rst b/modules/stock/tests/scenario_stock_shipment_out.rst
index 762a3fb5d8..e750a6ad4b 100644
--- a/modules/stock/tests/scenario_stock_shipment_out.rst
+++ b/modules/stock/tests/scenario_stock_shipment_out.rst
@@ -190,7 +190,7 @@ Ignore non assigned moves and pack shipment::
Set the state as Done::
- >>> shipment_out.click('done')
+ >>> shipment_out.click('do')
>>> assertEqual(shipment_out.done_by, employee)
>>> [m.state for m in shipment_out.outgoing_moves]
['done']
@@ -263,7 +263,7 @@ Finish the shipment::
Finish the shipment::
- >>> shipment_out.click('done')
+ >>> shipment_out.click('do')
>>> shipment_out.state
'done'
>>> outgoing_move, = shipment_out.outgoing_moves
diff --git a/modules/stock/tests/scenario_stock_shipment_out_return.rst b/modules/stock/tests/scenario_stock_shipment_out_return.rst
index 7795897488..5d9b8c69b1 100644
--- a/modules/stock/tests/scenario_stock_shipment_out_return.rst
+++ b/modules/stock/tests/scenario_stock_shipment_out_return.rst
@@ -85,7 +85,7 @@ Receive shipment::
Finish the shipment::
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> shipment.state
'done'
>>> len(shipment.incoming_moves)
diff --git a/modules/stock/view/shipment_in_form.xml b/modules/stock/view/shipment_in_form.xml
index 02e1814b16..bfa7103261 100644
--- a/modules/stock/view/shipment_in_form.xml
+++ b/modules/stock/view/shipment_in_form.xml
@@ -43,7 +43,7 @@ this repository contains the full copyright notices and license terms. -->
-
+
diff --git a/modules/stock/view/shipment_in_return_form.xml b/modules/stock/view/shipment_in_return_form.xml
index 87a7e66b50..b28a512fda 100644
--- a/modules/stock/view/shipment_in_return_form.xml
+++ b/modules/stock/view/shipment_in_return_form.xml
@@ -36,6 +36,6 @@ this repository contains the full copyright notices and license terms. -->
-
+
diff --git a/modules/stock/view/shipment_internal_form.xml b/modules/stock/view/shipment_internal_form.xml
index 79eb12bc2d..7f98a6ab92 100644
--- a/modules/stock/view/shipment_internal_form.xml
+++ b/modules/stock/view/shipment_internal_form.xml
@@ -47,6 +47,6 @@ this repository contains the full copyright notices and license terms. -->
-
+
diff --git a/modules/stock/view/shipment_out_form.xml b/modules/stock/view/shipment_out_form.xml
index ac35594aa3..3918ed06d5 100644
--- a/modules/stock/view/shipment_out_form.xml
+++ b/modules/stock/view/shipment_out_form.xml
@@ -48,6 +48,6 @@ this repository contains the full copyright notices and license terms. -->
-
+
diff --git a/modules/stock/view/shipment_out_return_form.xml b/modules/stock/view/shipment_out_return_form.xml
index 1c2d2b5e18..44930cc1f2 100644
--- a/modules/stock/view/shipment_out_return_form.xml
+++ b/modules/stock/view/shipment_out_return_form.xml
@@ -43,6 +43,6 @@ this repository contains the full copyright notices and license terms. -->
-
+
diff --git a/modules/stock_consignment/tests/scenario_stock_consignment.rst b/modules/stock_consignment/tests/scenario_stock_consignment.rst
index 2f923a1850..260180bab3 100644
--- a/modules/stock_consignment/tests/scenario_stock_consignment.rst
+++ b/modules/stock_consignment/tests/scenario_stock_consignment.rst
@@ -125,7 +125,7 @@ Fill supplier consignment location::
>>> shipment.click('assign_try')
>>> shipment.state
'assigned'
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> shipment.state
'done'
@@ -145,7 +145,7 @@ Use supplier consignment stock::
>>> shipment.click('assign_try')
>>> shipment.state
'assigned'
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> shipment.state
'done'
@@ -202,7 +202,7 @@ Fill customer consignment location::
>>> shipment.click('assign_try')
>>> shipment.state
'assigned'
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> shipment.state
'done'
@@ -222,7 +222,7 @@ Use customer consignment stock::
>>> shipment.click('assign_try')
>>> shipment.state
'assigned'
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> shipment.state
'done'
diff --git a/modules/stock_consignment/tests/scenario_stock_consignment_supplier_customer.rst b/modules/stock_consignment/tests/scenario_stock_consignment_supplier_customer.rst
index 96e4c18218..ce34d04f43 100644
--- a/modules/stock_consignment/tests/scenario_stock_consignment_supplier_customer.rst
+++ b/modules/stock_consignment/tests/scenario_stock_consignment_supplier_customer.rst
@@ -112,7 +112,7 @@ Fill supplier consignment location::
>>> shipment.click('assign_try')
>>> shipment.state
'assigned'
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> shipment.state
'done'
@@ -132,7 +132,7 @@ Use supplier consignment stock by customer::
>>> shipment.click('assign_try')
>>> shipment.state
'assigned'
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> shipment.state
'done'
>>> move, = shipment.moves
diff --git a/modules/stock_location_move/stock.py b/modules/stock_location_move/stock.py
index baf4718837..e19a6613fa 100644
--- a/modules/stock_location_move/stock.py
+++ b/modules/stock_location_move/stock.py
@@ -185,7 +185,7 @@ class ShipmentInternal(metaclass=PoolMeta):
@ModelView.button
@Workflow.transition('done')
@clear_location_assignation
- def done(cls, shipments):
+ def do(cls, shipments):
pool = Pool()
Location = pool.get('stock.location')
to_write = []
@@ -198,7 +198,7 @@ class ShipmentInternal(metaclass=PoolMeta):
})
if to_write:
Location.write(*to_write)
- super(ShipmentInternal, cls).done(shipments)
+ super().do(shipments)
@classmethod
@ModelView.button
@@ -244,8 +244,8 @@ class ShipmentOut(metaclass=PoolMeta):
@ModelView.button
@Workflow.transition('done')
@deactivate_empty_location
- def done(cls, shipments):
- super(ShipmentOut, cls).done(shipments)
+ def do(cls, shipments):
+ super().do(shipments)
class ShipmentInReturn(metaclass=PoolMeta):
@@ -255,8 +255,8 @@ class ShipmentInReturn(metaclass=PoolMeta):
@ModelView.button
@Workflow.transition('done')
@deactivate_empty_location
- def done(cls, shipments):
- super(ShipmentInReturn, cls).done(shipments)
+ def do(cls, shipments):
+ super().do(shipments)
class Supply(metaclass=PoolMeta):
diff --git a/modules/stock_location_move/tests/scenario_stock_location_move.rst b/modules/stock_location_move/tests/scenario_stock_location_move.rst
index d21c6c1f9e..3136f82852 100644
--- a/modules/stock_location_move/tests/scenario_stock_location_move.rst
+++ b/modules/stock_location_move/tests/scenario_stock_location_move.rst
@@ -49,7 +49,7 @@ Move pallet from storage1 to storage2::
>>> assertEqual(pallet.assigned_by, shipment)
>>> assertEqual(pallet.parent, storage1)
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> shipment.state
'done'
>>> pallet.reload()
@@ -90,7 +90,7 @@ Concurrently move pallet::
...
AssignError: ...
- >>> shipment1.click('done')
+ >>> shipment1.click('do')
Add lead time between warehouses::
@@ -119,6 +119,6 @@ Move pallet from storage1 to storage2 with lead_time::
>>> pallet.reload()
>>> assertEqual(pallet.parent, shipment.transit_location)
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> pallet.reload()
>>> assertEqual(pallet.parent, warehouse2.storage_location)
diff --git a/modules/stock_location_move/tests/scenario_stock_location_move_empty.rst b/modules/stock_location_move/tests/scenario_stock_location_move_empty.rst
index b43fdf94db..0cdbbcf2fe 100644
--- a/modules/stock_location_move/tests/scenario_stock_location_move_empty.rst
+++ b/modules/stock_location_move/tests/scenario_stock_location_move_empty.rst
@@ -134,7 +134,7 @@ Ship 1 product from the locations::
>>> shipment.click('assign_try')
>>> shipment.click('pick')
>>> shipment.click('pack')
- >>> shipment.click('done')
+ >>> shipment.click('do')
Check empty non movable location are still active::
diff --git a/modules/stock_lot/tests/scenario_stock_lot_shipment_in.rst b/modules/stock_lot/tests/scenario_stock_lot_shipment_in.rst
index cae099c58f..3805beeb89 100644
--- a/modules/stock_lot/tests/scenario_stock_lot_shipment_in.rst
+++ b/modules/stock_lot/tests/scenario_stock_lot_shipment_in.rst
@@ -81,7 +81,7 @@ Change lot and try to finish::
>>> incoming_move, = shipment.inventory_moves
>>> assertEqual(incoming_move.lot, lot1)
>>> incoming_move.lot = lot2
- >>> shipment.click('done')
+ >>> shipment.click('do')
Traceback (most recent call last):
...
ShipmentCheckQuantityWarning: ...
@@ -91,6 +91,6 @@ Change lot and try to finish::
Finish the shipment::
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> shipment.state
'done'
diff --git a/modules/stock_lot_unit/tests/scenario_stock_lot_unit.rst b/modules/stock_lot_unit/tests/scenario_stock_lot_unit.rst
index 31d8c74fef..bf45af1f19 100644
--- a/modules/stock_lot_unit/tests/scenario_stock_lot_unit.rst
+++ b/modules/stock_lot_unit/tests/scenario_stock_lot_unit.rst
@@ -76,7 +76,7 @@ Create an incoming shipment without lot::
>>> move2.from_location = supplier_loc
>>> move2.to_location = input_loc
>>> shipment.click('receive')
- >>> shipment.click('done')
+ >>> shipment.click('do')
Let's ship a product with a lot::
@@ -102,7 +102,7 @@ Let's ship a product with a lot::
>>> move.lot = lot
>>> shipment.click('pick')
>>> shipment.click('pack')
- >>> shipment.click('done')
+ >>> shipment.click('do')
Let's ship now two times the same lot::
diff --git a/modules/stock_package/stock.py b/modules/stock_package/stock.py
index e5c1fc1da6..4989399ac6 100644
--- a/modules/stock_package/stock.py
+++ b/modules/stock_package/stock.py
@@ -438,8 +438,8 @@ class ShipmentOut(PackageMixin, object, metaclass=PoolMeta):
@classmethod
@ModelView.button
@Workflow.transition('done')
- def done(cls, shipments):
- super(ShipmentOut, cls).done(shipments)
+ def do(cls, shipments):
+ super().do(shipments)
cls.check_packages(shipments)
@property
@@ -485,8 +485,8 @@ class ShipmentInReturn(PackageMixin, object, metaclass=PoolMeta):
@classmethod
@ModelView.button
@Workflow.transition('done')
- def done(cls, shipments):
- super(ShipmentInReturn, cls).done(shipments)
+ def do(cls, shipments):
+ super().do(shipments)
cls.check_packages(shipments)
@property
diff --git a/modules/stock_package_shipping/stock.py b/modules/stock_package_shipping/stock.py
index 452ae3f7b0..39cb4b7f97 100644
--- a/modules/stock_package_shipping/stock.py
+++ b/modules/stock_package_shipping/stock.py
@@ -288,8 +288,8 @@ class ShipmentInReturn(ShippingMixin, metaclass=PoolMeta):
@classmethod
@ModelView.button
@Workflow.transition('done')
- def done(cls, shipments):
- super().done(shipments)
+ def do(cls, shipments):
+ super().do(shipments)
cls.check_no_carrier(shipments)
@property
diff --git a/modules/stock_shipment_cost/stock.py b/modules/stock_shipment_cost/stock.py
index bffa53dadf..57aa501aa0 100644
--- a/modules/stock_shipment_cost/stock.py
+++ b/modules/stock_shipment_cost/stock.py
@@ -234,12 +234,12 @@ class ShipmentOutCostMixin(ShipmentCostMixin):
@classmethod
@ModelView.button
@Workflow.transition('done')
- def done(cls, shipments):
+ def do(cls, shipments):
for shipment in shipments:
shipment.cost = shipment.cost_used
shipment.cost_currency = shipment.cost_currency_used
cls.save(shipments)
- super().done(shipments)
+ super().do(shipments)
cls.set_shipment_cost(shipments)
diff --git a/modules/stock_shipment_cost/tests/scenario_stock_shipment_cost.rst b/modules/stock_shipment_cost/tests/scenario_stock_shipment_cost.rst
index 594a533d5e..6b54492649 100644
--- a/modules/stock_shipment_cost/tests/scenario_stock_shipment_cost.rst
+++ b/modules/stock_shipment_cost/tests/scenario_stock_shipment_cost.rst
@@ -88,7 +88,7 @@ Create a customer shipment::
>>> shipment.cost_edit = True
>>> shipment.cost_used = Decimal('5')
>>> shipment.cost_currency_used = company.currency
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> shipment.state
'done'
diff --git a/modules/stock_shipment_cost_weight/tests/scenario_stock_shipment_cost_weight.rst b/modules/stock_shipment_cost_weight/tests/scenario_stock_shipment_cost_weight.rst
index 4d8bb639ab..c94ff58e75 100644
--- a/modules/stock_shipment_cost_weight/tests/scenario_stock_shipment_cost_weight.rst
+++ b/modules/stock_shipment_cost_weight/tests/scenario_stock_shipment_cost_weight.rst
@@ -110,7 +110,7 @@ Create a customer shipment::
>>> shipment.click('assign_force')
>>> shipment.click('pick')
>>> shipment.click('pack')
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> shipment.state
'done'
diff --git a/modules/web_shop_shopify/tests/scenario_web_shop_shopify.rst b/modules/web_shop_shopify/tests/scenario_web_shop_shopify.rst
index 7ab8ebfa7d..96c6e098af 100644
--- a/modules/web_shop_shopify/tests/scenario_web_shop_shopify.rst
+++ b/modules/web_shop_shopify/tests/scenario_web_shop_shopify.rst
@@ -542,7 +542,7 @@ Make a partial shipment::
>>> move.quantity = 3
>>> shipment.click('pick')
>>> shipment.click('pack')
- >>> shipment.click('done')
+ >>> shipment.click('do')
>>> shipment.state
'done'