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

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

diff --cc addons/account/security/account_security.xml
index e1a29a6,e1a29a6..5ca9f26
--- 1/addons/account/security/account_security.xml
--- 2/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@@ -5,6 -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 --cc addons/purchase/security/purchase_security.xml
index 26a4aa1,26a4aa1..637a172
--- 1/addons/purchase/security/purchase_security.xml
--- 2/addons/purchase/security/purchase_security.xml
+++ b/addons/purchase/security/purchase_security.xml
@@@ -4,6 -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 --cc addons/sale/res_partner_view.xml
Simple merge

diff --cc addons/sale/sale.py
index a4e9abb,553b899..c288d4f
--- 1/addons/sale/sale.py
--- 2/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@@ -582,12 -582,6 +582,12 @@@ class sale_order(osv.osv)
          result.update(view_id = res and res[1] or False)
          return result
  
 +    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
 +
      def action_invoice_create(self, cr, uid, ids, grouped=False, states=['confirmed', 'done', 'exception'], date_inv = False, context=None):
          res = False
          invoices = {}

diff --cc addons/sale/security/sale_security.xml
index 5e1f4e2,5e1f4e2..cb3da35
--- 1/addons/sale/security/sale_security.xml
--- 2/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@@ -6,6 -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">