From 2e965c13c2dd2ee9b49e85aeec86193d57040252 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Wed, 20 Mar 2013 22:50:39 +0100
Subject: [PATCH] Remove _inherits

review670002
---
 company.py              |  24 ++++++++----------------
 company.xml             |  13 +++----------
 header_A4.odt           | Bin 11144 -> 14433 bytes
 tests/test_company.py   |  27 ++++++++++++++++++++-------
 view/company_form.xml   |  23 ++++++++---------------
 view/company_list.xml   |   2 +-
 view/company_tree.xml   |   3 +--
 view/employee_form.xml  |  15 ++++++---------
 view/employee_form2.xml |   9 ---------
 view/employee_tree.xml  |   2 +-
 10 files changed, 48 insertions(+), 70 deletions(-)
 delete mode 100644 view/employee_form2.xml

diff --git a/company.py b/company.py
index f43b59dd72..0a786bebc4 100644
--- a/company.py
+++ b/company.py
@@ -17,7 +17,7 @@ __metaclass__ = PoolMeta
 class Company(ModelSQL, ModelView):
     'Company'
     __name__ = 'company.company'
-    _inherits = {'party.party': 'party'}
+    _rec_name = 'party'
     party = fields.Many2One('party.party', 'Party', required=True,
             ondelete='CASCADE')
     parent = fields.Many2One('company.company', 'Parent')
@@ -36,19 +36,8 @@ class Company(ModelSQL, ModelView):
         super(Company, cls).validate(companies)
         cls.check_recursion(companies)
 
-    @classmethod
-    def copy(cls, companies, default=None):
-        Party = Pool().get('party.party')
-
-        if default is None:
-            default = {}
-        default = default.copy()
-        new_companies = []
-        for company in companies:
-            default['party'], = Party.copy([company.party])
-            new_company, = super(Company, cls).copy([company], default=default)
-            new_companies.append(new_company)
-        return new_companies
+    def get_rec_name(self, name):
+        return self.party.rec_name
 
     @classmethod
     def write(cls, companies, vals):
@@ -60,10 +49,13 @@ class Company(ModelSQL, ModelView):
 class Employee(ModelSQL, ModelView):
     'Employee'
     __name__ = 'company.employee'
-    _inherits = {'party.party': 'party'}
+    _rec_name = 'party'
     party = fields.Many2One('party.party', 'Party', required=True)
     company = fields.Many2One('company.company', 'Company', required=True)
 
+    def get_rec_name(self, name):
+        return self.party.rec_name
+
 
 class UserEmployee(ModelSQL):
     'User - Employee'
@@ -133,7 +125,7 @@ class User:
     def get_status_bar(self, name):
         status = super(User, self).get_status_bar(name)
         if self.company:
-            status += ' - %s [%s]' % (self.company.name,
+            status += ' - %s [%s]' % (self.company.rec_name,
                 self.company.currency.name)
         return status
 
diff --git a/company.xml b/company.xml
index a7cc7f9374..3c10eefb8a 100644
--- a/company.xml
+++ b/company.xml
@@ -6,7 +6,7 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.ui.view" id="company_view_form">
             <field name="model">company.company</field>
             <field name="type">form</field>
-            <field name="inherit" ref="party.party_view_form"/>
+            <field name="inherit" eval="None"/>
             <field name="name">company_form</field>
         </record>
         <record model="ir.ui.view" id="company_view_tree">
@@ -166,18 +166,11 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.ui.view" id="employee_view_form">
             <field name="model">company.employee</field>
             <field name="type">form</field>
-            <field name="inherit" ref="party.party_view_form"/>
+            <field name="inherit" eval="None"/>
             <field name="priority">10</field>
             <field name="name">employee_form</field>
         </record>
 
-        <record model="ir.ui.view" id="employee_view_form2">
-            <field name="model">company.employee</field>
-            <field name="type">form</field>
-            <field name="priority">20</field>
-            <field name="name">employee_form2</field>
-        </record>
-
         <record model="ir.ui.view" id="employee_view_tree">
             <field name="model">company.employee</field>
             <field name="type">tree</field>
@@ -195,7 +188,7 @@ this repository contains the full copyright notices and license terms. -->
         </record>
         <record model="ir.action.act_window.view" id="act_employee_form_view2">
             <field name="sequence" eval="20"/>
-            <field name="view" ref="employee_view_form2"/>
+            <field name="view" ref="employee_view_form"/>
             <field name="act_window" ref="act_employee_form"/>
         </record>
         <menuitem parent="party.menu_configuration" action="act_employee_form"
diff --git a/header_A4.odt b/header_A4.odt
index 57cd5462f56de4ffd385132b8b1729abe95a9009..e377a27cce79f3f95b5f89585a499296404257f9 100644
GIT binary patch
delta 11991
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

delta 8558
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
X`ukR5{{xgm4d&#feFaJT+xkBMLff3t

diff --git a/tests/test_company.py b/tests/test_company.py
index cfb0848a0a..face119142 100644
--- a/tests/test_company.py
+++ b/tests/test_company.py
@@ -22,6 +22,7 @@ class CompanyTestCase(unittest.TestCase):
 
     def setUp(self):
         trytond.tests.test_tryton.install_module('company')
+        self.party = POOL.get('party.party')
         self.company = POOL.get('company.company')
         self.employee = POOL.get('company.employee')
         self.currency = POOL.get('currency.currency')
@@ -49,8 +50,11 @@ class CompanyTestCase(unittest.TestCase):
                     ('code', '=', 'cu1'),
                     ], 0, 1, None)
 
-            company1, = self.company.create([{
+            party1, = self.party.create([{
                         'name': 'B2CK',
+                        }])
+            company1, = self.company.create([{
+                        'party': party1.id,
                         'currency': currency1.id,
                         }])
             self.assert_(company1)
@@ -66,11 +70,14 @@ class CompanyTestCase(unittest.TestCase):
                 ], 0, 1, None)
 
             company1, = self.company.search([
-                    ('name', '=', 'B2CK'),
+                    ('rec_name', '=', 'B2CK'),
                     ], 0, 1, None)
 
-            company2, = self.company.create([{
+            party2, = self.party.create([{
                         'name': 'B2CK Branch',
+                        }])
+            company2, = self.company.create([{
+                        'party': party2.id,
                         'parent': company1.id,
                         'currency': currency1.id,
                         }])
@@ -88,11 +95,14 @@ class CompanyTestCase(unittest.TestCase):
         with Transaction().start(DB_NAME, USER,
                 context=CONTEXT) as transaction:
             company1, = self.company.search([
-                    ('name', '=', 'B2CK'),
+                    ('rec_name', '=', 'B2CK'),
                     ], 0, 1, None)
 
-            self.employee.create([{
+            party, = self.party.create([{
                         'name': 'Employee1',
+                        }])
+            self.employee.create([{
+                        'party': party.id,
                         'company': company1.id,
                         }])
             transaction.cursor.commit()
@@ -108,11 +118,14 @@ class CompanyTestCase(unittest.TestCase):
                     ], 0, 1, None)
 
             company1, = self.company.search([
-                    ('name', '=', 'B2CK'),
+                    ('rec_name', '=', 'B2CK'),
                     ], 0, 1, None)
 
-            company2, = self.company.create([{
+            party2, = self.party.create([{
                         'name': 'B2CK Branch',
+                        }])
+            company2, = self.company.create([{
+                        'party': party2.id,
                         'parent': company1.id,
                         'currency': currency1.id,
                         }])
diff --git a/view/company_form.xml b/view/company_form.xml
index be512de07d..8d93a26559 100644
--- a/view/company_form.xml
+++ b/view/company_form.xml
@@ -1,19 +1,12 @@
 <?xml version="1.0"?>
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
-<data>
-    <xpath expr="/form" position="replace_attributes">
-        <form string="Company"/>
-    </xpath>
-    <xpath expr="/form/group[@id='checkboxes']" position="after">
-        <label name="currency"/>
-        <field name="currency"/>
-        <label name="vat_country"/>
-        <field name="vat_country"/>
-        <label name="vat_number"/>
-        <field name="vat_number"/>
-    </xpath>
-    <xpath expr="/form/notebook/page[@id='general']" position="after">
+<form string="Company">
+    <label name="party"/>
+    <field name="party"/>
+    <label name="currency"/>
+    <field name="currency"/>
+    <notebook colspan="4">
         <page string="Company" col="2" id="company">
             <label name="parent"/>
             <field name="parent"/>
@@ -25,5 +18,5 @@ this repository contains the full copyright notices and license terms. -->
             <separator name="footer"/>
             <field name="footer"/>
         </page>
-    </xpath>
-</data>
+    </notebook>
+</form>
diff --git a/view/company_list.xml b/view/company_list.xml
index 5e20a47f28..0bb5c5966c 100644
--- a/view/company_list.xml
+++ b/view/company_list.xml
@@ -2,5 +2,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. -->
 <tree string="Companies">
-    <field name="name"/>
+    <field name="party"/>
 </tree>
diff --git a/view/company_tree.xml b/view/company_tree.xml
index 0a224583ad..a1246a4f63 100644
--- a/view/company_tree.xml
+++ b/view/company_tree.xml
@@ -2,9 +2,8 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
 <tree string="Companies">
-    <field name="name"/>
+    <field name="party"/>
     <field name="currency"/>
-    <field name="vat_code"/>
     <field name="parent" tree_invisible="1"/>
     <field name="childs" tree_invisible="1"/>
 </tree>
diff --git a/view/employee_form.xml b/view/employee_form.xml
index 6c35910f99..485422cca2 100644
--- a/view/employee_form.xml
+++ b/view/employee_form.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0"?>
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
-<data>
-    <xpath expr="/form" position="replace_attributes">
-        <form string="Employee"/>
-    </xpath>
-    <xpath expr="/form/group/label[@name='active']" position="before">
-        <label name="company"/>
-        <field name="company"/>
-    </xpath>
-</data>
+<form string="Employee">
+    <label name="party"/>
+    <field name="party"/>
+    <label name="company"/>
+    <field name="company"/>
+</form>
diff --git a/view/employee_form2.xml b/view/employee_form2.xml
deleted file mode 100644
index 485422cca2..0000000000
--- a/view/employee_form2.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
-this repository contains the full copyright notices and license terms. -->
-<form string="Employee">
-    <label name="party"/>
-    <field name="party"/>
-    <label name="company"/>
-    <field name="company"/>
-</form>
diff --git a/view/employee_tree.xml b/view/employee_tree.xml
index bb055af56e..9fdac872dc 100644
--- a/view/employee_tree.xml
+++ b/view/employee_tree.xml
@@ -2,6 +2,6 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
 <tree string="Employees">
-    <field name="name"/>
+    <field name="party"/>
     <field name="company"/>
 </tree>