changeset f69ed5e42706 in modules/sale:default
details: https://hg.tryton.org/modules/sale?cmd=changeset;node=f69ed5e42706
description:
Rename sale state from cancel to cancelled
issue8927
review323391002
diffstat:
CHANGELOG | 1 +
party.py | 2 +-
party.xml | 2 +-
sale.py | 46 ++++++++++++++++++++++++++++------------------
4 files changed, 31 insertions(+), 20 deletions(-)
diffs (189 lines):
diff -r 34484e7618fb -r f69ed5e42706 CHANGELOG
--- a/CHANGELOG Mon Jun 01 10:08:02 2020 +0100
+++ b/CHANGELOG Sat Jun 06 10:04:28 2020 +0100
@@ -1,3 +1,4 @@
+* Rename sale state from cancel to cancelled
* Add window tab for exception states
Version 5.6.0 - 2020-05-04
diff -r 34484e7618fb -r f69ed5e42706 party.py
--- a/party.py Mon Jun 01 10:08:02 2020 +0100
+++ b/party.py Sat Jun 06 10:04:28 2020 +0100
@@ -32,7 +32,7 @@
('shipment_party', '=', party.id),
],
('company', '=', company.id),
- ('state', 'not in', ['done', 'cancel']),
+ ('state', 'not in', ['done', 'cancelled']),
])
if sales:
raise EraseError(
diff -r 34484e7618fb -r f69ed5e42706 party.xml
--- a/party.xml Mon Jun 01 10:08:02 2020 +0100
+++ b/party.xml Sat Jun 06 10:04:28 2020 +0100
@@ -9,7 +9,7 @@
<field name="domain"
eval="[If(Eval('active_ids', []) == [Eval('active_id')],
('party', '=', Eval('active_id')), ('party', 'in', Eval('active_ids')))]"
pyson="1"/>
- <field name="search_value" eval="[('state', 'not in', ['done',
'cancel'])]" pyson="1"/>
+ <field name="search_value" eval="[('state', 'not in', ['done',
'cancelled'])]" pyson="1"/>
</record>
<record model="ir.action.keyword"
id="act_open_sale_keyword1">
diff -r 34484e7618fb -r f69ed5e42706 sale.py
--- a/sale.py Mon Jun 01 10:08:02 2020 +0100
+++ b/sale.py Sat Jun 06 10:04:28 2020 +0100
@@ -83,7 +83,8 @@
sale_date = fields.Date('Sale Date',
states={
'readonly': ~Eval('state').in_(['draft', 'quotation']),
- 'required': ~Eval('state').in_(['draft', 'quotation', 'cancel']),
+ 'required': ~Eval('state').in_(
+ ['draft', 'quotation', 'cancelled']),
},
depends=['state'])
payment_term = fields.Many2One('account.invoice.payment_term',
@@ -122,7 +123,8 @@
],
states={
'readonly': Eval('state') != 'draft',
- 'required': ~Eval('state').in_(['draft', 'quotation', 'cancel']),
+ 'required': ~Eval('state').in_(
+ ['draft', 'quotation', 'cancelled']),
}, depends=['party', 'invoice_party', 'state'])
shipment_party = fields.Many2One('party.party', 'Shipment Party',
states={
@@ -139,7 +141,8 @@
],
states={
'readonly': Eval('state') != 'draft',
- 'required': ~Eval('state').in_(['draft', 'quotation', 'cancel']),
+ 'required': ~Eval('state').in_(
+ ['draft', 'quotation', 'cancelled']),
},
depends=['party', 'shipment_party', 'state'])
warehouse = fields.Many2One('stock.location', 'Warehouse',
@@ -236,17 +239,17 @@
quoted_by = employee_field(
"Quoted By",
- states=['quotation', 'confirmed', 'processing', 'done', 'cancel'])
+ states=['quotation', 'confirmed', 'processing', 'done', 'cancelled'])
confirmed_by = employee_field(
"Confirmed By",
- states=['confirmed', 'processing', 'done', 'cancel'])
+ states=['confirmed', 'processing', 'done', 'cancelled'])
state = fields.Selection([
('draft', "Draft"),
('quotation', "Quotation"),
('confirmed', "Confirmed"),
('processing', "Processing"),
('done', "Done"),
- ('cancel', "Canceled"),
+ ('cancelled', "Cancelled"),
], "State", readonly=True, required=True)
@classmethod
@@ -264,10 +267,10 @@
('processing', 'processing'),
('processing', 'done'),
('done', 'processing'),
- ('draft', 'cancel'),
- ('quotation', 'cancel'),
+ ('draft', 'cancelled'),
+ ('quotation', 'cancelled'),
('quotation', 'draft'),
- ('cancel', 'draft'),
+ ('cancelled', 'draft'),
))
cls._buttons.update({
'cancel': {
@@ -276,8 +279,8 @@
},
'draft': {
'invisible': ~Eval('state').in_(
- ['cancel', 'quotation', 'confirmed']),
- 'icon': If(Eval('state') == 'cancel',
+ ['cancelled', 'quotation', 'confirmed']),
+ 'icon': If(Eval('state') == 'cancelled',
'tryton-undo',
'tryton-back'),
'depends': ['state'],
@@ -300,12 +303,12 @@
},
'handle_invoice_exception': {
'invisible': ((Eval('invoice_state') != 'exception')
- | (Eval('state') == 'cancel')),
+ | (Eval('state') == 'cancelled')),
'depends': ['state', 'invoice_state'],
},
'handle_shipment_exception': {
'invisible': ((Eval('shipment_state') != 'exception')
- | (Eval('state') == 'cancel')),
+ | (Eval('state') == 'cancelled')),
'depends': ['state', 'shipment_state'],
},
'modify_header': {
@@ -315,11 +318,13 @@
},
})
# The states where amounts are cached
- cls._states_cached = ['confirmed', 'processing', 'done', 'cancel']
+ cls._states_cached = ['confirmed', 'processing', 'done', 'cancelled']
@classmethod
def __register__(cls, module_name):
+ cursor = Transaction().connection.cursor()
table = cls.__table_handler__(module_name)
+ sql_table = cls.__table__()
# Migration from 3.8: rename reference into number
if (table.column_exist('reference')
@@ -335,6 +340,11 @@
# Add index on create_date
table.index_action('create_date', action='add')
+ # Migration from 5.6: rename state cancel to cancelled
+ cursor.execute(*sql_table.update(
+ [sql_table.state], ['cancelled'],
+ where=sql_table.state == 'cancel'))
+
@classmethod
def default_payment_term(cls):
PaymentTerm = Pool().get('account.invoice.payment_term')
@@ -670,7 +680,7 @@
def view_attributes(cls):
attributes = [
('/form//field[@name="comment"]', 'spell', Eval('party_lang')),
- ('/tree', 'visual', If(Eval('state') == 'cancel', 'muted', '')),
+ ('/tree', 'visual', If(Eval('state') == 'cancelled', 'muted', '')),
('/tree/field[@name="invoice_state"]', 'visual',
If(Eval('invoice_state') == 'exception', 'danger', '')),
('/tree/field[@name="shipment_state"]', 'visual',
@@ -886,7 +896,7 @@
# Cancel before delete
cls.cancel(sales)
for sale in sales:
- if sale.state != 'cancel':
+ if sale.state != 'cancelled':
raise AccessError(
gettext('sale.msg_sale_delete_cancel',
sale=sale.rec_name))
@@ -894,7 +904,7 @@
@classmethod
@ModelView.button
- @Workflow.transition('cancel')
+ @Workflow.transition('cancelled')
def cancel(cls, sales):
cls.store_cache(sales)
@@ -1639,7 +1649,7 @@
@classmethod
def delete(cls, lines):
for line in lines:
- if line.sale_state not in {'cancel', 'draft'}:
+ if line.sale_state not in {'cancelled', 'draft'}:
raise AccessError(
gettext('sale.msg_sale_line_delete_cancel_draft',
line=line.rec_name,
