From c604b5fa7fb898f9a32d57b305209ef5289fa50c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 22 Oct 2008 20:08:25 +0200 Subject: [PATCH] Rename relationship into party --- __tryton__.py | 5 +++-- invoice.odt | Bin 9679 -> 9624 bytes invoice.py | 18 +++++++++--------- invoice.xml | 8 ++++---- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/__tryton__.py b/__tryton__.py index 1f729ff876..baafeb7eb5 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': 'Account Invoice', 'version': '0.1', @@ -11,7 +12,7 @@ 'ir', 'account', 'company', - 'relationship', + 'party', 'product', 'res', 'workflow', diff --git a/invoice.odt b/invoice.odt index 3c2927389391b750424fe405a19f01703dece4ff..fd89f7d45497da6591d971343e71e80878a1a88c 100644 GIT binary patch delta 4616 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 G7xEuRhGu~P diff --git a/invoice.py b/invoice.py index 34f769c6b6..b3c571fcd4 100644 --- a/invoice.py +++ b/invoice.py @@ -252,12 +252,12 @@ class Invoice(OSV): ], 'State', readonly=True) invoice_date = fields.Date('Invoice Date', 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', 'type', 'company']) - contact_address = fields.Many2One('relationship.address', 'Contact Address', + contact_address = fields.Many2One('party.address', 'Contact Address', required=True, states=_STATES, domain="[('party', '=', party)]") - invoice_address = fields.Many2One('relationship.address', 'Invoice Address', + invoice_address = fields.Many2One('party.address', 'Invoice Address', required=True, states=_STATES, domain="[('party', '=', party)]") currency = fields.Many2One('currency.currency', 'Currency', required=True, states={ @@ -407,8 +407,8 @@ class Invoice(OSV): return res 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') account_obj = self.pool.get('account.account') payment_term_obj = self.pool.get('account.invoice.payment_term') company_obj = self.pool.get('company.company') @@ -696,7 +696,7 @@ class Invoice(OSV): return True def get_tax_context(self, cursor, user, invoice, context=None): - party_obj = self.pool.get('relationship.party') + party_obj = self.pool.get('party.party') res = {} if isinstance(invoice, dict): if invoice.get('party'): @@ -1407,7 +1407,7 @@ class InvoiceLine(OSV): def on_change_product(self, cursor, user, ids, vals, context=None): product_obj = self.pool.get('product.product') - party_obj = self.pool.get('relationship.party') + party_obj = self.pool.get('party.party') account_obj = self.pool.get('account.account') uom_obj = self.pool.get('product.uom') company_obj = self.pool.get('company.company') @@ -1922,14 +1922,14 @@ InvoiceReport() class Address(OSV): - _name = 'relationship.address' + _name = 'party.address' invoice = fields.Boolean('Invoice') Address() class Party(OSV): - _name = 'relationship.party' + _name = 'party.party' payment_term = fields.Property(type='many2one', relation='account.invoice.payment_term', string='Invoice Payment Term', group_name='Accounting Properties', diff --git a/invoice.xml b/invoice.xml index 51f3871bb3..a15983e34d 100644 --- a/invoice.xml +++ b/invoice.xml @@ -646,8 +646,8 @@ this repository contains the full copyright notices and license terms. --> - relationship.address - + party.address + @@ -660,8 +660,8 @@ this repository contains the full copyright notices and license terms. --> - relationship.address - + party.address +