improve

bzr revid: fp@tinyerp.com-20100621215054-aog8glnkl8corg6o

diff --git a/addons/multi_company/__openerp__.py b/addons/multi_company/__openerp__.py
index e42bec3..8e9105a 100644 (file)
--- a/addons/multi_company/__openerp__.py
+++ b/addons/multi_company/__openerp__.py
@@ -37,6 +37,7 @@
     ],
     'init_xml': [],
     'update_xml': [
+        'res_company_view.xml'
         #'security/ir.model.access.csv',
     ],
     'demo_xml': [

diff --git a/addons/multi_company/res_company_view.xml b/addons/multi_company/res_company_view.xml
new file mode 100644 (file)
index 0000000..31cb145
--- /dev/null
+++ b/addons/multi_company/res_company_view.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+
+        <record id="view_inventory_tree" model="ir.ui.view">
+            <field name="name">multi_company.default.tree</field>
+            <field name="model">multi_company.default</field>
+            <field name="type">tree</field>
+            <field name="priority" eval="8"/>
+            <field name="arch" type="xml">
+                <tree string="Multi Company">
+                    <field name="company_id" groups="base.group_multi_company"/>
+                    <field name="object_id"/>
+                    <field name="field_id"/>
+                    <field name="expression" />
+                    <field name="sequence"/>
+                    <field name="company_dest_id"/>
+                    <field name="name"/>
+                </tree>
+            </field>
+        </record>
+        <record id="view_inventory_form" model="ir.ui.view">
+            <field name="name">multi_company.default.form</field>
+            <field name="model">multi_company.default</field>
+            <field name="type">form</field>
+            <field name="priority" eval="8"/>
+            <field name="arch" type="xml">
+                <form string="Multi Company">
+                    <group col="6" colspan="4">
+                        <field name="name" colspan="6"/>
+                        <separator string="Matching" colspan="6"/>
+                        <field name="company_id" groups="base.group_multi_company"/>
+                        <field name="object_id"/>
+                        <field name="field_id" domain="[('model_id','=',object_id)]"/>
+                        <separator string="Condition" colspan="6"/>
+                        <field name="expression" colspan="4"/>
+                        <field name="sequence"/>
+                        <separator string="Returning" colspan="6"/>
+                        <field name="company_dest_id"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="view_inventory_search" model="ir.ui.view">
+            <field name="name">multi_company.default.search</field>
+            <field name="model">multi_company.default</field>
+            <field name="type">search</field>
+            <field name="priority" eval="8"/>
+            <field name="arch" type="xml">
+                <search string="Multi Company">
+                    <field name="name" select="1"/>
+                    <field name="company_id" select="1" widget="selection"/>
+                    <field name="company_dest_id" select="1" widget="selection"/>
+                    <field name="object_id" select="1"/>
+                </search>
+            </field>
+        </record>
+
+        <record id="action_inventory_form" model="ir.actions.act_window">
+            <field name="name">Default Company per Object</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">multi_company.default</field>
+            <field name="view_type">form</field>
+            <field name="search_view_id" ref="view_inventory_search"/>
+        </record>
+
+        <menuitem id="menu_custom_multicompany"
+            name="Multi-Companies"
+            parent="base.menu_custom"
+            sequence="50"/>
+
+        <menuitem id="menu_action_inventory_form" 
+            action="action_inventory_form"
+            parent="menu_custom_multicompany"/>
+    </data>
+</openerp>
+

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 63f85be..6dce568 100644 (file)
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -362,7 +362,6 @@
                     <field name="product_uom" string="UoM"/>
                     <field name="salesman_id"/>
                     <field name="price_subtotal"/>
-                    <field name="th_weight"/>
                     <field name="state"/>
                 </tree>
             </field>
@@ -439,7 +438,6 @@
                     <field name="product_id"/>
                     <field name="salesman_id">
                         <filter icon="terp-dolar" domain="[('salesman_id','=',uid)]" help="My Sale Order Lines"/>
-                        <filter icon="terp-personal+" domain="[('salesman_id','child_of',[uid])]" help="My Departments Sale Order Lines"/>
                     </field>
                     <newline/>
                     <group expand="context.get('report',False)" string="Group By..." colspan="9" col="8">
@@ -473,7 +471,9 @@
                     <field name="order_id"/>
                     <field name="order_partner_id"/>
                     <field name="product_id"/>
-                    <field name="state"/>
+                    <field name="salesman_id">
+                        <filter icon="terp-dolar" domain="[('salesman_id','=',uid)]" help="My Sale Order Lines"/>
+                    </field>
                     <newline />
                     <group expand="0" string="Group By..." colspan="9" col="8">
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>