Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff -u addons/point_of_sale/report/pos_order_report.py.bk addons/point_of_sale/report/pos_order_report.py
- --- addons/point_of_sale/report/pos_order_report.py.bk 2016-06-13 11:10:47.496000000 +0530
- +++ addons/point_of_sale/report/pos_order_report.py 2016-06-12 17:58:42.005000000 +0530
- @@ -26,6 +26,7 @@
- 'nbr':fields.integer('# of Lines', readonly=True), # TDE FIXME master: rename into nbr_lines
- 'product_qty':fields.integer('Product Quantity', readonly=True),
- 'journal_id': fields.many2one('account.journal', 'Journal'),
- + 'table_id': fields.many2one('pos.order', 'Table', readonly=True),
- 'delay_validation': fields.integer('Delay Validation'),
- 'product_categ_id': fields.many2one('product.category', 'Product Category', readonly=True),
- 'invoiced': fields.boolean('Invoiced', readonly=True),
- @@ -73,6 +74,6 @@
- left join pos_config pc on (ps.config_id=pc.id)
- group by
- s.date_order, s.partner_id,s.state, pt.categ_id,
- - s.user_id,s.location_id,s.company_id,s.sale_journal,s.pricelist_id,s.invoice_id,l.product_id,s.create_date,pt.categ_id,pt.pos_categ_id,p.product_tmpl_id,ps.config_id,pc.stock_location_id
- + s.user_id,s.location_id,s.company_id,s.sale_journal,s.pricelist_id,s.invoice_id,s.table_id,l.product_id,s.create_date,pt.categ_id,pt.pos_categ_id,p.product_tmpl_id,ps.config_id,pc.stock_location_id
- having
- sum(l.qty * u.factor) != 0)""")
- diff -u addons/point_of_sale/report/pos_order_report_view.xml.bk addons/point_of_sale/report/pos_order_report_view.xml
- --- addons/point_of_sale/report/pos_order_report_view.xml.bk 2016-06-12 16:14:12.239000000 +0530
- +++ addons/point_of_sale/report/pos_order_report_view.xml 2016-06-13 11:12:21.151000000 +0530
- @@ -10,6 +10,7 @@
- <field name="date" interval="month" type="col"/>
- <field name="product_qty" type="measure"/>
- <field name="price_total" type="measure"/>
- + <field name="table_id" type="row"/>
- </pivot>
- </field>
- </record>
- @@ -42,6 +43,7 @@
- <field name="user_id"/>
- <field name="product_id"/>
- <field name="product_categ_id"/>
- + <field name="table_id"/>
- <group expand="1" string="Group By">
- <filter string="Salesperson" name="User" context="{'group_by':'user_id'}"/>
- <filter string="Product Category" context="{'group_by':'product_categ_id'}"/>
Add Comment
Please, Sign In to add comment