From 2b48c92282551f549aa8047a78afecb1dcde843f Mon Sep 17 00:00:00 2001 From: "Kuldeep Joshi (OpenERP)" Date: Mon, 19 Sep 2011 11:44:53 +0530 Subject: [PATCH 01/62] [IMP]purchase: change search view in purchase_view.xml bzr revid: kjo@tinyerp.com-20110919061453-z86f5fx15e00nftn --- addons/purchase/purchase_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index 035dbbc23b9..10495501cfa 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -242,13 +242,13 @@ - - + + From 88acb39c5f3dd666e00cee653b616e8989bfe86c Mon Sep 17 00:00:00 2001 From: "DBR (OpenERP)" Date: Mon, 19 Sep 2011 12:39:09 +0530 Subject: [PATCH 02/62] [IMP]sales_crm : Improve the search view bzr revid: dbr@tinyerp.com-20110919070909-em15z9u8epr93jh5 --- addons/crm/crm_lead_view.xml | 4 +- addons/crm/crm_phonecall_menu.xml | 2 +- addons/crm/crm_phonecall_view.xml | 53 +++++++++++++++++-- addons/crm/report/crm_lead_report_view.xml | 14 +++-- addons/crm_claim/crm_claim_view.xml | 2 +- .../report/crm_claim_report_view.xml | 4 +- .../crm_fundraising/crm_fundraising_view.xml | 2 +- .../report/crm_fundraising_report_view.xml | 4 +- addons/crm_helpdesk/crm_helpdesk_view.xml | 17 ++++++ .../report/crm_helpdesk_report_view.xml | 10 ++-- 10 files changed, 91 insertions(+), 21 deletions(-) diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 118bf117035..b041934d3fd 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -372,7 +372,7 @@ [('state','!=','done')] - + Scheduled calls list all the calls to be done by your sales team. A salesman can record the information about the call in the form view. This information will be stored in the partner form to trace every contact you have with a customer. You can also import a .CSV file with a list of calls to be done by your sales team. diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml index d312a58febd..fabe399ec16 100644 --- a/addons/crm/crm_phonecall_view.xml +++ b/addons/crm/crm_phonecall_view.xml @@ -182,9 +182,6 @@ search - + + + CRM - Scheduled Calls Search + crm.phonecall + search + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml index 09c08108b56..56d58c048bb 100644 --- a/addons/crm/report/crm_lead_report_view.xml +++ b/addons/crm/report/crm_lead_report_view.xml @@ -73,11 +73,13 @@ @@ -93,9 +95,13 @@ + + help="Leads/Opportunities which are in draft and open state"/> Leads Analysis crm.lead.report form - {'search_default_filter_lead': 1, "search_default_user":1, "search_default_this_month":1, 'group_by_no_leaf':1, 'group_by':[]} + {'search_default_filter_lead': 1, "search_default_lead":1, "search_default_user":1, "search_default_this_month":1, 'group_by_no_leaf':1, 'group_by':[]} tree,graph [] Leads Analysis allows you to check different CRM related information. Check for treatment delays, number of responses given and emails sent. You can sort out your leads analysis by different groups to get accurate grained analysis. @@ -231,7 +237,7 @@ Opportunities Analysis crm.lead.report form - {"search_default_filter_opportunity":1, "search_default_opportunity": 1, "search_default_user":1,"search_default_this_month":1,'group_by_no_leaf':1,'group_by':[]} + {"search_default_filter_opportunity":1, "search_default_opportunity":1,"search_default_opportunity": 1, "search_default_user":1,"search_default_this_month":1,'group_by_no_leaf':1,'group_by':[]} tree,graph Opportunities Analysis gives you an instant access to your opportunities with information such as the expected revenue, planned cost, missed deadlines or the number of interactions per opportunity. This report is mainly used by the sales manager in order to do the periodic review with the teams of the sales pipeline. diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml index 15956389e8e..53220a5304d 100644 --- a/addons/crm_claim/crm_claim_view.xml +++ b/addons/crm_claim/crm_claim_view.xml @@ -225,7 +225,7 @@ search - - - - search + + + + + + + - - - + + Date: Mon, 19 Sep 2011 14:17:50 +0530 Subject: [PATCH 03/62] [IMP]sales_crm : Improve the icons bzr revid: dbr@tinyerp.com-20110919084750-d3rjbeeyrqmz742c --- addons/crm_claim/report/crm_claim_report_view.xml | 2 +- addons/crm_fundraising/report/crm_fundraising_report_view.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml index 35a1a9168c4..29650fd7503 100644 --- a/addons/crm_claim/report/crm_claim_report_view.xml +++ b/addons/crm_claim/report/crm_claim_report_view.xml @@ -67,7 +67,7 @@ help="Claims created in last month"/> - - Date: Mon, 19 Sep 2011 14:25:49 +0530 Subject: [PATCH 04/62] [IMP] change in purchase_view.xml and purchase_requistion_view.xml bzr revid: kjo@tinyerp.com-20110919085549-7kozwwcd9k7r3a2h --- addons/purchase/purchase_view.xml | 44 +++++++++++++++++-- .../purchase_requisition_view.xml | 3 +- 2 files changed, 42 insertions(+), 5 deletions(-) diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index 10495501cfa..b8532388b8c 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -234,8 +234,8 @@ - - purchase.order.list.select + + request.for.quotation.select purchase.order search @@ -248,7 +248,8 @@ - + + @@ -268,6 +269,41 @@ + + + purchase.order.list.select + purchase.order + search + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + purchase.order.tree purchase.order @@ -297,7 +333,7 @@ form {'search_default_draft': 1} tree,form,graph,calendar - + You can create a request for quotation when you want to buy products to a supplier but the purchase is not confirmed yet. Use also this menu to review requests for quotation created automatically based on your logistic rules (minimum stock, MTO, etc). You can convert the request for quotation into a purchase order once the order is confirmed. If you use the extended interface (from user's preferences), you can select the way to control your supplier invoices: based on the order, based on the receptions or manual encoding. purchase.order - + + From be032cb8f6c905ebda1f652190a9552bdaedda81 Mon Sep 17 00:00:00 2001 From: "Kuldeep Joshi (OpenERP)" Date: Mon, 19 Sep 2011 14:31:48 +0530 Subject: [PATCH 05/62] [IMP]change draft button with new in search_view of purchase_requistion_view.xml bzr revid: kjo@tinyerp.com-20110919090148-tephdkxlukepxkb3 --- addons/purchase_requisition/purchase_requisition_view.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml index 4d917c01c6c..1e66b1fda2d 100644 --- a/addons/purchase_requisition/purchase_requisition_view.xml +++ b/addons/purchase_requisition/purchase_requisition_view.xml @@ -121,11 +121,12 @@ - + + From 03832c6aed3bb54d8ac0bca6bbe68c4f6b457dcf Mon Sep 17 00:00:00 2001 From: "Kuldeep Joshi (OpenERP)" Date: Mon, 19 Sep 2011 14:45:50 +0530 Subject: [PATCH 06/62] [IMP] stock: change the button name and order in search_view of stock_view.xml bzr revid: kjo@tinyerp.com-20110919091550-7z72kc9yp62vxgxn --- addons/stock/stock_view.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 6a6566d8bf9..7bbfc866be0 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -1675,10 +1675,9 @@ - + - - + From 6d6badf2fd1cfbf76bbc4a6cbe254f9578a8156f Mon Sep 17 00:00:00 2001 From: "Kuldeep Joshi (OpenERP)" Date: Mon, 19 Sep 2011 15:06:53 +0530 Subject: [PATCH 07/62] [IMP] change in purchase_requistion_view.xml bzr revid: kjo@tinyerp.com-20110919093653-4wmxc8iixv38xqzy --- addons/purchase/purchase_view.xml | 2 -- .../purchase_requisition_view.xml | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index b8532388b8c..04d52d4a79f 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -248,8 +248,6 @@ - - diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml index 1e66b1fda2d..f781abaa807 100644 --- a/addons/purchase_requisition/purchase_requisition_view.xml +++ b/addons/purchase_requisition/purchase_requisition_view.xml @@ -27,6 +27,20 @@ + + + request.for.quotation.select.inherit + form + purchase.order + + + + + + + + + purchase.requisition.form form From d0ceb8f301777cf891ecdc105218e411bc9f5742 Mon Sep 17 00:00:00 2001 From: "DBR (OpenERP)" Date: Mon, 19 Sep 2011 15:07:37 +0530 Subject: [PATCH 08/62] [IMP]crm : Improve the code bzr revid: dbr@tinyerp.com-20110919093737-ehrbimwl7um2do3j --- addons/crm/report/crm_lead_report_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml index 56d58c048bb..8a0a61f3b20 100644 --- a/addons/crm/report/crm_lead_report_view.xml +++ b/addons/crm/report/crm_lead_report_view.xml @@ -215,7 +215,7 @@ Leads Analysis crm.lead.report form - {'search_default_filter_lead': 1, "search_default_lead":1, "search_default_user":1, "search_default_this_month":1, 'group_by_no_leaf':1, 'group_by':[]} + {'search_default_lead': 1, "search_default_user":1, "search_default_this_month":1, 'group_by_no_leaf':1, 'group_by':[]} tree,graph [] Leads Analysis allows you to check different CRM related information. Check for treatment delays, number of responses given and emails sent. You can sort out your leads analysis by different groups to get accurate grained analysis. @@ -237,7 +237,7 @@ Opportunities Analysis crm.lead.report form - {"search_default_filter_opportunity":1, "search_default_opportunity":1,"search_default_opportunity": 1, "search_default_user":1,"search_default_this_month":1,'group_by_no_leaf':1,'group_by':[]} + {"search_default_opportunity":1,"search_default_opportunity": 1, "search_default_user":1,"search_default_this_month":1,'group_by_no_leaf':1,'group_by':[]} tree,graph Opportunities Analysis gives you an instant access to your opportunities with information such as the expected revenue, planned cost, missed deadlines or the number of interactions per opportunity. This report is mainly used by the sales manager in order to do the periodic review with the teams of the sales pipeline. From 7482f1166b4ffb431db923411001481ba2fc2f89 Mon Sep 17 00:00:00 2001 From: "DBR (OpenERP)" Date: Mon, 19 Sep 2011 15:23:41 +0530 Subject: [PATCH 09/62] [IMP]Events : Improve the search view bzr revid: dbr@tinyerp.com-20110919095341-2yupmuw6nsz690bq --- addons/event/event_view.xml | 4 +-- .../report/report_event_registration_view.xml | 31 ++++++++++--------- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index cb31ad04b65..ad72e2b51e2 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -229,7 +229,7 @@ - + @@ -475,7 +475,7 @@ - + diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml index 11d8592350b..17c8f26a8b6 100644 --- a/addons/event/report/report_event_registration_view.xml +++ b/addons/event/report/report_event_registration_view.xml @@ -53,21 +53,24 @@ - - - + + + - + + Date: Mon, 19 Sep 2011 15:34:19 +0530 Subject: [PATCH 10/62] [IMP] set default done and to_invoice button in serch_view bzr revid: kjo@tinyerp.com-20110919100419-3deyt30et683etr9 --- addons/purchase/stock_view.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml index 538d0b81ab7..ca595641098 100644 --- a/addons/purchase/stock_view.xml +++ b/addons/purchase/stock_view.xml @@ -71,9 +71,9 @@ - - @@ -109,7 +109,7 @@ form tree,form,calendar [('type','=','in')] - {'contact_display': 'partner_address',"search_default_available":1} + {'contact_display': 'partner_address',"search_default_done":1, "search_default_to_invoice":1} Create invoice from reception of products. If you selected this invoice control method in the purchase order, all receptions done are available here to be invoiced. From a2899119937c814726abda27533b0a06f2bc764d Mon Sep 17 00:00:00 2001 From: "Kuldeep Joshi (OpenERP)" Date: Mon, 19 Sep 2011 16:00:06 +0530 Subject: [PATCH 11/62] [IMP] change in stock_view.xml bzr revid: kjo@tinyerp.com-20110919103006-ggedqg24653r2bml --- addons/stock/stock_view.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 7bbfc866be0..9304e2d80a5 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -1675,7 +1675,8 @@ - + + From 82b56b64a1748a986a1f2e82ad1908cf18f5d7e2 Mon Sep 17 00:00:00 2001 From: "DBR (OpenERP)" Date: Mon, 19 Sep 2011 16:06:53 +0530 Subject: [PATCH 12/62] [IMP]crm_helpdesk : Improve the filter bzr revid: dbr@tinyerp.com-20110919103653-cdw9nt96xgsy5zgj --- addons/crm_helpdesk/crm_helpdesk_menu.xml | 2 +- addons/crm_helpdesk/crm_helpdesk_view.xml | 6 ++---- addons/crm_helpdesk/report/crm_helpdesk_report_view.xml | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/addons/crm_helpdesk/crm_helpdesk_menu.xml b/addons/crm_helpdesk/crm_helpdesk_menu.xml index 162cef8c15d..31ee27345b0 100644 --- a/addons/crm_helpdesk/crm_helpdesk_menu.xml +++ b/addons/crm_helpdesk/crm_helpdesk_menu.xml @@ -11,8 +11,8 @@ crm.helpdesk tree,calendar,form - {"search_default_user_id":uid, 'search_default_section_id': section_id} + {"search_default_user_id":uid, "search_default_current":1, 'search_default_section_id': section_id} Helpdesk and Support allow you to track your interventions. Select a customer, add notes and categorize interventions with partners if necessary. You can also assign a priority level. Use the OpenERP Issues system to manage your support activities. Issues can be connected to the email gateway: new emails may create issues, each of them automatically gets the history of the conversation with the customer. diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml index 746b96a6951..aca7ac061a8 100644 --- a/addons/crm_helpdesk/crm_helpdesk_view.xml +++ b/addons/crm_helpdesk/crm_helpdesk_view.xml @@ -232,7 +232,8 @@ search - - - - crm.helpdesk.report form tree,graph - {"search_default_User":1,"search_default_This Month":1,'group_by_no_leaf':1,'group_by':[]} + {"search_default_User":1,"search_default_this_month":1,'group_by_no_leaf':1,'group_by':[]} Have a general overview of all support requests by sorting them with specific criteria such as the processing time, number of requests answered, emails sent and costs. From 93a5c151ef3b5afe71618ad57740bcf7afc46345 Mon Sep 17 00:00:00 2001 From: "Kuldeep Joshi (OpenERP)" Date: Mon, 19 Sep 2011 16:39:52 +0530 Subject: [PATCH 13/62] [IMP] add button in purchase order search view and also add separator between back Orders and To Invoice bzr revid: kjo@tinyerp.com-20110919110952-h1k9v0vmxaili3f3 --- addons/purchase/purchase_view.xml | 5 +++-- addons/purchase/stock_view.xml | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index 04d52d4a79f..90a13835a83 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -235,7 +235,7 @@ - request.for.quotation.select + request.quotation.select purchase.order search @@ -275,7 +275,8 @@ - + + diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml index ca595641098..2ee1ff7f692 100644 --- a/addons/purchase/stock_view.xml +++ b/addons/purchase/stock_view.xml @@ -73,6 +73,7 @@ + From d24b721ae9e14c6049eeecbcd76c47966fd59a55 Mon Sep 17 00:00:00 2001 From: "DBR (OpenERP)" Date: Mon, 19 Sep 2011 16:42:14 +0530 Subject: [PATCH 14/62] [IMP]crm_helpdesk : Improve the code bzr revid: dbr@tinyerp.com-20110919111214-m7f5j63fvscxnzv8 --- addons/crm_helpdesk/crm_helpdesk_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml index aca7ac061a8..20a0dcef570 100644 --- a/addons/crm_helpdesk/crm_helpdesk_view.xml +++ b/addons/crm_helpdesk/crm_helpdesk_view.xml @@ -232,12 +232,12 @@ search - From fa56c87151eaa9d88ffbdc109f7296e3ba799164 Mon Sep 17 00:00:00 2001 From: "DBR (OpenERP)" Date: Mon, 19 Sep 2011 16:52:52 +0530 Subject: [PATCH 15/62] [IMP]Event : Improve the indentation bzr revid: dbr@tinyerp.com-20110919112252-0nwc88bdgvmftbw3 --- .../report/report_event_registration_view.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml index 17c8f26a8b6..d2497d863f8 100644 --- a/addons/event/report/report_event_registration_view.xml +++ b/addons/event/report/report_event_registration_view.xml @@ -53,7 +53,7 @@ - - - + + Date: Mon, 19 Sep 2011 16:54:13 +0530 Subject: [PATCH 16/62] [IMP]crm_helpdesk : Improve the filter help bzr revid: dbr@tinyerp.com-20110919112413-zcs8fdfhn32l82sk --- addons/crm_helpdesk/crm_helpdesk_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml index 20a0dcef570..c3f229861c1 100644 --- a/addons/crm_helpdesk/crm_helpdesk_view.xml +++ b/addons/crm_helpdesk/crm_helpdesk_view.xml @@ -239,7 +239,7 @@ Date: Mon, 19 Sep 2011 17:11:42 +0530 Subject: [PATCH 17/62] [IMP]change in stock move and Delivery products search view bzr revid: kjo@tinyerp.com-20110919114142-9pku6simfofvshdd --- addons/stock/stock_view.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 6a6566d8bf9..3fee1142f1d 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -1486,11 +1486,11 @@ - - + + - - + + @@ -1707,12 +1707,12 @@ - - + + From 9b837808465b52367b2b8e3316b688d1a1c1fe96 Mon Sep 17 00:00:00 2001 From: "Kuldeep Joshi (OpenERP)" Date: Mon, 19 Sep 2011 17:24:47 +0530 Subject: [PATCH 18/62] [IMP]change in procurement order search view bzr revid: kjo@tinyerp.com-20110919115447-83eh30c35dfv08qr --- addons/procurement/procurement_view.xml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml index b2f5e13b756..8da4299cb0d 100644 --- a/addons/procurement/procurement_view.xml +++ b/addons/procurement/procurement_view.xml @@ -101,15 +101,14 @@ - - - + + From 0af5ff77b3223109bd16a57ed75ea0e85336a36b Mon Sep 17 00:00:00 2001 From: "DBR (OpenERP)" Date: Mon, 19 Sep 2011 17:39:16 +0530 Subject: [PATCH 19/62] [IMP]project : Improve the search view bzr revid: dbr@tinyerp.com-20110919120916-skeyaztygd3bq2vf --- addons/project/project_view.xml | 3 ++- addons/project_timesheet/project_timesheet_view.xml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 2bca9293e08..30f3aec1e60 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -107,7 +107,8 @@ - + + diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml index 02272025ef8..39965618ac8 100644 --- a/addons/project_timesheet/project_timesheet_view.xml +++ b/addons/project_timesheet/project_timesheet_view.xml @@ -39,7 +39,7 @@ - + From fbde483416abc89d225ee0a187bdc16bde698dc1 Mon Sep 17 00:00:00 2001 From: "Kuldeep Joshi (OpenERP)" Date: Mon, 19 Sep 2011 17:40:29 +0530 Subject: [PATCH 20/62] [IMP] purchase: remove view_type in request for quotation action bzr revid: kjo@tinyerp.com-20110919121029-2w31y24qabvph7j3 --- addons/purchase/purchase_view.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index 90a13835a83..4cec0750345 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -329,7 +329,6 @@ Requests for Quotation ir.actions.act_window purchase.order - form {'search_default_draft': 1} tree,form,graph,calendar From 307f742edcdedefedd41a3c9ed36f8c36be589bc Mon Sep 17 00:00:00 2001 From: "Kuldeep Joshi (OpenERP)" Date: Mon, 19 Sep 2011 18:24:05 +0530 Subject: [PATCH 21/62] [IMP] change button name from back Orders to Back Orders bzr revid: kjo@tinyerp.com-20110919125405-mkja58da4egvpv5f --- addons/purchase/stock_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml index 2ee1ff7f692..5b9901a9a49 100644 --- a/addons/purchase/stock_view.xml +++ b/addons/purchase/stock_view.xml @@ -71,7 +71,7 @@ - Date: Mon, 19 Sep 2011 18:30:57 +0530 Subject: [PATCH 22/62] [IMP] change the button order in stock_view.xml bzr revid: kjo@tinyerp.com-20110919130057-ag1v92dll6xytxge --- addons/stock/stock_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 3fee1142f1d..672408841df 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -1675,11 +1675,11 @@ - - + + From dfd9fc3721e2848e353c8e50a4bcbee75cce8120 Mon Sep 17 00:00:00 2001 From: "DBR (OpenERP)" Date: Mon, 19 Sep 2011 18:47:18 +0530 Subject: [PATCH 23/62] [IMP]mrp : Improve the search view bzr revid: dbr@tinyerp.com-20110919131718-c85nomc2dkm08ry2 --- addons/mrp/report/mrp_production_order_view.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/mrp/report/mrp_production_order_view.xml b/addons/mrp/report/mrp_production_order_view.xml index dfcf41d9333..c8f47a369d9 100644 --- a/addons/mrp/report/mrp_production_order_view.xml +++ b/addons/mrp/report/mrp_production_order_view.xml @@ -60,8 +60,7 @@ domain="[('date','<=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','>=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]" help="Production during last month"/> - - + From 23c7a3373da9ee25a53905e1fffbf7fb355f63fb Mon Sep 17 00:00:00 2001 From: "DBR (OpenERP)" Date: Tue, 20 Sep 2011 10:40:58 +0530 Subject: [PATCH 24/62] [IMP]mrp : Restore & Rename current button bzr revid: dbr@tinyerp.com-20110920051058-4jyotioj66jld3q2 --- addons/mrp/report/mrp_production_order_view.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/mrp/report/mrp_production_order_view.xml b/addons/mrp/report/mrp_production_order_view.xml index c8f47a369d9..f62b97b1cbc 100644 --- a/addons/mrp/report/mrp_production_order_view.xml +++ b/addons/mrp/report/mrp_production_order_view.xml @@ -60,6 +60,7 @@ domain="[('date','<=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','>=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]" help="Production during last month"/> + From d375943aa418f9b03175e2bcb9396b7146d47198 Mon Sep 17 00:00:00 2001 From: "DBR (OpenERP)" Date: Tue, 20 Sep 2011 14:12:34 +0530 Subject: [PATCH 25/62] [IMP]mrp : Improve the search view bzr revid: dbr@tinyerp.com-20110920084234-mc46vmyvq0vx5h83 --- addons/mrp/report/mrp_production_order_view.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/mrp/report/mrp_production_order_view.xml b/addons/mrp/report/mrp_production_order_view.xml index f62b97b1cbc..43222c8bb30 100644 --- a/addons/mrp/report/mrp_production_order_view.xml +++ b/addons/mrp/report/mrp_production_order_view.xml @@ -60,8 +60,9 @@ domain="[('date','<=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','>=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]" help="Production during last month"/> - - + + + From 96addb9375db31abf92b367a2ae4e10317dbbcf0 Mon Sep 17 00:00:00 2001 From: Jigar Amin - OpenERP Date: Tue, 20 Sep 2011 14:38:06 +0530 Subject: [PATCH 26/62] [IMP] hr_recuitment - Applicants Search View: removed the current bzr revid: jam@tinyerp.com-20110920090806-o49rn50poqi9bzsd --- addons/hr_recruitment/hr_recruitment_view.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml index fce529731fc..ff8357b61f6 100644 --- a/addons/hr_recruitment/hr_recruitment_view.xml +++ b/addons/hr_recruitment/hr_recruitment_view.xml @@ -217,12 +217,6 @@ search - - Date: Tue, 20 Sep 2011 14:45:31 +0530 Subject: [PATCH 27/62] [IMP] hr - Job Positions Search : Added In Position Serach button bzr revid: jam@tinyerp.com-20110920091531-cu7ot4cmgql6mulj --- addons/hr/hr_view.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index fb10baedc9e..47a157584a4 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -349,6 +349,10 @@ + From 8d788ea0ca2b6eb1a59d65f2cae000a139234b1c Mon Sep 17 00:00:00 2001 From: Jigar Amin - OpenERP Date: Tue, 20 Sep 2011 14:53:44 +0530 Subject: [PATCH 28/62] [IMP] he_expense - Expense : Expenses : New (rename draft)and removed Vertical to keep all state together bzr revid: jam@tinyerp.com-20110920092344-smvchm728b4f3yge --- addons/hr_expense/hr_expense_view.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml index 295f9593d0f..6e2dcdd25cd 100644 --- a/addons/hr_expense/hr_expense_view.xml +++ b/addons/hr_expense/hr_expense_view.xml @@ -136,8 +136,7 @@ - - + Date: Tue, 20 Sep 2011 15:03:05 +0530 Subject: [PATCH 29/62] [IMP] rename Current into Open in report.account.invoice.product search_view bzr revid: kjo@tinyerp.com-20110920093305-eguvulko7rmn2m84 --- addons/sale_margin/report/report_margin_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/sale_margin/report/report_margin_view.xml b/addons/sale_margin/report/report_margin_view.xml index c826ea9c853..7941efa327b 100644 --- a/addons/sale_margin/report/report_margin_view.xml +++ b/addons/sale_margin/report/report_margin_view.xml @@ -37,7 +37,7 @@ - + From 861ef42bbbf4e3c07b8b90ef1b807226d14e7113 Mon Sep 17 00:00:00 2001 From: Jigar Amin - OpenERP Date: Tue, 20 Sep 2011 15:04:18 +0530 Subject: [PATCH 30/62] [IMP] hr_holidays - Leave Requests :Rearranged To Confirm To Approve Validated bzr revid: jam@tinyerp.com-20110920093418-v9wgaooul8nkhlur --- addons/hr_holidays/hr_holidays_view.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml index 074b44a4104..58d37490bd7 100644 --- a/addons/hr_holidays/hr_holidays_view.xml +++ b/addons/hr_holidays/hr_holidays_view.xml @@ -8,10 +8,9 @@ - - + From 0fe0b3ea16d39c76b5a2934c9e9014db12f03d85 Mon Sep 17 00:00:00 2001 From: "DBR (OpenERP)" Date: Tue, 20 Sep 2011 15:08:58 +0530 Subject: [PATCH 31/62] [IMP]membership : Add filters in search view bzr revid: dbr@tinyerp.com-20110920093858-1bn9zz89f80a5zig --- .../report/report_membership_view.xml | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/addons/membership/report/report_membership_view.xml b/addons/membership/report/report_membership_view.xml index 0e6ddc630f6..f219fe364c4 100644 --- a/addons/membership/report/report_membership_view.xml +++ b/addons/membership/report/report_membership_view.xml @@ -36,14 +36,19 @@ - - - + + + + - + @@ -91,7 +96,7 @@ report.membership form - {"search_default_member":1, 'search_default_Revenue':1, 'search_default_salesman':1, } + {"search_default_member":1, 'search_default_Revenue':1, 'search_default_this_month':1, 'search_default_salesman':1, } From 48fa8eafdb6e1e072567d051c4046aaeff642d1b Mon Sep 17 00:00:00 2001 From: Jigar Amin - OpenERP Date: Tue, 20 Sep 2011 15:16:08 +0530 Subject: [PATCH 32/62] [IMP] hr_evalution - Renamed Current Filter to Pending bzr revid: jam@tinyerp.com-20110920094608-e0mx5bcxfb875h8x --- addons/hr_evaluation/hr_evaluation_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml index e5a3d0ac818..592a986d98c 100644 --- a/addons/hr_evaluation/hr_evaluation_view.xml +++ b/addons/hr_evaluation/hr_evaluation_view.xml @@ -252,7 +252,7 @@ - + Date: Tue, 20 Sep 2011 15:34:32 +0530 Subject: [PATCH 33/62] [FIX] hr job position current button removed bzr revid: jam@tinyerp.com-20110920100432-p5vmqebqltr11034 --- addons/hr/hr_view.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index 47a157584a4..5c9482a579a 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -346,9 +346,6 @@ search - - Date: Tue, 20 Sep 2011 15:40:01 +0530 Subject: [PATCH 34/62] [FIX] hr job position added new icon for in position Jobs bzr revid: jam@tinyerp.com-20110920101001-oaweemhq5p5qsnwy --- addons/hr/hr_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index 5c9482a579a..87a9da2cc6e 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -346,7 +346,7 @@ search - From 08ff02c21aa5200682b304c8a47b2eb326c9aace Mon Sep 17 00:00:00 2001 From: Jigar Amin - OpenERP Date: Tue, 20 Sep 2011 15:45:03 +0530 Subject: [PATCH 35/62] [FIX] hr_evalution improved the tooltips bzr revid: jam@tinyerp.com-20110920101503-9vy1mqeo72mdti0r --- addons/hr_evaluation/hr_evaluation_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml index 592a986d98c..58c5452799e 100644 --- a/addons/hr_evaluation/hr_evaluation_view.xml +++ b/addons/hr_evaluation/hr_evaluation_view.xml @@ -252,8 +252,8 @@ - - + + From 9511ec1138d031b0a659e5fe2f476f58ae5d1068 Mon Sep 17 00:00:00 2001 From: Jigar Amin - OpenERP Date: Tue, 20 Sep 2011 15:54:22 +0530 Subject: [PATCH 36/62] [IMP] Survey - Added new Filter button for the new Survey and rOpen Surbey and Removed Current button bzr revid: jam@tinyerp.com-20110920102422-tqj1qwbekytsogpg --- addons/survey/survey_view.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml index 00ac7620be7..d3708d6099d 100644 --- a/addons/survey/survey_view.xml +++ b/addons/survey/survey_view.xml @@ -261,7 +261,8 @@ - + + From 4c86752e1e649c6251b2558bdbd1f1f256230a33 Mon Sep 17 00:00:00 2001 From: Jigar Amin - OpenERP Date: Tue, 20 Sep 2011 15:58:57 +0530 Subject: [PATCH 37/62] [IMP] Idea Rearraned three button New, Open and Accepted bzr revid: jam@tinyerp.com-20110920102857-f8yg12kbu8yzzter --- addons/idea/idea_view.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml index 59111a11d04..4b1c7ecab93 100644 --- a/addons/idea/idea_view.xml +++ b/addons/idea/idea_view.xml @@ -289,7 +289,8 @@ - + + From 9efb9c7d0d663516bfab21d9ef5b75229fd6dcf5 Mon Sep 17 00:00:00 2001 From: Jigar Amin - OpenERP Date: Tue, 20 Sep 2011 16:05:43 +0530 Subject: [PATCH 38/62] [IMP] Idea Survey Anaysis Search View Rearranged the Filteres and Survey Renamed the button icons bzr revid: jam@tinyerp.com-20110920103543-u52qciy5o84nw5fl --- addons/idea/idea_view.xml | 4 ++-- addons/idea/report/report_vote_view.xml | 11 ++--------- addons/survey/survey_view.xml | 2 +- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml index 4b1c7ecab93..38817f10e0c 100644 --- a/addons/idea/idea_view.xml +++ b/addons/idea/idea_view.xml @@ -290,8 +290,8 @@ - - + diff --git a/addons/idea/report/report_vote_view.xml b/addons/idea/report/report_vote_view.xml index eb5cfe3c28b..8e4a8ae2abb 100644 --- a/addons/idea/report/report_vote_view.xml +++ b/addons/idea/report/report_vote_view.xml @@ -40,17 +40,10 @@ domain="[('date','<=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','>=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]" help="Idea Vote created last month"/> - - - - - + From 477a7f1d4eba5757c02df8fcb12613adddb48e10 Mon Sep 17 00:00:00 2001 From: "DBR (OpenERP)" Date: Tue, 20 Sep 2011 16:28:29 +0530 Subject: [PATCH 39/62] [IMP] Improve the search views bzr revid: dbr@tinyerp.com-20110920105829-ythiwkwv437qti30 --- addons/project/project_view.xml | 2 +- addons/project/report/project_report_view.xml | 6 +++--- addons/project_issue/project_issue_menu.xml | 2 +- addons/project_issue/project_issue_view.xml | 4 +--- .../report/project_issue_report_view.xml | 12 +++++++----- addons/project_long_term/project_long_term_view.xml | 2 +- addons/project_scrum/project_scrum_view.xml | 11 +++++------ 7 files changed, 19 insertions(+), 20 deletions(-) diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 30f3aec1e60..dd2868c9ded 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -454,7 +454,7 @@ - + diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml index b9be53a2431..601f6e2004f 100644 --- a/addons/project/report/project_report_view.xml +++ b/addons/project/report/project_report_view.xml @@ -72,11 +72,11 @@ domain="[('date_start','<=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date_start','>=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]" help="Previous Month"/> - - + diff --git a/addons/project_issue/project_issue_menu.xml b/addons/project_issue/project_issue_menu.xml index 18c8779704f..e1a6af40997 100644 --- a/addons/project_issue/project_issue_menu.xml +++ b/addons/project_issue/project_issue_menu.xml @@ -13,7 +13,7 @@ tree,calendar - {"search_default_user_id": uid, "search_default_current":1, "search_default_project_id":project_id} + {"search_default_user_id": uid, "search_default_project_id":project_id} Issues such as system bugs, customer complaints, and material breakdowns are collected here. You can define the stages assigned when solving the project issue (analysis, development, done). With the mailgateway module, issues can be integrated through an email address (example: support@mycompany.com) diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index db70d2df3cc..10fa6930311 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -208,10 +208,8 @@ - - - + diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml index ef629b5b017..12ae4f7a870 100644 --- a/addons/project_issue/report/project_issue_report_view.xml +++ b/addons/project_issue/report/project_issue_report_view.xml @@ -53,7 +53,7 @@ - @@ -63,11 +63,13 @@ - - + + string="New" + domain="[('state','=','draft')]"/> + diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index c53f4196202..dd83b162997 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -267,7 +267,7 @@ - + diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml index 53e0d9e442d..a987b771651 100644 --- a/addons/project_scrum/project_scrum_view.xml +++ b/addons/project_scrum/project_scrum_view.xml @@ -132,12 +132,11 @@ + string="Draft" + domain="['|','&',('sprint_id.date_start','<=',time.strftime('%%Y-%%m-%%d')), ('sprint_id.date_stop','>=',time.strftime('%%Y-%%m-%%d')), ('state','=','draft')]" + help="Draft Backlogs"/> - + @@ -179,7 +178,7 @@ Product Backlogs project.scrum.product.backlog form - {'search_default_current': 1,'search_default_user_id':uid,'search_default_project_id':project_id} + {'search_default_user_id':uid,'search_default_project_id':project_id} The scrum agile methodology is used in software development projects. The Product Backlog is the list of features to be implemented. A product backlog can be planified in a development sprint and may be split into several tasks. The product backlog is managed by the product owner of the project. From f09b5eea521238c57b825ce94aa3570e53f6be2a Mon Sep 17 00:00:00 2001 From: "DBR (OpenERP)" Date: Tue, 20 Sep 2011 16:38:27 +0530 Subject: [PATCH 40/62] [IMP]mrp:change icon and remove the New filter bzr revid: dbr@tinyerp.com-20110920110827-r4cbhpdc5l1x2emq --- addons/mrp/report/mrp_production_order_view.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/mrp/report/mrp_production_order_view.xml b/addons/mrp/report/mrp_production_order_view.xml index 43222c8bb30..9ee2cfdd5fd 100644 --- a/addons/mrp/report/mrp_production_order_view.xml +++ b/addons/mrp/report/mrp_production_order_view.xml @@ -60,10 +60,9 @@ domain="[('date','<=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','>=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]" help="Production during last month"/> - - + From 9560bcc8b22dbe8575fe76527e79544f39ba8864 Mon Sep 17 00:00:00 2001 From: "Kuldeep Joshi (OpenERP)" Date: Tue, 20 Sep 2011 16:50:39 +0530 Subject: [PATCH 41/62] [IMP] change the tooltip of button bzr revid: kjo@tinyerp.com-20110920112039-1d0kkbgq6c34mw3s --- addons/purchase_requisition/purchase_requisition_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml index f781abaa807..0cb0650facf 100644 --- a/addons/purchase_requisition/purchase_requisition_view.xml +++ b/addons/purchase_requisition/purchase_requisition_view.xml @@ -135,7 +135,7 @@ - + @@ -166,7 +166,7 @@ purchase.requisition form tree,form - {"search_default_create_uid":uid,'search_default_draft': 1} + {"search_default_create_uid":uid,'search_default_New': 1} A purchase requisition is the step before a request for quotation. In a purchase requisition (or purchase tender), you can record the products you need to buy and trigger the creation of RfQs to suppliers. After the negotiation, once you have reviewed all the supplier's offers, you can validate some and cancel others. From b08399c0848d2cb9588b07d9419e7e80a9418011 Mon Sep 17 00:00:00 2001 From: "DBR (OpenERP)" Date: Tue, 20 Sep 2011 16:59:22 +0530 Subject: [PATCH 42/62] [IMP]Improve the help bzr revid: dbr@tinyerp.com-20110920112922-gacht3qg0o4ypkx9 --- addons/crm/crm_lead_view.xml | 4 ++-- addons/crm/report/crm_lead_report_view.xml | 2 +- addons/crm_claim/crm_claim_view.xml | 2 +- addons/crm_helpdesk/crm_helpdesk_view.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index b041934d3fd..141d8228347 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -373,7 +373,7 @@ + help="Leads/Opportunities which are in New state"/> + help="New Claims" /> + help="New Helpdesk Request" /> Date: Tue, 20 Sep 2011 17:23:13 +0530 Subject: [PATCH 43/62] [IMP]event: Improve the filters bzr revid: dbr@tinyerp.com-20110920115313-mmxv35ss81932b1d --- addons/event/event_view.xml | 2 +- addons/event/report/report_event_registration_view.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index ad72e2b51e2..ed59bd81321 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -229,7 +229,7 @@ - + diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml index d2497d863f8..3fd24c0a366 100644 --- a/addons/event/report/report_event_registration_view.xml +++ b/addons/event/report/report_event_registration_view.xml @@ -66,7 +66,7 @@ + help="Events which are in New state"/> Date: Tue, 20 Sep 2011 18:22:59 +0530 Subject: [PATCH 44/62] [IMP]project_scrum: Improve the sprints search view bzr revid: dbr@tinyerp.com-20110920125259-36me4wcq1zmw8s2b --- addons/project_scrum/project_scrum_view.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml index a987b771651..9520cad5c6a 100644 --- a/addons/project_scrum/project_scrum_view.xml +++ b/addons/project_scrum/project_scrum_view.xml @@ -319,9 +319,8 @@ - - - + + From 15df3b8cf26979a9ec934dca3a6e1ac21dea58b7 Mon Sep 17 00:00:00 2001 From: "DBR (OpenERP)" Date: Wed, 21 Sep 2011 11:11:46 +0530 Subject: [PATCH 45/62] [IMP]Improve the help bzr revid: dbr@tinyerp.com-20110921054146-o0dhl9b1olp2hnk4 --- addons/crm/crm_lead_view.xml | 4 ++-- addons/crm_claim/crm_claim_view.xml | 2 +- addons/crm_fundraising/crm_fundraising_view.xml | 2 +- addons/crm_helpdesk/crm_helpdesk_view.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 141d8228347..2a1269be1f6 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -373,7 +373,7 @@ + help="New and Open Claims" /> + help="New and Open Funds" /> diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml index 3353840133c..c00769995d7 100644 --- a/addons/crm_helpdesk/crm_helpdesk_view.xml +++ b/addons/crm_helpdesk/crm_helpdesk_view.xml @@ -235,7 +235,7 @@ + help="New and Open Helpdesk Request" /> Date: Wed, 21 Sep 2011 12:45:44 +0530 Subject: [PATCH 46/62] [IMP]Improve Domains bzr revid: dbr@tinyerp.com-20110921071544-quyoatb7d1ba5fh3 --- addons/crm/crm_lead_view.xml | 8 ++++---- addons/crm/report/crm_lead_report_view.xml | 4 ++-- addons/crm_claim/crm_claim_view.xml | 4 ++-- addons/crm_fundraising/crm_fundraising_view.xml | 4 ++-- addons/crm_helpdesk/crm_helpdesk_view.xml | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 2a1269be1f6..9a0abd6e663 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -373,8 +373,8 @@ + name="current" help="New Leads" + domain="[('state','=','draft')]"/> @@ -675,9 +675,9 @@ + domain="[('state','=','draft')]"/> diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml index 13dc7350497..90297c5b5c7 100644 --- a/addons/crm/report/crm_lead_report_view.xml +++ b/addons/crm/report/crm_lead_report_view.xml @@ -100,8 +100,8 @@ help="Leads/Opportunities which are in New state"/> + domain="[('state','=','open')]" + help="Leads/Opportunities which are in open state"/> + domain="[('state','=','draft')]" + help="New Claims" /> + domain="[('state','=','draft')]" name="current" + help="New Funds" /> diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml index c00769995d7..c4567cb8f31 100644 --- a/addons/crm_helpdesk/crm_helpdesk_view.xml +++ b/addons/crm_helpdesk/crm_helpdesk_view.xml @@ -234,8 +234,8 @@ + domain="[('state','=','draft')]" + help="New Helpdesk Request" /> Date: Thu, 22 Sep 2011 12:30:17 +0530 Subject: [PATCH 47/62] [IMP] set ready button as search_default in stock.move action bzr revid: kjo@tinyerp.com-20110922070017-y2vnrro8r08ee4ps --- addons/stock/stock_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 672408841df..1412798f9cd 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -1525,7 +1525,7 @@ form - {'search_default_Available':1} + {'search_default_ready':1} This menu gives you the full traceability of inventory operations on a specific product. You can filter on the product to see all the past or future movements for the product. From f1cf24bc8e3f8058caa75edc55032a193ff9d9f9 Mon Sep 17 00:00:00 2001 From: "DBR (OpenERP)" Date: Thu, 22 Sep 2011 12:46:11 +0530 Subject: [PATCH 48/62] [Imp]Improve code of registration search view bzr revid: dbr@tinyerp.com-20110922071611-juobodb1sk7f96m5 --- addons/event/event_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index ed59bd81321..f73d68da7e9 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -475,7 +475,7 @@ - + From 56b08a3ead6489524437b926d35d7d1caf63a70d Mon Sep 17 00:00:00 2001 From: "DBR (OpenERP)" Date: Thu, 22 Sep 2011 14:39:00 +0530 Subject: [PATCH 49/62] [Imp]Improve project_issue search view bzr revid: dbr@tinyerp.com-20110922090900-e34meuea1cap3edd --- addons/project_issue/project_issue_menu.xml | 2 +- addons/project_issue/project_issue_view.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/project_issue/project_issue_menu.xml b/addons/project_issue/project_issue_menu.xml index e1a6af40997..952316aaa33 100644 --- a/addons/project_issue/project_issue_menu.xml +++ b/addons/project_issue/project_issue_menu.xml @@ -13,7 +13,7 @@ tree,calendar - {"search_default_user_id": uid, "search_default_project_id":project_id} + {"search_default_user_id": uid, "search_default_New": 1, "search_default_project_id":project_id} Issues such as system bugs, customer complaints, and material breakdowns are collected here. You can define the stages assigned when solving the project issue (analysis, development, done). With the mailgateway module, issues can be integrated through an email address (example: support@mycompany.com) diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index 10fa6930311..a4c11fdfa9e 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -208,7 +208,7 @@ - + From 61c115dd137310218aa33226068fba15b3bd4e4c Mon Sep 17 00:00:00 2001 From: "ARA (OpenERP)" Date: Thu, 22 Sep 2011 14:49:19 +0530 Subject: [PATCH 50/62] [FIX] cannot install chart template of belgian chart lp bug: https://launchpad.net/bugs/854697 fixed bzr revid: ara@tinyerp.com-20110922091919-zc9atxnlwoyromaq --- addons/l10n_be/account_tax_template.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/l10n_be/account_tax_template.xml b/addons/l10n_be/account_tax_template.xml index a4d42779a97..d72b093b5f8 100644 --- a/addons/l10n_be/account_tax_template.xml +++ b/addons/l10n_be/account_tax_template.xml @@ -6,7 +6,7 @@ 10 VAT-OUT-21-S - VAT 21% + VAT 21% - Services @@ -48,7 +48,7 @@ 20 VAT-OUT-12-S - VAT 12% + VAT 12% - Services @@ -90,7 +90,7 @@ 30 VAT-OUT-06-S - VAT 6% + VAT 6% - Services @@ -132,7 +132,7 @@ 40 VAT-OUT-00-S - VAT 0% + VAT 0% - Services 0 percent @@ -2070,7 +2070,7 @@ 722 VAT-IN-V82-CAR-EXC-C2 - Frais de voiture - VAT 50% Deductible + Frais de voiture - VAT 50% Deductible (Price Excl.) @@ -2090,7 +2090,7 @@ 723 VAT-IN-V82-CAR-EXC-C3 - Frais de voiture - Montant de la note de crédit + Frais de voiture - Montant de la note de crédit (Price Excl.) 0 From de2db44b5376ad9e621b56802ff595c8e02a5366 Mon Sep 17 00:00:00 2001 From: "DBR (OpenERP)" Date: Thu, 22 Sep 2011 14:59:26 +0530 Subject: [PATCH 51/62] [IMP]project_scrum: Improve the default search bzr revid: dbr@tinyerp.com-20110922092926-ynbhj7n93t3l6d7x --- addons/project_scrum/project_scrum_view.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml index 9520cad5c6a..601d28c6026 100644 --- a/addons/project_scrum/project_scrum_view.xml +++ b/addons/project_scrum/project_scrum_view.xml @@ -133,6 +133,7 @@ @@ -178,7 +179,7 @@ Product Backlogs project.scrum.product.backlog form - {'search_default_user_id':uid,'search_default_project_id':project_id} + {'search_default_current':1, 'search_default_user_id':uid,'search_default_project_id':project_id} The scrum agile methodology is used in software development projects. The Product Backlog is the list of features to be implemented. A product backlog can be planified in a development sprint and may be split into several tasks. The product backlog is managed by the product owner of the project. @@ -319,7 +320,7 @@ - + @@ -349,7 +350,7 @@ form tree,form,calendar - {"search_default_filter_current": 1} + {"search_default_current": 1} The scrum agile methodology is used in software development projects. In this methodology, a sprint is a short period of time (e.g. one month) during which the team implements a list of product backlogs. The sprint review is organized when the team presents its work to the customer and product owner. From b80c31cf348692462e19f4067b3266f52d3a8126 Mon Sep 17 00:00:00 2001 From: "Kuldeep Joshi (OpenERP)" Date: Thu, 22 Sep 2011 15:08:18 +0530 Subject: [PATCH 52/62] [IMP] stock: change tooltip of To Do button bzr revid: kjo@tinyerp.com-20110922093818-hojcoz8f3bd1kz0u --- addons/stock/stock_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 9304e2d80a5..f5e4b224d43 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -1675,7 +1675,7 @@ - + From 1373698a487687205ff01af9bde257deced1dcb4 Mon Sep 17 00:00:00 2001 From: "DBR (OpenERP)" Date: Thu, 22 Sep 2011 16:00:57 +0530 Subject: [PATCH 53/62] [IMP]Improve the code bzr revid: dbr@tinyerp.com-20110922103057-nlb77lksv28t6oas --- addons/project_scrum/project_scrum_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml index 601d28c6026..93883dd4bc5 100644 --- a/addons/project_scrum/project_scrum_view.xml +++ b/addons/project_scrum/project_scrum_view.xml @@ -320,7 +320,7 @@ - + From edb0f5600254aa9a9e2f5f1acf1a047d21ac56af Mon Sep 17 00:00:00 2001 From: "DBR (OpenERP)" Date: Thu, 22 Sep 2011 16:12:28 +0530 Subject: [PATCH 54/62] Remove the separator bzr revid: dbr@tinyerp.com-20110922104228-tqrjx6ajh289nsin --- addons/project_scrum/project_scrum_view.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml index 93883dd4bc5..0bba9b273fa 100644 --- a/addons/project_scrum/project_scrum_view.xml +++ b/addons/project_scrum/project_scrum_view.xml @@ -136,7 +136,6 @@ name="current" domain="['|','&',('sprint_id.date_start','<=',time.strftime('%%Y-%%m-%%d')), ('sprint_id.date_stop','>=',time.strftime('%%Y-%%m-%%d')), ('state','=','draft')]" help="Draft Backlogs"/> - From f66f72c14d29b34cd8033269cf96ca5ad44f558c Mon Sep 17 00:00:00 2001 From: "Kuldeep Joshi (OpenERP)" Date: Fri, 23 Sep 2011 19:01:43 +0530 Subject: [PATCH 55/62] [FIX] Merge Diff bzr revid: kjo@tinyerp.com-20110923133143-bow7devd85xo7qoa --- addons/stock/stock_view.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 43a6e3c515e..5a55700f357 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -1675,13 +1675,8 @@ -<<<<<<< TREE - - -======= ->>>>>>> MERGE-SOURCE From 029a636f4ee1cbcd8ca1eb805cbdc435ddd1a060 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Fri, 23 Sep 2011 15:48:27 +0200 Subject: [PATCH 56/62] [FIX] account: fiscalyear closure wizard bzr revid: qdp-launchpad@openerp.com-20110923134827-0o64yz7letsop1n6 --- .../wizard/account_fiscalyear_close.py | 274 ++++++++++-------- 1 file changed, 152 insertions(+), 122 deletions(-) diff --git a/addons/account/wizard/account_fiscalyear_close.py b/addons/account/wizard/account_fiscalyear_close.py index 927f895bb3b..297911f15f7 100644 --- a/addons/account/wizard/account_fiscalyear_close.py +++ b/addons/account/wizard/account_fiscalyear_close.py @@ -52,9 +52,11 @@ class account_fiscalyear_close(osv.osv_memory): obj_acc_period = self.pool.get('account.period') obj_acc_fiscalyear = self.pool.get('account.fiscalyear') obj_acc_journal = self.pool.get('account.journal') + obj_acc_move = self.pool.get('account.move') obj_acc_move_line = self.pool.get('account.move.line') obj_acc_account = self.pool.get('account.account') obj_acc_journal_period = self.pool.get('account.journal.period') + currency_obj = self.pool.get('res.currency') data = self.browse(cr, uid, ids, context=context) @@ -81,150 +83,178 @@ class account_fiscalyear_close(osv.osv_memory): raise osv.except_osv(_('UserError'), _('The journal must have centralised counterpart without the Skipping draft state option checked!')) - move_ids = obj_acc_move_line.search(cr, uid, [ - ('journal_id', '=', new_journal.id), ('period_id.fiscalyear_id', '=', new_fyear.id)]) - + #delete existing move and move lines if any + move_ids = obj_acc_move.search(cr, uid, [ + ('journal_id', '=', new_journal.id), ('period_id', '=', period.id)]) if move_ids: - obj_acc_move_line._remove_move_reconcile(cr, uid, move_ids, context=context) - obj_acc_move_line.unlink(cr, uid, move_ids, context=context) + move_line_ids = obj_acc_move_line.search(cr, uid, [('move_id', 'in', move_ids)]) + obj_acc_move_line._remove_move_reconcile(cr, uid, move_line_ids, context=context) + obj_acc_move_line.unlink(cr, uid, move_line_ids, context=context) + obj_acc_move.unlink(cr, uid, move_ids, context=context) cr.execute("SELECT id FROM account_fiscalyear WHERE date_stop < %s", (str(new_fyear.date_start),)) result = cr.dictfetchall() fy_ids = ','.join([str(x['id']) for x in result]) query_line = obj_acc_move_line._query_get(cr, uid, obj='account_move_line', context={'fiscalyear': fy_ids}) - cr.execute('select id from account_account WHERE active AND company_id = %s', (old_fyear.company_id.id,)) - ids = map(lambda x: x[0], cr.fetchall()) - for account in obj_acc_account.browse(cr, uid, ids, - context={'fiscalyear': fy_id}): - accnt_type_data = account.user_type - if not accnt_type_data: - continue - if accnt_type_data.close_method=='none' or account.type == 'view': - continue - if accnt_type_data.close_method=='balance': - balance_in_currency = 0.0 - if account.currency_id: - cr.execute('SELECT sum(amount_currency) as balance_in_currency FROM account_move_line ' \ - 'WHERE account_id = %s ' \ - 'AND ' + query_line + ' ' \ - 'AND currency_id = %s', (account.id, account.currency_id.id)) - balance_in_currency = cr.dictfetchone()['balance_in_currency'] + #create the opening move + vals = { + 'name': '/', + 'ref': '', + 'period_id': period.id, + 'journal_id': new_journal.id, + } + move_id = obj_acc_move.create(cr, uid, vals, context=context) - if abs(account.balance)>0.0001: - obj_acc_move_line.create(cr, uid, { - 'debit': account.balance>0 and account.balance, - 'credit': account.balance<0 and -account.balance, - 'name': data[0].report_name, - 'date': period.date_start, - 'journal_id': new_journal.id, - 'period_id': period.id, - 'account_id': account.id, - 'currency_id': account.currency_id and account.currency_id.id or False, - 'amount_currency': balance_in_currency, - }, {'journal_id': new_journal.id, 'period_id':period.id}) - if accnt_type_data.close_method == 'unreconciled': - offset = 0 - limit = 100 - while True: - cr.execute('SELECT id, name, quantity, debit, credit, account_id, ref, ' \ - 'amount_currency, currency_id, blocked, partner_id, ' \ - 'date_maturity, date_created ' \ - 'FROM account_move_line ' \ - 'WHERE account_id = %s ' \ - 'AND ' + query_line + ' ' \ - 'AND reconcile_id is NULL ' \ - 'ORDER BY id ' \ - 'LIMIT %s OFFSET %s', (account.id, limit, offset)) - result = cr.dictfetchall() - if not result: - break - for move in result: - move.pop('id') - move.update({ - 'date': period.date_start, - 'journal_id': new_journal.id, - 'period_id': period.id, - }) - obj_acc_move_line.create(cr, uid, move, { - 'journal_id': new_journal.id, - 'period_id': period.id, - }) - offset += limit + #1. report of the accounts with defferal method == 'unreconciled' + cr.execute(''' + SELECT a.id + FROM account_account a + LEFT JOIN account_account_type t ON (a.user_type = t.id) + WHERE a.active + AND a.type != 'view' + AND t.close_method = %s''', ('unreconciled', )) + account_ids = map(lambda x: x[0], cr.fetchall()) - #We have also to consider all move_lines that were reconciled - #on another fiscal year, and report them too - offset = 0 - limit = 100 - while True: - cr.execute('SELECT DISTINCT b.id, b.name, b.quantity, b.debit, b.credit, b.account_id, b.ref, ' \ - 'b.amount_currency, b.currency_id, b.blocked, b.partner_id, ' \ - 'b.date_maturity, b.date_created ' \ - 'FROM account_move_line a, account_move_line b ' \ - 'WHERE b.account_id = %s ' \ - 'AND b.reconcile_id is NOT NULL ' \ - 'AND a.reconcile_id = b.reconcile_id ' \ - 'AND b.period_id IN ('+fy_period_set+') ' \ - 'AND a.period_id IN ('+fy2_period_set+') ' \ - 'ORDER BY id ' \ - 'LIMIT %s OFFSET %s', (account.id, limit, offset)) - result = cr.dictfetchall() - if not result: - break - for move in result: - move.pop('id') - move.update({ - 'date': period.date_start, - 'journal_id': new_journal.id, - 'period_id': period.id, - }) - obj_acc_move_line.create(cr, uid, move, { - 'journal_id': new_journal.id, - 'period_id': period.id, - }) - offset += limit - if accnt_type_data.close_method=='detail': - offset = 0 - limit = 100 - while True: - cr.execute('SELECT id, name, quantity, debit, credit, account_id, ref, ' \ - 'amount_currency, currency_id, blocked, partner_id, ' \ - 'date_maturity, date_created ' \ - 'FROM account_move_line ' \ - 'WHERE account_id = %s ' \ - 'AND ' + query_line + ' ' \ - 'ORDER BY id ' \ - 'LIMIT %s OFFSET %s', (account.id, limit, offset)) + if account_ids: + cr.execute(''' + INSERT INTO account_move_line ( + name, create_uid, create_date, write_uid, write_date, + statement_id, journal_id, currency_id, date_maturity, + partner_id, blocked, credit, state, debit, + ref, account_id, period_id, date, move_id, amount_currency, + quantity, product_id, company_id) + (SELECT name, create_uid, create_date, write_uid, write_date, + statement_id, %s,currency_id, date_maturity, partner_id, + blocked, credit, 'draft', debit, ref, account_id, + %s, date, %s, amount_currency, quantity, product_id, company_id + FROM account_move_line + WHERE account_id IN %s + AND ''' + query_line + ''' + AND reconcile_id IS NULL)''', (new_journal.id, period.id, move_id, tuple(account_ids),)) - result = cr.dictfetchall() - if not result: - break - for move in result: - move.pop('id') - move.update({ - 'date': period.date_start, - 'journal_id': new_journal.id, - 'period_id': period.id, - }) - obj_acc_move_line.create(cr, uid, move) - offset += limit - ids = obj_acc_move_line.search(cr, uid, [('journal_id','=',new_journal.id), + #We have also to consider all move_lines that were reconciled + #on another fiscal year, and report them too + cr.execute(''' + INSERT INTO account_move_line ( + name, create_uid, create_date, write_uid, write_date, + statement_id, journal_id, currency_id, date_maturity, + partner_id, blocked, credit, state, debit, + ref, account_id, period_id, date, move_id, amount_currency, + quantity, product_id, company_id) + (SELECT + b.name, b.create_uid, b.create_date, b.write_uid, b.write_date, + b.statement_id, %s, b.currency_id, b.date_maturity, + b.partner_id, b.blocked, b.credit, 'draft', b.debit, + b.ref, b.account_id, %s, b.date, %s, b.amount_currency, + b.quantity, b.product_id, b.company_id + FROM account_move_line b + WHERE b.account_id IN %s + AND b.reconcile_id IS NOT NULL + AND b.period_id IN ('''+fy_period_set+''') + AND b.reconcile_id IN (SELECT DISTINCT(reconcile_id) + FROM account_move_line a + WHERE a.period_id IN ('''+fy2_period_set+''')))''', (new_journal.id, period.id, move_id, tuple(account_ids),)) + + #2. report of the accounts with defferal method == 'detail' + cr.execute(''' + SELECT a.id + FROM account_account a + LEFT JOIN account_account_type t ON (a.user_type = t.id) + WHERE a.active + AND a.type != 'view' + AND t.close_method = %s''', ('detail', )) + account_ids = map(lambda x: x[0], cr.fetchall()) + + if account_ids: + cr.execute(''' + INSERT INTO account_move_line ( + name, create_uid, create_date, write_uid, write_date, + statement_id, journal_id, currency_id, date_maturity, + partner_id, blocked, credit, state, debit, + ref, account_id, period_id, date, move_id, amount_currency, + quantity, product_id, company_id) + (SELECT name, create_uid, create_date, write_uid, write_date, + statement_id, %s,currency_id, date_maturity, partner_id, + blocked, credit, 'draft', debit, ref, account_id, + %s, date, %s, amount_currency, quantity, product_id, company_id + FROM account_move_line + WHERE account_id IN %s + AND ''' + query_line + ''') + ''', (new_journal.id, period.id, move_id, tuple(account_ids),)) + + + #3. report of the accounts with defferal method == 'balance' + cr.execute(''' + SELECT a.id + FROM account_account a + LEFT JOIN account_account_type t ON (a.user_type = t.id) + WHERE a.active + AND a.type != 'view' + AND t.close_method = %s''', ('balance', )) + account_ids = map(lambda x: x[0], cr.fetchall()) + + query_1st_part = """ + INSERT INTO account_move_line ( + debit, credit, name, date, move_id, journal_id, period_id, + account_id, currency_id, amount_currency, company_id, state) VALUES + """ + query_2nd_part = "" + query_2nd_part_args = [] + for account in obj_acc_account.browse(cr, uid, account_ids, context={'fiscalyear': fy_id}): + balance_in_currency = 0.0 + if account.currency_id: + cr.execute('SELECT sum(amount_currency) as balance_in_currency FROM account_move_line ' \ + 'WHERE account_id = %s ' \ + 'AND ' + query_line + ' ' \ + 'AND currency_id = %s', (account.id, account.currency_id.id)) + balance_in_currency = cr.dictfetchone()['balance_in_currency'] + + company_currency_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.currency_id + if not currency_obj.is_zero(cr, uid, company_currency_id, abs(account.balance)): + if query_2nd_part: + query_2nd_part += ',' + query_2nd_part += "(%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)" + query_2nd_part_args += (account.balance > 0 and account.balance or 0.0, + account.balance < 0 and -account.balance or 0.0, + data[0].report_name, + period.date_start, + move_id, + new_journal.id, + period.id, + account.id, + account.currency_id and account.currency_id.id or None, + balance_in_currency, + account.company_id.id, + 'draft') + if query_2nd_part: + cr.execute(query_1st_part + query_2nd_part, tuple(query_2nd_part_args)) + + #validate and centralize the opening move + obj_acc_move.validate(cr, uid, [move_id], context=context) + + #reconcile all the move.line of the opening move + ids = obj_acc_move_line.search(cr, uid, [('journal_id', '=', new_journal.id), ('period_id.fiscalyear_id','=',new_fyear.id)]) context['fy_closing'] = True - if ids: - obj_acc_move_line.reconcile(cr, uid, ids, context=context) + reconcile_id = obj_acc_move_line.reconcile(cr, uid, ids, context=context) + #set the creation date of the reconcilation at the first day of the new fiscalyear, in order to have good figures in the aged trial balance + self.pool.get('account.move.reconcile').write(cr, uid, [reconcile_id], {'create_date': new_fyear.date_start}, context=context) + + #create the journal.period object and link it to the old fiscalyear new_period = data[0].period_id.id - ids = obj_acc_journal_period.search(cr, uid, [('journal_id','=',new_journal.id),('period_id','=',new_period)]) + ids = obj_acc_journal_period.search(cr, uid, [('journal_id', '=', new_journal.id), ('period_id', '=', new_period)]) if not ids: ids = [obj_acc_journal_period.create(cr, uid, { - 'name': (new_journal.name or '')+':'+(period.code or ''), + 'name': (new_journal.name or '') + ':' + (period.code or ''), 'journal_id': new_journal.id, 'period_id': period.id })] cr.execute('UPDATE account_fiscalyear ' \ 'SET end_journal_period_id = %s ' \ 'WHERE id = %s', (ids[0], old_fyear.id)) + return {'type': 'ir.actions.act_window_close'} account_fiscalyear_close() From 008cc8e385e2e7ec116bb6c7007b7e49fc547e5a Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Fri, 23 Sep 2011 16:32:23 +0200 Subject: [PATCH 57/62] [IMP] openerp-server: catch db init errors to avoid exiting main thread bzr revid: odo@openerp.com-20110923143223-4c9gofbml7w2gimo --- openerp-server | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/openerp-server b/openerp-server index c42651dc419..5fdbb28eeb6 100755 --- a/openerp-server +++ b/openerp-server @@ -88,8 +88,11 @@ def setup_pid_file(): def preload_registry(dbname): """ Preload a registry, and start the cron.""" - db, pool = openerp.pooler.get_db_and_pool(dbname, update_module=config['init'] or config['update'], pooljobs=False) - pool.get('ir.cron').restart(db.dbname) + try: + db, pool = openerp.pooler.get_db_and_pool(dbname, update_module=config['init'] or config['update'], pooljobs=False) + pool.get('ir.cron').restart(db.dbname) + except Exception: + logging.exception('Failed to initialize database `%s`.', dbname) def run_test_file(dbname, test_file): """ Preload a registry, possibly run a test file, and start the cron.""" From bf06ac9e8514b0a3afa2fe0479556a93036876ec Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Fri, 23 Sep 2011 18:38:03 +0200 Subject: [PATCH 58/62] [FIX] remove debugging crap bzr revid: al@openerp.com-20110923163803-b4bjtzzkat0qpyot --- addons/web/static/src/js/chrome.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 7a48c00b4fe..12a9c47ab81 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -1025,7 +1025,6 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie }, do_url_set_hash: function(url) { if(!this.url_external_hashchange) { - console.log("url set #hash to",url); this.url_internal_hashchange = true; jQuery.bbq.pushState(url); } @@ -1033,10 +1032,8 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie on_url_hashchange: function() { if(this.url_internal_hashchange) { this.url_internal_hashchange = false; - console.log("url jump to FLAG OFF"); } else { var url = jQuery.deparam.fragment(); - console.log("url jump to",url); this.url_external_hashchange = true; this.action_manager.on_url_hashchange(url); this.url_external_hashchange = false; From 253eaa462d3773a6d0cc820ac244df0d4e0c5a67 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Sat, 24 Sep 2011 02:55:47 +0200 Subject: [PATCH 59/62] [FIX] fix useless and invalid casts in domain fields The ORM will automatically append 00:00:00 to a date literal that is being compared with a timestamp field with operators '>' or '>=', and 23:59:59 if compared with operators '<' or '<='. So a trivial domain for 'Today' is: [('tstamp_field','>=',current_date),('tstamp_field','<=',current_date)] taking advantage of the current_date helper that is defined as the current date in YYYY-MM-DD format. bzr revid: odo@openerp.com-20110924005547-pvgblte6r14so7mw --- addons/crm_helpdesk/crm_helpdesk_view.xml | 4 ++-- addons/hr_attendance/hr_attendance_view.xml | 2 +- addons/mrp/mrp_view.xml | 2 +- addons/mrp_operations/mrp_operations_view.xml | 2 +- addons/procurement/procurement_view.xml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml index 5aea32298b7..f9f5318bfc2 100644 --- a/addons/crm_helpdesk/crm_helpdesk_view.xml +++ b/addons/crm_helpdesk/crm_helpdesk_view.xml @@ -248,13 +248,13 @@ /> diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml index 0affdde9e73..7a65ce7f88c 100644 --- a/addons/hr_attendance/hr_attendance_view.xml +++ b/addons/hr_attendance/hr_attendance_view.xml @@ -52,7 +52,7 @@ - + diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index 19e25438cad..a344545748c 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -808,7 +808,7 @@ help="Manufacturing Orders which are currently in production."/> diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml index a80a1a41a9c..2484345de9a 100644 --- a/addons/mrp_operations/mrp_operations_view.xml +++ b/addons/mrp_operations/mrp_operations_view.xml @@ -140,7 +140,7 @@ domain="[('state','=','pause')]"/> diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml index edd82160025..400412298cc 100644 --- a/addons/procurement/procurement_view.xml +++ b/addons/procurement/procurement_view.xml @@ -106,7 +106,7 @@ From e85f246469d6dbf5c9f801e20babd7d13b2c05f9 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Sat, 24 Sep 2011 03:58:52 +0200 Subject: [PATCH 60/62] [IMP] sql_db: auto-exception-logging can now be turned off per cursor, not only per query bzr revid: odo@openerp.com-20110924015852-9vru7cdsmzbvault --- openerp/sql_db.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/openerp/sql_db.py b/openerp/sql_db.py index 79606b9101c..8038c39486d 100644 --- a/openerp/sql_db.py +++ b/openerp/sql_db.py @@ -183,6 +183,8 @@ class Cursor(object): self.__caller = False self.__closer = False + self._default_log_exceptions = True + def __del__(self): if not self.__closed: # Oops. 'self' has not been closed explicitly. @@ -199,7 +201,7 @@ class Cursor(object): self._close(True) @check - def execute(self, query, params=None, log_exceptions=True): + def execute(self, query, params=None, log_exceptions=None): if '%d' in query or '%f' in query: self.__logger.warn(query) self.__logger.warn("SQL queries cannot contain %d or %f anymore. " @@ -212,11 +214,11 @@ class Cursor(object): params = params or None res = self._obj.execute(query, params) except psycopg2.ProgrammingError, pe: - if log_exceptions: + if self._default_log_exceptions or log_exceptions: self.__logger.error("Programming error: %s, in query %s", pe, query) raise except Exception: - if log_exceptions: + if self._default_log_exceptions or log_exceptions: self.__logger.exception("bad query: %s", self._obj.query or query) raise From 67dcd97ea62a8822517d8d3bb08c8623045e48ee Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Sat, 24 Sep 2011 04:03:03 +0200 Subject: [PATCH 61/62] [FIX] orm,expression: sanity checks for domain terms, cleanup, tests bzr revid: odo@openerp.com-20110924020303-2amkx95ij1yp8ofk --- .../addons/base/test/test_osv_expression.yml | 29 ++++++++ openerp/osv/expression.py | 66 ++++++++++--------- openerp/osv/orm.py | 33 ++++++---- 3 files changed, 83 insertions(+), 45 deletions(-) diff --git a/openerp/addons/base/test/test_osv_expression.yml b/openerp/addons/base/test/test_osv_expression.yml index 3e9a0f6fb3e..43fea5c16cf 100644 --- a/openerp/addons/base/test/test_osv_expression.yml +++ b/openerp/addons/base/test/test_osv_expression.yml @@ -471,4 +471,33 @@ - !python {model: res.country }: | ids = self.search(cr, uid, [('create_date', '<', '2001-01-01 12:00:00')]) + + - + Verify that invalid expressions are refused, even for magic fields +- + !python {model: res.country }: | + try: + self.search(cr, uid, [('does_not_exist', '=', 'foo')]) + raise AssertionError('Invalid fields should not be accepted') + except ValueError: + pass + + try: + self.search(cr, uid, [('create_date', '>>', 'foo')]) + raise AssertionError('Invalid operators should not be accepted') + except ValueError: + pass + + import psycopg2 + try: + cr._default_log_exceptions = False + cr.execute('SAVEPOINT expression_failure_test') + self.search(cr, uid, [('create_date', '=', "1970-01-01'); --")]) + # if the above search gives no error, the operand was not escaped! + cr.execute('RELEASE SAVEPOINT expression_failure_test') + raise AssertionError('Operands should always be SQL escaped') + except psycopg2.DataError: + # Should give: 'DataError: invalid input syntax for type timestamp' or similar + cr.execute('ROLLBACK TO SAVEPOINT expression_failure_test') + diff --git a/openerp/osv/expression.py b/openerp/osv/expression.py index 272c1945d25..cb8cfea583f 100644 --- a/openerp/osv/expression.py +++ b/openerp/osv/expression.py @@ -126,6 +126,7 @@ import logging from openerp.tools import flatten, reverse_enumerate import fields import openerp.modules +from openerp.osv.orm import MAGIC_COLUMNS #.apidoc title: Domain Expressions @@ -413,7 +414,7 @@ class expression(object): # check if the expression is valid if not is_leaf(e): - raise ValueError('Bad domain expression: %r, %r is not a valid term.' % (exp, e)) + raise ValueError("Invalid term %r in domain expression %r" % (e, exp)) # normalize the leaf's operator e = normalize_leaf(*e) @@ -421,41 +422,47 @@ class expression(object): left, operator, right = e working_table = table # The table containing the field (the name provided in the left operand) - fargs = left.split('.', 1) + field_path = left.split('.', 1) # If the field is _inherits'd, search for the working_table, # and extract the field. - if fargs[0] in table._inherit_fields: + if field_path[0] in table._inherit_fields: while True: - field = working_table._columns.get(fargs[0]) + field = working_table._columns.get(field_path[0]) if field: self.__field_tables[i] = working_table break - next_table = working_table.pool.get(working_table._inherit_fields[fargs[0]][0]) + next_table = working_table.pool.get(working_table._inherit_fields[field_path[0]][0]) if next_table not in self.__all_tables: self.__joins.append('%s."%s"=%s."%s"' % (next_table._table, 'id', working_table._table, working_table._inherits[next_table._name])) self.__all_tables.add(next_table) working_table = next_table # Or (try to) directly extract the field. else: - field = working_table._columns.get(fargs[0]) + field = working_table._columns.get(field_path[0]) if not field: if left == 'id' and operator == 'child_of': ids2 = to_ids(right, table) dom = child_of_domain(left, ids2, working_table) self.__exp = self.__exp[:i] + dom + self.__exp[i+1:] + else: + # field could not be found in model columns, it's probably invalid, unless + # it's one of the _log_access special fields + # TODO: make these fields explicitly available in self.columns instead! + if field_path[0] not in MAGIC_COLUMNS: + raise ValueError("Invalid field %r in domain expression %r" % (left, exp)) continue field_obj = table.pool.get(field._obj) - if len(fargs) > 1: + if len(field_path) > 1: if field._type == 'many2one': - right = field_obj.search(cr, uid, [(fargs[1], operator, right)], context=context) - self.__exp[i] = (fargs[0], 'in', right) + right = field_obj.search(cr, uid, [(field_path[1], operator, right)], context=context) + self.__exp[i] = (field_path[0], 'in', right) # Making search easier when there is a left operand as field.o2m or field.m2m if field._type in ['many2many', 'one2many']: - right = field_obj.search(cr, uid, [(fargs[1], operator, right)], context=context) - right1 = table.search(cr, uid, [(fargs[0], 'in', right)], context=context) + right = field_obj.search(cr, uid, [(field_path[1], operator, right)], context=context) + right1 = table.search(cr, uid, [(field_path[0], 'in', right)], context=context) self.__exp[i] = ('id', 'in', right1) if not isinstance(field, fields.property): @@ -657,6 +664,12 @@ class expression(object): def __leaf_to_sql(self, leaf, table): left, operator, right = leaf + # final sanity checks - should never fail + assert operator in (TERM_OPERATORS + ('inselect',)), \ + "Invalid operator %r in domain term %r" % (operator, leaf) + assert leaf in (TRUE_LEAF, FALSE_LEAF) or left in table._all_columns \ + or left in MAGIC_COLUMNS, "Invalid field %r in domain term %r" % (left, leaf) + if leaf == TRUE_LEAF: query = 'TRUE' params = [] @@ -704,8 +717,8 @@ class expression(object): query = '(%s OR %s."%s" IS NULL)' % (query, table._table, left) elif check_nulls and operator == 'not in': query = '(%s AND %s."%s" IS NOT NULL)' % (query, table._table, left) # needed only for TRUE. - else: # Must not happen. - pass + else: # Must not happen + raise ValueError("Invalid domain term %r" % (leaf,)) elif right == False and (left in table._columns) and table._columns[left]._type=="boolean" and (operator == '='): query = '(%s."%s" IS NULL or %s."%s" = false )' % (table._table, left, table._table, left) @@ -725,15 +738,12 @@ class expression(object): elif (operator == '=?'): if (right is False or right is None): + # '=?' is a short-circuit that makes the term TRUE if right is None or False query = 'TRUE' params = [] - elif left in table._columns: - format = table._columns[left]._symbol_set[0] - query = '(%s."%s" = %s)' % (table._table, left, format) - params = table._columns[left]._symbol_set[1](right) else: - query = "(%s.\"%s\" = '%%s')" % (table._table, left) - params = right + # '=?' behaves like '=' in other cases + query, params = self.__leaf_to_sql((left, '=', right), table) elif left == 'id': query = '%s.id %s %%s' % (table._table, operator) @@ -749,15 +759,11 @@ class expression(object): query = '(unaccent(%s."%s") %s unaccent(%s))' % (table._table, left, sql_operator, format) else: query = '(%s."%s" %s %s)' % (table._table, left, sql_operator, format) - else: - # Ugly case to support columns present in database but not in - # _columns. This will probably be removed in the future, but - # we have to keep it for now. - _logger.warning("The domain term '%s' specify a column not declared in _columns." % ((left, operator, right),)) - if self.has_unaccent and sql_operator in ('ilike', 'not ilike'): - query = "(unaccent(%s.\"%s\") %s unaccent('%s'))" % (table._table, left, sql_operator, right) - else: - query = "(%s.\"%s\" %s '%s')" % (table._table, left, sql_operator, right) + elif left in MAGIC_COLUMNS: + query = "(%s.\"%s\" %s %%s)" % (table._table, left, sql_operator) + params = right + else: # Must not happen + raise ValueError("Invalid field %r in domain term %r" % (left, leaf)) add_null = False if need_wildcard: @@ -771,10 +777,6 @@ class expression(object): add_null = not str_utf8 elif left in table._columns: params = table._columns[left]._symbol_set[1](right) - else: - # Matching else clause for the above else clause, where the - # params are actually already in the query. - params = [] if add_null: query = '(%s OR %s."%s" IS NULL)' % (query, table._table, left) diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py index 5f19ddf2378..0dd7d487bba 100644 --- a/openerp/osv/orm.py +++ b/openerp/osv/orm.py @@ -638,6 +638,7 @@ class orm_template(object): _log_create = False CONCURRENCY_CHECK_FIELD = '__last_update' + def log(self, cr, uid, id, message, secondary=False, context=None): if context and context.get('disable_log'): return True @@ -2546,12 +2547,24 @@ class orm_memory(orm_template): for id in ids: self._check_access(uid, id, operation) +# Definition of log access columns, automatically added to models if +# self._log_access is True +LOG_ACCESS_COLUMNS = { + 'create_uid': 'INTEGER REFERENCES res_users ON DELETE SET NULL', + 'create_date': 'TIMESTAMP', + 'write_uid': 'INTEGER REFERENCES res_users ON DELETE SET NULL', + 'write_date': 'TIMESTAMP' +} +# special columns automatically created by the ORM +MAGIC_COLUMNS = ['id'] + LOG_ACCESS_COLUMNS.keys() + class orm(orm_template): _sql_constraints = [] _table = None _protected = ['read', 'write', 'create', 'default_get', 'perm_read', 'unlink', 'fields_get', 'fields_view_get', 'search', 'name_get', 'distinct_field_get', 'name_search', 'copy', 'import_data', 'search_count', 'exists'] __logger = logging.getLogger('orm') __schema = logging.getLogger('orm.schema') + def read_group(self, cr, uid, domain, fields, groupby, offset=0, limit=None, context=None, orderby=False): """ Get the list of records in list view grouped by the given ``groupby`` fields @@ -2780,7 +2793,7 @@ class orm(orm_template): # iterate on the database columns to drop the NOT NULL constraints # of fields which were required but have been removed (or will be added by another module) columns = [c for c in self._columns if not (isinstance(self._columns[c], fields.function) and not self._columns[c].store)] - columns += ('id', 'write_uid', 'write_date', 'create_uid', 'create_date') # openerp access columns + columns += MAGIC_COLUMNS cr.execute("SELECT a.attname, a.attnotnull" " FROM pg_class c, pg_attribute a" " WHERE c.relname=%s" @@ -2847,7 +2860,7 @@ class orm(orm_template): column_data = self._select_column_data(cr) for k, f in self._columns.iteritems(): - if k in ('id', 'write_uid', 'write_date', 'create_uid', 'create_date'): + if k in MAGIC_COLUMNS: continue # Don't update custom (also called manual) fields if f.manual and not update_custom_fields: @@ -3149,23 +3162,17 @@ class orm(orm_template): def _add_log_columns(self, cr): - logs = { - 'create_uid': 'INTEGER REFERENCES res_users ON DELETE SET NULL', - 'create_date': 'TIMESTAMP', - 'write_uid': 'INTEGER REFERENCES res_users ON DELETE SET NULL', - 'write_date': 'TIMESTAMP' - } - for k in logs: + for field, field_def in LOG_ACCESS_COLUMNS.iteritems(): cr.execute(""" SELECT c.relname FROM pg_class c, pg_attribute a WHERE c.relname=%s AND a.attname=%s AND c.oid=a.attrelid - """, (self._table, k)) + """, (self._table, field)) if not cr.rowcount: - cr.execute('ALTER TABLE "%s" ADD COLUMN "%s" %s' % (self._table, k, logs[k])) + cr.execute('ALTER TABLE "%s" ADD COLUMN "%s" %s' % (self._table, field, field_def)) cr.commit() self.__schema.debug("Table '%s': added column '%s' with definition=%s", - self._table, k, logs[k]) + self._table, field, field_def) def _select_column_data(self, cr): @@ -4641,7 +4648,7 @@ class orm(orm_template): for f in fields: ftype = fields[f]['type'] - if self._log_access and f in ('create_date', 'create_uid', 'write_date', 'write_uid'): + if self._log_access and f in LOG_ACCESS_COLUMNS: del data[f] if f in default: From dfccbaf28b77fef5860b9ad60ffdf97f3b4a64e0 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Sat, 24 Sep 2011 04:49:28 +0200 Subject: [PATCH 62/62] [FIX] orm,expression: special-case previous commit for osv_memory This will soon be obsolete and deleted, as soon as osv_memory will be removed and merged inside normal osv. bzr revid: odo@openerp.com-20110924024928-awgncvhcyfkmnak5 --- openerp/osv/expression.py | 2 +- openerp/osv/orm.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/openerp/osv/expression.py b/openerp/osv/expression.py index cb8cfea583f..ff2528db73d 100644 --- a/openerp/osv/expression.py +++ b/openerp/osv/expression.py @@ -450,7 +450,7 @@ class expression(object): # field could not be found in model columns, it's probably invalid, unless # it's one of the _log_access special fields # TODO: make these fields explicitly available in self.columns instead! - if field_path[0] not in MAGIC_COLUMNS: + if (field_path[0] not in MAGIC_COLUMNS) and (left not in MAGIC_COLUMNS): raise ValueError("Invalid field %r in domain expression %r" % (left, exp)) continue diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py index 0dd7d487bba..37dd1010d2f 100644 --- a/openerp/osv/orm.py +++ b/openerp/osv/orm.py @@ -2556,7 +2556,8 @@ LOG_ACCESS_COLUMNS = { 'write_date': 'TIMESTAMP' } # special columns automatically created by the ORM -MAGIC_COLUMNS = ['id'] + LOG_ACCESS_COLUMNS.keys() +MAGIC_COLUMNS = ['id'] + LOG_ACCESS_COLUMNS.keys() + \ + ['internal.create_uid', 'internal.date_access'] # for osv_memory only class orm(orm_template): _sql_constraints = []