[MERGE] purchase + [FIX] misc sale order without delivery orders

bzr revid: fp@openerp.com-20120916150517-16vr5lp419b0kpid

6 files changed, 7 insertions, 3 deletions

diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index e1a29a6edfb..5ca9f26b96b 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -5,6 +5,7 @@
         <field name="name">Invoicing &amp; Payments</field>
         <field name="category_id" ref="base.module_category_accounting_and_finance"/>
         <field name="users" eval="[(4, ref('base.user_root'))]"/>
+        <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
     </record>
     <record id="group_account_user" model="res.groups">
         <field name="name">Accountant</field>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 5d6f6c34b3b..53f27245e7e 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -183,7 +183,7 @@
                     <button name="action_cancel" states="except_picking,except_invoice" string="Cancel" type="object" />
                     <button name="picking_ok" states="except_picking" string="Manually Corrected"/>
                     <button name="invoice_ok" states="except_invoice" string="Manually Corrected"/>
-                    <button name="purchase_approve" states="confirmed" string="Approve Order" class="oe_highlight"/>
+                    <button name="purchase_approve" states="confirmed" string="Approve Order" class="oe_highlight" groups="purchase.group_purchase_manager"/>
                     <button name="view_invoice" string="Receive Invoice" type="object" attrs="{'invisible': ['|', ('invoice_method','=','picking'), '|', ('state','!=', 'approved'), ('invoiced','=',True) ]}" class="oe_highlight"/>
                     <button name="view_picking" string="Receive Products" type="object" attrs="{'invisible': ['|', ('shipped','=',True), ('state','!=', 'approved')]}" class="oe_highlight"/>
                     <button name="action_cancel_draft" states="cancel,sent,confirmed" string="Set to Draft" type="object" />
@@ -241,7 +241,7 @@
                             <label for="notes"/>
                             <field name="notes"/>
                         </page>
-                        <page string="Delivery &amp; Invoicing">
+                        <page string="Reception &amp; Invoicing">
                             <group>
                                 <group>
                                     <field name="dest_address_id" string="Customer Address" on_change="onchange_dest_address_id(dest_address_id)"/>
diff --git a/addons/purchase/security/purchase_security.xml b/addons/purchase/security/purchase_security.xml
index 26a4aa14f1c..637a1722c7e 100644
--- a/addons/purchase/security/purchase_security.xml
+++ b/addons/purchase/security/purchase_security.xml
@@ -4,6 +4,7 @@
 
     <record id="group_purchase_user" model="res.groups">
         <field name="name">User</field>
+        <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
         <field name="category_id" ref="base.module_category_purchase_management"/>
     </record>
 
diff --git a/addons/sale/res_partner_view.xml b/addons/sale/res_partner_view.xml
index e524fe4415d..cd0536bd05b 100644
--- a/addons/sale/res_partner_view.xml
+++ b/addons/sale/res_partner_view.xml
@@ -50,6 +50,7 @@
                 <xpath expr="//div[@name='buttons']" position="inside">
                     <button name="%(sale.act_res_partner_2_sale_order)d" type="action"
                         string="Quotations and Sales"
+                        attrs="{'invisible': [('customer', '=', False)]}"
                         groups="base.group_sale_salesman"/>
                 </xpath>
             </field>
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index a4e9abb881e..c288d4fc67e 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -584,7 +584,7 @@ class sale_order(osv.osv):
 
     def test_no_product(self, cr, uid, order, context):
         for line in order.order_line:
-            if line.product_id:
+            if line.product_id and (line.product_id.type<>'service'):
                 return False
         return True
 
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index 5e1f4e25b52..cb3da35dd81 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -6,6 +6,7 @@
         <field name="name">See Own Leads</field>
         <field name="category_id" ref="base.module_category_sales_management"/>
         <field name="comment">the user will have access to his own data in the sales application.</field>
+        <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
     </record>
 
     <record id="base.group_sale_salesman_all_leads" model="res.groups">