From b477654cb58ae96e8e9b45abc5438a2ebfd1d4a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 28 Mar 2016 10:33:48 +0200 Subject: [PATCH] Naming convention for code, number and reference issue1479 review17171002 --- CHANGELOG | 1 + configuration.py | 2 +- purchase.odt | Bin 15443 -> 11875 bytes purchase.py | 33 ++++++++++++++++++--------------- view/purchase_form.xml | 4 ++-- view/purchase_tree.xml | 2 +- 6 files changed, 23 insertions(+), 19 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 71affdc012..ebb64252c6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,4 @@ +* Rename Purchase reference into number and supplier reference into reference * Add return location on warehouse * Add Python3 support * Replace Delivery Time by Lead Time on Product Template diff --git a/configuration.py b/configuration.py index b1d7c6dd41..733f1dc455 100644 --- a/configuration.py +++ b/configuration.py @@ -10,7 +10,7 @@ class Configuration(ModelSingleton, ModelSQL, ModelView): 'Purchase Configuration' __name__ = 'purchase.configuration' purchase_sequence = fields.Property(fields.Many2One('ir.sequence', - 'Purchase Reference Sequence', domain=[ + 'Purchase Sequence', domain=[ ('company', 'in', [Eval('context', {}).get('company', -1), None]), ('code', '=', 'purchase.purchase'), diff --git a/purchase.odt b/purchase.odt index fbbbf6fb07e8b8586bf3bc28bed7a66524f8ec5d..554035870fd985df015be4faae4ef4a349347412 100644 GIT binary patch delta 9990 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 literal 15443 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 z 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 diff --git a/purchase.py b/purchase.py index 40d3896f18..b00441c1c6 100644 --- a/purchase.py +++ b/purchase.py @@ -38,7 +38,7 @@ _ZERO = Decimal(0) class Purchase(Workflow, ModelSQL, ModelView, TaxableMixin): 'Purchase' __name__ = 'purchase.purchase' - _rec_name = 'reference' + _rec_name = 'number' company = fields.Many2One('company.company', 'Company', required=True, states={ 'readonly': (Eval('state') != 'draft') | Eval('lines', [0]), @@ -48,8 +48,8 @@ class Purchase(Workflow, ModelSQL, ModelView, TaxableMixin): Eval('context', {}).get('company', -1)), ], depends=['state'], select=True) - reference = fields.Char('Reference', size=None, readonly=True, select=True) - supplier_reference = fields.Char('Supplier Reference', select=True) + number = fields.Char('Number', size=None, readonly=True, select=True) + reference = fields.Char('Reference', select=True) description = fields.Char('Description', size=None, states=_STATES, depends=_DEPENDS) state = fields.Selection([ @@ -256,6 +256,11 @@ class Purchase(Workflow, ModelSQL, ModelView, TaxableMixin): table = TableHandler(cls, module_name) table.column_rename('packing_state', 'shipment_state') + # Migration from 3.8: + if table.column_exist('supplier_reference'): + table.column_rename('reference', 'number') + table.column_rename('supplier_reference', 'reference') + super(Purchase, cls).__register__(module_name) # Migration from 1.2: rename packing to shipment in @@ -567,20 +572,20 @@ class Purchase(Workflow, ModelSQL, ModelView, TaxableMixin): }) def get_rec_name(self, name): - return (self.reference or str(self.id) + return (self.number or str(self.id) + ' - ' + self.party.name) @classmethod def search_rec_name(cls, name, clause): _, operator, value = clause - if operator[1].startswith('!') or operator[1].startswith('not '): + if operator.startswith('!') or operator.startswith('not '): bool_op = 'AND' else: bool_op = 'OR' names = value.split(' - ', 1) domain = [bool_op, + ('number', operator, names[0]), ('reference', operator, names[0]), - ('supplier_reference', operator, names[0]), ] if len(names) != 1 and names[1]: domain = [bool_op, domain, ('party', operator, names[1])] @@ -596,7 +601,7 @@ class Purchase(Workflow, ModelSQL, ModelView, TaxableMixin): default = {} default = default.copy() default['state'] = 'draft' - default['reference'] = None + default['number'] = None default['invoice_state'] = 'none' default['invoices_ignored'] = None default['moves'] = None @@ -612,9 +617,9 @@ class Purchase(Workflow, ModelSQL, ModelView, TaxableMixin): self.raise_user_error('warehouse_required', (self.rec_name,)) @classmethod - def set_reference(cls, purchases): + def set_number(cls, purchases): ''' - Fill the reference field with the purchase sequence + Fill the number field with the purchase sequence ''' pool = Pool() Sequence = pool.get('ir.sequence') @@ -622,12 +627,10 @@ class Purchase(Workflow, ModelSQL, ModelView, TaxableMixin): config = Config(1) for purchase in purchases: - if purchase.reference: + if purchase.number: continue - reference = Sequence.get_id(config.purchase_sequence.id) - cls.write([purchase], { - 'reference': reference, - }) + purchase.number = Sequence.get_id(config.purchase_sequence.id) + cls.save(purchases) @classmethod def set_purchase_date(cls, purchases): @@ -778,7 +781,7 @@ class Purchase(Workflow, ModelSQL, ModelView, TaxableMixin): def quote(cls, purchases): for purchase in purchases: purchase.check_for_quotation() - cls.set_reference(purchases) + cls.set_number(purchases) @classmethod @ModelView.button diff --git a/view/purchase_form.xml b/view/purchase_form.xml index ff08382839..9184518c15 100644 --- a/view/purchase_form.xml +++ b/view/purchase_form.xml @@ -6,8 +6,8 @@ this repository contains the full copyright notices and license terms. -->