[MERGE] from stw

bzr revid: fva@openerp.com-20120821121123-ingbtoedurmt6h48

addons/point_of_sale/point_of_sale_view.xml

@@ -55,10 +55,14 @@
                                     </group>
                                 </form>
                             </field>
-                            <group class="oe_subtotal_footer">
+                            <group class="oe_subtotal_footer oe_right" colspan="2" name="order_total">
                                 <field name="amount_tax"/>
-                                <field name="amount_total"/>
-                                <button name="button_dummy" string="Update" class="oe_link" states="draft"/>
+                                <div class="oe_subtotal_footer_separator oe_inline">
+                                    <label for="amount_total" />
+                                    <button name="button_dummy"
+                                        states="draft" string="(update)" type="object" class="oe_edit_only oe_link"/>
+                                </div>
+                                <field name="amount_total" nolabel="1" class="oe_subtotal_footer_separator"/>
                             </group>
                         </page>
                         <page string="Payments">

addons/point_of_sale/report/pos_sales_user.py

@@ -37,14 +37,14 @@ class pos_sales_user(report_sxw.rml_parse):
         dt1 = form['date_start'] + ' 00:00:00'
         dt2 = form['date_end'] + ' 23:59:59'
         data={}
-        self.cr.execute("select po.name as pos,po.date_order,ru.name as user,po.state,rc.name " \
-                        "from pos_order as po,res_users as ru,res_company as rc " \
+        self.cr.execute("select po.name as pos,po.date_order,rp.name as user,po.state,rc.name " \
+                        "from pos_order as po,res_users as ru,res_company as rc, res_partner as rp " \
                         "where po.date_order >= %s and po.date_order <= %s " \
-                        "and po.company_id=rc.id and po.user_id=ru.id and po.user_id IN %s " \
+                        "and po.company_id=rc.id and po.user_id=ru.id and po.user_id IN %s and ru.partner_id = rp.id" \
                     ,(dt1,dt2,tuple(form['user_id'])))
 
         return self.cr.dictfetchall()
 
 report_sxw.report_sxw('report.pos.sales.user', 'pos.order', 'addons/point_of_sale/report/pos_sales_user.rml', parser=pos_sales_user,header='internal')
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/point_of_sale/security/ir.model.access.csv

@@ -60,7 +60,8 @@ access_product_uom_manager,product.uom manager,product.model_product_uom,group_p
 access_res_partner_manager,res.partner manager,base.model_res_partner,group_pos_manager,1,0,0,0
 access_product_category_manager,product.category manager,product.model_product_category,group_pos_manager,1,1,1,1
 access_product_pricelist_manager,product.pricelist manager,product.model_product_pricelist,group_pos_manager,1,0,0,0
-access_product_category_pos_manager,pos.category manager,model_pos_category,group_pos_manager,1,1,1,"1"""
-access_product_category_pos_user,pos.category user,model_pos_category,group_pos_user,1,0,0,"0"""
+access_product_category_pos_manager,pos.category manager,model_pos_category,group_pos_manager,1,1,1,1
+access_product_category_pos_user,pos.category user,model_pos_category,group_pos_user,1,0,0,0
 access_pos_session_user,pos.session user,model_pos_session,group_pos_user,1,1,1,0
 access_pos_config_user,pos.config user,model_pos_config,group_pos_user,1,1,1,0
+access_ir_sequence_manager,ir.sequence manager,base.model_ir_sequence,group_pos_manager,1,1,1,1

addons/point_of_sale/test/00_register_open.yml

@@ -9,9 +9,3 @@
 - 
   !python {model: pos.open.statement}: |
     self.open_statement(cr, uid, [ref('new_statement_open')], context={})
-- 
-  I check that I have some bank statements open for the admin user
-- 
-  !python {model: account.bank.statement}: |
-    ids = self.search(cr, uid, [('state', 'in', ('open','new')), ('user_id', '=', 1)])
-    assert (len(ids)>0), 'No statement open for the admin user!'

addons/product/product.py

@@ -208,8 +208,10 @@ product_ul()
 class product_category(osv.osv):
 
     def name_get(self, cr, uid, ids, context=None):
-        if not len(ids):
+        if isinstance(ids, (list, tuple)) and not len(ids):
             return []
+        if isinstance(ids, (long, int)):
+            ids = [ids]
         reads = self.read(cr, uid, ids, ['name','parent_id'], context=context)
         res = []
         for record in reads: