From a0c6493743bd6bc6f25b261e3dc4fe518480f9d8 Mon Sep 17 00:00:00 2001 From: pso Date: Mon, 20 Dec 2010 17:54:22 +0530 Subject: [PATCH] [FIX] account, sale, purchase: Improved analysis report lp bug: https://launchpad.net/bugs/673835 fixed bzr revid: pso@tinyerp.com-20101220122422-kqao990cf3q582df --- .../account/report/account_invoice_report.py | 20 ++++++++++++------- addons/purchase/report/purchase_report.py | 17 +++++++++++----- .../purchase/report/purchase_report_view.xml | 2 +- addons/sale/report/sale_report.py | 20 +++++++++++-------- addons/sale/report/sale_report_view.xml | 2 +- 5 files changed, 39 insertions(+), 22 deletions(-) diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py index 125edb0d992..e8da59bb165 100644 --- a/addons/account/report/account_invoice_report.py +++ b/addons/account/report/account_invoice_report.py @@ -36,7 +36,7 @@ class account_invoice_report(osv.osv): ('10','October'), ('11','November'), ('12','December')], 'Month', readonly=True), 'product_id': fields.many2one('product.product', 'Product', readonly=True), 'product_qty':fields.float('Qty', readonly=True), - 'uom_name': fields.char('Default UoM', size=128, readonly=True), + 'uom_name': fields.char('Reference UoM', size=128, readonly=True), 'payment_term': fields.many2one('account.payment.term', 'Payment Term', readonly=True), 'period_id': fields.many2one('account.period', 'Force Period', domain=[('state','<>','done')], readonly=True), 'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position', readonly=True), @@ -88,7 +88,11 @@ class account_invoice_report(osv.osv): ai.partner_id as partner_id, ai.payment_term as payment_term, ai.period_id as period_id, - u.name as uom_name, + (case when u.uom_type not in ('reference') then + (select name from product_uom where uom_type='reference' and category_id=u.category_id) + else + u.name + end) as uom_name, ai.currency_id as currency_id, ai.journal_id as journal_id, ai.fiscal_position as fiscal_position, @@ -104,9 +108,9 @@ class account_invoice_report(osv.osv): ai.account_id as account_id, ai.partner_bank_id as partner_bank_id, sum(case when ai.type in ('out_refund','in_invoice') then - ail.quantity * u.factor * -1 + ail.quantity / u.factor * -1 else - ail.quantity * u.factor + ail.quantity / u.factor end) as product_qty, sum(case when ai.type in ('out_refund','in_invoice') then ail.quantity*ail.price_unit * -1 @@ -125,9 +129,9 @@ class account_invoice_report(osv.osv): else sum(ail.quantity*ail.price_unit) end)/(case when ai.type in ('out_refund','in_invoice') then - sum(ail.quantity*u.factor*-1) + sum(ail.quantity/u.factor*-1) else - sum(ail.quantity*u.factor) + sum(ail.quantity/u.factor) end) / cr.rate as price_average, cr.rate as currency_rate, sum((select extract(epoch from avg(date_trunc('day',aml.date_created)-date_trunc('day',l.create_date)))/(24*60*60)::decimal(16,2) @@ -179,7 +183,9 @@ class account_invoice_report(osv.osv): ai.account_id, ai.partner_bank_id, ai.residual, - ai.amount_total + ai.amount_total, + u.uom_type, + u.category_id ) """) diff --git a/addons/purchase/report/purchase_report.py b/addons/purchase/report/purchase_report.py index f30d65d8f28..8c5510852ca 100644 --- a/addons/purchase/report/purchase_report.py +++ b/addons/purchase/report/purchase_report.py @@ -52,7 +52,7 @@ class purchase_report(osv.osv): 'date_approve':fields.date('Date Approved', readonly=True), 'expected_date':fields.date('Expected Date', readonly=True), 'validator' : fields.many2one('res.users', 'Validated By', readonly=True), - 'product_uom' : fields.many2one('product.uom', 'Product UoM', required=True), + 'product_uom' : fields.many2one('product.uom', 'Reference UoM', required=True), 'company_id':fields.many2one('res.company', 'Company', readonly=True), 'user_id':fields.many2one('res.users', 'Responsible', readonly=True), 'delay':fields.float('Days to Validate', digits=(16,2), readonly=True), @@ -92,16 +92,20 @@ class purchase_report(osv.osv): s.company_id as company_id, l.product_id, t.categ_id as category_id, - l.product_uom as product_uom, + (case when u.uom_type not in ('reference') then + (select id from product_uom where uom_type='reference' and category_id = 1) + else + u.id + end) as product_uom, s.location_id as location_id, - sum(l.product_qty*u.factor) as quantity, + sum(l.product_qty/u.factor) as quantity, extract(epoch from age(s.date_approve,s.date_order))/(24*60*60)::decimal(16,2) as delay, extract(epoch from age(l.date_planned,s.date_order))/(24*60*60)::decimal(16,2) as delay_pass, count(*) as nbr, (l.price_unit*l.product_qty*u.factor)::decimal(16,2) as price_total, avg(100.0 * (l.price_unit*l.product_qty*u.factor) / (t.standard_price*l.product_qty*u.factor))::decimal(16,2) as negociation, sum(t.standard_price*l.product_qty*u.factor)::decimal(16,2) as price_standard, - (sum(l.product_qty*l.price_unit)/sum(l.product_qty*u.factor))::decimal(16,2) as price_average + (sum(l.product_qty*l.price_unit)/sum(l.product_qty/u.factor))::decimal(16,2) as price_average from purchase_order s left join purchase_order_line l on (s.id=l.order_id) left join product_product p on (l.product_id=p.id) @@ -131,7 +135,10 @@ class purchase_report(osv.osv): to_char(s.date_order, 'MM'), to_char(s.date_order, 'YYYY-MM-DD'), s.state, - s.warehouse_id + s.warehouse_id, + u.uom_type, + u.category_id, + u.id ) """) purchase_report() diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml index 8bf381b4d41..7f52ca73cf0 100644 --- a/addons/purchase/report/purchase_report_view.xml +++ b/addons/purchase/report/purchase_report_view.xml @@ -101,7 +101,7 @@ - + diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py index 75c37ff9416..f1dcbc32574 100644 --- a/addons/sale/report/sale_report.py +++ b/addons/sale/report/sale_report.py @@ -38,7 +38,7 @@ 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), - 'uom_name': fields.char('Default UoM', size=128, readonly=True), + 'uom_name': fields.char('Reference UoM', size=128, readonly=True), 'product_uom_qty': fields.float('# of Qty', readonly=True), 'partner_id': fields.many2one('res.partner', 'Partner', readonly=True), @@ -90,17 +90,21 @@ class sale_report(osv.osv): sale_order s, ( select l.id as id, - l.product_id as product_id, - u.name as uom_name, - sum(l.product_uom_qty * u.factor) as product_uom_qty, - sum(l.product_uom_qty*l.price_unit) as price_total, - (sum(l.product_uom_qty*l.price_unit)/sum(l.product_uom_qty * u.factor)*count(l.product_id))::decimal(16,2) as price_average, - pt.categ_id, l.order_id + l.product_id as product_id, + (case when u.uom_type not in ('reference') then + (select name from product_uom where uom_type='reference' and category_id=u.category_id) + else + u.name + end) as uom_name, + sum(l.product_uom_qty/u.factor) as product_uom_qty, + sum(l.product_uom_qty*l.price_unit) as price_total, + (sum(l.product_uom_qty*l.price_unit)/sum(l.product_uom_qty/u.factor)*count(l.product_id))::decimal(16,2) as price_average, + pt.categ_id, l.order_id from sale_order_line l left join product_uom u on (u.id=l.product_uom) left join product_template pt on (pt.id=l.product_id) - group by l.id, l.order_id, l.product_id, u.name, pt.categ_id) el + group by l.id, l.order_id, l.product_id, u.name, pt.categ_id, u.uom_type, u.category_id) el where s.id = el.order_id group by el.id, el.product_id, diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml index a47ab2e73a9..40e6b0256e0 100644 --- a/addons/sale/report/sale_report_view.xml +++ b/addons/sale/report/sale_report_view.xml @@ -100,7 +100,7 @@ - +