diff --git a/fr_FR.csv b/fr_FR.csv
index 0f314b0041..73df8d4710 100644
--- a/fr_FR.csv
+++ b/fr_FR.csv
@@ -243,12 +243,12 @@ model,"stock.product_stock_date.init,name",0,Compute stock quantities,Quantités
model,"workflow.activity,name",packingout_act_assigned,Assigned,Assigné,0
model,"workflow.activity,name",packinginternal_act_assigned,Assigned,Assigné,0
model,"workflow.activity,name",packing_in_return_act_assigned,Assigned,Assigné,0
-model,"workflow.activity,name",packingin_act_cancel,Cancel,Annulé,0
-model,"workflow.activity,name",packingout_act_cancel,Cancel,Annulé,0
-model,"workflow.activity,name",packinginternal_act_cancel,Cancel,Annulé,0
-model,"workflow.activity,name",packing_out_return_act_cancel,Cancel,Annuler,0
-model,"workflow.activity,name",packing_in_return_act_cancel,Cancel,Annuler,0
-model,"workflow.activity,name",inventory_act_cancel,Cancel,Annulé,0
+model,"workflow.activity,name",packingin_act_cancel,Canceled,Annulé,0
+model,"workflow.activity,name",packingout_act_cancel,Canceled,Annulé,0
+model,"workflow.activity,name",packinginternal_act_cancel,Canceled,Annulé,0
+model,"workflow.activity,name",packing_out_return_act_cancel,Canceled,Annuler,0
+model,"workflow.activity,name",packing_in_return_act_cancel,Canceled,Annuler,0
+model,"workflow.activity,name",inventory_act_cancel,Canceled,Annulé,0
model,"workflow.activity,name",packingin_act_done,Done,Fait,0
model,"workflow.activity,name",packingout_act_done,Done,Fait,0
model,"workflow.activity,name",packinginternal_act_done,Done,Fait,0
@@ -282,7 +282,7 @@ odt,stock.packing.out,0,Phone:,Téléphone,0
odt,stock.packing.out,0,Product,Produit,0
odt,stock.packing.out,0,Quantity,Quantité,0
odt,stock.packing.out,0,Reference:,Référence :,0
-selection,"stock.inventory,state",0,Cancel,Annulé,0
+selection,"stock.inventory,state",0,Canceled,Annulé,0
selection,"stock.inventory,state",0,Done,Fait,0
selection,"stock.inventory,state",0,Draft,Brouillon,0
selection,"stock.location,type",0,Customer,Client,0
@@ -293,29 +293,29 @@ selection,"stock.location,type",0,Supplier,Fournisseur,0
selection,"stock.location,type",0,View,Vue,0
selection,"stock.location,type",0,Warehouse,Entrepôt,0
selection,"stock.move,state",0,Assigned,Assigné,0
-selection,"stock.move,state",0,Cancel,Annulé,0
+selection,"stock.move,state",0,Canceled,Annulé,0
selection,"stock.move,state",0,Done,Fait,0
selection,"stock.move,state",0,Draft,Brouillon,0
selection,"stock.packing.in.return,state",0,Assigned,Assigné,0
-selection,"stock.packing.in.return,state",0,Cancel,Annuler,0
+selection,"stock.packing.in.return,state",0,Canceled,Annuler,0
selection,"stock.packing.in.return,state",0,Done,Fait,0
selection,"stock.packing.in.return,state",0,Draft,Brouillon,0
selection,"stock.packing.in.return,state",0,Waiting,En attente,0
-selection,"stock.packing.in,state",0,Cancel,Annulé,0
+selection,"stock.packing.in,state",0,Canceled,Annulé,0
selection,"stock.packing.in,state",0,Done,Fait,0
selection,"stock.packing.in,state",0,Draft,Brouillon,0
selection,"stock.packing.in,state",0,Received,Reçu,0
selection,"stock.packing.internal,state",0,Assigned,Assigné,0
-selection,"stock.packing.internal,state",0,Cancel,Annulé,0
+selection,"stock.packing.internal,state",0,Canceled,Annulé,0
selection,"stock.packing.internal,state",0,Done,Fait,0
selection,"stock.packing.internal,state",0,Draft,Brouillon,0
selection,"stock.packing.internal,state",0,Waiting,En attente,0
-selection,"stock.packing.out.return,state",0,Cancel,Annuler,0
+selection,"stock.packing.out.return,state",0,Canceled,Annulé,0
selection,"stock.packing.out.return,state",0,Done,Fait,0
selection,"stock.packing.out.return,state",0,Draft,Brouillon,0
selection,"stock.packing.out.return,state",0,Received,Reçu,0
selection,"stock.packing.out,state",0,Assigned,Assigné,0
-selection,"stock.packing.out,state",0,Cancel,Annulé,0
+selection,"stock.packing.out,state",0,Canceled,Annulé,0
selection,"stock.packing.out,state",0,Done,Fait,0
selection,"stock.packing.out,state",0,Draft,Brouillon,0
selection,"stock.packing.out,state",0,Packed,Emballé,0
diff --git a/inventory.py b/inventory.py
index 8bdb4238a9..c90188bdc6 100644
--- a/inventory.py
+++ b/inventory.py
@@ -35,7 +35,7 @@ class Inventory(ModelWorkflow, ModelSQL, ModelView):
state = fields.Selection([
('draft', 'Draft'),
('done', 'Done'),
- ('cancel', 'Cancel'),
+ ('cancel', 'Canceled'),
], 'State', readonly=True, select=1)
def __init__(self):
diff --git a/inventory.xml b/inventory.xml
index 0eb8cc3683..200b3fc923 100644
--- a/inventory.xml
+++ b/inventory.xml
@@ -138,7 +138,7 @@ this repository contains the full copyright notices and license terms. -->
True
- Cancel
+ Canceled
function
set_state_cancel()
diff --git a/move.py b/move.py
index 2f4a60fcae..b45136c440 100644
--- a/move.py
+++ b/move.py
@@ -53,7 +53,7 @@ class Move(ModelSQL, ModelView):
('draft', 'Draft'),
('assigned', 'Assigned'),
('done', 'Done'),
- ('cancel', 'Cancel'),
+ ('cancel', 'Canceled'),
], 'State', select=1, readonly=True)
company = fields.Many2One('company.company', 'Company', required=True,
states={
@@ -98,7 +98,7 @@ class Move(ModelSQL, ModelView):
'set_state_assigned': 'You can not set state to assigned!',
'set_state_done': 'You can not set state to done!',
'del_draft_cancel': 'You can only delete draft or cancelled moves!',
- 'service_product': 'You can not use service product for a move!',
+ 'service_product': 'You can not use service products for a move!',
})
def default_planned_date(self, cursor, user, context=None):
diff --git a/packing.py b/packing.py
index 577af77100..0fada4856d 100644
--- a/packing.py
+++ b/packing.py
@@ -63,7 +63,7 @@ class PackingIn(ModelWorkflow, ModelSQL, ModelView):
state = fields.Selection([
('draft', 'Draft'),
('done', 'Done'),
- ('cancel', 'Cancel'),
+ ('cancel', 'Canceled'),
('received', 'Received'),
], 'State', readonly=True)
@@ -322,7 +322,7 @@ class PackingInReturn(ModelWorkflow, ModelSQL, ModelView):
)
state = fields.Selection([
('draft', 'Draft'),
- ('cancel', 'Cancel'),
+ ('cancel', 'Canceled'),
('assigned', 'Assigned'),
('waiting', 'Waiting'),
('done', 'Done'),
@@ -490,7 +490,7 @@ class PackingOut(ModelWorkflow, ModelSQL, ModelView):
state = fields.Selection([
('draft', 'Draft'),
('done', 'Done'),
- ('cancel', 'Cancel'),
+ ('cancel', 'Canceled'),
('assigned', 'Assigned'),
('packed', 'Packed'),
('waiting', 'Waiting'),
@@ -878,7 +878,7 @@ class PackingOutReturn(ModelWorkflow, ModelSQL, ModelView):
state = fields.Selection([
('draft', 'Draft'),
('done', 'Done'),
- ('cancel', 'Cancel'),
+ ('cancel', 'Canceled'),
('received', 'Received'),
], 'State', readonly=True)
@@ -1211,7 +1211,7 @@ class PackingInternal(ModelWorkflow, ModelSQL, ModelView):
)
state = fields.Selection([
('draft', 'Draft'),
- ('cancel', 'Cancel'),
+ ('cancel', 'Canceled'),
('assigned', 'Assigned'),
('waiting', 'Waiting'),
('done', 'Done'),
diff --git a/packing.xml b/packing.xml
index be94de0075..0f1f8409b7 100644
--- a/packing.xml
+++ b/packing.xml
@@ -828,7 +828,7 @@ this repository contains the full copyright notices and license terms. -->
True
- Cancel
+ Canceled
function
set_state_cancel()
@@ -897,7 +897,7 @@ this repository contains the full copyright notices and license terms. -->
True
- Cancel
+ Canceled
function
set_state_cancel()
@@ -1046,7 +1046,7 @@ this repository contains the full copyright notices and license terms. -->
True
- Cancel
+ Canceled
function
set_state_cancel()
@@ -1157,7 +1157,7 @@ this repository contains the full copyright notices and license terms. -->
True
- Cancel
+ Canceled
function
set_state_cancel()
@@ -1225,7 +1225,7 @@ this repository contains the full copyright notices and license terms. -->
True
- Cancel
+ Canceled
function
set_state_cancel()