From 431ca5b03ebfb9fce93e06ec8a5468c49ceaf00b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 22 Oct 2008 20:13:23 +0200 Subject: [PATCH] Rename relationship into party Use party full_xxx --- __tryton__.py | 5 +++-- location.py | 4 ++-- location.xml | 7 ++++--- packing.py | 18 ++++++++++-------- packing.xml | 11 ++++++----- packing_out.odt | Bin 8873 -> 8830 bytes 6 files changed, 25 insertions(+), 20 deletions(-) diff --git a/__tryton__.py b/__tryton__.py index e18aa8ad88..c502d17ae9 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': 'Stock Management', 'version': '0.1', @@ -10,7 +11,7 @@ 'depends': [ 'ir', 'workflow', - 'relationship', + 'party', 'product', 'company', 'currency', diff --git a/location.py b/location.py index 8d12ef36d7..39218f3091 100644 --- a/location.py +++ b/location.py @@ -17,7 +17,7 @@ class Location(OSV): name = fields.Char("Name", size=None, required=True, states=STATES) code = fields.Char("Code", size=None, states=STATES, select=1) active = fields.Boolean('Active', select=1) - address = fields.Many2One("relationship.address", "Address", + address = fields.Many2One("party.address", "Address", states={ 'invisible': "type != 'warehouse'", 'readonly': "not active", @@ -131,7 +131,7 @@ Location() class Party(OSV): - _name = 'relationship.party' + _name = 'party.party' supplier_location = fields.Property(type='many2one', relation='stock.location', string='Supplier Location', group_name='Stock Properties', view_load=True, diff --git a/location.xml b/location.xml index 15fc831b46..4277f2593a 100644 --- a/location.xml +++ b/location.xml @@ -1,5 +1,6 @@ - + @@ -187,14 +188,14 @@ supplier_location customer_location diff --git a/packing.py b/packing.py index efae89bda2..59411547a9 100644 --- a/packing.py +++ b/packing.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. "Packing" from trytond.osv import fields, OSV from trytond.netsvc import LocalService @@ -22,11 +23,11 @@ class PackingIn(OSV): reference = fields.Char( "Reference", size=None, select=1, states={'readonly': "state != 'draft'",}) - supplier = fields.Many2One('relationship.party', 'Supplier', + supplier = fields.Many2One('party.party', 'Supplier', states={ 'readonly': "state != 'draft' or bool(incoming_moves)", }, on_change=['supplier'], required=True) - contact_address = fields.Many2One('relationship.address', 'Contact Address', + contact_address = fields.Many2One('party.address', 'Contact Address', states={ 'readonly': "state != 'draft'", }, domain="[('party', '=', supplier)]") @@ -86,7 +87,7 @@ class PackingIn(OSV): def on_change_supplier(self, cursor, user, ids, values, context=None): if not values.get('supplier'): return {} - party_obj = self.pool.get("relationship.party") + party_obj = self.pool.get("party.party") address_id = party_obj.address_get(cursor, user, values['supplier'], context=context) return {'contact_address': address_id} @@ -269,11 +270,11 @@ class PackingOut(OSV): states={ 'readonly': "state != 'draft'", }) - customer = fields.Many2One('relationship.party', 'Customer', required=True, + customer = fields.Many2One('party.party', 'Customer', required=True, states={ 'readonly': "state != 'draft'", }, on_change=['customer']) - delivery_address = fields.Many2One('relationship.address', + delivery_address = fields.Many2One('party.address', 'Delivery Address', required=True, states={ 'readonly': "state != 'draft'", @@ -327,7 +328,7 @@ class PackingOut(OSV): def on_change_customer(self, cursor, user, ids, values, context=None): if not values.get('customer'): return {} - party_obj = self.pool.get("relationship.party") + party_obj = self.pool.get("party.party") address_id = party_obj.address_get(cursor, user, values['customer'], type='delivery', context=context) party = party_obj.browse(cursor, user, values['customer'], context=context) @@ -751,8 +752,9 @@ class PackingInternal(OSV): PackingInternal() + class Address(OSV): - _name = 'relationship.address' + _name = 'party.address' delivery = fields.Boolean('Delivery') Address() diff --git a/packing.xml b/packing.xml index c49e7ab476..b9e8529d0d 100644 --- a/packing.xml +++ b/packing.xml @@ -1,5 +1,6 @@ - + @@ -801,8 +802,8 @@ - relationship.address - + party.address + @@ -815,8 +816,8 @@ - relationship.address - + party.address + diff --git a/packing_out.odt b/packing_out.odt index 0f1d969f9aa76857548d527c1b99b01966746a30..b774e2f680f7e20e02cf311acda7837d89b2e00f 100644 GIT binary patch delta 3744 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 delta 3898 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