From ca93a52e6468a926737bdbe41e6872cf48c43c04 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Tue, 21 Aug 2012 10:23:43 +0200 Subject: [PATCH 1/5] [FIX] point_of_sale: fix a report bzr revid: stw@openerp.com-20120821082343-mu1p8231c4wa0kjm --- addons/point_of_sale/report/pos_sales_user.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/point_of_sale/report/pos_sales_user.py b/addons/point_of_sale/report/pos_sales_user.py index e49528441b9..6ac2e1892c1 100644 --- a/addons/point_of_sale/report/pos_sales_user.py +++ b/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: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From c803243a38285e1418954968e6857013e5005fc2 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Tue, 21 Aug 2012 10:23:56 +0200 Subject: [PATCH 2/5] [FIX] point_of_sale: remove an useless test bzr revid: stw@openerp.com-20120821082356-dr4vdka5u796ho9w --- addons/point_of_sale/test/00_register_open.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/addons/point_of_sale/test/00_register_open.yml b/addons/point_of_sale/test/00_register_open.yml index 7d5aabbcdc3..ce13f3c0f26 100644 --- a/addons/point_of_sale/test/00_register_open.yml +++ b/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!' From 28c036aef0bafe0921a5d135f273fba43d193875 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Tue, 21 Aug 2012 10:38:28 +0200 Subject: [PATCH 3/5] [FIX] point_of_sale: A manager can create a ir.sequence for the pos.config bzr revid: stw@openerp.com-20120821083828-as5sqvatvvseaj9d --- addons/point_of_sale/security/ir.model.access.csv | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/point_of_sale/security/ir.model.access.csv b/addons/point_of_sale/security/ir.model.access.csv index 06673fc3da8..74b4bbf5753 100644 --- a/addons/point_of_sale/security/ir.model.access.csv +++ b/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 From bc1f8e6d4be5b5905712b0c2359390049e99cc7a Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Tue, 21 Aug 2012 10:48:57 +0200 Subject: [PATCH 4/5] [IMP] point_of_sale: improve the layout of the pos.order bzr revid: stw@openerp.com-20120821084857-4ieoknwcsivdooa1 --- addons/point_of_sale/point_of_sale_view.xml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml index e40cbc756b8..c45cedbfbc6 100644 --- a/addons/point_of_sale/point_of_sale_view.xml +++ b/addons/point_of_sale/point_of_sale_view.xml @@ -55,10 +55,14 @@ - + - -