From 477af5167d481dab311c922af1908730c452bc05 Mon Sep 17 00:00:00 2001 From: "Kuldeep Joshi (OpenERP)" Date: Fri, 4 Nov 2011 15:53:15 +0530 Subject: [PATCH 01/36] [FIX]project: task analysis show only task not tamplate lp bug: https://launchpad.net/bugs/885610 fixed bzr revid: kjo@tinyerp.com-20111104102315-y2vi54kx3vbg5r08 --- addons/project/report/project_report.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py index fb1b0b030d6..e42cd523dc1 100644 --- a/addons/project/report/project_report.py +++ b/addons/project/report/project_report.py @@ -91,7 +91,7 @@ class report_project_task_user(osv.osv): (extract('epoch' from (t.date_start-t.create_date)))/(3600*24) as opening_days, abs((extract('epoch' from (t.date_deadline-t.date_end)))/(3600*24)) as delay_endings_days FROM project_task t - + where t.active = 'true' GROUP BY t.id, remaining_hours, From c5727fbb9c829bb85a75c8fa0ace2bf3391a7b75 Mon Sep 17 00:00:00 2001 From: "Kuldeep Joshi (OpenERP)" Date: Tue, 8 Nov 2011 15:23:26 +0530 Subject: [PATCH 02/36] [FIX]all anlysis not show active=false bzr revid: kjo@tinyerp.com-20111108095326-glcdy7gnv0rshkn3 --- addons/crm/report/crm_lead_report.py | 1 + addons/crm_fundraising/report/crm_fundraising_report.py | 1 + addons/crm_helpdesk/report/crm_helpdesk_report.py | 1 + addons/project_issue/report/project_issue_report.py | 2 +- 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/addons/crm/report/crm_lead_report.py b/addons/crm/report/crm_lead_report.py index 24f48e7de86..a2215d28740 100644 --- a/addons/crm/report/crm_lead_report.py +++ b/addons/crm/report/crm_lead_report.py @@ -147,6 +147,7 @@ class crm_lead_report(osv.osv): extract('epoch' from (c.date_open-c.create_date))/(3600*24) as delay_open FROM crm_lead c + WHERE c.active = 'true' )""") crm_lead_report() diff --git a/addons/crm_fundraising/report/crm_fundraising_report.py b/addons/crm_fundraising/report/crm_fundraising_report.py index 107ebf06bf5..c0f3ec8c3a6 100644 --- a/addons/crm_fundraising/report/crm_fundraising_report.py +++ b/addons/crm_fundraising/report/crm_fundraising_report.py @@ -97,6 +97,7 @@ class crm_fundraising_report(osv.osv): avg(extract('epoch' from (c.date_closed-c.create_date)))/(3600*24) as delay_close from crm_fundraising c + where c.active = 'true' group by to_char(c.date, 'YYYY'), to_char(c.date, 'MM'),\ c.state, c.user_id,c.section_id,c.categ_id,type_id,c.partner_id,c.company_id, c.create_date,to_char(c.date, 'YYYY-MM-DD') diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report.py b/addons/crm_helpdesk/report/crm_helpdesk_report.py index 80fc07db38d..55643d9b0f8 100644 --- a/addons/crm_helpdesk/report/crm_helpdesk_report.py +++ b/addons/crm_helpdesk/report/crm_helpdesk_report.py @@ -101,6 +101,7 @@ class crm_helpdesk_report(osv.osv): abs(avg(extract('epoch' from (c.date_deadline - c.date_closed)))/(3600*24)) as delay_expected from crm_helpdesk c + where c.active = 'true' group by to_char(c.date, 'YYYY'), to_char(c.date, 'MM'),to_char(c.date, 'YYYY-MM-DD'),\ c.state, c.user_id,c.section_id,c.priority,\ c.partner_id,c.company_id,c.date_deadline,c.create_date,c.date,c.date_closed,\ diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py index 36ce72f2a70..b550b5c47ce 100644 --- a/addons/project_issue/report/project_issue_report.py +++ b/addons/project_issue/report/project_issue_report.py @@ -104,7 +104,7 @@ class project_issue_report(osv.osv): FROM project_issue c - WHERE c.categ_id IN (select id from crm_case_categ where object_id in (select id from ir_model where model = 'project.issue')) + WHERE c.active= 'true' and c.categ_id IN (select id from crm_case_categ where object_id in (select id from ir_model where model = 'project.issue')) )""") project_issue_report() From 9b457c2bcdf44e2dc43477e6b2203de1e73020df Mon Sep 17 00:00:00 2001 From: "Kuldeep Joshi (OpenERP)" Date: Wed, 9 Nov 2011 18:12:20 +0530 Subject: [PATCH 03/36] [FIX] set active=true in anlysis report bzr revid: kjo@tinyerp.com-20111109124220-xllj7xr4yh4krvz7 --- addons/account/report/account_entries_report.py | 4 +++- addons/account/report/account_invoice_report.py | 5 ++++- .../account_voucher/report/account_voucher_sales_receipt.py | 2 +- addons/auction/report/report_auction.py | 3 ++- addons/event/report/report_event_registration.py | 5 +++++ addons/hr_expense/report/hr_expense_report.py | 2 ++ addons/hr_recruitment/report/hr_recruitment_report.py | 2 ++ addons/hr_timesheet_sheet/report/hr_timesheet_report.py | 4 ++++ addons/hr_timesheet_sheet/report/timesheet_report.py | 3 +++ addons/membership/report/report_membership.py | 2 +- addons/point_of_sale/report/pos_order_report.py | 3 +++ addons/stock/report/report_stock_move.py | 6 ++++-- 12 files changed, 34 insertions(+), 7 deletions(-) diff --git a/addons/account/report/account_entries_report.py b/addons/account/report/account_entries_report.py index 266b4a056d7..04a139ff1b6 100644 --- a/addons/account/report/account_entries_report.py +++ b/addons/account/report/account_entries_report.py @@ -149,7 +149,9 @@ class account_entries_report(osv.osv): left join account_account a on (l.account_id = a.id) left join account_move am on (am.id=l.move_id) left join account_period p on (am.period_id=p.id) - where l.state != 'draft' + left join product_product pr on (l.product_id=pr.id) + left join res_partner rp on (l.partner_id=rp.id) + where l.state != 'draft' and a.active='true' and rp.active='true' and pr.active='true' ) """) account_entries_report() diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py index 839c9b13043..e48d57cdce8 100644 --- a/addons/account/report/account_invoice_report.py +++ b/addons/account/report/account_invoice_report.py @@ -162,10 +162,13 @@ class account_invoice_report(osv.osv): left join account_invoice as ai ON (ai.id=ail.invoice_id) left join product_product pr on (pr.id=ail.product_id) left join product_template pt on (pt.id=pr.product_tmpl_id) - left join product_uom u on (u.id=ail.uos_id), + left join product_uom u on (u.id=ail.uos_id) + left join res_partner rp on (ai.partner_id=rp.id) + left join account_account aa on (ail.account_id=aa.id), res_currency_rate cr where cr.id in (select id from res_currency_rate cr2 where (cr2.currency_id = ai.currency_id) and ((ai.date_invoice is not null and cr.name <= ai.date_invoice) or (ai.date_invoice is null and cr.name <= NOW())) limit 1) + and rp.active='true' and pr.active='true' and aa.active='true' group by ail.product_id, ai.date_invoice, ai.id, diff --git a/addons/account_voucher/report/account_voucher_sales_receipt.py b/addons/account_voucher/report/account_voucher_sales_receipt.py index b31dedc8aa1..8d1517ac79f 100644 --- a/addons/account_voucher/report/account_voucher_sales_receipt.py +++ b/addons/account_voucher/report/account_voucher_sales_receipt.py @@ -103,7 +103,7 @@ class sale_receipt_report(osv.osv): left join account_voucher as av on (av.id=avl.voucher_id) left join res_partner as rp ON (rp.id=av.partner_id) left join account_journal as aj ON (aj.id=av.journal_id) - where av.type='sale' and aj.type in ('sale','sale_refund') + where av.type='sale' and aj.type in ('sale','sale_refund') and rp.active='true' group by av.date, av.id, diff --git a/addons/auction/report/report_auction.py b/addons/auction/report/report_auction.py index 012ea3c891e..e704b09edc7 100644 --- a/addons/auction/report/report_auction.py +++ b/addons/auction/report/report_auction.py @@ -86,8 +86,9 @@ class report_auction(osv.osv): auction_lots al, auction_dates ad, auction_deposit ade + left join res_partner rp on (ade.partner_id=rp.id) where - ad.id=al.auction_id and ade.id=al.bord_vnd_id + ad.id=al.auction_id and ade.id=al.bord_vnd_id and rp.active='true' group by ad.auction1, al.ach_uid, diff --git a/addons/event/report/report_event_registration.py b/addons/event/report/report_event_registration.py index e78179b9b5e..b65d2ed15e0 100644 --- a/addons/event/report/report_event_registration.py +++ b/addons/event/report/report_event_registration.py @@ -100,6 +100,11 @@ class report_event_registration(osv.osv): event_registration c ON (e.id=c.event_id) LEFT JOIN event_type t ON (e.type=t.id) + LEFT JOIN + product_product p ON (e.product_id=p.id) + LEFT JOIN + res_partner rp ON (e.main_speaker_id=rp.id) + WHERE c.active = 'true' and p.active='true' and rp.active='true' GROUP BY to_char(e.date_begin, 'YYYY'), to_char(e.date_begin, 'MM'), diff --git a/addons/hr_expense/report/hr_expense_report.py b/addons/hr_expense/report/hr_expense_report.py index df630931875..41627d1864d 100644 --- a/addons/hr_expense/report/hr_expense_report.py +++ b/addons/hr_expense/report/hr_expense_report.py @@ -100,6 +100,8 @@ class hr_expense_report(osv.osv): from hr_expense_line l left join hr_expense_expense s on (s.id=l.expense_id) left join product_uom u on (u.id=l.uom_id) + left join product_product pp on (pp.id=l.product_id) + where pp.active='true' group by date_trunc('day',s.date), to_char(date_trunc('day',s.create_date), 'YYYY'), diff --git a/addons/hr_recruitment/report/hr_recruitment_report.py b/addons/hr_recruitment/report/hr_recruitment_report.py index 5234e933813..e04144744df 100644 --- a/addons/hr_recruitment/report/hr_recruitment_report.py +++ b/addons/hr_recruitment/report/hr_recruitment_report.py @@ -99,6 +99,8 @@ class hr_recruitment_report(osv.osv): extract('epoch' from (s.date_closed-s.create_date))/(3600*24) as delay_close, count(*) as nbr from hr_applicant s + left join res_partner rp on (s.partner_id=rp.id) + where rp.active='true' group by to_char(s.create_date, 'YYYY'), to_char(s.create_date, 'MM'), diff --git a/addons/hr_timesheet_sheet/report/hr_timesheet_report.py b/addons/hr_timesheet_sheet/report/hr_timesheet_report.py index d20ad3a5f4c..c2276e35436 100644 --- a/addons/hr_timesheet_sheet/report/hr_timesheet_report.py +++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report.py @@ -68,6 +68,10 @@ class hr_timesheet_report(osv.osv): from hr_analytic_timesheet as t left join account_analytic_line as l ON (t.line_id=l.id) + left join product_product as pp on (l.product_id=pp.id) + left join account_account as aa on (l.general_account_id=aa.id) + left join res_users as u on (l.user_id= u.id) + where pp.active='true' and aa.active='true' and u.active='true' group by l.date, l.account_id, diff --git a/addons/hr_timesheet_sheet/report/timesheet_report.py b/addons/hr_timesheet_sheet/report/timesheet_report.py index a8c0440a053..61f39846cd6 100644 --- a/addons/hr_timesheet_sheet/report/timesheet_report.py +++ b/addons/hr_timesheet_sheet/report/timesheet_report.py @@ -98,6 +98,9 @@ class timesheet_report(osv.osv): from account_analytic_line as aal left join hr_analytic_timesheet as hat ON (hat.line_id=aal.id) left join hr_timesheet_sheet_sheet as htss ON (hat.line_id=htss.id) + left join account_account as aa on (aal.general_account_id=aa.id) + left join product_product as pp on (aal.product_id=pp.id) + where aa.active='true' and pp.active='true' group by to_char(htss.date_current,'YYYY'), to_char(htss.date_current,'MM'), diff --git a/addons/membership/report/report_membership.py b/addons/membership/report/report_membership.py index c5d82332fc1..631acab46b1 100644 --- a/addons/membership/report/report_membership.py +++ b/addons/membership/report/report_membership.py @@ -109,7 +109,7 @@ class report_membership(osv.osv): LEFT JOIN membership_membership_line ml ON (ml.partner = p.id) LEFT JOIN account_invoice_line il ON (ml.account_invoice_line = il.id) LEFT JOIN account_invoice ai ON (il.invoice_id = ai.id) - WHERE p.membership_state != 'none' + WHERE p.membership_state != 'none' and p.active = 'true' GROUP BY p.id, p.user_id, diff --git a/addons/point_of_sale/report/pos_order_report.py b/addons/point_of_sale/report/pos_order_report.py index ceb20a11a36..f4c88fc0d05 100644 --- a/addons/point_of_sale/report/pos_order_report.py +++ b/addons/point_of_sale/report/pos_order_report.py @@ -77,6 +77,9 @@ class pos_order_report(osv.osv): left join pos_order s on (s.id=l.order_id) left join product_template pt on (pt.id=l.product_id) left join product_uom u on (u.id=pt.uom_id) + left join res_partner rp on (s.partner_id=rp.id) + left join product_product pp on (pp.id=l.product_id) + where rp.active='true' and pp.active='true' group by to_char(s.date_order, 'dd-MM-YYYY'),to_char(s.date_order, 'YYYY'),to_char(s.date_order, 'MM'), to_char(s.date_order, 'YYYY-MM-DD'), s.partner_id,s.state, diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py index d728cbf0e29..93635e27dda 100644 --- a/addons/stock/report/report_stock_move.py +++ b/addons/stock/report/report_stock_move.py @@ -129,14 +129,14 @@ class report_stock_move(osv.osv): LEFT JOIN product_uom pu2 ON (sm.product_uom=pu2.id) LEFT JOIN product_template pt ON (pp.product_tmpl_id=pt.id) LEFT JOIN stock_location sl ON (sm.location_id = sl.id) - + LEFT JOIN res_partner rp on(sm.partner_id = rp.id) + where pp.active = 'true' and rp.active='true' and sl.active='true' GROUP BY sm.id,sp.type, sm.date,sm.address_id, sm.product_id,sm.state,sm.product_uom,sm.date_expected, sm.product_id,pt.standard_price, sm.picking_id, sm.product_qty, sm.company_id,sm.product_qty, sm.location_id,sm.location_dest_id,pu.factor,pt.categ_id, sp.stock_journal_id) AS al - GROUP BY al.out_qty,al.in_qty,al.curr_year,al.curr_month, al.curr_day,al.curr_day_diff,al.curr_day_diff1,al.curr_day_diff2,al.dp,al.location_id,al.location_dest_id, @@ -189,6 +189,7 @@ CREATE OR REPLACE view report_stock_inventory AS ( LEFT JOIN product_uom pu2 ON (m.product_uom=pu2.id) LEFT JOIN product_uom u ON (m.product_uom=u.id) LEFT JOIN stock_location l ON (m.location_id=l.id) + WHERE pp.active = 'true' and l.active='true' GROUP BY m.id, m.product_id, m.product_uom, pt.categ_id, m.address_id, m.location_id, m.location_dest_id, m.prodlot_id, m.date, m.state, l.usage, m.company_id, pt.uom_id @@ -210,6 +211,7 @@ CREATE OR REPLACE view report_stock_inventory AS ( LEFT JOIN product_uom pu2 ON (m.product_uom=pu2.id) LEFT JOIN product_uom u ON (m.product_uom=u.id) LEFT JOIN stock_location l ON (m.location_dest_id=l.id) + WHERE pp.active = 'true' and l.active='true' GROUP BY m.id, m.product_id, m.product_uom, pt.categ_id, m.address_id, m.location_id, m.location_dest_id, m.prodlot_id, m.date, m.state, l.usage, m.company_id, pt.uom_id From 8764f304bce59d9cb79dd5ea6818f4e4b02a879b Mon Sep 17 00:00:00 2001 From: "Kuldeep Joshi (OpenERP)" Date: Thu, 10 Nov 2011 12:42:45 +0530 Subject: [PATCH 04/36] [FIX]change in all analysis report bzr revid: kjo@tinyerp.com-20111110071245-fxof230tqmtnbepc --- addons/account/report/account_entries_report.py | 4 +--- addons/account/report/account_invoice_report.py | 3 --- .../account_voucher/report/account_voucher_sales_receipt.py | 2 +- addons/auction/report/report_auction.py | 3 +-- addons/event/report/report_event_registration.py | 6 +----- addons/hr_expense/report/hr_expense_report.py | 2 -- addons/hr_recruitment/report/hr_recruitment_report.py | 2 -- addons/hr_timesheet_sheet/report/hr_timesheet_report.py | 4 ---- addons/hr_timesheet_sheet/report/timesheet_report.py | 3 --- addons/point_of_sale/report/pos_order_report.py | 3 --- addons/stock/report/report_stock.py | 1 + addons/stock/report/report_stock_move.py | 5 ----- 12 files changed, 5 insertions(+), 33 deletions(-) diff --git a/addons/account/report/account_entries_report.py b/addons/account/report/account_entries_report.py index 04a139ff1b6..36a7ceb8ce9 100644 --- a/addons/account/report/account_entries_report.py +++ b/addons/account/report/account_entries_report.py @@ -149,9 +149,7 @@ class account_entries_report(osv.osv): left join account_account a on (l.account_id = a.id) left join account_move am on (am.id=l.move_id) left join account_period p on (am.period_id=p.id) - left join product_product pr on (l.product_id=pr.id) - left join res_partner rp on (l.partner_id=rp.id) - where l.state != 'draft' and a.active='true' and rp.active='true' and pr.active='true' + where l.state != 'draft' ) """) account_entries_report() diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py index e48d57cdce8..ff98088f0fd 100644 --- a/addons/account/report/account_invoice_report.py +++ b/addons/account/report/account_invoice_report.py @@ -163,12 +163,9 @@ class account_invoice_report(osv.osv): left join product_product pr on (pr.id=ail.product_id) left join product_template pt on (pt.id=pr.product_tmpl_id) left join product_uom u on (u.id=ail.uos_id) - left join res_partner rp on (ai.partner_id=rp.id) - left join account_account aa on (ail.account_id=aa.id), res_currency_rate cr where cr.id in (select id from res_currency_rate cr2 where (cr2.currency_id = ai.currency_id) and ((ai.date_invoice is not null and cr.name <= ai.date_invoice) or (ai.date_invoice is null and cr.name <= NOW())) limit 1) - and rp.active='true' and pr.active='true' and aa.active='true' group by ail.product_id, ai.date_invoice, ai.id, diff --git a/addons/account_voucher/report/account_voucher_sales_receipt.py b/addons/account_voucher/report/account_voucher_sales_receipt.py index 8d1517ac79f..b31dedc8aa1 100644 --- a/addons/account_voucher/report/account_voucher_sales_receipt.py +++ b/addons/account_voucher/report/account_voucher_sales_receipt.py @@ -103,7 +103,7 @@ class sale_receipt_report(osv.osv): left join account_voucher as av on (av.id=avl.voucher_id) left join res_partner as rp ON (rp.id=av.partner_id) left join account_journal as aj ON (aj.id=av.journal_id) - where av.type='sale' and aj.type in ('sale','sale_refund') and rp.active='true' + where av.type='sale' and aj.type in ('sale','sale_refund') group by av.date, av.id, diff --git a/addons/auction/report/report_auction.py b/addons/auction/report/report_auction.py index e704b09edc7..012ea3c891e 100644 --- a/addons/auction/report/report_auction.py +++ b/addons/auction/report/report_auction.py @@ -86,9 +86,8 @@ class report_auction(osv.osv): auction_lots al, auction_dates ad, auction_deposit ade - left join res_partner rp on (ade.partner_id=rp.id) where - ad.id=al.auction_id and ade.id=al.bord_vnd_id and rp.active='true' + ad.id=al.auction_id and ade.id=al.bord_vnd_id group by ad.auction1, al.ach_uid, diff --git a/addons/event/report/report_event_registration.py b/addons/event/report/report_event_registration.py index b65d2ed15e0..61e2238b585 100644 --- a/addons/event/report/report_event_registration.py +++ b/addons/event/report/report_event_registration.py @@ -100,11 +100,7 @@ class report_event_registration(osv.osv): event_registration c ON (e.id=c.event_id) LEFT JOIN event_type t ON (e.type=t.id) - LEFT JOIN - product_product p ON (e.product_id=p.id) - LEFT JOIN - res_partner rp ON (e.main_speaker_id=rp.id) - WHERE c.active = 'true' and p.active='true' and rp.active='true' + WHERE c.active = 'true' GROUP BY to_char(e.date_begin, 'YYYY'), to_char(e.date_begin, 'MM'), diff --git a/addons/hr_expense/report/hr_expense_report.py b/addons/hr_expense/report/hr_expense_report.py index 41627d1864d..df630931875 100644 --- a/addons/hr_expense/report/hr_expense_report.py +++ b/addons/hr_expense/report/hr_expense_report.py @@ -100,8 +100,6 @@ class hr_expense_report(osv.osv): from hr_expense_line l left join hr_expense_expense s on (s.id=l.expense_id) left join product_uom u on (u.id=l.uom_id) - left join product_product pp on (pp.id=l.product_id) - where pp.active='true' group by date_trunc('day',s.date), to_char(date_trunc('day',s.create_date), 'YYYY'), diff --git a/addons/hr_recruitment/report/hr_recruitment_report.py b/addons/hr_recruitment/report/hr_recruitment_report.py index e04144744df..5234e933813 100644 --- a/addons/hr_recruitment/report/hr_recruitment_report.py +++ b/addons/hr_recruitment/report/hr_recruitment_report.py @@ -99,8 +99,6 @@ class hr_recruitment_report(osv.osv): extract('epoch' from (s.date_closed-s.create_date))/(3600*24) as delay_close, count(*) as nbr from hr_applicant s - left join res_partner rp on (s.partner_id=rp.id) - where rp.active='true' group by to_char(s.create_date, 'YYYY'), to_char(s.create_date, 'MM'), diff --git a/addons/hr_timesheet_sheet/report/hr_timesheet_report.py b/addons/hr_timesheet_sheet/report/hr_timesheet_report.py index c2276e35436..d20ad3a5f4c 100644 --- a/addons/hr_timesheet_sheet/report/hr_timesheet_report.py +++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report.py @@ -68,10 +68,6 @@ class hr_timesheet_report(osv.osv): from hr_analytic_timesheet as t left join account_analytic_line as l ON (t.line_id=l.id) - left join product_product as pp on (l.product_id=pp.id) - left join account_account as aa on (l.general_account_id=aa.id) - left join res_users as u on (l.user_id= u.id) - where pp.active='true' and aa.active='true' and u.active='true' group by l.date, l.account_id, diff --git a/addons/hr_timesheet_sheet/report/timesheet_report.py b/addons/hr_timesheet_sheet/report/timesheet_report.py index 61f39846cd6..a8c0440a053 100644 --- a/addons/hr_timesheet_sheet/report/timesheet_report.py +++ b/addons/hr_timesheet_sheet/report/timesheet_report.py @@ -98,9 +98,6 @@ class timesheet_report(osv.osv): from account_analytic_line as aal left join hr_analytic_timesheet as hat ON (hat.line_id=aal.id) left join hr_timesheet_sheet_sheet as htss ON (hat.line_id=htss.id) - left join account_account as aa on (aal.general_account_id=aa.id) - left join product_product as pp on (aal.product_id=pp.id) - where aa.active='true' and pp.active='true' group by to_char(htss.date_current,'YYYY'), to_char(htss.date_current,'MM'), diff --git a/addons/point_of_sale/report/pos_order_report.py b/addons/point_of_sale/report/pos_order_report.py index f4c88fc0d05..ceb20a11a36 100644 --- a/addons/point_of_sale/report/pos_order_report.py +++ b/addons/point_of_sale/report/pos_order_report.py @@ -77,9 +77,6 @@ class pos_order_report(osv.osv): left join pos_order s on (s.id=l.order_id) left join product_template pt on (pt.id=l.product_id) left join product_uom u on (u.id=pt.uom_id) - left join res_partner rp on (s.partner_id=rp.id) - left join product_product pp on (pp.id=l.product_id) - where rp.active='true' and pp.active='true' group by to_char(s.date_order, 'dd-MM-YYYY'),to_char(s.date_order, 'YYYY'),to_char(s.date_order, 'MM'), to_char(s.date_order, 'YYYY-MM-DD'), s.partner_id,s.state, diff --git a/addons/stock/report/report_stock.py b/addons/stock/report/report_stock.py index 6344fe2c044..37e4f28c858 100644 --- a/addons/stock/report/report_stock.py +++ b/addons/stock/report/report_stock.py @@ -159,6 +159,7 @@ class report_stock_lines_date(osv.osv): left outer join stock_inventory_line l on (p.id=l.product_id) left join stock_inventory s on (l.inventory_id=s.id) and s.state = 'done' + where p.active='true' group by p.id )""") report_stock_lines_date() diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py index 93635e27dda..021c88e0c31 100644 --- a/addons/stock/report/report_stock_move.py +++ b/addons/stock/report/report_stock_move.py @@ -128,9 +128,6 @@ class report_stock_move(osv.osv): LEFT JOIN product_uom pu ON (sm.product_uom=pu.id) LEFT JOIN product_uom pu2 ON (sm.product_uom=pu2.id) LEFT JOIN product_template pt ON (pp.product_tmpl_id=pt.id) - LEFT JOIN stock_location sl ON (sm.location_id = sl.id) - LEFT JOIN res_partner rp on(sm.partner_id = rp.id) - where pp.active = 'true' and rp.active='true' and sl.active='true' GROUP BY sm.id,sp.type, sm.date,sm.address_id, sm.product_id,sm.state,sm.product_uom,sm.date_expected, @@ -189,7 +186,6 @@ CREATE OR REPLACE view report_stock_inventory AS ( LEFT JOIN product_uom pu2 ON (m.product_uom=pu2.id) LEFT JOIN product_uom u ON (m.product_uom=u.id) LEFT JOIN stock_location l ON (m.location_id=l.id) - WHERE pp.active = 'true' and l.active='true' GROUP BY m.id, m.product_id, m.product_uom, pt.categ_id, m.address_id, m.location_id, m.location_dest_id, m.prodlot_id, m.date, m.state, l.usage, m.company_id, pt.uom_id @@ -211,7 +207,6 @@ CREATE OR REPLACE view report_stock_inventory AS ( LEFT JOIN product_uom pu2 ON (m.product_uom=pu2.id) LEFT JOIN product_uom u ON (m.product_uom=u.id) LEFT JOIN stock_location l ON (m.location_dest_id=l.id) - WHERE pp.active = 'true' and l.active='true' GROUP BY m.id, m.product_id, m.product_uom, pt.categ_id, m.address_id, m.location_id, m.location_dest_id, m.prodlot_id, m.date, m.state, l.usage, m.company_id, pt.uom_id From 7e7cb6c131347f2d4a232c009ae966c1ae6b4a7f Mon Sep 17 00:00:00 2001 From: "Kuldeep Joshi (OpenERP)" Date: Thu, 17 Nov 2011 11:45:03 +0530 Subject: [PATCH 05/36] [FIX]project: add resource_calendar_id field in project.project lp bug: https://launchpad.net/bugs/884208 fixed bzr revid: kjo@tinyerp.com-20111117061503-4bos5thfpdfubkp0 --- addons/project/project_view.xml | 1 + addons/project_issue/project_issue.py | 1 - addons/project_issue/project_issue_view.xml | 14 -------------- .../project_long_term/project_long_term_view.xml | 16 ---------------- 4 files changed, 1 insertion(+), 31 deletions(-) diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index d85481a6e5e..b21e7d270d0 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -34,6 +34,7 @@ + diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index 0833cab7441..595c9bd7b0c 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -480,7 +480,6 @@ project_issue() class project(osv.osv): _inherit = "project.project" _columns = { - 'resource_calendar_id' : fields.many2one('resource.calendar', 'Working Time', help="Timetable working hours to adjust the gantt diagram report", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}), 'project_escalation_id' : fields.many2one('project.project','Project Escalation', help='If any issue is escalated from the current Project, it will be listed under the project selected here.', states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}), 'reply_to' : fields.char('Reply-To Email Address', size=256) } diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index a54ae14737d..03e1ee44b7e 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -396,20 +396,6 @@ # ------------------------------------------------------ # Project # ------------------------------------------------------ - - - Project Resource Calendar View - project.project - form - - - - - - - - - project.project.form.inherited project.project diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index cdeb0a0d63d..277efe0f31c 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -273,22 +273,6 @@ - # ------------------------------------------------------ - # Project - # ------------------------------------------------------ - - - Project Resource Calendar View - project.project - form - - - - - - - - # ------------------------------------------------------ # Project Task From 5dff2820493ac820191d54c71284d63ac9c56018 Mon Sep 17 00:00:00 2001 From: "Kuldeep Joshi (OpenERP)" Date: Thu, 17 Nov 2011 12:56:51 +0530 Subject: [PATCH 06/36] [FIX]project_long_term: remove dependency of resource module bzr revid: kjo@tinyerp.com-20111117072651-74x5v5jh27g1g4ms --- addons/project_long_term/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/project_long_term/__openerp__.py b/addons/project_long_term/__openerp__.py index 31522d63ea2..f4b8ce34ad0 100644 --- a/addons/project_long_term/__openerp__.py +++ b/addons/project_long_term/__openerp__.py @@ -26,7 +26,7 @@ "website": "http://www.openerp.com", "category": "Project Management", "images": ["images/project_phase_form.jpeg","images/project_phases.jpeg", "images/resources_allocation.jpeg"], - "depends": ["resource", "project"], + "depends": ["project"], "description": """ Long Term Project management module that tracks planning, scheduling, resources allocation. =========================================================================================== From b18c2321c3e4ce6d4160b786854d66a220b5cd7b Mon Sep 17 00:00:00 2001 From: "Kuldeep Joshi (OpenERP)" Date: Thu, 17 Nov 2011 15:27:27 +0530 Subject: [PATCH 07/36] [FIX]project_issue: add right model_crm_case_section to project user lp bug: https://launchpad.net/bugs/890968 fixed bzr revid: kjo@tinyerp.com-20111117095727-lz4ti74gifroauog --- addons/project_issue/security/ir.model.access.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/project_issue/security/ir.model.access.csv b/addons/project_issue/security/ir.model.access.csv index 01afcb73b09..b15c0e3537a 100644 --- a/addons/project_issue/security/ir.model.access.csv +++ b/addons/project_issue/security/ir.model.access.csv @@ -9,3 +9,4 @@ "access_resource_calendar_project_manager","resource.calendar.project.manager","resource.model_resource_calendar","project.group_project_manager",1,1,1,1 "access_project_issue_report_user","project.issue.report user","model_project_issue_report","project.group_project_user",1,0,0,0 "access_mail_message_issue_project_user","mail.message.user","mail.model_mail_message","project.group_project_user",1,1,1,0 +"access_crm_case_section","crm.case.section","crm.model_crm_case_section","project.group_project_user",1,0,0,0 \ No newline at end of file From 7c2cb8d6593775330560641edd2de302da3913a6 Mon Sep 17 00:00:00 2001 From: "Kirti Savalia (OpenERP)" Date: Thu, 17 Nov 2011 15:37:52 +0530 Subject: [PATCH 08/36] [FIX]:in stock real time accounting wrong values for stock moves with purchase unit lp bug: https://launchpad.net/bugs/889093 fixed bzr revid: ksa@tinyerp.com-20111117100752-774f7kkcfr1wtajg --- addons/purchase/stock.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/addons/purchase/stock.py b/addons/purchase/stock.py index 42d9c40d7e5..c212a171b21 100644 --- a/addons/purchase/stock.py +++ b/addons/purchase/stock.py @@ -35,16 +35,12 @@ class stock_move(osv.osv): on the purchase order in case the valuation data was not directly specified during picking confirmation. """ - product_uom_obj = self.pool.get('product.uom') - reference_amount, reference_currency_id = super(stock_move, self)._get_reference_accounting_values_for_valuation(cr, uid, move, context=context) - default_uom = move.product_id.uom_id.id - qty = product_uom_obj._compute_qty(cr, uid, move.product_uom.id, move.product_qty, default_uom) if move.product_id.cost_method != 'average' or not move.price_unit: # no average price costing or cost not specified during picking validation, we will # plug the purchase line values if they are found. if move.purchase_line_id and move.picking_id.purchase_id.pricelist_id: - reference_amount, reference_currency_id = move.purchase_line_id.price_unit * qty, move.picking_id.purchase_id.pricelist_id.currency_id.id + reference_amount, reference_currency_id = move.purchase_line_id.price_unit * move.product_qty, move.picking_id.purchase_id.pricelist_id.currency_id.id return reference_amount, reference_currency_id stock_move() From 235ae1d6a2a89119a3f49e0ba5d08fd3e5950764 Mon Sep 17 00:00:00 2001 From: "Tejas (OpenERP)" Date: Thu, 17 Nov 2011 17:30:23 +0530 Subject: [PATCH 09/36] demo data: set a stage in a maximum of record in order to display a good view in kanban (all column diplayed) bzr revid: tta@openerp.com-20111117120023-4rrsjok67ksyox1v --- addons/project_issue/project_issue_demo.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/addons/project_issue/project_issue_demo.xml b/addons/project_issue/project_issue_demo.xml index 12ff265b1e9..f1c7dd5eb4d 100644 --- a/addons/project_issue/project_issue_demo.xml +++ b/addons/project_issue/project_issue_demo.xml @@ -16,6 +16,7 @@ + @@ -31,6 +32,7 @@ + @@ -45,6 +47,7 @@ + @@ -60,6 +63,7 @@ + @@ -74,6 +78,7 @@ + @@ -89,6 +94,7 @@ + @@ -104,6 +110,7 @@ + @@ -119,6 +126,7 @@ + @@ -133,6 +141,7 @@ + @@ -148,6 +157,7 @@ + @@ -163,6 +173,7 @@ + @@ -179,6 +190,7 @@ + @@ -195,6 +207,7 @@ + @@ -210,6 +223,7 @@ + @@ -225,6 +239,7 @@ + @@ -240,6 +255,7 @@ + From 8a2f152dabee779c90a9af804f943f9cf42faef8 Mon Sep 17 00:00:00 2001 From: "Kuldeep Joshi (OpenERP)" Date: Thu, 17 Nov 2011 18:27:54 +0530 Subject: [PATCH 10/36] [FIX]project_issue: change in csv file bzr revid: kjo@tinyerp.com-20111117125754-ixvdmq4wmyi47xoa --- addons/project_issue/security/ir.model.access.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/project_issue/security/ir.model.access.csv b/addons/project_issue/security/ir.model.access.csv index b15c0e3537a..f5c39be7713 100644 --- a/addons/project_issue/security/ir.model.access.csv +++ b/addons/project_issue/security/ir.model.access.csv @@ -9,4 +9,4 @@ "access_resource_calendar_project_manager","resource.calendar.project.manager","resource.model_resource_calendar","project.group_project_manager",1,1,1,1 "access_project_issue_report_user","project.issue.report user","model_project_issue_report","project.group_project_user",1,0,0,0 "access_mail_message_issue_project_user","mail.message.user","mail.model_mail_message","project.group_project_user",1,1,1,0 -"access_crm_case_section","crm.case.section","crm.model_crm_case_section","project.group_project_user",1,0,0,0 \ No newline at end of file +"access_crm_case_section","crm.case.section","crm.model_crm_case_section","project.group_project_user",1,0,0,0 From aca8c57f94b3eb19291f347e946eb8d9ade22575 Mon Sep 17 00:00:00 2001 From: "Kuldeep Joshi (OpenERP)" Date: Thu, 17 Nov 2011 19:09:29 +0530 Subject: [PATCH 11/36] [FIX]crm: change the context lp bug: https://launchpad.net/bugs/889056 fixed bzr revid: kjo@tinyerp.com-20111117133929-9yi8lmpaurj3rhsa --- addons/crm/crm_lead.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index 91c8a453cd6..5b92a49a5a5 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -432,6 +432,8 @@ class crm_lead(crm_case, osv.osv): This opens Meeting's calendar view to schedule meeting on current Opportunity @return : Dictionary value for created Meeting view """ + if context is None: + context = {} value = {} for opp in self.browse(cr, uid, ids, context=context): data_obj = self.pool.get('ir.model.data') @@ -449,7 +451,7 @@ class crm_lead(crm_case, osv.osv): if id3: id3 = data_obj.browse(cr, uid, id3, context=context).res_id - context = { + context .update( { 'default_opportunity_id': opp.id, 'default_partner_id': opp.partner_id and opp.partner_id.id or False, 'default_user_id': uid, @@ -457,7 +459,7 @@ class crm_lead(crm_case, osv.osv): 'default_email_from': opp.email_from, 'default_state': 'open', 'default_name': opp.name - } + }) value = { 'name': _('Meetings'), 'context': context, From 8acda908e9e80c0b09fd308f3871ea22b79960d2 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Fri, 18 Nov 2011 12:18:30 +0530 Subject: [PATCH 12/36] [IMP] added yml files for Project_scrum module bzr revid: tpa@tinyerp.com-20111118064830-mg28ugws5ylrdupm --- addons/project_scrum/__openerp__.py | 7 ++- addons/project_scrum/project_scrum.py | 6 +- addons/project_scrum/project_scrum_demo.xml | 4 +- addons/project_scrum/project_scrum_view.xml | 4 +- addons/project_scrum/test/cancel_backlog.yml | 52 +++++++++++++++++ .../test/draft2open2close_backlog.yml | 41 +++++++++++++ .../test/draft2open2close_sprint.yml | 57 +++++++++++++++++++ .../project_scrum/test/project_scrum_test.yml | 8 +++ 8 files changed, 173 insertions(+), 6 deletions(-) create mode 100644 addons/project_scrum/test/cancel_backlog.yml create mode 100644 addons/project_scrum/test/draft2open2close_backlog.yml create mode 100644 addons/project_scrum/test/draft2open2close_sprint.yml create mode 100644 addons/project_scrum/test/project_scrum_test.yml diff --git a/addons/project_scrum/__openerp__.py b/addons/project_scrum/__openerp__.py index fb08b8432be..eb84a6bc52b 100644 --- a/addons/project_scrum/__openerp__.py +++ b/addons/project_scrum/__openerp__.py @@ -65,7 +65,12 @@ More information on the methodology: "board_project_scrum_view.xml", ], 'demo_xml': ['project_scrum_demo.xml'], - 'test': ['test/project_scrum_report.yml'], + 'test': ['test/project_scrum_report.yml', + 'test/draft2open2close_sprint.yml', + 'test/draft2open2close_backlog.yml', + 'test/cancel_backlog.yml', + 'test/project_scrum_test.yml' + ], 'installable': True, 'active': False, 'certificate' : '00736750152003010781', diff --git a/addons/project_scrum/project_scrum.py b/addons/project_scrum/project_scrum.py index f0db98294e7..b378b1a02b2 100644 --- a/addons/project_scrum/project_scrum.py +++ b/addons/project_scrum/project_scrum.py @@ -262,7 +262,7 @@ class project_scrum_task(osv.osv): 'project.scrum.product.backlog': (_get_task, ['sprint_id'], 10) }), } - + #dead code def onchange_backlog_id(self, cr, uid, backlog_id=False): if not backlog_id: return {} @@ -292,7 +292,7 @@ class project_scrum_meeting(osv.osv): _defaults = { 'date' : lambda *a: time.strftime('%Y-%m-%d'), } - + # dead code def button_send_to_master(self, cr, uid, ids, context=None): meeting_id = self.browse(cr, uid, ids, context=context)[0] if meeting_id and meeting_id.sprint_id.scrum_master_id.user_email: @@ -303,6 +303,7 @@ class project_scrum_meeting(osv.osv): raise osv.except_osv(_('Error !'), _('Please provide email address for scrum master defined on sprint.')) return True + #dead code def button_send_product_owner(self, cr, uid, ids, context=None): if context is None: context = {} @@ -316,6 +317,7 @@ class project_scrum_meeting(osv.osv): raise osv.except_osv(_('Error !'), _('Please provide email address for product owner defined on sprint.')) return True + #dead code def email_send(self, cr, uid, ids, email, context=None): mail_message_obj = self.pool.get('mail.message') meeting_id = self.browse(cr, uid, ids, context=context)[0] diff --git a/addons/project_scrum/project_scrum_demo.xml b/addons/project_scrum/project_scrum_demo.xml index 76f2846c76f..687fb9c734f 100644 --- a/addons/project_scrum/project_scrum_demo.xml +++ b/addons/project_scrum/project_scrum_demo.xml @@ -10,7 +10,6 @@ - open @@ -387,6 +386,9 @@ open + + + Admin: Worked on the Automatic migration system diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml index ddf74eb2e93..2ce12c70e1d 100644 --- a/addons/project_scrum/project_scrum_view.xml +++ b/addons/project_scrum/project_scrum_view.xml @@ -263,6 +263,8 @@ +