pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP]sale:Corrected conflict in SQL report.

Browse Source 
bzr revid: apa@tinyerp.com-20100528050801-t6biri188t4dn8c5
This commit is contained in:
apa-tiny
2010-05-28 10:38:01 +05:30
parent ccaa75b73b
commit 6efd32d8e5
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/sale/report/sale_report.py
-5
View File
@@ -36,13 +36,8 @@ class sale_report(osv.osv):
('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
'day': fields.char('Day', size=128, readonly=True),
'product_id':fields.many2one('product.product', 'Product', readonly=True),
<<<<<<< TREE
'uom_id': fields.many2one('product.uom', 'Default Unit Of Measure', readonly=True),
'product_qty':fields.float('# of Qty', readonly=True),
=======
'uom_name': fields.char('Default UoM', size=128, readonly=True),
'product_uom_qty':fields.float('# of Qty', readonly=True),
>>>>>>> MERGE-SOURCE
'partner_id':fields.many2one('res.partner', 'Partner', readonly=True),
'shop_id':fields.many2one('sale.shop', 'Shop', readonly=True),
'company_id':fields.many2one('res.company', 'Company', readonly=True),