From d4b78bbda2fa9001f572ab119224ad351f18958f Mon Sep 17 00:00:00 2001
From: =?utf8?q?S=C3=A9bastien=20Grignard?= <seb@amakaze.org>
Date: Thu, 2 Jan 2014 20:06:50 +0100
Subject: [PATCH] Sync

---
 security/ir.model.access.csv |  5 ++++-
 view/point_of_sale.xml       | 13 +++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/security/ir.model.access.csv b/security/ir.model.access.csv
index 5b086a9..a5467ea 100644
--- a/security/ir.model.access.csv
+++ b/security/ir.model.access.csv
@@ -10,5 +10,8 @@ access_stock_location_group_pos_user,access_stock_location group_pos_user,stock.
 access_procurement_order_group_pos_user,access_procurement_order group_pos_user,procurement.model_procurement_order,point_of_sale.group_pos_user,1,0,0,0
 access_product_pricelist_version_group_pos_user,access_product_pricelist_version group_pos_user,product.model_product_pricelist_version,point_of_sale.group_pos_user,1,0,0,0
 access_product_price_type,access_product_price_type group_pos_user,product.model_product_price_type,point_of_sale.group_pos_user,1,0,0,0
-access_bikecoop_partner_theme_group_user,access_bikecoop_partner_theme group_user,model_bikecoop_partner_theme,base.group_user,1,0,0,1
+access_bikecoop_partner_theme_group_user,access_bikecoop_partner_theme group_user,model_bikecoop_partner_theme,base.group_user,0,0,1,1
+access_bikecoop_partner_theme_group_pos_user,access_bikecoop_partner_theme group_pos_user,model_bikecoop_partner_theme,point_of_sale.group_pos_user,1,0,0,0
 access_bikecoop_partner_theme_group_partner_manager,access_bikecoop_partner_theme group_partner_manager,model_bikecoop_partner_theme,base.group_partner_manager,1,0,1,1
+access_res_partner_group_pos_user,access_res_partner group_pos_user,model_res_partner,point_of_sale.group_pos_user,1,1,1,1
+access_membership_membership_line_group_pos_user,membership.membership_line group_pos_user,membership.model_membership_membership_line,point_of_sale.group_pos_user,1,1,1,1
diff --git a/view/point_of_sale.xml b/view/point_of_sale.xml
index 25906e5..d9c11c5 100644
--- a/view/point_of_sale.xml
+++ b/view/point_of_sale.xml
@@ -6,6 +6,9 @@
             <field name="model">pos.order</field>
             <field name="inherit_id" ref="point_of_sale.view_pos_pos_form"/>
             <field name="arch" type="xml">
+                <xpath expr="//button[@name='action_invoice']" position="attributes">
+                    <attribute name="invisible">1</attribute>
+                </xpath>
                 <xpath expr="//field[@name='partner_id']" position="replace">
                     <field name="partner_id" on_change="onchange_partner_id(partner_id, context)" context="{'search_default_customer': 1, 'form_view_ref': 'bikecoop.view_bikecoop_members_form'}" attrs="{'readonly': [('state','=', 'invoiced')]}"/>
                 </xpath>
@@ -14,5 +17,15 @@
         <record id="point_of_sale.menu_pos_session_all" model="ir.ui.menu">
             <field name="groups_id" eval="[(4, ref('point_of_sale.group_pos_user'))]"/>
         </record>
+        <record id="view_pos_payment" model="ir.ui.view">
+            <field name="name">Pay Order</field>
+            <field name="model">pos.make.payment</field>
+            <field name="inherit_id" ref="point_of_sale.view_pos_payment"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='journal_id']" position="replace">
+                    <field name="journal_id" context="{ 'pos_session_id': pos_session_id }"/>
+                </xpath>
+            </field>
+        </record>
     </data>
 </openerp>
-- 
2.20.1