fix

bzr revid: fp@tinyerp.com-20100611142631-8njuqup1ugudbb3w

6 files changed, 16 insertions, 21 deletions

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index b18e3e2f609..2fdb2c5fd07 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1519,7 +1519,7 @@
             res_model="account.addtmpl.wizard"
             context="{'tmpl_ids': active_id}"
             src_model="account.account.template"
-	    view_type="form" view_mode="form"/>
+            view_type="form" view_mode="form"/>
 
         <!-- Account Templates -->
         <menuitem
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index e1e43420d6e..1512bd402b2 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -118,7 +118,6 @@
                             <field name="acc_number"/>
                         </tree>
                     </field>
-                    <field name="invoice_ids" colspan="4" nolabel="1" context="{'group_by':'product_id'}"/>
                 </page>
                 </notebook>
             </field>
@@ -126,21 +125,14 @@
         
         <!--  Partners info tab view-->
 
-        <record id="view_account_partner_info_form" model="ir.ui.view">
-            <field name="name">res.partner.account.info.inherit</field>
-            <field name="model">res.partner</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_partner_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//notebook[last()]" position="after">
-	                <notebook colspan="4">
-	                    <page string="Project">
-	                        <field name="contract_ids" colspan="4" nolabel="1" />
-	                    </page>
-	                </notebook>
-                </xpath>
-            </field>
-        </record>
-        
+        <act_window 
+            id="action_analytic_open"
+            name="Analytic Accounts"
+            res_model="account.analytic.account"
+            domain="[('partner_id','=',active_id)]"
+            src_model="res.partner"
+            view_type="form"
+            view_mode="tree,form,graph,calendar"/>
+
     </data>
 </openerp>
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index b1fa9a510c9..aa37b4472ad 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -3,7 +3,7 @@
     <!--<menuitem name="Document Management" icon="terp-stock" id="menu_document"/>
     <menuitem name="Document Configuration" id="menu_document_configuration" parent="menu_document"/>-->
 
-    <menuitem name="Knowledge Management" icon="terp-stock" id="base.menu_document" sequence="4" groups="base.group_user"/>
+    <menuitem name="Knowledge" icon="terp-stock" id="base.menu_document" sequence="4" groups="base.group_user"/>
     <menuitem name="Configuration" id="base.menu_document_configuration" parent="base.menu_document" sequence="50"/>
     <menuitem name="Document Management" id="menu_document_management_configuration" parent="base.menu_document_configuration" sequence="1"/>
 
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 08507f9dfac..87f4c3031bb 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -633,7 +633,7 @@ class purchase_order_line(osv.osv):
         prod= self.pool.get('product.product').browse(cr, uid,product)
         lang=False
         if partner_id:
-            lang=self.pool.get('res.partner').read(cr, uid, partner_id)['lang']
+            lang=self.pool.get('res.partner').read(cr, uid, partner_id, ['lang'])['lang']
         context={'lang':lang}
         context['partner_id'] = partner_id
 
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 502c33bd5f9..d5050c69b18 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -3,7 +3,7 @@
     <data>
         <!--<menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Purchase Management"
             groups="group_purchase_user"/>-->
-       <menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Procurement Management"
+       <menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Purchases"
             groups="group_purchase_user" sequence="7"/>
        <menuitem id="menu_procurement_management" name="Purchase Management"
             parent="base.menu_purchase_root" sequence="1"/>
diff --git a/addons/purchase/security/ir.model.access.csv b/addons/purchase/security/ir.model.access.csv
index 9b0f8bc184e..f5ac86559cc 100644
--- a/addons/purchase/security/ir.model.access.csv
+++ b/addons/purchase/security/ir.model.access.csv
@@ -17,3 +17,6 @@
 "access_stock_picking_purchase_user_manager","stock.picking","stock.model_stock_picking","purchase.group_purchase_manager",1,1,1,1
 "access_stock_move_purchase_user_manager","stock.move","stock.model_stock_move","purchase.group_purchase_manager",1,1,1,1
 "access_account_tax_purchase_user_manager","account.tax","account.model_account_tax","purchase.group_purchase_manager",1,0,0,0
+"access_product_product_purchase_user","product.product.purchase.user","product.model_product_product","group_purchase_user",1,0,0,0
+"access_account_invoice_purchase","account_invoice purchase","account.model_account_invoice","group_purchase_user",1,1,1,1
+"access_account_invoice_line_purchase","account_invoice.line purchase","account.model_account_invoice_line","group_purchase_user",1,1,1,1