From f7248d27396e5e509b74e632b30cee48db187352 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 22 Oct 2008 20:12:14 +0200 Subject: [PATCH] Rename relationship into party Use party full_xxx --- __tryton__.py | 5 +++-- purchase.odt | Bin 9406 -> 9351 bytes purchase.py | 24 ++++++++++++------------ purchase.xml | 5 +++-- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/__tryton__.py b/__tryton__.py index e2f7aaf4cc..53288c3384 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -1,4 +1,5 @@ -#This file is part of Tryton. The COPYRIGHT file at the top level of this repository contains the full copyright notices and license terms. +#This file is part of Tryton. The COPYRIGHT file at the top level of +#this repository contains the full copyright notices and license terms. { 'name': 'Purchase', 'version': '0.1', @@ -9,7 +10,7 @@ 'description': 'Purchase Management', 'depends': [ 'company', - 'relationship', + 'party', 'stock', 'account', 'product', diff --git a/purchase.odt b/purchase.odt index 439abd2448fee77be5ea4f42b1620498208aa047..daed884b7373aeef3de2c3a9064a40addabf959b 100644 GIT binary patch delta 3739 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 LKb%U3=j8BzJin8s delta 3708 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 Ts4mPyvqZQqEDi~VABFq}pWCQe diff --git a/purchase.py b/purchase.py index 0e4a0daf04..1d61932ae9 100644 --- a/purchase.py +++ b/purchase.py @@ -35,14 +35,14 @@ class Purchase(OSV): purchase_date = fields.Date('Purchase Date', required=True, states=_STATES) payment_term = fields.Many2One('account.invoice.payment_term', 'Payment Term', required=True, states=_STATES) - party = fields.Many2One('relationship.party', 'Party', change_default=True, + party = fields.Many2One('party.party', 'Party', change_default=True, required=True, states=_STATES, on_change=['party', 'payment_term'], select=1) party_lang = fields.Function('get_function_fields', type='char', string='Party Language', on_change_with=['party']) - contact_address = fields.Many2One('relationship.address', 'Contact Address', + contact_address = fields.Many2One('party.address', 'Contact Address', domain="[('party', '=', party)]", states=_STATES) - invoice_address = fields.Many2One('relationship.address', 'Invoice Address', + invoice_address = fields.Many2One('party.address', 'Invoice Address', domain="[('party', '=', party)]", states=_STATES) warehouse = fields.Many2One('stock.location', 'Warehouse', domain=[('type', '=', 'warehouse')], required=True, states=_STATES) @@ -171,8 +171,8 @@ class Purchase(OSV): return 'none' def on_change_party(self, cursor, user, ids, vals, context=None): - party_obj = self.pool.get('relationship.party') - address_obj = self.pool.get('relationship.address') + party_obj = self.pool.get('party.party') + address_obj = self.pool.get('party.address') payment_term_obj = self.pool.get('account.invoice.payment_term') res = { 'invoice_address': False, @@ -230,7 +230,7 @@ class Purchase(OSV): def on_change_with_party_lang(self, cursor, user, ids, vals, context=None): - party_obj = self.pool.get('relationship.party') + party_obj = self.pool.get('party.party') if vals.get('party'): party = party_obj.browse(cursor, user, vals['party'], context=context) @@ -239,7 +239,7 @@ class Purchase(OSV): return 'en_US' def get_tax_context(self, cursor, user, purchase, context=None): - party_obj = self.pool.get('relationship.party') + party_obj = self.pool.get('party.party') res = {} if isinstance(purchase, dict): if purchase.get('party'): @@ -871,7 +871,7 @@ class PurchaseLine(OSV): return res def on_change_product(self, cursor, user, ids, vals, context=None): - party_obj = self.pool.get('relationship.party') + party_obj = self.pool.get('party.party') product_obj = self.pool.get('product.product') uom_obj = self.pool.get('product.uom') if context is None: @@ -1234,7 +1234,7 @@ class ProductSupplier(OSV): product = fields.Many2One('product.template', 'Product', required=True, ondelete='CASCADE', select=1) - party = fields.Many2One('relationship.party', 'Supplier', required=True, + party = fields.Many2One('party.party', 'Supplier', required=True, ondelete='CASCADE', select=1) name = fields.Char('Name', size=None, translate=True, select=1) code = fields.Char('Code', size=None, select=1) @@ -1382,7 +1382,7 @@ class Move(OSV): relation='purchase.purchase', string='Purchase', fnct_search='search_purchase', select=1) supplier = fields.Function('get_supplier', type='many2one', - relation='relationship.party', string='Supplier', + relation='party.party', string='Supplier', fnct_search='search_supplier', select=1) def get_purchase(self, cursor, user, ids, name, arg, context=None): @@ -1416,7 +1416,7 @@ class Move(OSV): return args2 def get_supplier(self, cursor, user, ids, name, arg, context=None): - party_obj = self.pool.get('relationship.party') + party_obj = self.pool.get('party.party') res = {} for move in self.browse(cursor, user, ids, context=context): @@ -1489,7 +1489,7 @@ class OpenSupplier(Wizard): model_data_ids = model_data_obj.search(cursor, user, [ ('fs_id', '=', 'act_party_form'), - ('module', '=', 'relationship'), + ('module', '=', 'party'), ('inherit', '=', False), ], limit=1, context=context) model_data = model_data_obj.browse(cursor, user, model_data_ids[0], diff --git a/purchase.xml b/purchase.xml index e63611397f..75cce47997 100644 --- a/purchase.xml +++ b/purchase.xml @@ -1,5 +1,6 @@ - + @@ -760,7 +761,7 @@ purchase.open_supplier