[Fix] Point_of_sale:Fix the name of rule group

bzr revid: sbh@tinyerp.com-20100611060215-zdkvnoqf1t2epbof

diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index 5d4df5a..0ec31cb 100644 (file)
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -193,7 +193,7 @@ class pos_order(osv.osv):
                             res[order.id]['amount_tax'])
                 else:
                     res[order.id]['amount_tax'] = reduce(lambda x, y: x+round(y['amount'], 2),
-                        tax_obj.compute(cr, uid, line.product_id.taxes_id,
+                        tax_obj.compute_all(cr, uid, line.product_id.taxes_id,
                             line.price_unit * \
                             (1-(line.discount or 0.0)/100.0), line.qty),
                             res[order.id]['amount_tax'])                                                    
@@ -789,7 +789,7 @@ class pos_order(osv.osv):
                 tax_amount = 0
                 taxes = [t for t in line.product_id.taxes_id]
                 if order.price_type=='tax_excluded':
-                    computed_taxes = account_tax_obj.compute(
+                    computed_taxes = account_tax_objcompute_all(
                         cr, uid, taxes, line.price_unit, line.qty)
                 else:
                     computed_taxes = account_tax_obj.compute_inv(
@@ -1058,7 +1058,7 @@ class pos_order_line(osv.osv):
         for line in self.browse(cr, uid, ids):
             tax_amount = 0.0
             taxes = [t for t in line.product_id.taxes_id]
-            computed_taxes = account_tax_obj.compute(cr, uid, taxes, line.price_unit, line.qty)
+            computed_taxes = account_tax_objcompute_all(cr, uid, taxes, line.price_unit, line.qty)
             for tax in computed_taxes:
                 tax_amount += tax['amount']
             price = self.price_by_product(cr, uid, ids, line.order_id.pricelist_id.id, line.product_id.id, line.qty, line.order_id.partner_id.id)

diff --git a/addons/point_of_sale/posrule_data.xml b/addons/point_of_sale/posrule_data.xml
index 905e78e..be1b3d0 100644 (file)
--- a/addons/point_of_sale/posrule_data.xml
+++ b/addons/point_of_sale/posrule_data.xml
@@ -2,6 +2,12 @@
 <openerp>
        <data>
 
+               <record id="ir_rule_group_point0" model="ir.rule">
+                       <field name="name">point</field>
+               <field name="model_id" ref="model_pos_order"/>
+               <field name="global" eval="True"/>
+               <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+               </record>
                <record id="res_users_shopuser0" model="res.users">
             <field model="ir.actions.actions" name="menu_id" search="[('name','=','Menu')]"/>
             <field eval="[(6,0,[ref('base.group_partner_manager')])]" name="groups_id"/>
@@ -63,12 +69,12 @@
        </data>
 
        <data>
-       <record id="ir_rule_0" model="ir.rule">         
-       <field eval="&quot;&quot;&quot;point&quot;&quot;&quot;" name="name"/>
-               <field name="model_id" ref="model_pos_order"/>
-        <field name="global" eval="True"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
-       </record>     
+               <record id="ir_rule_0" model="ir.rule">         
+               <field eval="&quot;&quot;&quot;point&quot;&quot;&quot;" name="name"/>
+                       <field name="model_id" ref="model_pos_order"/>
+               <field name="global" eval="True"/>
+               <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+               </record>     
                <record id="ir_rule_group_posreporting0" model="ir.rule">
                        <field name="model_id" ref="point_of_sale.model_report_transaction_pos"/>
                        <field eval="&quot;&quot;&quot;POS Reporting&quot;&quot;&quot;" name="name"/>
@@ -98,7 +104,7 @@
                        ref('procurement.menu_mrp_procurement_action3'),
                        ref('point_of_sale.menu_point_root')])]" name="menu_access"/>
                        <field eval="[(6,0,[ref('res_users_shopuser0'),ref('res_users_shopuser1')])]" name="users"/>
-                               <field eval="[(6,0,[ref('point_of_sale.ir_rule_group_point0'),ref('point_of_sale.ir_rule_group_poslinecompany0'),ref('point_of_sale.ir_rule_group_posreporting0')])]" name="rule_groups"/>
+                               <field eval="[(6,0,[ref('point_of_sale.ir_rule_group_point0'),ref('point_of_sale.ir_rule_0'),ref('point_of_sale.ir_rule_group_posreporting0')])]" name="rule_groups"/>
                        <field eval="&quot;&quot;&quot;POS_user&quot;&quot;&quot;" name="name"/>
                </record>
                <record id="ir_model_access_point0" model="ir.model.access">

diff --git a/addons/point_of_sale/statement_data.xml b/addons/point_of_sale/statement_data.xml
index 5172e0e..a1f920c 100644 (file)
--- a/addons/point_of_sale/statement_data.xml
+++ b/addons/point_of_sale/statement_data.xml
@@ -34,7 +34,7 @@
                </record>
                <record id="point_of_sale.res_groups_posuser0" model="res.groups">
                <field eval="[(6,0,[ref('product.menu_config_product'),ref('product.menu_product_category_action_form'),ref('point_of_sale.menu_point_ofsale'),ref('point_of_sale.menu_point_config'),ref('point_of_sale.menu_statement_tree_all'),ref('stock.menu_stock_root'),ref('stock.menu_action_location_form'),ref('stock.menu_action_location_tree'),ref('stock.menu_picking_waiting'),ref('stock.menu_action_picking_tree3'),ref('stock.menu_action_picking_tree5'),ref('stock.menu_action_picking_form'),ref('stock.menu_action_picking_tree7'),ref('stock.menu_action_picking_tree8'),ref('stock.menu_action_picking_tree9'),ref('procurement.menu_mrp_procurement_action3'),ref('procurement.menu_mrp_procurement_new'),ref('mrp.next_id_77'),ref('mrp.menu_report_workcenter_load'),ref('mrp.menu_report_in_out_picking'),ref('base.menu_sales'),ref('sale.menu_action_shop_form'),ref('sale.menu_sale_order'),ref('sale.menu_action_order_tree'),ref('sale.menu_action_order_tree_all'),ref('sale.menu_action_order_tree2'),ref('sale.menu_action_order_tree3'),ref('sale.menu_action_order_tree7'),ref('sale.menu_action_order_tree8'),ref('sale.menu_action_order_line_tree1'),ref('delivery.menu_action_delivery_carrier_form'),ref('delivery.menu_action_delivery_grid_form'),ref('point_of_sale.menu_point_root')])]" name="menu_access"/>
-                       <field eval="[(6,0,[ref('ir_rule_group_bankstatementcompany0'),ref('ir_rule_group_bankstatementlinecompany0'),ref('point_of_sale.ir_rule_group_point0'),ref('point_of_sale.ir_rule_group_poslinecompany0'),ref('point_of_sale.ir_rule_group_posreporting0')])]" name="rule_groups"/>
+                       <field eval="[(6,0,[ref('ir_rule_group_bankstatementcompany0'),ref('ir_rule_group_bankstatementlinecompany0'),ref('point_of_sale.ir_rule_group_point0'),ref('point_of_sale.ir_rule_0'),ref('point_of_sale.ir_rule_group_posreporting0')])]" name="rule_groups"/>
                        <field eval="&quot;&quot;&quot;POS_user&quot;&quot;&quot;" name="name"/>
                </record>
        </data>