From e1e9f4510021ccda5ae45dddac9a7bbbca657018 Mon Sep 17 00:00:00 2001 From: fabian Date: Tue, 24 Nov 2009 18:15:16 +0100 Subject: [PATCH] [IMP] Added company_id fields for multicompany management [IMP] Improved demo datas for mutlicompany bzr revid: fabian@fabian-openerp-20091124171516-c7dwf40yfi9wm2mu --- addons/account/account_move_line.py | 2 +- addons/crm/crm.py | 1 + addons/multi_company/multi_company_demo.xml | 382 ++++++++++++++++++-- addons/sale/sale.py | 1 + 4 files changed, 363 insertions(+), 23 deletions(-) diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index cfbf14c68a2..a798a57f94e 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -387,7 +387,7 @@ class account_move_line(osv.osv): 'analytic_account_id' : fields.many2one('account.analytic.account', 'Analytic Account'), #TODO: remove this 'amount_taxed':fields.float("Taxed Amount",digits=(16,int(tools.config['price_accuracy']))), - 'company_id': fields.many2one('res.company', 'Company', required=True,select=2), + 'company_id': fields.related('move_id','company_id',type='many2one',object='res.company',string='Company') } diff --git a/addons/crm/crm.py b/addons/crm/crm.py index 603b17a1aa6..8d37bb84a20 100755 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -517,6 +517,7 @@ class crm_case(osv.osv): 'date_action_last': fields.datetime('Last Action', readonly=1), 'date_action_next': fields.datetime('Next Action', readonly=1), + 'company_id': fields.many2one('res.company','Company'), } def _get_default_partner_address(self, cr, uid, context): if not context.get('portal',False): diff --git a/addons/multi_company/multi_company_demo.xml b/addons/multi_company/multi_company_demo.xml index 1e34162d324..7db9d77270a 100644 --- a/addons/multi_company/multi_company_demo.xml +++ b/addons/multi_company/multi_company_demo.xml @@ -1,34 +1,372 @@ - - Tiny Editor + + + OpenERP Corp. + + OpenERP Editor + + + OpenERP US + + + OpenERP IN + + + OpenERP BE + + + Odoo + + + + + OpenERP Corp. + + + + + OpenERP Editor + + + + + OpenERP US + + + + + OpenERP BE + OpenERP IN + + + + OpenERP IN + + + + + Odoo + + + + + + editor_demo + OpenERP Editor + editor_demo + + + + sales_demo_us + OpenERP Salesman US + sales_demo_us + + + + sales_demo_be + OpenERP Salesman BE + sales_demo_be + + + + sales_demo_in + OpenERP Salesman IN + sales_demo_in + + + + odoo_demo + Odoo + odoo_demo + + + + + - - Tiny Editor - - - Free Business Solutions - Web: http://tiny.be - Tel: (+32).81.81.37.00 - Bank: CPH 126-2013269-07 - IBAN: BE74 1262 0132 6907 - SWIFT: GKCCBEBB - VAT: BE0477.472.701 - + + - - - Tiny Integrator + + - - - Tiny Integrator - - - Free Business Solutions - Web: http://tiny.be - Tel: (+32).81.81.37.00 - Bank: CPH 126-2013269-07 - IBAN: BE74 1262 0132 6907 - SWIFT: GKCCBEBB - VAT: BE0477.472.701 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Odoo Offers + + + ODOO + produce + 35.0 + 10.0 + + + Odoo Offer + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/addons/sale/sale.py b/addons/sale/sale.py index a7ec20bb3cb..5b163a3fb45 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -254,6 +254,7 @@ class sale_order(osv.osv): 'invoice_quantity': fields.selection([('order', 'Ordered Quantities'), ('procurement', 'Shipped Quantities')], 'Invoice on', help="The sale order will automatically create the invoice proposition (draft invoice). Ordered and delivered quantities may not be the same. You have to choose if you invoice based on ordered or shipped quantities. If the product is a service, shipped quantities means hours spent on the associated tasks.", required=True), 'payment_term': fields.many2one('account.payment.term', 'Payment Term'), 'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position'), + 'company_id': fields.many2one('res.company','Company'), } _defaults = { 'picking_policy': lambda *a: 'direct',