From 5356d3f51cc39bd94acfa1a1a6dd08fe4c6a2a04 Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Fri, 24 Feb 2012 11:29:28 +0530 Subject: [PATCH 01/15] [IMP] sale:-changed menu name from 'Lines to invoice' to 'Order Lines to Invoice' bzr revid: mtr@tinyerp.com-20120224055928-9se9bmscasfboyep --- addons/sale/sale_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 90d3838f5a0..dc454d1c2a7 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -461,7 +461,7 @@ - Lines to Invoice + Order Lines to Invoice ir.actions.act_window sale.order.line form From 8701f17b7639c522ef056780558634a8f0997cb9 Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Fri, 24 Feb 2012 11:42:20 +0530 Subject: [PATCH 02/15] [IMP] account_analytic_analysis:-changed menu name from 'All Uninvoiced Entries' to 'Time & Costs to Invoice' bzr revid: mtr@tinyerp.com-20120224061220-29ldf0bhgjdrymoe --- .../account_analytic_analysis_menu.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml index 86f437ae8bd..1577ecdc3f3 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml +++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml @@ -3,7 +3,7 @@ - All Uninvoiced Entries + Time & Costs to Invoice account.analytic.line form tree,form From ce1f236f19b34d3643fcff9f894ce97dc4718eeb Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Fri, 24 Feb 2012 11:49:40 +0530 Subject: [PATCH 03/15] [IMP] import_google:-reorganised 'Import Google Calendar' and 'Import Google Contacts' menu bzr revid: mtr@tinyerp.com-20120224061940-sqpeum2luvpk29m9 --- addons/import_google/wizard/import_google_data_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/import_google/wizard/import_google_data_view.xml b/addons/import_google/wizard/import_google_data_view.xml index b35e97645e7..fe099a3cb71 100644 --- a/addons/import_google/wizard/import_google_data_view.xml +++ b/addons/import_google/wizard/import_google_data_view.xml @@ -78,12 +78,12 @@ From 59c177ea67ff64e6a27660c788d0bcf0fa8b221e Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Fri, 24 Feb 2012 11:53:31 +0530 Subject: [PATCH 04/15] [IMP] wiki_sale_faq:-changed menu name from Documents->Sales Documents and FAQ->Sales FAQ bzr revid: mtr@tinyerp.com-20120224062331-b3c7v5h1apvqpamf --- addons/wiki_sale_faq/wiki_sale_faq_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/wiki_sale_faq/wiki_sale_faq_view.xml b/addons/wiki_sale_faq/wiki_sale_faq_view.xml index 9fdaafd96b9..b43649af23a 100644 --- a/addons/wiki_sale_faq/wiki_sale_faq_view.xml +++ b/addons/wiki_sale_faq/wiki_sale_faq_view.xml @@ -27,13 +27,13 @@ From 5f92d68c5da18fd7a341f3b7aab3c4e873b713a3 Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Fri, 24 Feb 2012 14:54:50 +0530 Subject: [PATCH 05/15] [IMP] crm,crm_caldav,import_base,import_google,import_crm:-reorganised the menus(i.e.Meetings,Import) and created 'Import & Synchronize' menu bzr revid: mtr@tinyerp.com-20120224092450-ew4oai64n9ziqt3z --- addons/crm/crm_meeting_menu.xml | 7 +++++-- addons/crm_caldav/crm_caldav_view.xml | 10 +++++----- addons/import_base/import_base_view.xml | 2 +- .../import_google/wizard/import_google_data_view.xml | 4 ++-- addons/import_sugarcrm/import_sugarcrm_view.xml | 2 +- 5 files changed, 14 insertions(+), 11 deletions(-) diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml index af50149f693..6f29970b492 100644 --- a/addons/crm/crm_meeting_menu.xml +++ b/addons/crm/crm_meeting_menu.xml @@ -90,9 +90,12 @@ + + + action="crm_case_categ_meet" parent="base.menu_sales" + sequence="20" /> Meeting Invitations diff --git a/addons/crm_caldav/crm_caldav_view.xml b/addons/crm_caldav/crm_caldav_view.xml index a610095d6a6..ad0d8cde2ad 100644 --- a/addons/crm_caldav/crm_caldav_view.xml +++ b/addons/crm_caldav/crm_caldav_view.xml @@ -11,14 +11,14 @@ form new - + - - + parent="base.menu_import_crm" sequence="1"/> + + - + diff --git a/addons/import_base/import_base_view.xml b/addons/import_base/import_base_view.xml index 1368b50b6e4..3f10a462507 100644 --- a/addons/import_base/import_base_view.xml +++ b/addons/import_base/import_base_view.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/addons/import_google/wizard/import_google_data_view.xml b/addons/import_google/wizard/import_google_data_view.xml index fe099a3cb71..510160c6247 100644 --- a/addons/import_google/wizard/import_google_data_view.xml +++ b/addons/import_google/wizard/import_google_data_view.xml @@ -78,12 +78,12 @@ diff --git a/addons/import_sugarcrm/import_sugarcrm_view.xml b/addons/import_sugarcrm/import_sugarcrm_view.xml index 3c1f9df60fb..4b0b9d295e9 100644 --- a/addons/import_sugarcrm/import_sugarcrm_view.xml +++ b/addons/import_sugarcrm/import_sugarcrm_view.xml @@ -98,7 +98,7 @@ - + From 5433875477294e190ac06ada25a9bf9bb98fdac4 Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Fri, 24 Feb 2012 15:59:41 +0530 Subject: [PATCH 06/15] [IMP] crm:-commented 'Meetings' and 'Meeting Invitations' menu bzr revid: mtr@tinyerp.com-20120224102941-avqqkxwtro4vrk81 --- addons/crm/crm_meeting_menu.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml index 6f29970b492..03d9737f403 100644 --- a/addons/crm/crm_meeting_menu.xml +++ b/addons/crm/crm_meeting_menu.xml @@ -87,8 +87,8 @@ - + @@ -109,10 +109,10 @@ With Meeting Invitations you can create and manage the meeting invitations sent/to be sent to your colleagues/partners. You can not only invite OpenERP users, but also external parties, such as a customer. - + groups="base.group_no_one" /> --> From 495face5871ffdb320af475b23269d7379c74517 Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Fri, 24 Feb 2012 16:08:30 +0530 Subject: [PATCH 07/15] [IMP] sale:-added 'Customers','Contacts' and 'Quotations' menu under Sales. bzr revid: mtr@tinyerp.com-20120224103830-o0xc2wu6xlugr8yu --- addons/sale/sale_view.xml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index dc454d1c2a7..849f5958066 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -8,6 +8,12 @@ parent="base.menu_base_partner" sequence="1" /> + + + @@ -319,7 +325,7 @@ - All Quotations + Quotations ir.actions.act_window sale.order form @@ -328,6 +334,10 @@ + + Old Quotations ir.actions.act_window From f2c5f1a03c7a63f84cafc429d99baf8aab2e2b40 Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Fri, 24 Feb 2012 16:12:51 +0530 Subject: [PATCH 08/15] [IMP] account_analytic_analysis,crm,crm_todo,sale:-reorganised sequence of menus falling under the Sales menu(base.menu_sales) bzr revid: mtr@tinyerp.com-20120224104251-gvaxno1qh76ss0ep --- .../account_analytic_analysis_menu.xml | 2 +- addons/crm/crm_meeting_menu.xml | 2 +- addons/crm_todo/crm_todo_view.xml | 3 ++- addons/sale/sale_view.xml | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml index 1577ecdc3f3..6d3e047fcfc 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml +++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml @@ -81,7 +81,7 @@ - + diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml index 03d9737f403..04aa133b556 100644 --- a/addons/crm/crm_meeting_menu.xml +++ b/addons/crm/crm_meeting_menu.xml @@ -95,7 +95,7 @@ + sequence="7" /> Meeting Invitations diff --git a/addons/crm_todo/crm_todo_view.xml b/addons/crm_todo/crm_todo_view.xml index c098f908b8a..a587463fedb 100644 --- a/addons/crm_todo/crm_todo_view.xml +++ b/addons/crm_todo/crm_todo_view.xml @@ -57,7 +57,8 @@ + action="crm_todo_action" + sequence="5"/> diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 849f5958066..9235d2a47e9 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -300,7 +300,7 @@ {} Sales Orders help you manage quotations and orders from your customers. OpenERP suggests that you start by creating a quotation. Once it is confirmed, the quotation will be converted into a Sales Order. OpenERP can handle several types of products so that a sales order may trigger tasks, delivery orders, manufacturing orders, purchases and so on. Based on the configuration of the sales order, a draft invoice will be generated so that you just have to confirm it when you want to bill your customer. - + Sales in Exception From dbeaa1a5502b439b481c4183f432d93d140e8fd7 Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Fri, 24 Feb 2012 17:05:18 +0530 Subject: [PATCH 09/15] [IMP] account_analytic_analysis,crm_caldav,import_*,sale,stock_planning:-reorganised sequences of menus 'Invoicing','Sales Forecast','Import&Synchronise' bzr revid: mtr@tinyerp.com-20120224113518-9p2z43mxgfz1anaq --- .../account_analytic_analysis_menu.xml | 2 +- addons/crm_caldav/crm_caldav_view.xml | 2 +- addons/import_base/import_base_view.xml | 2 +- addons/import_google/wizard/import_google_data_view.xml | 4 ++-- addons/import_sugarcrm/import_sugarcrm_view.xml | 2 +- addons/sale/sale_view.xml | 2 +- addons/stock_planning/stock_planning_view.xml | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml index 6d3e047fcfc..964383246dd 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml +++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml @@ -11,7 +11,7 @@ {'search_default_to_invoice': 1} - + account.analytic.account.search diff --git a/addons/crm_caldav/crm_caldav_view.xml b/addons/crm_caldav/crm_caldav_view.xml index ad0d8cde2ad..e33f56dd036 100644 --- a/addons/crm_caldav/crm_caldav_view.xml +++ b/addons/crm_caldav/crm_caldav_view.xml @@ -17,7 +17,7 @@ action="action_caldav_browse" id="menu_caldav_browse" icon="STOCK_EXECUTE" - parent="base.menu_import_crm" sequence="1"/> + parent="base.menu_import_crm" sequence="10"/> diff --git a/addons/import_base/import_base_view.xml b/addons/import_base/import_base_view.xml index 3f10a462507..8d4735be00a 100644 --- a/addons/import_base/import_base_view.xml +++ b/addons/import_base/import_base_view.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/addons/import_google/wizard/import_google_data_view.xml b/addons/import_google/wizard/import_google_data_view.xml index 510160c6247..4a5096c38a4 100644 --- a/addons/import_google/wizard/import_google_data_view.xml +++ b/addons/import_google/wizard/import_google_data_view.xml @@ -80,12 +80,12 @@ + sequence="5" /> + sequence="15" /> diff --git a/addons/import_sugarcrm/import_sugarcrm_view.xml b/addons/import_sugarcrm/import_sugarcrm_view.xml index 4b0b9d295e9..f90451c69f5 100644 --- a/addons/import_sugarcrm/import_sugarcrm_view.xml +++ b/addons/import_sugarcrm/import_sugarcrm_view.xml @@ -98,7 +98,7 @@ - + diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 9235d2a47e9..852cef1f2f1 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -509,7 +509,7 @@ groups="base.group_sale_salesman"/> - + diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml index 3cbee4d53d8..1dc6b88e3fc 100644 --- a/addons/stock_planning/stock_planning_view.xml +++ b/addons/stock_planning/stock_planning_view.xml @@ -184,7 +184,7 @@ + parent="base.menu_base_partner" sequence="5" groups="base.group_extended"/> stock.sale.forecast.list.select From fbe9f81acfc34c1d651f57e2bd656a1689b04141 Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Fri, 24 Feb 2012 18:30:20 +0530 Subject: [PATCH 10/15] [IMP] crm_caldav:-renamed menu Synchronize This Calendar=>Synchronize Your Meetings bzr revid: mtr@tinyerp.com-20120224130020-lbwt21go6jm9fsyj --- addons/crm_caldav/crm_caldav_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/crm_caldav/crm_caldav_view.xml b/addons/crm_caldav/crm_caldav_view.xml index e33f56dd036..287e301532e 100644 --- a/addons/crm_caldav/crm_caldav_view.xml +++ b/addons/crm_caldav/crm_caldav_view.xml @@ -13,7 +13,7 @@ Date: Fri, 24 Feb 2012 18:34:00 +0530 Subject: [PATCH 11/15] [IMP] crm_claim,crm_helpdesk:- moved 'After-Sale Services' menu to project bzr revid: mtr@tinyerp.com-20120224130400-ovvxe5fnc50rd748 --- addons/crm_claim/crm_claim_menu.xml | 2 +- addons/crm_helpdesk/crm_helpdesk_menu.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/crm_claim/crm_claim_menu.xml b/addons/crm_claim/crm_claim_menu.xml index f33b6f7ad31..f5405cea5bb 100644 --- a/addons/crm_claim/crm_claim_menu.xml +++ b/addons/crm_claim/crm_claim_menu.xml @@ -4,7 +4,7 @@ + parent="base.menu_main_pm" sequence="7" /> diff --git a/addons/crm_helpdesk/crm_helpdesk_menu.xml b/addons/crm_helpdesk/crm_helpdesk_menu.xml index 31ee27345b0..88388e4548f 100644 --- a/addons/crm_helpdesk/crm_helpdesk_menu.xml +++ b/addons/crm_helpdesk/crm_helpdesk_menu.xml @@ -2,7 +2,7 @@ + parent="base.menu_main_pm" sequence="7" /> From 2a6155b6b426d0289f3f1b453e916672582bd2fc Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Mon, 27 Feb 2012 10:11:08 +0530 Subject: [PATCH 12/15] [IMP] sale:-removed previously added 'Customer' and 'Contacts' menu from sale bzr revid: mtr@tinyerp.com-20120227044108-p7l72e5dl0rr1w02 --- addons/sale/sale_view.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 852cef1f2f1..93ac3b59c9f 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -8,12 +8,6 @@ parent="base.menu_base_partner" sequence="1" /> - - - From 2c5781c2c9de8ec111ecc85334b29e179d3ba3bf Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Mon, 27 Feb 2012 10:14:29 +0530 Subject: [PATCH 13/15] [IMP] sale:-removed 'Sales' menu bzr revid: mtr@tinyerp.com-20120227044429-a5n176n9vnpmahav --- addons/sale/sale_view.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 93ac3b59c9f..3789fb08b2a 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -4,10 +4,6 @@ id="base.menu_base_partner" name="Sales" sequence="0" groups="base.group_sale_salesman,base.group_sale_manager"/> - - From 434294dfc452b018362d8c03e540216d35b5f0d3 Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Mon, 27 Feb 2012 16:59:02 +0530 Subject: [PATCH 14/15] [IMP] crm_claim, crm_helpdesk:- reverted previously committed changes at revision 6638 for 'After-Sale Services' menu bzr revid: mtr@tinyerp.com-20120227112902-n6spkh8ha14x5090 --- addons/crm_claim/crm_claim_menu.xml | 2 +- addons/crm_helpdesk/crm_helpdesk_menu.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/crm_claim/crm_claim_menu.xml b/addons/crm_claim/crm_claim_menu.xml index f5405cea5bb..f33b6f7ad31 100644 --- a/addons/crm_claim/crm_claim_menu.xml +++ b/addons/crm_claim/crm_claim_menu.xml @@ -4,7 +4,7 @@ + parent="base.menu_base_partner" sequence="7" /> diff --git a/addons/crm_helpdesk/crm_helpdesk_menu.xml b/addons/crm_helpdesk/crm_helpdesk_menu.xml index 88388e4548f..31ee27345b0 100644 --- a/addons/crm_helpdesk/crm_helpdesk_menu.xml +++ b/addons/crm_helpdesk/crm_helpdesk_menu.xml @@ -2,7 +2,7 @@ + parent="base.menu_base_partner" sequence="7" /> From b9c1b6057fe968390b1e6fd185c31da3f08a483b Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Tue, 28 Feb 2012 16:18:18 +0530 Subject: [PATCH 15/15] [IMP] crm_claim, crm_helpdesk:-added project menu bzr revid: mtr@tinyerp.com-20120228104818-ajy4dwazdik1jsmc --- addons/crm_claim/crm_claim_menu.xml | 8 +++++++- addons/crm_helpdesk/crm_helpdesk_menu.xml | 9 ++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/addons/crm_claim/crm_claim_menu.xml b/addons/crm_claim/crm_claim_menu.xml index f33b6f7ad31..b23110c3da3 100644 --- a/addons/crm_claim/crm_claim_menu.xml +++ b/addons/crm_claim/crm_claim_menu.xml @@ -1,10 +1,16 @@ + + parent="base.menu_main_pm" sequence="7" /> diff --git a/addons/crm_helpdesk/crm_helpdesk_menu.xml b/addons/crm_helpdesk/crm_helpdesk_menu.xml index 31ee27345b0..278a3ed0f16 100644 --- a/addons/crm_helpdesk/crm_helpdesk_menu.xml +++ b/addons/crm_helpdesk/crm_helpdesk_menu.xml @@ -1,8 +1,15 @@ + + + + parent="base.menu_main_pm" sequence="7" />