From dc02b190452ded83946a7970abe3f869819e42cf Mon Sep 17 00:00:00 2001 From: vishmita Date: Fri, 11 May 2012 15:27:07 +0530 Subject: [PATCH 001/232] [FIX]when discard modification and click on next record from pager again it gives warning. lp bug: https://launchpad.net/bugs/997468 fixed bzr revid: vja@vja-desktop-20120511095707-jsqixg5c87u7itd4 --- addons/web/static/src/js/view_form.js | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 27606a564be..4506005d822 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -546,6 +546,7 @@ instance.web.FormView = instance.web.View.extend(_.extend({}, instance.web.form. }, on_button_cancel: function(event) { if (this.can_be_discarded()) { + this.on_record_loaded(this.datarecord); this.set({mode: "view"}); } return false; From 107af72dd1199a72292610d13a8db63ab653683d Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Mon, 21 May 2012 14:33:52 +0530 Subject: [PATCH 002/232] [IMP] account : added missing filter string in search view. bzr revid: mdi@tinyerp.com-20120521090352-ntkqob7jqzuxkkom --- addons/account/account_view.xml | 4 ++-- addons/account/project/project_view.xml | 6 +++--- .../account/report/account_analytic_entries_report_view.xml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 37b2d42d9c6..1e7f82fe91d 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -1235,7 +1235,7 @@ - + @@ -2213,7 +2213,7 @@ - + diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml index 648af6dda4c..72a47d6c820 100644 --- a/addons/account/project/project_view.xml +++ b/addons/account/project/project_view.xml @@ -433,10 +433,10 @@ - - + + - + diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml index 408e76fdcb9..3dce53d8685 100644 --- a/addons/account/report/account_analytic_entries_report_view.xml +++ b/addons/account/report/account_analytic_entries_report_view.xml @@ -63,7 +63,7 @@ - + From 1180e5d1cadb955509a29e2a44df53573c35276e Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Mon, 21 May 2012 14:41:20 +0530 Subject: [PATCH 003/232] [IMP] account_analytic_analysis : added missing filter string in search view. bzr revid: mdi@tinyerp.com-20120521091120-3uajgp1kc5p10cfz --- .../account_analytic_analysis_menu.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml index 964383246dd..54c8323d996 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml +++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml @@ -34,10 +34,10 @@ - + - + From c933291f700bed1e69ba0517d4a91584c6af362f Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Mon, 21 May 2012 15:01:30 +0530 Subject: [PATCH 004/232] [IMP] caldav : added missing filter string in search view. bzr revid: mdi@tinyerp.com-20120521093130-oau0k8d0r71crd98 --- addons/caldav/caldav_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml index b47e093d436..2819884aa7b 100644 --- a/addons/caldav/caldav_view.xml +++ b/addons/caldav/caldav_view.xml @@ -157,7 +157,7 @@ - + From cd5c913576d8a06ef66f7e9ad5c8f8bb58e14eed Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Mon, 21 May 2012 15:28:47 +0530 Subject: [PATCH 005/232] [IMP] crm : added missing filter string and improve indentation in search view. bzr revid: mdi@tinyerp.com-20120521095847-y7hcgl7v2byi7vpi --- addons/crm/crm_lead_view.xml | 20 +++++--- addons/crm/crm_meeting_view.xml | 6 ++- addons/crm/crm_phonecall_view.xml | 12 +++-- addons/crm/crm_report_view.xml | 51 +++++++++---------- addons/crm/report/crm_lead_report_view.xml | 2 +- .../crm/report/crm_phonecall_report_view.xml | 3 +- 6 files changed, 53 insertions(+), 41 deletions(-) diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 9c3bd07562c..9f86b4b16dd 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -349,25 +349,28 @@ - - - - + @@ -597,18 +600,21 @@ - - - diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml index 24799e97421..7ada27c40db 100644 --- a/addons/crm/crm_meeting_view.xml +++ b/addons/crm/crm_meeting_view.xml @@ -278,12 +278,14 @@ - - diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml index af49956eda8..ec03b9d11ea 100644 --- a/addons/crm/crm_phonecall_view.xml +++ b/addons/crm/crm_phonecall_view.xml @@ -204,13 +204,15 @@ - - @@ -254,13 +256,15 @@ - - diff --git a/addons/crm/crm_report_view.xml b/addons/crm/crm_report_view.xml index e89e0c1a8d8..74443b135aa 100644 --- a/addons/crm/crm_report_view.xml +++ b/addons/crm/crm_report_view.xml @@ -163,13 +163,13 @@ - - - + + + @@ -238,19 +238,18 @@ search - - - - + + + + - - + @@ -332,18 +331,18 @@ search - - - - + + + + - + diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml index e012d4745e4..3d91e65e540 100644 --- a/addons/crm/report/crm_lead_report_view.xml +++ b/addons/crm/report/crm_lead_report_view.xml @@ -114,7 +114,7 @@ - diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml index ea210ddc85a..bd4453d6a02 100644 --- a/addons/crm/report/crm_phonecall_report_view.xml +++ b/addons/crm/report/crm_phonecall_report_view.xml @@ -78,7 +78,8 @@ - From 335811467eaf3b098baa4f6b4a3932a315d4836e Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Mon, 21 May 2012 15:35:01 +0530 Subject: [PATCH 006/232] [IMP] crm_claim : added missing filter string and improve indentation in search view. bzr revid: mdi@tinyerp.com-20120521100501-lnrlz8vmgxneold3 --- addons/crm_claim/crm_claim_view.xml | 7 ++++--- addons/crm_claim/report/crm_claim_report_view.xml | 6 ++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml index 03639fc10e4..48fc4e467a4 100644 --- a/addons/crm_claim/crm_claim_view.xml +++ b/addons/crm_claim/crm_claim_view.xml @@ -214,9 +214,10 @@ - + diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml index a100747690e..411963dbb63 100644 --- a/addons/crm_claim/report/crm_claim_report_view.xml +++ b/addons/crm_claim/report/crm_claim_report_view.xml @@ -82,14 +82,16 @@ - - From 97380cb20832f6938d82e5848ea137522610f0ca Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Mon, 21 May 2012 15:40:36 +0530 Subject: [PATCH 007/232] [IMP] crm_fundraising : added missing filter string in search view. bzr revid: mdi@tinyerp.com-20120521101036-goz84yxanmvkaiss --- addons/crm_fundraising/crm_fundraising_view.xml | 6 ++++-- .../crm_fundraising/report/crm_fundraising_report_view.xml | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml index 48eb1aa3072..636b12749e0 100644 --- a/addons/crm_fundraising/crm_fundraising_view.xml +++ b/addons/crm_fundraising/crm_fundraising_view.xml @@ -228,12 +228,14 @@ string="Fund Description" /> - - diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml index 4a0323ff4da..583dfd1e9d5 100644 --- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml +++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml @@ -101,13 +101,15 @@ - - From a3a7ec567f966a194f5987b0b01e6e53d0bcf4e4 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Mon, 21 May 2012 15:57:41 +0530 Subject: [PATCH 008/232] [IMP] crm_helpdesk : added missing filter string in search view. bzr revid: mdi@tinyerp.com-20120521102741-j36and6ks2yh0ged --- addons/crm_helpdesk/crm_helpdesk_view.xml | 3 ++- addons/crm_helpdesk/report/crm_helpdesk_report_view.xml | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml index 48681357660..2e204f9a229 100644 --- a/addons/crm_helpdesk/crm_helpdesk_view.xml +++ b/addons/crm_helpdesk/crm_helpdesk_view.xml @@ -231,7 +231,8 @@ - diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml index 64d54fc8cd9..34f07c35ebf 100644 --- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml +++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml @@ -75,13 +75,15 @@ - - From 21ae3b0f3fe60093381037b4413433d40edd7d56 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Mon, 21 May 2012 16:14:56 +0530 Subject: [PATCH 009/232] [IMP] document : added missing filter string in search view. bzr revid: mdi@tinyerp.com-20120521104456-wejghmrlrb0pq5ud --- addons/document/document_view.xml | 9 +++++---- addons/document/report/document_report_view.xml | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml index f774dd2f3c9..d9e59b6a2a8 100644 --- a/addons/document/document_view.xml +++ b/addons/document/document_view.xml @@ -294,10 +294,11 @@ - - + + diff --git a/addons/document/report/document_report_view.xml b/addons/document/report/document_report_view.xml index e6e1847cd56..0333e8aca15 100644 --- a/addons/document/report/document_report_view.xml +++ b/addons/document/report/document_report_view.xml @@ -41,7 +41,7 @@ search - + @@ -50,7 +50,7 @@ - + From 3a07843c6e9ef40fb2559a8242ebf7c94f6ba1e4 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Mon, 21 May 2012 16:33:10 +0530 Subject: [PATCH 010/232] [IMP] hr_expense : added missing filter string in search view. bzr revid: mdi@tinyerp.com-20120521110310-anod47oajf9c3y6c --- addons/hr_expense/hr_expense_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml index a62a9026ecf..e54e38e429a 100644 --- a/addons/hr_expense/hr_expense_view.xml +++ b/addons/hr_expense/hr_expense_view.xml @@ -148,8 +148,8 @@ - - + + Date: Mon, 21 May 2012 16:37:23 +0530 Subject: [PATCH 011/232] [IMP] hr_holidays : added missing filter string in search view. bzr revid: mdi@tinyerp.com-20120521110723-60b2zyu784pwxdp0 --- addons/hr_holidays/hr_holidays_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml index 9f8f998cbd9..a311ca971f7 100644 --- a/addons/hr_holidays/hr_holidays_view.xml +++ b/addons/hr_holidays/hr_holidays_view.xml @@ -19,10 +19,10 @@ help="Holidays during last month"/> - + - + From 2a9cdd4954b034d995a7f591fea514d6ef312246 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Mon, 21 May 2012 16:46:00 +0530 Subject: [PATCH 012/232] [IMP] hr_recruitment : added missing filter string in search view. bzr revid: mdi@tinyerp.com-20120521111600-abzff3nqkgfpw6nk --- addons/hr_recruitment/hr_recruitment_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml index 5d175bd16f5..93bb581d894 100644 --- a/addons/hr_recruitment/hr_recruitment_view.xml +++ b/addons/hr_recruitment/hr_recruitment_view.xml @@ -193,7 +193,7 @@ - + From f81c4b643f9d88eb6d2826035c77918028a7f950 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Mon, 21 May 2012 16:52:22 +0530 Subject: [PATCH 013/232] [IMP] hr_timesheet_sheet : added missing filter string in search view. bzr revid: mdi@tinyerp.com-20120521112222-3wwe0xowfr8ykgyk --- addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml index d822f10d944..f4e722f0b7b 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml @@ -166,7 +166,8 @@ - From 41a5c186e47021d1a30d123e62f3dcd9619506f2 Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Mon, 21 May 2012 18:20:14 +0530 Subject: [PATCH 014/232] [IMP]all: remved default filters and select=1 bzr revid: mma@tinyerp.com-20120521125014-7hf0ir1j11f3pc6b --- addons/crm/crm_lead_menu.xml | 2 +- addons/hr/hr_view.xml | 2 +- addons/hr_payroll/hr_payroll_view.xml | 2 +- addons/hr_recruitment/hr_recruitment_menu.xml | 2 +- addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml | 2 +- addons/project_issue/project_issue_menu.xml | 1 - addons/project_issue/report/project_issue_report_view.xml | 2 +- addons/project_long_term/project_long_term_view.xml | 2 +- addons/purchase/purchase_view.xml | 2 +- 9 files changed, 8 insertions(+), 9 deletions(-) diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml index 3cd45fd5cd1..676e6b1d1ab 100644 --- a/addons/crm/crm_lead_menu.xml +++ b/addons/crm/crm_lead_menu.xml @@ -66,7 +66,7 @@ crm.lead kanban,tree,form,graph,calendar [('type','=','opportunity')] - {'search_default_new':1, 'search_default_open':1, 'search_default_section_id':section_id, 'stage_type': 'opportunity', 'default_type': 'opportunity'} + {'search_default_section_id':section_id, 'stage_type': 'opportunity', 'default_type': 'opportunity'} With opportunities you can manage and keep track of your sales pipeline by creating specific customer- or prospect-related sales documents to follow up potential sales. Information such as expected revenue, opportunity stage, expected closing date, communication history and much more can be stored. Opportunities can be connected to the email gateway: new emails may create opportunities, each of them automatically gets the history of the conversation with the customer. diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index 4147ebc30a9..59bf944db8e 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -109,7 +109,7 @@ - + diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml index 3e993ad6629..3312c8d3d99 100644 --- a/addons/hr_payroll/hr_payroll_view.xml +++ b/addons/hr_payroll/hr_payroll_view.xml @@ -650,7 +650,7 @@ - + diff --git a/addons/hr_recruitment/hr_recruitment_menu.xml b/addons/hr_recruitment/hr_recruitment_menu.xml index 04d73dcd2a8..6b43c06824d 100644 --- a/addons/hr_recruitment/hr_recruitment_menu.xml +++ b/addons/hr_recruitment/hr_recruitment_menu.xml @@ -8,7 +8,7 @@ hr.applicant kanban,tree,form,graph,calendar - {'search_default_filter_inprogress':1,'search_default_filter_new':1,"search_default_department_id": department_id} + {"search_default_department_id": department_id} From this menu you can track applicants in the recruitment process and manage all operations: meetings, interviews, phone calls, etc. If you setup the email gateway, applicants and their attached CV are created automatically when an email is sent to jobs@yourcompany.com. If you install the document management modules, all documents (CV and motivation letters) are indexed automatically, so that you can easily search through their content. diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml index d822f10d944..284208ac1b6 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml @@ -252,7 +252,7 @@ - + diff --git a/addons/project_issue/project_issue_menu.xml b/addons/project_issue/project_issue_menu.xml index 1c4cecfe439..8044d149901 100644 --- a/addons/project_issue/project_issue_menu.xml +++ b/addons/project_issue/project_issue_menu.xml @@ -12,7 +12,6 @@ kanban,tree,calendar - {"search_default_user_id": uid, "search_default_draft": 1,"search_default_todo": 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/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml index 1695fa3469a..3e42bde9f2e 100644 --- a/addons/project_issue/report/project_issue_report_view.xml +++ b/addons/project_issue/report/project_issue_report_view.xml @@ -81,7 +81,7 @@ - + diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index 7e1b58745a6..945ffa77f0e 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -327,7 +327,7 @@ - + diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index 9743fb58a7b..8f2ce36b203 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -318,7 +318,7 @@ ir.actions.act_window purchase.order tree,form,graph,calendar - {'search_default_approved': 1,'search_default_create_uid':uid} + {'search_default_approved': 1} Use this menu to search within your purchase orders by references, supplier, products, etc. For each purchase order, you can track the products received, and control the supplier invoices. From faeb8865d2d1f07c41a3ec13a6c6436c4bd74db2 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Tue, 22 May 2012 10:50:01 +0530 Subject: [PATCH 015/232] [IMP] account : Removed all filters related to a date field and added the related date field in the search view. bzr revid: mdi@tinyerp.com-20120522052001-zfuetczlp7ojm5gt --- addons/account/project/project_view.xml | 3 --- .../account/report/account_invoice_report_view.xml | 14 +------------- addons/account/report/account_report_view.xml | 6 ------ 3 files changed, 1 insertion(+), 22 deletions(-) diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml index 72a47d6c820..46bcbb110ab 100644 --- a/addons/account/project/project_view.xml +++ b/addons/account/project/project_view.xml @@ -432,9 +432,6 @@ - - - diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml index 6e5f83a83d1..687f98be59f 100644 --- a/addons/account/report/account_invoice_report_view.xml +++ b/addons/account/report/account_invoice_report_view.xml @@ -56,19 +56,6 @@ - - - - - + diff --git a/addons/account/report/account_report_view.xml b/addons/account/report/account_report_view.xml index fe2b8a3940a..2c6a8736522 100644 --- a/addons/account/report/account_report_view.xml +++ b/addons/account/report/account_report_view.xml @@ -149,9 +149,6 @@ search - - - @@ -215,9 +212,6 @@ search - - - From ec31f3775a6d795f637f0c16e0e637b712b0b6a5 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Tue, 22 May 2012 10:54:55 +0530 Subject: [PATCH 016/232] [IMP] account_analytic_analysis : Removed all filters related to a date field and added the related date field in the search view. bzr revid: mdi@tinyerp.com-20120522052455-6vzp6p1dezgild73 --- .../account_analytic_analysis_menu.xml | 5 +---- 1 file changed, 1 insertion(+), 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 54c8323d996..248a342506b 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml +++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml @@ -26,10 +26,6 @@ - @@ -39,6 +35,7 @@ + From c9a31168dfab779975f186967b26c9481d3dee78 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Tue, 22 May 2012 11:04:08 +0530 Subject: [PATCH 017/232] [IMP] account_asset : Removed all filters related to a date field and added the related date field in the search view. bzr revid: mdi@tinyerp.com-20120522053408-d7vvu14w3fsbnxlv --- .../report/account_asset_report_view.xml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/addons/account_asset/report/account_asset_report_view.xml b/addons/account_asset/report/account_asset_report_view.xml index c2f931862f5..3ef8cf3a58f 100644 --- a/addons/account_asset/report/account_asset_report_view.xml +++ b/addons/account_asset/report/account_asset_report_view.xml @@ -44,17 +44,6 @@ - - - - - From 970a4ef2e8c21bc40da0b1e726dba8a3598c4265 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Tue, 22 May 2012 11:18:29 +0530 Subject: [PATCH 018/232] [IMP] account_voucher : Removed all filters related to a date field and added the related date field in the search view. bzr revid: mdi@tinyerp.com-20120522054829-dwfg64agv8veh73s --- .../report/account_voucher_sales_receipt_view.xml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml index 561dcf747d4..726f331164c 100644 --- a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml +++ b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml @@ -49,19 +49,6 @@ - - - - - + From 67d5ab5ae0e2c8a1513f2da00e7179b9b03c32dd Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Tue, 22 May 2012 11:40:02 +0530 Subject: [PATCH 019/232] [IMP] crm : Removed all filters related to a date field and added the related date field in the search view. bzr revid: mdi@tinyerp.com-20120522061002-ux5oppi3a52srv1e --- addons/crm/crm_lead_view.xml | 9 +--- addons/crm/crm_phonecall_view.xml | 27 +----------- addons/crm/crm_report_view.xml | 43 +++++-------------- addons/crm/report/crm_lead_report_view.xml | 11 ----- .../crm/report/crm_phonecall_report_view.xml | 11 ----- 5 files changed, 14 insertions(+), 87 deletions(-) diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 9f86b4b16dd..e7dad4679b6 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -337,14 +337,6 @@ name="pending" domain="[('state','=','pending')]"/> - - - @@ -372,6 +364,7 @@ + diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml index ec03b9d11ea..611ab3ce1f3 100644 --- a/addons/crm/crm_phonecall_view.xml +++ b/addons/crm/crm_phonecall_view.xml @@ -188,19 +188,6 @@ search - - - - @@ -215,6 +202,7 @@ icon="terp-personal+" domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]" help="My Sales Team(s)" /> + @@ -239,18 +227,6 @@ - - - @@ -267,6 +243,7 @@ icon="terp-personal+" domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]" help="My Sales Team(s)" /> + diff --git a/addons/crm/crm_report_view.xml b/addons/crm/crm_report_view.xml index 74443b135aa..aaad73af29a 100644 --- a/addons/crm/crm_report_view.xml +++ b/addons/crm/crm_report_view.xml @@ -69,17 +69,11 @@ search - - - - - - + + + + + @@ -163,13 +157,8 @@ - - - + + @@ -239,13 +228,8 @@ - - - + + @@ -332,13 +316,8 @@ - - - + + diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml index 3d91e65e540..47784dbf76b 100644 --- a/addons/crm/report/crm_lead_report_view.xml +++ b/addons/crm/report/crm_lead_report_view.xml @@ -72,17 +72,6 @@ - - - - - - - - - - Date: Tue, 22 May 2012 11:49:41 +0530 Subject: [PATCH 020/232] [IMP] crm_claim : Removed all filters related to a date field and added the related date field in the search view. bzr revid: mdi@tinyerp.com-20120522061941-6waf82biqv2hm4zq --- addons/crm_claim/report/crm_claim_report_view.xml | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml index 411963dbb63..ff54f598819 100644 --- a/addons/crm_claim/report/crm_claim_report_view.xml +++ b/addons/crm_claim/report/crm_claim_report_view.xml @@ -54,20 +54,6 @@ - - - - - - - - @@ -118,6 +104,7 @@ + From 15c23819e40c2bf5199cc9e2413e56302fd025c0 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Tue, 22 May 2012 11:58:47 +0530 Subject: [PATCH 021/232] [IMP] crm_fundraising : Removed all filters related to a date field and added the related date field in the search view. bzr revid: mdi@tinyerp.com-20120522062847-scb5jnhtv6xdoji6 --- .../report/crm_fundraising_report_view.xml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml index 583dfd1e9d5..fafbe6c9b55 100644 --- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml +++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml @@ -76,19 +76,6 @@ - - - - - - - @@ -128,6 +115,7 @@ domain="[('state','=','cancel')]"/> + From dcad4713ae722733cd8a970283f3f203d155d13d Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Tue, 22 May 2012 12:05:31 +0530 Subject: [PATCH 022/232] [IMP] crm_helpdesk : Removed all filters related to a date field and added the related date field in the search view. bzr revid: mdi@tinyerp.com-20120522063531-re45k20jiwn2q3s0 --- addons/crm_helpdesk/crm_helpdesk_view.xml | 11 +---------- .../report/crm_helpdesk_report_view.xml | 13 +------------ 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml index 2e204f9a229..770b0087eed 100644 --- a/addons/crm_helpdesk/crm_helpdesk_view.xml +++ b/addons/crm_helpdesk/crm_helpdesk_view.xml @@ -217,16 +217,6 @@ help="All pending Helpdesk Request" /> - - - @@ -236,6 +226,7 @@ domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]" help="My Sales Team(s)" /> + - - - - - - + From 8d5296adfaa79546259ae1e8e6f74b6a81c510da Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Tue, 22 May 2012 12:10:27 +0530 Subject: [PATCH 023/232] [IMP] crm_partner_assign : Removed all filters related to a date field and added the related date field in the search view. bzr revid: mdi@tinyerp.com-20120522064027-pditpokigbv9dc53 --- addons/crm_partner_assign/report/crm_lead_report_view.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/addons/crm_partner_assign/report/crm_lead_report_view.xml b/addons/crm_partner_assign/report/crm_lead_report_view.xml index 256719c8742..9dbfdf998c0 100644 --- a/addons/crm_partner_assign/report/crm_lead_report_view.xml +++ b/addons/crm_partner_assign/report/crm_lead_report_view.xml @@ -10,11 +10,6 @@ - - - From 8944ae0da8dfe3098124ed5e89e3f227574f5bae Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Tue, 22 May 2012 12:14:17 +0530 Subject: [PATCH 024/232] [IMP] document : Removed all filters related to a date field and added the related date field in the search view. bzr revid: mdi@tinyerp.com-20120522064417-pljax1jh0v6nlc42 --- addons/document/report/document_report_view.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/addons/document/report/document_report_view.xml b/addons/document/report/document_report_view.xml index 0333e8aca15..4541d0189e4 100644 --- a/addons/document/report/document_report_view.xml +++ b/addons/document/report/document_report_view.xml @@ -43,9 +43,6 @@ - - - From cf2a6ceb95c48b6670ca8df0845f3194e5e39a54 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Tue, 22 May 2012 12:18:28 +0530 Subject: [PATCH 025/232] [IMP] event : Removed all filters related to a date field and added the related date field in the search view. bzr revid: mdi@tinyerp.com-20120522064828-7aic79o4w50h77xu --- .../event/report/report_event_registration_view.xml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml index 71d656740fe..89ba191dab6 100644 --- a/addons/event/report/report_event_registration_view.xml +++ b/addons/event/report/report_event_registration_view.xml @@ -53,17 +53,6 @@ - - - - - Date: Tue, 22 May 2012 12:29:54 +0530 Subject: [PATCH 026/232] [IMP] hr_evaluation : Removed all filters related to a date field and added the related date field in the search view. bzr revid: mdi@tinyerp.com-20120522065954-1xhbje34p0j5xqsn --- addons/hr_evaluation/hr_evaluation_view.xml | 4 +--- .../report/hr_evaluation_report_view.xml | 12 +----------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml index e38a8796895..a3c1b183221 100644 --- a/addons/hr_evaluation/hr_evaluation_view.xml +++ b/addons/hr_evaluation/hr_evaluation_view.xml @@ -254,14 +254,12 @@ - - + diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml index b82c8f6f850..965366723c7 100644 --- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml +++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml @@ -47,17 +47,6 @@ - - - - - + From 94c010b8a13ff19e851681455e8fee4138700880 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Tue, 22 May 2012 12:33:48 +0530 Subject: [PATCH 027/232] [IMP] hr_expense : Removed all filters related to a date field and added the related date field in the search view. bzr revid: mdi@tinyerp.com-20120522070348-mollhizuy7zbgd5q --- addons/hr_expense/hr_expense_view.xml | 3 --- addons/hr_expense/report/hr_expense_report_view.xml | 12 ------------ 2 files changed, 15 deletions(-) diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml index e54e38e429a..375e3ec2ef0 100644 --- a/addons/hr_expense/hr_expense_view.xml +++ b/addons/hr_expense/hr_expense_view.xml @@ -142,9 +142,6 @@ - - diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml index 32f4ab32b65..c09cb847385 100644 --- a/addons/hr_expense/report/hr_expense_report_view.xml +++ b/addons/hr_expense/report/hr_expense_report_view.xml @@ -53,18 +53,6 @@ - - - - - Date: Tue, 22 May 2012 12:38:24 +0530 Subject: [PATCH 028/232] [IMP] hr_holidays : Removed all filters related to a date field and added the related date field in the search view. bzr revid: mdi@tinyerp.com-20120522070824-rzi5go9rxcoq0u73 --- addons/hr_holidays/hr_holidays_view.xml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml index a311ca971f7..9ec209db80e 100644 --- a/addons/hr_holidays/hr_holidays_view.xml +++ b/addons/hr_holidays/hr_holidays_view.xml @@ -8,16 +8,6 @@ - - - - - - - - @@ -25,6 +15,7 @@ + From 44762771e087988fa7ea816afa1869d507e8aae4 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Tue, 22 May 2012 12:47:34 +0530 Subject: [PATCH 029/232] [IMP] hr_recruitment : Removed all filters related to a date field and added the related date field in the search view. bzr revid: mdi@tinyerp.com-20120522071734-hqzc9elgoxyve13t --- .../report/hr_recruitment_report_view.xml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml index 112258ac4af..75f663ffa8e 100644 --- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml +++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml @@ -49,19 +49,6 @@ - - - - - Date: Tue, 22 May 2012 12:50:26 +0530 Subject: [PATCH 030/232] [IMP] hr_timesheet : Removed all filters related to a date field and added the related date field in the search view. bzr revid: mdi@tinyerp.com-20120522072026-bq40iydnu2hb44ke --- addons/hr_timesheet/hr_timesheet_view.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml index e4838edbd3e..8df6c78d767 100644 --- a/addons/hr_timesheet/hr_timesheet_view.xml +++ b/addons/hr_timesheet/hr_timesheet_view.xml @@ -63,8 +63,6 @@ - - From a4d963311864f4e0f22b57ecfaeaa2b613632784 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Tue, 22 May 2012 12:54:16 +0530 Subject: [PATCH 031/232] [IMP] hr_timesheet_invoice : Removed all filters related to a date field and added the related date field in the search view. bzr revid: mdi@tinyerp.com-20120522072416-00ijo6jf6k0al61p --- .../hr_timesheet_invoice_report_view.xml | 24 ------------------- .../report/report_analytic_view.xml | 3 --- 2 files changed, 27 deletions(-) diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml index be090dfcdbb..07cffe9ea2c 100644 --- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml +++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml @@ -47,18 +47,6 @@ - - - - - - - - @@ -298,10 +282,6 @@ - - - - @@ -370,10 +350,6 @@ - - - - diff --git a/addons/hr_timesheet_invoice/report/report_analytic_view.xml b/addons/hr_timesheet_invoice/report/report_analytic_view.xml index c196beae880..c32ae7a076b 100644 --- a/addons/hr_timesheet_invoice/report/report_analytic_view.xml +++ b/addons/hr_timesheet_invoice/report/report_analytic_view.xml @@ -114,9 +114,6 @@ - - - From c249a5fe311f565766a813d6f0cdfe6c083049f6 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Tue, 22 May 2012 12:58:37 +0530 Subject: [PATCH 032/232] [IMP] hr_timesheet_sheet : Removed all filters related to a date field and added the related date field in the search view. bzr revid: mdi@tinyerp.com-20120522072837-kfzhzjliex4nmlkt --- .../report/hr_timesheet_report_view.xml | 14 -------------- .../report/timesheet_report_view.xml | 15 +-------------- 2 files changed, 1 insertion(+), 28 deletions(-) diff --git a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml index 447c3be6966..752850d31d6 100644 --- a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml +++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml @@ -41,20 +41,6 @@ - - - - - diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml index 96277f10c78..7bbd2175c92 100644 --- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml +++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml @@ -49,20 +49,6 @@ - - - - - @@ -87,6 +73,7 @@ + From 63964f4df46cff25c78c9fbfc102dd62b0e6963c Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Tue, 22 May 2012 14:23:01 +0530 Subject: [PATCH 033/232] [IMP] idea : Removed all filters related to a date field and added the related date field in the search view. bzr revid: mdi@tinyerp.com-20120522085301-h5j8t4zbnusp6yci --- addons/idea/report/report_vote_view.xml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/addons/idea/report/report_vote_view.xml b/addons/idea/report/report_vote_view.xml index f3b722a4ce5..4437337f7f9 100644 --- a/addons/idea/report/report_vote_view.xml +++ b/addons/idea/report/report_vote_view.xml @@ -29,18 +29,6 @@ - - - - - @@ -54,6 +42,7 @@ + From 4bf7b26451119f6442b139435b6e08fe7748549a Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Tue, 22 May 2012 14:34:03 +0530 Subject: [PATCH 034/232] [IMP] lunch : Removed all filters related to a date field and added the related date field in the search view. bzr revid: mdi@tinyerp.com-20120522090403-sc6kckhn434g732y --- addons/lunch/lunch_view.xml | 19 +------------------ .../lunch/report/report_lunch_order_view.xml | 12 +----------- 2 files changed, 2 insertions(+), 29 deletions(-) diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml index 7070b995dc6..a92a51e967b 100644 --- a/addons/lunch/lunch_view.xml +++ b/addons/lunch/lunch_view.xml @@ -82,8 +82,6 @@ - - @@ -189,8 +187,6 @@ search - - @@ -372,23 +368,10 @@ - - - - - - + diff --git a/addons/lunch/report/report_lunch_order_view.xml b/addons/lunch/report/report_lunch_order_view.xml index 5dd25322d47..168398ae5cc 100644 --- a/addons/lunch/report/report_lunch_order_view.xml +++ b/addons/lunch/report/report_lunch_order_view.xml @@ -26,17 +26,7 @@ - - - + From 99cd6418ec4cea134fff16ff153eed9cc8b92c53 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Tue, 22 May 2012 14:47:02 +0530 Subject: [PATCH 035/232] [IMP] crm : fix the error. bzr revid: mdi@tinyerp.com-20120522091702-fz3ajgpngcyp8qmu --- addons/crm/crm_lead_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index e7dad4679b6..a48949b1c74 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -364,7 +364,7 @@ - + From d991d8c766b7bfdff1fe80e7dae85afc43201a20 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Tue, 22 May 2012 15:14:35 +0530 Subject: [PATCH 036/232] [IMP] mail : Removed all filters related to a date field and added the related date field in the search view. bzr revid: mdi@tinyerp.com-20120522094435-13gj3o0w2imbkxcm --- addons/mail/report/mail_message_report_view.xml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/addons/mail/report/mail_message_report_view.xml b/addons/mail/report/mail_message_report_view.xml index ecb26b78d1d..9874214b32a 100644 --- a/addons/mail/report/mail_message_report_view.xml +++ b/addons/mail/report/mail_message_report_view.xml @@ -18,17 +18,7 @@ - - - + From 31a851ad15675161a5823bcc50fb6d2b3081bd32 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Tue, 22 May 2012 15:34:16 +0530 Subject: [PATCH 037/232] [IMP] marketing_campaign : Removed all filters related to a date field and added the related date field in the search view. bzr revid: mdi@tinyerp.com-20120522100416-vxto8fumhcnil9hz --- .../marketing_campaign_view.xml | 2 -- .../report/campaign_analysis_view.xml | 16 +--------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml index d04cde0e428..379992d1b29 100644 --- a/addons/marketing_campaign/marketing_campaign_view.xml +++ b/addons/marketing_campaign/marketing_campaign_view.xml @@ -398,8 +398,6 @@ - - diff --git a/addons/marketing_campaign/report/campaign_analysis_view.xml b/addons/marketing_campaign/report/campaign_analysis_view.xml index ea1ddc9a397..9d978d260e4 100644 --- a/addons/marketing_campaign/report/campaign_analysis_view.xml +++ b/addons/marketing_campaign/report/campaign_analysis_view.xml @@ -32,21 +32,6 @@ - - - - - - - - @@ -62,6 +47,7 @@ + From 601802a62f2be8a172e80a6b1f2aa8051a7344a1 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Tue, 22 May 2012 15:38:36 +0530 Subject: [PATCH 038/232] [IMP] membership : Removed all filters related to a date field and added the related date field in the search view. bzr revid: mdi@tinyerp.com-20120522100836-rnmbhv0jx93vev0d --- addons/membership/report/report_membership_view.xml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/addons/membership/report/report_membership_view.xml b/addons/membership/report/report_membership_view.xml index b0ac01ac89f..259a3935fa7 100644 --- a/addons/membership/report/report_membership_view.xml +++ b/addons/membership/report/report_membership_view.xml @@ -36,23 +36,13 @@ - - - - - + From 3f148674c2e57ae71e66679360b968da0e1f6692 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Tue, 22 May 2012 15:46:07 +0530 Subject: [PATCH 039/232] [IMP] mrp_operations : Removed all filters related to a date field and added the related date field in the search view. bzr revid: mdi@tinyerp.com-20120522101607-8hsiqjagdvepocnk --- .../report/mrp_workorder_analysis_view.xml | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/addons/mrp_operations/report/mrp_workorder_analysis_view.xml b/addons/mrp_operations/report/mrp_workorder_analysis_view.xml index 45b6ffd9be9..455c2ca27f7 100644 --- a/addons/mrp_operations/report/mrp_workorder_analysis_view.xml +++ b/addons/mrp_operations/report/mrp_workorder_analysis_view.xml @@ -47,26 +47,13 @@ - - - - - + From 3dcccc8f7d8d04c230f253e29bdb3db69d5f174b Mon Sep 17 00:00:00 2001 From: vishmita Date: Wed, 23 May 2012 18:45:27 +0530 Subject: [PATCH 040/232] [FIX]date widget must store the selected date immediately. lp bug: https://launchpad.net/bugs/1002343 fixed bzr revid: vja@vja-desktop-20120523131527-ad3vzpkcyslfqaho --- addons/web/static/src/js/view_form.js | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 3430f1dd703..6321ccfaab3 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -1968,6 +1968,7 @@ instance.web.DateTimeWidget = instance.web.OldWidget.extend({ this.$input_picker = this.$element.find('input.oe_datepicker_container'); this.$input.change(this.on_change); this.picker({ + onClose: this.on_picker_select, onSelect: this.on_picker_select, changeMonth: true, changeYear: true, From 24f870f06649eade62d304ce842ef4f556b0a5af Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Thu, 24 May 2012 12:43:27 +0530 Subject: [PATCH 041/232] [FIX]tree view not repecting precision in xml. lp bug: https://launchpad.net/bugs/994589 fixed bzr revid: vme@tinyerp.com-20120524071327-zb7i8qiccw6ith8y --- addons/web/static/src/js/formats.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/js/formats.js b/addons/web/static/src/js/formats.js index 2b527686ddd..de6fe24c892 100644 --- a/addons/web/static/src/js/formats.js +++ b/addons/web/static/src/js/formats.js @@ -118,7 +118,8 @@ instance.web.format_value = function (value, descriptor, value_if_empty) { return instance.web.insert_thousand_seps( _.str.sprintf('%d', value)); case 'float': - var precision = descriptor.digits ? descriptor.digits[1] : 2; + var precision = descriptor.digits ? + (typeof descriptor.digits === "string")? py.eval(descriptor.digits)[1]: descriptor.digits[1] : 2; var formatted = _.str.sprintf('%.' + precision + 'f', value).split('.'); formatted[0] = instance.web.insert_thousand_seps(formatted[0]); return formatted.join(l10n.decimal_point); From ce6d03c66a25f412a28a7265f4cbb177cb84f759 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Mon, 28 May 2012 12:12:41 +0530 Subject: [PATCH 042/232] [IMP] point_of_sale : Removed all filters related to a date field and added the related date field in the search view. bzr revid: mdi@tinyerp.com-20120528064241-imvko29lik159xal --- .../report/pos_order_report_view.xml | 19 +------------ .../report/report_cash_register_view.xml | 28 ++++--------------- 2 files changed, 6 insertions(+), 41 deletions(-) diff --git a/addons/point_of_sale/report/pos_order_report_view.xml b/addons/point_of_sale/report/pos_order_report_view.xml index a1631ab0203..b3a9990023c 100644 --- a/addons/point_of_sale/report/pos_order_report_view.xml +++ b/addons/point_of_sale/report/pos_order_report_view.xml @@ -35,24 +35,6 @@ - - - - - - - @@ -67,6 +49,7 @@ help="My Sales" domain="[('user_id','=',uid)]"/> + diff --git a/addons/point_of_sale/report/report_cash_register_view.xml b/addons/point_of_sale/report/report_cash_register_view.xml index b4a2f1e6ecb..cfed1aebdc7 100644 --- a/addons/point_of_sale/report/report_cash_register_view.xml +++ b/addons/point_of_sale/report/report_cash_register_view.xml @@ -26,29 +26,10 @@ search - - - - - - - - - - + + @@ -59,6 +40,7 @@ help="My Sales" domain="[('user_id','=',uid)]"/> + From 6a47ac151c712ae09d9e1f86a3e931411c12cf7d Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Mon, 28 May 2012 12:42:22 +0530 Subject: [PATCH 043/232] [IMP] project : Added missing filter string and removed all filters related to a date field and added the related date field in the search view. bzr revid: mdi@tinyerp.com-20120528071222-0kupd9u5nqxe2rnl --- addons/project/project_view.xml | 2 +- addons/project/report/project_cumulative.xml | 14 ++++---------- addons/project/report/project_report_view.xml | 14 -------------- 3 files changed, 5 insertions(+), 25 deletions(-) diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 70cdac1efa0..bfa9f4c90bf 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -124,7 +124,7 @@ - + diff --git a/addons/project/report/project_cumulative.xml b/addons/project/report/project_cumulative.xml index 89667992f0a..2e5ecd28f88 100644 --- a/addons/project/report/project_cumulative.xml +++ b/addons/project/report/project_cumulative.xml @@ -58,20 +58,14 @@ - - - - - + - - + + + diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml index 3bdec47fcb9..446b808c57b 100644 --- a/addons/project/report/project_report_view.xml +++ b/addons/project/report/project_report_view.xml @@ -62,20 +62,6 @@ - - - - - Date: Mon, 28 May 2012 12:49:18 +0530 Subject: [PATCH 044/232] [IMP] point_of_sale : fix the eeror. bzr revid: mdi@tinyerp.com-20120528071918-sdthomsohyev6lrt --- addons/point_of_sale/report/report_cash_register_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/point_of_sale/report/report_cash_register_view.xml b/addons/point_of_sale/report/report_cash_register_view.xml index cfed1aebdc7..3cbc315ce0f 100644 --- a/addons/point_of_sale/report/report_cash_register_view.xml +++ b/addons/point_of_sale/report/report_cash_register_view.xml @@ -40,7 +40,7 @@ help="My Sales" domain="[('user_id','=',uid)]"/> - + From aa495b790e090ca137a7fdc1403ca0836e79e493 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Mon, 28 May 2012 15:03:41 +0530 Subject: [PATCH 045/232] [IMP] point_of_sale : Removed all filters related to a date field and added the related date field in the search view. bzr revid: mdi@tinyerp.com-20120528093341-x7dvpnknwez9w1bs --- addons/point_of_sale/point_of_sale_view.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml index a83aab01ca9..ebdc5ccb352 100644 --- a/addons/point_of_sale/point_of_sale_view.xml +++ b/addons/point_of_sale/point_of_sale_view.xml @@ -143,11 +143,9 @@ - - - + From d9bd1faea593fff34435b53e85b0c11a9772d443 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Mon, 28 May 2012 15:17:52 +0530 Subject: [PATCH 046/232] [IMP] project_issue : Added missing filter string and removed all filters related to a date field and added the related date field in the search view. bzr revid: mdi@tinyerp.com-20120528094752-sy2vtk9dcsep1rd5 --- addons/project_issue/project_issue_view.xml | 2 +- .../report/project_issue_report_view.xml | 13 +------------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index 716a02f2f60..079cfc4f7f9 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -170,7 +170,7 @@ - + diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml index ee0a4fbd1ed..3f35b780534 100644 --- a/addons/project_issue/report/project_issue_report_view.xml +++ b/addons/project_issue/report/project_issue_report_view.xml @@ -53,18 +53,6 @@ - - - - - @@ -84,6 +72,7 @@ + From ddbe1c6a58de63ac8ecd2a9152b8ecfa24983096 Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Mon, 28 May 2012 15:18:49 +0530 Subject: [PATCH 047/232] [IMP]crm: added a country field in group by filter in opportunity and customer serch view bzr revid: mma@tinyerp.com-20120528094849-prjozx2chaezmafy --- addons/crm/crm_lead_view.xml | 1 + addons/crm/res_partner_view.xml | 3 +++ 2 files changed, 4 insertions(+) diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 3c2b8f48eb6..08c675ca274 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -615,6 +615,7 @@ + diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml index fe880d29bd3..1eac3c17ec3 100644 --- a/addons/crm/res_partner_view.xml +++ b/addons/crm/res_partner_view.xml @@ -39,6 +39,9 @@ + + + From c958ecce52827e8bf91215c939d88559033199fd Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Mon, 28 May 2012 15:24:46 +0530 Subject: [PATCH 048/232] [IMP] project_long_term : added missing filter string in search view. bzr revid: mdi@tinyerp.com-20120528095446-vjcjr4xq6qc3ltmq --- addons/project_long_term/project_long_term_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index 1e9f50cdd87..ad3a6c9b9e0 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -272,7 +272,7 @@ - + From 2fc05037fdee7995e6e458b80765d408ff437ff4 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Mon, 28 May 2012 15:49:52 +0530 Subject: [PATCH 049/232] [IMP] project_scrum : added missing filter string in search view. bzr revid: mdi@tinyerp.com-20120528101952-tn5c975hp1k6cwk9 --- addons/project_scrum/project_scrum_view.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml index ef8a2681620..354ce1daaef 100644 --- a/addons/project_scrum/project_scrum_view.xml +++ b/addons/project_scrum/project_scrum_view.xml @@ -149,11 +149,11 @@ @@ -440,7 +440,7 @@ - + @@ -580,8 +580,8 @@ - - + + From 7eef578e9302ecda5771466abc44548bd7c7ce65 Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Mon, 28 May 2012 18:56:19 +0530 Subject: [PATCH 050/232] [IMP]: removed name in filter bzr revid: mma@tinyerp.com-20120528132619-o3coy4kaneqczxcj --- addons/crm/crm_lead_view.xml | 3 --- addons/hr_recruitment/hr_recruitment_view.xml | 4 ++-- addons/project_issue/project_issue_view.xml | 4 ++-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 08c675ca274..0090ac8c3af 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -580,15 +580,12 @@ search - - diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index 716a02f2f60..148d2f79b97 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -164,8 +164,8 @@ - - + + From e8bf2fda8ed49ba8a4982a276df1d764debfd2fd Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Tue, 29 May 2012 10:25:09 +0530 Subject: [PATCH 051/232] [IMP] project_timesheet : Removed all filters related to a date field and added the related date field in the search view. bzr revid: mdi@tinyerp.com-20120529045509-garnh9vhb68fph0v --- .../project_timesheet/report/task_report_view.xml | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/addons/project_timesheet/report/task_report_view.xml b/addons/project_timesheet/report/task_report_view.xml index b1ba9b8672e..6d430347c01 100644 --- a/addons/project_timesheet/report/task_report_view.xml +++ b/addons/project_timesheet/report/task_report_view.xml @@ -31,21 +31,8 @@ - - - - - + From 1ec901aa813300c587a5e061f3cae909d689f573 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Tue, 29 May 2012 10:40:45 +0530 Subject: [PATCH 052/232] [IMP] purchase : Removed all filters related to a date field and added the related date field in the search view. bzr revid: mdi@tinyerp.com-20120529051045-d8er0czvss2lw2ti --- addons/purchase/report/purchase_report_view.xml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml index 2837b5e7ab6..10672be504a 100644 --- a/addons/purchase/report/purchase_report_view.xml +++ b/addons/purchase/report/purchase_report_view.xml @@ -54,20 +54,6 @@ - - - - - Date: Tue, 29 May 2012 14:20:51 +0530 Subject: [PATCH 053/232] [IMP] report_intrastat : Removed all filters related to a date field and added the related date field in the search view. bzr revid: mdi@tinyerp.com-20120529085051-3cj6wyz22v0q9zao --- addons/report_intrastat/report_intrastat_view.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/addons/report_intrastat/report_intrastat_view.xml b/addons/report_intrastat/report_intrastat_view.xml index 2527f2e4f97..295fcbeeb4b 100644 --- a/addons/report_intrastat/report_intrastat_view.xml +++ b/addons/report_intrastat/report_intrastat_view.xml @@ -98,9 +98,6 @@ - - - From cef8622452535e0d63e82ccffbe4ff6877a51b7c Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Tue, 29 May 2012 14:35:37 +0530 Subject: [PATCH 054/232] [IMP] sale : Added missing filter string and removed all filters related to a date field and added the related date field in the search view. bzr revid: mdi@tinyerp.com-20120529090537-9c0slyugyzlof7y1 --- addons/sale/report/sale_report_view.xml | 13 ------------- addons/sale/sale_view.xml | 6 +++--- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml index 4b3647a5ac2..9cb332d69e2 100644 --- a/addons/sale/report/sale_report_view.xml +++ b/addons/sale/report/sale_report_view.xml @@ -51,19 +51,6 @@ - - - - - diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 36c061645e7..a8206aea906 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -290,7 +290,7 @@ filter_domain="['|', ('name','ilike',self),('client_order_ref','ilike',self)]"/> - + @@ -444,7 +444,7 @@ - + @@ -473,7 +473,7 @@ - + From 4077d10f71097326435c477704edda2307ba3746 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Tue, 29 May 2012 14:39:26 +0530 Subject: [PATCH 055/232] [IMP] sale_crm : added missing filter string in search view. bzr revid: mdi@tinyerp.com-20120529090926-vbuaebnci8qoltc1 --- addons/sale_crm/sale_crm_view.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml index 3151c910e2f..9056adc4289 100644 --- a/addons/sale_crm/sale_crm_view.xml +++ b/addons/sale_crm/sale_crm_view.xml @@ -37,7 +37,8 @@ - From bcf2099bac094485929d48e1ef3cfd43656dfd47 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Wed, 30 May 2012 10:37:27 +0530 Subject: [PATCH 056/232] [IMP] stock : Removed all filters related to a date field and added the related date field in the search view. bzr revid: mdi@tinyerp.com-20120530050727-2nk2v9nvegwnc1il --- .../stock/report/report_stock_move_view.xml | 30 ------------------- addons/stock/stock_view.xml | 2 +- 2 files changed, 1 insertion(+), 31 deletions(-) diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml index dc457bc4ea8..d6ab3c4674f 100644 --- a/addons/stock/report/report_stock_move_view.xml +++ b/addons/stock/report/report_stock_move_view.xml @@ -67,21 +67,6 @@ - - - - - - - - - - - + From 22c4f2916d8009ac4921aef1a546d6b37d6979f8 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Wed, 30 May 2012 10:45:14 +0530 Subject: [PATCH 057/232] [IMP] subscription : Removed all filters related to a date field and added the related date field in the search view. bzr revid: mdi@tinyerp.com-20120530051514-p8kq32722m38wqnr --- addons/subscription/subscription_view.xml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml index 13ebe096843..c00c4e8b40f 100644 --- a/addons/subscription/subscription_view.xml +++ b/addons/subscription/subscription_view.xml @@ -84,14 +84,11 @@ - - - + From c6bb1edac40d538c60548ad03c6f0cc1ecdb09d0 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Wed, 30 May 2012 10:51:32 +0530 Subject: [PATCH 058/232] [IMP] survey : added missing filter string in search view. bzr revid: mdi@tinyerp.com-20120530052132-jpb0r9nrjik4mt8n --- addons/survey/survey_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml index e8f02f6d3e0..a5560c8208d 100644 --- a/addons/survey/survey_view.xml +++ b/addons/survey/survey_view.xml @@ -267,7 +267,7 @@ - + @@ -1110,7 +1110,7 @@ - + From 395d912bb87dee3de4461fb361215f5c54e609f8 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Fri, 1 Jun 2012 18:38:18 +0530 Subject: [PATCH 059/232] [IMP] account :Improved filter string in search view. bzr revid: mdi@tinyerp.com-20120601130818-tmkerk2yvfdmklpl --- addons/account/account_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 90ac278d0fc..e757dc17d11 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -1254,7 +1254,7 @@ - + From 4b8468d84f917182b0c1adb624034ac3494653ca Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Fri, 1 Jun 2012 18:41:48 +0530 Subject: [PATCH 060/232] [IMP] account_analytic_analysis :Improved filter string in search view. bzr revid: mdi@tinyerp.com-20120601131148-bxrbqobb5d626i3x --- .../account_analytic_analysis_menu.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml index 31f211264a0..5e8bc754d45 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml +++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml @@ -30,10 +30,10 @@ - + - + From 21fa3c5e314d2ddf655a4fc2c096d4462f6c6d6d Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Fri, 1 Jun 2012 18:46:53 +0530 Subject: [PATCH 061/232] [IMP] project :Improved filter string in search view. bzr revid: mdi@tinyerp.com-20120601131653-6rba78oh5kvlyv44 --- addons/project/project_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index c63548651af..1158d211371 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -124,7 +124,7 @@ - + @@ -344,7 +344,7 @@ name="planned_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" - groups="project.group_time_work_estimation_tasks" + groups="project.group_time_work_estimation_tasks" on_change="onchange_planned(planned_hours, effective_hours)"/> Date: Fri, 1 Jun 2012 18:49:10 +0530 Subject: [PATCH 062/232] [IMP] project_scrum :Improved filter string in search view. bzr revid: mdi@tinyerp.com-20120601131910-p74g5w7tkqz3y6j6 --- addons/project_scrum/project_scrum_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml index e81c3a97641..438e4604905 100644 --- a/addons/project_scrum/project_scrum_view.xml +++ b/addons/project_scrum/project_scrum_view.xml @@ -145,11 +145,11 @@ From 709522a45b1b85701b25bd3d0567ab214133fd90 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Mon, 4 Jun 2012 11:57:09 +0530 Subject: [PATCH 063/232] [IMP] account : fix the error : Object 2012-01-01 has no method 'getFullYear'. bzr revid: mdi@tinyerp.com-20120604062709-qi1qj4thrvq75q3d --- addons/account/report/account_invoice_report_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml index c156c980301..b5d3881a966 100644 --- a/addons/account/report/account_invoice_report_view.xml +++ b/addons/account/report/account_invoice_report_view.xml @@ -124,7 +124,7 @@ account.invoice.report form tree,graph - {'search_default_period':1,'search_default_current':1, 'search_default_year': 1, 'search_default_category_product':1, 'search_default_customer':1, 'search_default_date': time.strftime('%Y-01-01'), 'group_by':[], 'group_by_no_leaf':1,} + {'search_default_period':1,'search_default_current':1, 'search_default_year': 1, 'search_default_category_product':1, 'search_default_customer':1, 'group_by':[], 'group_by_no_leaf':1,} From this report, you can have an overview of the amount invoiced to your customer as well as payment delays. The tool search can also be used to personalise your Invoices reports and so, match this analysis to your needs. From 5097feeaf2c3a899e13b32e91d3f9c919df08c38 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Mon, 4 Jun 2012 12:07:42 +0530 Subject: [PATCH 064/232] [IMP] account_voucher : fix the error : Object 2012-01-01 has no method 'getFullYear'. bzr revid: mdi@tinyerp.com-20120604063742-6ajtzzvily37jz2i --- .../report/account_voucher_sales_receipt_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml index b452af6776a..aeea50a0b1a 100644 --- a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml +++ b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml @@ -103,7 +103,7 @@ sale.receipt.report form tree,graph - {'search_default_year':1,'search_default_month':1,'search_default_current':1, 'search_default_partner':1, 'search_default_customer':1, 'search_default_date': time.strftime('%Y-01-01'), 'group_by':[], 'group_by_no_leaf':1,} + {'search_default_year':1,'search_default_month':1,'search_default_current':1, 'search_default_partner':1, 'search_default_customer':1, 'group_by':[], 'group_by_no_leaf':1,} From this report, you can have an overview of the amount invoiced to your customer as well as payment delays. The tool search can also be used to personalise your Invoices reports and so, match this analysis to your needs. From 8459c8af3c01592c181d0fed4906edf5fff8b764 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Mon, 4 Jun 2012 14:34:37 +0530 Subject: [PATCH 065/232] [IMP] project_issue : fix the view error. bzr revid: mdi@tinyerp.com-20120604090437-ynq8w2a7w1y0c9mh --- addons/project_issue/report/project_issue_report_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml index 41eea15bb42..5d7f9c7c671 100644 --- a/addons/project_issue/report/project_issue_report_view.xml +++ b/addons/project_issue/report/project_issue_report_view.xml @@ -72,7 +72,7 @@ - + From a08bdbdc144e4ca414d72e9e1256bc4125415b2f Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Mon, 4 Jun 2012 14:53:57 +0530 Subject: [PATCH 066/232] [IMP] account : Removed all filters related to a date field and added the related date field in the search view. bzr revid: mdi@tinyerp.com-20120604092357-9xpbn946nvjemmoo --- .../account_analytic_entries_report_view.xml | 27 ++----------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml index 3dce53d8685..18bda6cbbab 100644 --- a/addons/account/report/account_analytic_entries_report_view.xml +++ b/addons/account/report/account_analytic_entries_report_view.xml @@ -35,36 +35,13 @@ - - - - - - - - - + + From c9260da9cd1adcd173d4d210b4faf78743a2e43b Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Mon, 4 Jun 2012 15:30:04 +0530 Subject: [PATCH 067/232] [IMP] account_asset : fix the error : Object 2012-01-01 has no method 'getFullYear'. bzr revid: mdi@tinyerp.com-20120604100004-flnvca2ezn51q6k6 --- addons/account_asset/report/account_asset_report_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account_asset/report/account_asset_report_view.xml b/addons/account_asset/report/account_asset_report_view.xml index 3ef8cf3a58f..cb529ae660d 100644 --- a/addons/account_asset/report/account_asset_report_view.xml +++ b/addons/account_asset/report/account_asset_report_view.xml @@ -83,7 +83,7 @@ form tree,graph - {'search_default_year':1,'search_default_this_month':1,'search_default_asset_category':1, 'search_default_posted':1, 'search_default_purchase_date': time.strftime('%Y-01-01'), 'group_by':[], 'group_by_no_leaf':1} + {'search_default_year':1,'search_default_this_month':1,'search_default_asset_category':1, 'search_default_posted':1, 'group_by':[], 'group_by_no_leaf':1} From this report, you can have an overview on all depreciation. The tool search can also be used to personalise your Assets reports and so, match this analysis to your needs; From 023c314f198a9584eedbbfa459520ce143d18225 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Wed, 6 Jun 2012 10:42:55 +0530 Subject: [PATCH 068/232] [IMP] Improved some typos in filter string. bzr revid: mdi@tinyerp.com-20120606051255-62wyp3k4kmfkr9o2 --- addons/account/account_invoice_view.xml | 2 +- addons/crm_claim/report/crm_claim_report_view.xml | 2 +- addons/crm_fundraising/report/crm_fundraising_report_view.xml | 2 +- addons/crm_helpdesk/report/crm_helpdesk_report_view.xml | 2 +- addons/mrp_repair/mrp_repair_view.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index d1b6e21d61a..d822b3dda85 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -370,7 +370,7 @@ filter_domain="['|', ('number','ilike',self),('origin','ilike',self)]"/> - + diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml index 4c0b8a6c1cd..eefc534fc0e 100644 --- a/addons/crm_claim/report/crm_claim_report_view.xml +++ b/addons/crm_claim/report/crm_claim_report_view.xml @@ -76,7 +76,7 @@ - - - - + From 1cb74dcebddfc5ff3864e40106d4fda80393f269 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Wed, 6 Jun 2012 11:31:14 +0530 Subject: [PATCH 069/232] [IMP] Added missing filter string and removed all filters related to a date field and added the related date field in the search view. bzr revid: mdi@tinyerp.com-20120606060114-fm3dy5wv1mpfu35i --- openerp/addons/base/ir/ir.xml | 21 ++++++++++---------- openerp/addons/base/ir/ir_filters.xml | 4 ++-- openerp/addons/base/res/res_company_view.xml | 8 ++++---- openerp/addons/base/res/res_request_view.xml | 2 +- 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml index 837374d371b..c90ac0da394 100644 --- a/openerp/addons/base/ir/ir.xml +++ b/openerp/addons/base/ir/ir.xml @@ -206,7 +206,7 @@ - + @@ -254,8 +254,8 @@ search - - + + @@ -818,14 +818,13 @@ string="Binary" domain="[('type','=','binary')]"/> - - + - @@ -1169,9 +1168,9 @@ string="Untranslated" domain="['|',('value', '=', False),('value','=','')]"/> - - - + + + @@ -1476,7 +1475,7 @@ - + diff --git a/openerp/addons/base/ir/ir_filters.xml b/openerp/addons/base/ir/ir_filters.xml index a0e37b45e5a..f6d4444541c 100644 --- a/openerp/addons/base/ir/ir_filters.xml +++ b/openerp/addons/base/ir/ir_filters.xml @@ -60,8 +60,8 @@ + name="my_filters" + string="My Filters" /> diff --git a/openerp/addons/base/res/res_company_view.xml b/openerp/addons/base/res/res_company_view.xml index 1f183265da6..07914c0c851 100644 --- a/openerp/addons/base/res/res_company_view.xml +++ b/openerp/addons/base/res/res_company_view.xml @@ -156,10 +156,10 @@ - - - - + + + + diff --git a/openerp/addons/base/res/res_request_view.xml b/openerp/addons/base/res/res_request_view.xml index e723fc39710..b4337b8f451 100644 --- a/openerp/addons/base/res/res_request_view.xml +++ b/openerp/addons/base/res/res_request_view.xml @@ -83,7 +83,7 @@ - + From cf0d077767e3f2a4f01cb2675170e185bb1f361c Mon Sep 17 00:00:00 2001 From: "Purnendu Singh (OpenERP)" Date: Wed, 6 Jun 2012 18:43:25 +0530 Subject: [PATCH 070/232] [IMP] crm: typo bzr revid: psi@tinyerp.com-20120606131325-5yszqjo2l56bwq1p --- addons/crm/crm_lead_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 5fc7858dee8..6d69209f5d8 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -329,7 +329,7 @@ - + From fc9901c7a5dd4c5a1787a53ffae2c2795ac1db17 Mon Sep 17 00:00:00 2001 From: Jigar Amin - OpenERP Date: Thu, 7 Jun 2012 16:06:47 +0530 Subject: [PATCH 071/232] [IMP] Add action help if noaction on deshbaord bzr revid: jam@tinyerp.com-20120607103647-8ylpddobydc6ed1d --- .../web_dashboard/static/src/js/dashboard.js | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js index 761876929da..8b8d34c6368 100644 --- a/addons/web_dashboard/static/src/js/dashboard.js +++ b/addons/web_dashboard/static/src/js/dashboard.js @@ -231,6 +231,15 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({ } }, renderElement: function() { + var self = this; + //to Check dash contains any action if not then show the action help + var array= []; + _.each(this.node.children, function(column, column_index) { + array.push(_.include(_.pluck(column.children,"tag"),"action")); + }); + if (! _.include(array,true)){ + return self.no_result(); + } // We should start with three columns available for (var i = this.node.children.length; i < 3; i++) { this.node.children.push({ @@ -242,6 +251,17 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({ var rendered = QWeb.render(this.form_template, this); this.$element.html(rendered); }, + no_result: function () { + if (!this.view.options.action + || !this.view.options.action.help) { + return; + } + this.$element.prepend( + $('
') + .append($('', { src: '/web_dashboard/static/src/img/view_todo_arrow.png' })) + .append($('
').html(this.view.options.action.help)) + ); + }, do_reload: function() { var view_manager = this.view.getParent(), action_manager = view_manager.getParent(); From 5bf89ebd7159bb59fac9e61002a903f636678325 Mon Sep 17 00:00:00 2001 From: Jigar Amin - OpenERP Date: Thu, 7 Jun 2012 16:07:13 +0530 Subject: [PATCH 072/232] [ADD] Added the image help arrow bzr revid: jam@tinyerp.com-20120607103713-gls9104930lrjnsg --- .../static/src/img/view_todo_arrow.png | Bin 0 -> 3389 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 addons/web_dashboard/static/src/img/view_todo_arrow.png diff --git a/addons/web_dashboard/static/src/img/view_todo_arrow.png b/addons/web_dashboard/static/src/img/view_todo_arrow.png new file mode 100644 index 0000000000000000000000000000000000000000..8633430e9aebc63cf85dd08fefd7926b773173b1 GIT binary patch literal 3389 zcmV-D4Z`w?P) zPjD^Dmc&Y-1$4Ph(m0MuDm*%d*k49b7lp2=fxwBaBWh7-(AG$8I7Q0TGGHK<3nDOV zRpkBLeeX^G*gNthkuph(>D!)nL%veJsI?BQG1?LdioymvjD!A{v-KdDaykjTbq8=_VnXF|IWs(7 z>Q8$&3{)z!1_aqWuSuoS0Pwd55BB|ZVq!x1epYXlG4tTPsPg%IG+LP4rKB3GROaGD z!XOYBfU4K4V8(X=pu4-8H&G+}Z>8KFQ4|^gviT=EnMym2 zdUfj1f!&|(G~QcR4pug4V^h7 z8Q|f<yUed4>59~VU5s8;3x z@a46pbrVT|ar*xI@4Qef7Nzg|TL1!}Ru;8}PbLyc0IZw*)@Ce>)*!+u0GOV>nYP4) zIO{q9FfvveNOx`fWW8RC7U^`X*vjOJP!cApEa8vz#xFg=XXXYPMq!m;m_)| zG5}sIF<9j$0PvZC`}!)KSU9hf2TqANJJ8otUROqIqZj>b05*F@+zde`9FdL# zU}=vcz-feafW=hY`{wPY1~BG6*x|9#PAQzv)~aO?(Gp(8)^S|uD4a3%>QCa(4|r1p z*eZYp(SymP2VR={0FYHm0l-g=9=&%iF1r2A>w&REpVg0!PrjeQpRd=epi9Jp%lwZ4 zAtbMFF2r0s_UJH%=pZ7}rw`vbOb?TG=fUfO#-03*#qhZ)!@Y3N6f|ZT}fS=#! zz5c%dFf;_-v;fYlCxY*FH^9p z+$5N>oG~OBqroIz-}C_H^Z6JsYj;^|;wEkx09tDxK(heQ+neQ031AQe0ss#WKXVfZ zJHx24+~dhw3y^L!iD0vO;4T3Gq!J%<-NcPXYhKRrM8re{1EDr`2>0}yqqr*OUvnJy zoy(W`Hjb@w6CkEvxugu*Yyi&8{3^#O6(3*WIhX)2+rF3s-`sp0NJO--_(LDnCR$eg z*X%@Oy{VpU>x` zLgCrOYA>3Is8D$J1HKQN%jL|(#ES|myrK;Sutofa=>1A11T$Ok3NM(Mtu z5BK-)Z3IElB_djB=rS`$K_Lk=CV-<;jgfZGU zN~OT~(eQUlzvcV6aA;_VR`ZV&;C0`)a*2*XVq>e&EL^7F5jSm+}pOb=* z`Tm}l;^Yvo26uON+g!Y7$d@qzH*ZB!3JJ|oR4LCwxrtkZ5XF%~={X^3(D!%0474_7 zcWSKD3du4(Fn&y7bo7~Dwo?5}N+)Bj;cFyr24Is(PuA;IFz}Rs`O8E7d(U2e?n@=G zv$m(FN0u8Odf9c|-Y~3NfJCdXPbNLtXw<-r#~VWUgAd&GR(lk^D*(3J=y>Tx>Qr2=zgUInxU5IoD9W`FE%-@qF&gyOa^1yw4mBkJkDU@DSDsgKR%>#JJ=cT<2 zDwWx{nfTAkZ|y1gK5UB{bGe+^Z~$9(aAd4B=yhfOqFR|-B@Zr2jSPkXK_=W3IgUaj ztV2iPc>pgFa1Iu)K+t)>{+|#;#^Pz|s2-yudj+Ks7))9^j!Gs{s8r^rE$q>O{yjg4 z!+Ju^%*>dz7_F`Vz&MP*`S`!Q&$aqhN2+dPw8h%52^)Yc5j)axNjVBc0+ua|j$n*| zWy8xWqu2t%xQT=U15sG}XBKAg@B??BYXP}`e_mh9h+#z`98AS4yd#ClM>3i1$L8iP zgaEngx8lbZAlsJ0shNdoXmFg0;TE&1cs@Qz3zkl!SwesW2yytAZ3@(g%WOnYt z8%iZyfY))ulthyzoF?CjRe*>1SQ52bMH2~`PH!8CAkPhtP5x1w`LnuMgj`MixZ)(z zx?3m4CqD%teq@aS;-#Wa85S`>+HsU}-2|%Dx&O3;V*>~Jo^O>sGc(UDn;%#8pv}a@ zgv#gh(MaL+LtUBf(em5{+pK6hXyO*rLn4uKj5Ua&@F|iQJp3np=iBLOT>xxPDkI~i zuY0M?@oIIB<1HBKu(2f@fJDmcqFS|FW6-zDZ#TZ>`}b4y}F&kJDiq5i(7*3AQ3#|Ht(_hCm0rLO?^t3=YH zM!nj4#G%vVdkc_JN+}|NFs%P8llaDw1D`p)Hd%NP{~sD64uUD?aDU(52q|uF)GI&k z>e{A+5X1}(qE3?V1z=?qg%J_K^D@6lZ0~LtGS=Dyuc#3LV7M?D5b$uyOFOk{84PG5 z$Q5gd8=ajQMkNxC6cY7%^*M$)a-@In^m>Nyq9qOhjE|Q-6j~ey;SW<@7wWYNm=OV1 zUQdapsg7wOq)H||)T(o@fNAj1!QD>-3yH>GTb#ROZS|_*(fbHPRAhfnDOAI+S&L=|r(ul+)8U&rkD4M^E2s z9dRGQ{(dr<{-BT&QP@DF!&pdI;N%Selr2D+GdTVS7kXf(WKpj{yT4G?`y z3g?$xH!-ikSZl!6!deT-ObaL_(-ksteW1?CZolcMZpBl+NB!!(b0cTnbcf{Ba@NBl_Jt}Ea~svr1#s6dUYvfJnnUq zNrx>X3LB@$go6(~^x4!TtB&d10Zz&#lW_k*<3HuL5jLKLqW%$s~bLtImC2Ncq(x2lo7|#dG`j z@7K({Zm*Q;SO6g?l8!=xQ^|Ux_EQpc>~Q~{AGSQM$)8a^pI_I@=r{m#x%p<|rfOxD zndyNe{e4fgYR%r>BE{jF-KbFDj{F)PoBYzq$aA;0ejYk=#(6icqf-H-*7qk*o>aiX z&l~+ko%$N&efx^?_S;w2eywTYy7eCEYnHILYzx3G0Ji|#0&vT=0Netw6Yc*2r9w(M Tu8hFi00000NkvXXu0mjfq2O{c literal 0 HcmV?d00001 From 2b2b1ec41b09e573e1cec5476de32ad81a60309b Mon Sep 17 00:00:00 2001 From: Jigar Amin - OpenERP Date: Fri, 8 Jun 2012 14:54:04 +0530 Subject: [PATCH 073/232] [IMP] imporved code bzr revid: jam@tinyerp.com-20120608092404-p5832c093dbkwzna --- addons/web_dashboard/static/src/js/dashboard.js | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js index 8b8d34c6368..42fde360d72 100644 --- a/addons/web_dashboard/static/src/js/dashboard.js +++ b/addons/web_dashboard/static/src/js/dashboard.js @@ -232,14 +232,13 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({ }, renderElement: function() { var self = this; - //to Check dash contains any action if not then show the action help - var array= []; - _.each(this.node.children, function(column, column_index) { - array.push(_.include(_.pluck(column.children,"tag"),"action")); + var check = _.detect(this.node.children, function(column, column_index) { + return _.detect(column.children,function(element){ + return element.tag === "action"? element: false; + }); }); - if (! _.include(array,true)){ + if (!check) return self.no_result(); - } // We should start with three columns available for (var i = this.node.children.length; i < 3; i++) { this.node.children.push({ @@ -252,14 +251,10 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({ this.$element.html(rendered); }, no_result: function () { - if (!this.view.options.action - || !this.view.options.action.help) { - return; - } this.$element.prepend( $('
') .append($('', { src: '/web_dashboard/static/src/img/view_todo_arrow.png' })) - .append($('
').html(this.view.options.action.help)) + .append($('
').html(this.view.options.action.help || " ")) ); }, do_reload: function() { From e9ab3b16fa77f5e64acee507fe0f30b991f835cf Mon Sep 17 00:00:00 2001 From: Jigar Amin - OpenERP Date: Fri, 8 Jun 2012 15:50:15 +0530 Subject: [PATCH 074/232] [FIX] no image if no help on action bzr revid: jam@tinyerp.com-20120608102015-jpyv7zji3j0zocrg --- addons/web_dashboard/static/src/js/dashboard.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js index 42fde360d72..a27c5f30bb5 100644 --- a/addons/web_dashboard/static/src/js/dashboard.js +++ b/addons/web_dashboard/static/src/js/dashboard.js @@ -251,11 +251,13 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({ this.$element.html(rendered); }, no_result: function () { - this.$element.prepend( - $('
') - .append($('', { src: '/web_dashboard/static/src/img/view_todo_arrow.png' })) - .append($('
').html(this.view.options.action.help || " ")) - ); + if (this.view.options.action.help){ + this.$element.append( + $('
') + .append($('', { src: '/web_dashboard/static/src/img/view_todo_arrow.png' })) + .append($('
').html(this.view.options.action.help || " ")) + ); + } }, do_reload: function() { var view_manager = this.view.getParent(), From 71ebce80184cb142426fa1adcb6f093626afccdc Mon Sep 17 00:00:00 2001 From: "Kuldeep Joshi (OpenERP)" Date: Mon, 11 Jun 2012 16:04:25 +0530 Subject: [PATCH 075/232] [IMP]remove res.partner.address and sequence from ir.sequence bzr revid: kjo@tinyerp.com-20120611103425-ekeoso4m1475d6rq --- openerp/addons/base/ir/ir.xml | 1 - openerp/tests/test_ir_sequence.py | 2 +- openerp/tests/test_orm.py | 28 ++++++++++++++-------------- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml index 837374d371b..c718b8e165a 100644 --- a/openerp/addons/base/ir/ir.xml +++ b/openerp/addons/base/ir/ir.xml @@ -595,7 +595,6 @@ ir.needaction_users_rel.tree ir.needaction_users_rel tree - 10 diff --git a/openerp/tests/test_ir_sequence.py b/openerp/tests/test_ir_sequence.py index fcc5888e47e..2943676d1bc 100644 --- a/openerp/tests/test_ir_sequence.py +++ b/openerp/tests/test_ir_sequence.py @@ -114,7 +114,7 @@ class test_ir_sequence_change_implementation(unittest2.TestCase): d = dict(code='test_sequence_type_3', name='Test sequence type') c = registry('ir.sequence.type').create(cr, ADMIN_USER_ID, d, {}) assert c - d = dict(code='test_sequence_type_3', name='Test sequence') + d = dict(code='test_sequence_type_3', name='Test sequence', 'implementation': 'standard') c = registry('ir.sequence').create(cr, ADMIN_USER_ID, d, {}) assert c d = dict(code='test_sequence_type_4', name='Test sequence type') diff --git a/openerp/tests/test_orm.py b/openerp/tests/test_orm.py index 0c4046df2a4..197694d6552 100644 --- a/openerp/tests/test_orm.py +++ b/openerp/tests/test_orm.py @@ -20,7 +20,7 @@ class TestO2MSerialization(common.TransactionCase): def setUp(self): super(TestO2MSerialization, self).setUp() self.partner = self.registry('res.partner') - self.address = self.registry('res.partner.address') +# self.address = self.registry('res.partner.address') def test_no_command(self): " empty list of commands yields an empty list of records " @@ -43,9 +43,9 @@ class TestO2MSerialization(common.TransactionCase): def test_LINK_TO_command(self): " reads the records from the database, records are returned with their ids. " ids = [ - self.address.create(self.cr, UID, {'name': 'foo'}), - self.address.create(self.cr, UID, {'name': 'bar'}), - self.address.create(self.cr, UID, {'name': 'baz'}) + self.partner.create(self.cr, UID, {'name': 'foo'}), + self.partner.create(self.cr, UID, {'name': 'bar'}), + self.partner.create(self.cr, UID, {'name': 'baz'}) ] commands = map(LINK_TO, ids) @@ -61,9 +61,9 @@ class TestO2MSerialization(common.TransactionCase): def test_bare_ids_command(self): " same as the equivalent LINK_TO commands " ids = [ - self.address.create(self.cr, UID, {'name': 'foo'}), - self.address.create(self.cr, UID, {'name': 'bar'}), - self.address.create(self.cr, UID, {'name': 'baz'}) + self.partner.create(self.cr, UID, {'name': 'foo'}), + self.partner.create(self.cr, UID, {'name': 'bar'}), + self.partner.create(self.cr, UID, {'name': 'baz'}) ] results = self.partner.resolve_o2m_commands_to_record_dicts( @@ -77,9 +77,9 @@ class TestO2MSerialization(common.TransactionCase): def test_UPDATE_command(self): " take the in-db records and merge the provided information in " - id_foo = self.address.create(self.cr, UID, {'name': 'foo'}) - id_bar = self.address.create(self.cr, UID, {'name': 'bar'}) - id_baz = self.address.create(self.cr, UID, {'name': 'baz', 'city': 'tag'}) + id_foo = self.partner.create(self.cr, UID, {'name': 'foo'}) + id_bar = self.partner.create(self.cr, UID, {'name': 'bar'}) + id_baz = self.partner.create(self.cr, UID, {'name': 'baz', 'city': 'tag'}) results = self.partner.resolve_o2m_commands_to_record_dicts( self.cr, UID, 'address', [ @@ -96,7 +96,7 @@ class TestO2MSerialization(common.TransactionCase): def test_mixed_commands(self): ids = [ - self.address.create(self.cr, UID, {'name': name}) + self.partner.create(self.cr, UID, {'name': name}) for name in ['NObar', 'baz', 'qux', 'NOquux', 'NOcorge', 'garply'] ] @@ -126,9 +126,9 @@ class TestO2MSerialization(common.TransactionCase): def test_LINK_TO_pairs(self): "LINK_TO commands can be written as pairs, instead of triplets" ids = [ - self.address.create(self.cr, UID, {'name': 'foo'}), - self.address.create(self.cr, UID, {'name': 'bar'}), - self.address.create(self.cr, UID, {'name': 'baz'}) + self.partner.create(self.cr, UID, {'name': 'foo'}), + self.partner.create(self.cr, UID, {'name': 'bar'}), + self.partner.create(self.cr, UID, {'name': 'baz'}) ] commands = map(lambda id: (4, id), ids) From 3692c1dd1491431019eb72f8fc1686f008864069 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Mon, 11 Jun 2012 14:12:57 +0200 Subject: [PATCH 076/232] [IMP] account: improved search view on journal items + removed views for an object that does not exist anymore bzr revid: qdp-launchpad@openerp.com-20120611121257-91c8sybl0x2ykot0 --- addons/account/account_view.xml | 3 +- addons/account/project/project_view.xml | 64 ------------------------- 2 files changed, 2 insertions(+), 65 deletions(-) diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index e7a1fa40c93..5a36204cddf 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -1238,11 +1238,12 @@ domain="[('reconcile_id','=',False), ('account_id.reconcile','=',True)]" help="Unreconciled Journal Items" name="unreconciled"/> + + - diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml index aa92167f64d..0abbe54bc16 100644 --- a/addons/account/project/project_view.xml +++ b/addons/account/project/project_view.xml @@ -377,70 +377,6 @@ action="action_account_analytic_journal_tree" id="account_analytic_journal_print" parent="account.next_id_40"/> - # - # Statistics - # - - - report.hr.timesheet.invoice.journal.form - report.hr.timesheet.invoice.journal - form - -
- - - - - -
- - - - report.hr.timesheet.invoice.journal.tree - report.hr.timesheet.invoice.journal - tree - - - - - - - - - - - - - - - report.hr.timesheet.invoice.journal.graph - report.hr.timesheet.invoice.journal - graph - - - - - - - - - - - - - report.hr.timesheet.invoice.journal.search - report.hr.timesheet.invoice.journal - search - - - - - - - - - - Date: Mon, 11 Jun 2012 18:22:53 +0200 Subject: [PATCH 077/232] [IMP] improved search views bzr revid: qdp-launchpad@openerp.com-20120611162253-mfz8f7k7dll7q4i9 --- addons/account/account_invoice_view.xml | 6 +- addons/account/account_view.xml | 3 +- .../account_analytic_entries_report_view.xml | 5 +- .../account_analytic_analysis_menu.xml | 13 ++--- addons/caldav/caldav_view.xml | 6 +- addons/crm/crm_lead_view.xml | 44 ++++++++------- addons/crm/crm_meeting_view.xml | 10 ++-- addons/crm/crm_phonecall_menu.xml | 2 +- addons/crm/crm_phonecall_view.xml | 56 +++---------------- addons/crm/report/crm_lead_report_view.xml | 16 +++--- .../crm/report/crm_phonecall_report_view.xml | 15 +++-- addons/crm_claim/crm_claim_view.xml | 10 ++-- .../crm_fundraising/crm_fundraising_view.xml | 23 ++++---- addons/crm_helpdesk/crm_helpdesk_view.xml | 12 ++-- 14 files changed, 87 insertions(+), 134 deletions(-) diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index 96a0ab609f8..b0f6060698e 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -411,13 +411,13 @@ + + - - - + diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index f99d364951e..a572118b478 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -1163,8 +1163,7 @@ - - + diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml index 18bda6cbbab..9759e31ad78 100644 --- a/addons/account/report/account_analytic_entries_report_view.xml +++ b/addons/account/report/account_analytic_entries_report_view.xml @@ -35,11 +35,10 @@ + - - - + diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml index 5e8bc754d45..a019fd08793 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml +++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml @@ -26,17 +26,14 @@ - + + + - - - - - - + + - diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml index 60d74e69d1e..e4e0679a710 100644 --- a/addons/caldav/caldav_view.xml +++ b/addons/caldav/caldav_view.xml @@ -162,11 +162,11 @@ + + - - - + diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 4eebb83ce04..3426839eb5b 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -296,28 +296,27 @@ domain="[('state','=','pending')]"/> - - - - - - - - + + - + + + + @@ -535,30 +534,33 @@ - - - - + + + + - - - - - + + + diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml index c6fc9b404a4..f62b8cfb33b 100644 --- a/addons/crm/crm_phonecall_menu.xml +++ b/addons/crm/crm_phonecall_menu.xml @@ -106,7 +106,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 2347a8322f5..ba6de07ecbf 100644 --- a/addons/crm/crm_phonecall_view.xml +++ b/addons/crm/crm_phonecall_view.xml @@ -179,63 +179,23 @@ search - - - - + + - - - + - - - - - - - - - - - - - - - - CRM - Scheduled Calls Search - crm.phonecall - search - - - - + help="Phone Calls that are assigned to me or to my team(s)" /> - - - + - + widget="selection" string="Sales Team"/> - - - - - - - - + help="Leads/Opportunities that are assigned to one of the sale teams I manage"/> + + + + diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml index 65ac10906b6..cd54f8e4e37 100644 --- a/addons/crm/report/crm_phonecall_report_view.xml +++ b/addons/crm/report/crm_phonecall_report_view.xml @@ -65,17 +65,16 @@ domain="[('state','=','pending')]" help="Phone calls which are in pending state"/> - - - - - - + help="Phone calls that are assigned to one of the sale teams I manage"/> + + + + diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml index 7bedc12dac7..224446672e7 100644 --- a/addons/crm_claim/crm_claim_view.xml +++ b/addons/crm_claim/crm_claim_view.xml @@ -210,14 +210,14 @@ help="All pending Claims" /> - - - - - + + + + + + + - - - - - + widget="selection"/> + diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml index 7d9bb596a2a..811e5a1cc90 100644 --- a/addons/crm_helpdesk/crm_helpdesk_view.xml +++ b/addons/crm_helpdesk/crm_helpdesk_view.xml @@ -164,15 +164,15 @@ help="All pending Helpdesk Request" /> + + - - - + From a6728729630a6f85da26a5d945875a46aa19429b Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Tue, 12 Jun 2012 11:20:25 +0530 Subject: [PATCH 078/232] [FIX] knowledge : Invalid XML for View Architecture. bzr revid: mdi@tinyerp.com-20120612055025-jd4j36w0ujydzr9l --- addons/knowledge/res_config_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/knowledge/res_config_view.xml b/addons/knowledge/res_config_view.xml index 8f3c5cca7e7..2e5e6785438 100644 --- a/addons/knowledge/res_config_view.xml +++ b/addons/knowledge/res_config_view.xml @@ -6,7 +6,7 @@ knowledge.config.settings form -
+
-
  • + + +
  • - - + +
    • - - + +

    @@ -98,8 +100,8 @@

    - - + +

    @@ -129,4 +131,18 @@ + + +

  • +
    + + +
    + + +
    + +
    +
    • + From d8dd84cc6a66816c5c8fc645056f814907f4e5ae Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Wed, 13 Jun 2012 14:18:23 +0530 Subject: [PATCH 081/232] [IMP] Improved the Search View. bzr revid: mdi@tinyerp.com-20120613084823-7wm0obxq54bdr3rg --- openerp/addons/base/ir/ir.xml | 155 ++++++++++++++++++---------------- 1 file changed, 82 insertions(+), 73 deletions(-) diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml index 0144db05776..a3e2a04f888 100644 --- a/openerp/addons/base/ir/ir.xml +++ b/openerp/addons/base/ir/ir.xml @@ -71,9 +71,9 @@ search - - - + @@ -202,7 +202,9 @@ search - + @@ -255,8 +257,9 @@ search - - + @@ -306,8 +309,9 @@ search - - + @@ -390,13 +394,11 @@ ir.actions.report.xml search - + - - - - - + @@ -497,8 +499,9 @@ - - + @@ -567,9 +570,9 @@ search - - - + @@ -656,6 +659,10 @@ search + + @@ -666,10 +673,8 @@ string="Form" domain="[('type', '=','form')]"/> - - - + @@ -795,28 +800,29 @@ + + + + - + - - - - - - + @@ -940,26 +946,19 @@ search + + - - - - - - - - - - - @@ -1028,20 +1027,20 @@ search + + - - - - @@ -1050,7 +1049,6 @@ - @@ -1095,13 +1093,14 @@ search + + - - - @@ -1297,7 +1296,9 @@ search - + @@ -1375,7 +1376,9 @@ search - + @@ -1458,22 +1461,24 @@ search - - + + + - - - - - - - + + + + + + @@ -1552,16 +1557,18 @@ ir.rule search - + - + + - @@ -1606,7 +1613,7 @@ - @@ -1693,13 +1700,15 @@ - - + + - + @@ -1795,7 +1804,7 @@ form The configuration wizards are used to help you configure a new instance of OpenERP. They are launched during the installation of new modules, but you can choose to restart some wizards manually from this menu. - + @@ -1901,9 +1910,9 @@ search - - - + From d3cfad9564b21e46cf208a68ab9c05b3a18bfce0 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Wed, 13 Jun 2012 14:20:53 +0530 Subject: [PATCH 082/232] [IMP] Improved the Search View. bzr revid: mdi@tinyerp.com-20120613085053-3pog59o4jhj4d61t --- openerp/addons/base/ir/ir_config_parameter_view.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/openerp/addons/base/ir/ir_config_parameter_view.xml b/openerp/addons/base/ir/ir_config_parameter_view.xml index 24825eefc0f..5e6db1255a6 100644 --- a/openerp/addons/base/ir/ir_config_parameter_view.xml +++ b/openerp/addons/base/ir/ir_config_parameter_view.xml @@ -7,7 +7,9 @@ search - + From d87dd53df9caf2d0630776c5c6a0cd506d7782c2 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Wed, 13 Jun 2012 14:22:03 +0530 Subject: [PATCH 083/232] [IMP] Improved the Search View. bzr revid: mdi@tinyerp.com-20120613085203-hscu337wya33xm6r --- openerp/addons/base/ir/ir_filters.xml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/openerp/addons/base/ir/ir_filters.xml b/openerp/addons/base/ir/ir_filters.xml index 5558929248f..44e41efc5a5 100644 --- a/openerp/addons/base/ir/ir_filters.xml +++ b/openerp/addons/base/ir/ir_filters.xml @@ -51,16 +51,18 @@ search + + + - - - - + From 469d64328b11b6dd547f836b4219521d2e1d3c01 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Wed, 13 Jun 2012 14:24:43 +0530 Subject: [PATCH 084/232] [IMP] Improved the Search View. bzr revid: mdi@tinyerp.com-20120613085443-h8k0jddalmmh2b1u --- .../addons/base/ir/workflow/workflow_view.xml | 146 ++++++++++-------- 1 file changed, 79 insertions(+), 67 deletions(-) diff --git a/openerp/addons/base/ir/workflow/workflow_view.xml b/openerp/addons/base/ir/workflow/workflow_view.xml index e4fa561e202..deb58509802 100644 --- a/openerp/addons/base/ir/workflow/workflow_view.xml +++ b/openerp/addons/base/ir/workflow/workflow_view.xml @@ -26,15 +26,16 @@ - workflow.search - workflow - search - - - - - - + workflow.search + workflow + search + + + + + @@ -157,27 +158,30 @@ - workflow.activity.search - workflow.activity - search - - - - - - - - - - - - - - - - + workflow.activity.search + workflow.activity + search + + + + + + + + + + + + + + + + + @@ -229,17 +233,19 @@ - workflow.transition.search - workflow.transition - search - - - - - - - - + workflow.transition.search + workflow.transition + search + + + + + + + + @@ -286,17 +292,20 @@ - workflow.instance.search - workflow.instance - search - - - - - - - - + workflow.instance.search + workflow.instance + search + + + + + + + + + @@ -339,7 +348,7 @@ tree - + @@ -348,20 +357,23 @@ - workflow.workitem.search - workflow.workitem - search - - - - - - - - - - - + workflow.workitem.search + workflow.workitem + search + + + + + + + + + + + + From 77dd3143611f6d78a93dc2f98d080012065294e2 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Wed, 13 Jun 2012 14:26:39 +0530 Subject: [PATCH 085/232] [IMP] Improved the Search View. bzr revid: mdi@tinyerp.com-20120613085639-b3egccdi5z95mx2z --- openerp/addons/base/module/module_view.xml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml index 8da405b23cd..6808bc19cf6 100644 --- a/openerp/addons/base/module/module_view.xml +++ b/openerp/addons/base/module/module_view.xml @@ -42,18 +42,17 @@ - - - - - - - - + + + + + + + From 7c8500a52c70fe3effa71ca4b7def46382310be2 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Wed, 13 Jun 2012 14:27:53 +0530 Subject: [PATCH 086/232] [IMP] Improved the Search View. bzr revid: mdi@tinyerp.com-20120613085753-mznv0q4dt5rccclf --- .../base/publisher_warranty/publisher_warranty_view.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml b/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml index 4b15ff8f8c0..d1277df4dcf 100644 --- a/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml +++ b/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml @@ -55,7 +55,9 @@ search - + From 969ad2aa9a36a8c0b887bc46935d00059c8a7c1f Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Wed, 13 Jun 2012 14:28:49 +0530 Subject: [PATCH 087/232] [IMP] Improved the Search View. bzr revid: mdi@tinyerp.com-20120613085849-d5q14h36a6jcvys8 --- openerp/addons/base/res/ir_property_view.xml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/openerp/addons/base/res/ir_property_view.xml b/openerp/addons/base/res/ir_property_view.xml index 3d8fb14b48e..9e67774bab9 100644 --- a/openerp/addons/base/res/ir_property_view.xml +++ b/openerp/addons/base/res/ir_property_view.xml @@ -8,13 +8,16 @@ search + + - - + From 738083b0fcc6dd8de6a06bb358041025f305c3f4 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Wed, 13 Jun 2012 14:29:55 +0530 Subject: [PATCH 088/232] [IMP] Improved the Search View. bzr revid: mdi@tinyerp.com-20120613085955-ayx9u01xqwzwc6rh --- openerp/addons/base/res/res_bank_view.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/openerp/addons/base/res/res_bank_view.xml b/openerp/addons/base/res/res_bank_view.xml index c098c5a92db..bff192ef125 100644 --- a/openerp/addons/base/res/res_bank_view.xml +++ b/openerp/addons/base/res/res_bank_view.xml @@ -138,12 +138,14 @@ search + + - - From 04e5302da10e63e78e5e06f97516ed3bfdd004c1 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Wed, 13 Jun 2012 14:32:26 +0530 Subject: [PATCH 089/232] [IMP] Improved the Search View. bzr revid: mdi@tinyerp.com-20120613090226-p6sliguyev724n18 --- openerp/addons/base/res/res_company_view.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/openerp/addons/base/res/res_company_view.xml b/openerp/addons/base/res/res_company_view.xml index 479c0bfc055..76273cac7d5 100644 --- a/openerp/addons/base/res/res_company_view.xml +++ b/openerp/addons/base/res/res_company_view.xml @@ -171,7 +171,9 @@ - + From e6dd6abd45bbe1c1984f82bba2fcf581b59edc56 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Wed, 13 Jun 2012 14:35:27 +0530 Subject: [PATCH 090/232] [IMP] Improved the Search View. bzr revid: mdi@tinyerp.com-20120613090527-t8wh69lqouyca69v --- openerp/addons/base/res/res_currency_view.xml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/openerp/addons/base/res/res_currency_view.xml b/openerp/addons/base/res/res_currency_view.xml index e571ba70700..a80c4d37e87 100644 --- a/openerp/addons/base/res/res_currency_view.xml +++ b/openerp/addons/base/res/res_currency_view.xml @@ -8,7 +8,9 @@ search - + @@ -109,7 +111,9 @@ search - + From ff38813969d27217e198b63bfce64a616bd79c2e Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Wed, 13 Jun 2012 14:36:51 +0530 Subject: [PATCH 091/232] [IMP] Improved the Search View. bzr revid: mdi@tinyerp.com-20120613090651-o417fpkzfdya0alx --- openerp/addons/base/res/res_lang_view.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/openerp/addons/base/res/res_lang_view.xml b/openerp/addons/base/res/res_lang_view.xml index a29275d77e4..7e3519e3641 100644 --- a/openerp/addons/base/res/res_lang_view.xml +++ b/openerp/addons/base/res/res_lang_view.xml @@ -108,11 +108,12 @@ + + - - - From 3bd80300e46c148e7f7b7d182599f1e75b6e19b5 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Wed, 13 Jun 2012 14:42:59 +0530 Subject: [PATCH 092/232] [IMP] Improved the Search View. bzr revid: mdi@tinyerp.com-20120613091259-ha7cmazhn84yh980 --- openerp/addons/base/res/res_partner_view.xml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml index 99735659f7b..0c1617609b3 100644 --- a/openerp/addons/base/res/res_partner_view.xml +++ b/openerp/addons/base/res/res_partner_view.xml @@ -248,14 +248,17 @@ - - - - - + + + + + + From e484e455030d62b6839638685281fa671883358d Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Wed, 13 Jun 2012 14:44:33 +0530 Subject: [PATCH 093/232] [IMP] Improved the Search View. bzr revid: mdi@tinyerp.com-20120613091433-81yk3m1wst8nza2t --- openerp/addons/base/res/res_request_view.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/openerp/addons/base/res/res_request_view.xml b/openerp/addons/base/res/res_request_view.xml index 2fa5caccea9..46eeaa6e2e1 100644 --- a/openerp/addons/base/res/res_request_view.xml +++ b/openerp/addons/base/res/res_request_view.xml @@ -32,8 +32,9 @@ search - - + From 3268a7112657aeab326243539e02f49f9ffb1de1 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Wed, 13 Jun 2012 14:46:04 +0530 Subject: [PATCH 094/232] [IMP] Improved the Search View. bzr revid: mdi@tinyerp.com-20120613091604-ikwin4wsyhi3ewoi --- openerp/addons/base/res/res_users_view.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml index 277cda2f576..1138a5638c1 100644 --- a/openerp/addons/base/res/res_users_view.xml +++ b/openerp/addons/base/res/res_users_view.xml @@ -148,8 +148,9 @@ search - - + From c359e27006a657368d32da1eb8a9402b0fe6531c Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Wed, 13 Jun 2012 14:48:11 +0530 Subject: [PATCH 095/232] [IMP] Improved the Search View. bzr revid: mdi@tinyerp.com-20120613091811-ppss128wirdb6alq --- openerp/addons/base/res/res_widget_view.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/openerp/addons/base/res/res_widget_view.xml b/openerp/addons/base/res/res_widget_view.xml index da82738090c..bac4ef44606 100644 --- a/openerp/addons/base/res/res_widget_view.xml +++ b/openerp/addons/base/res/res_widget_view.xml @@ -7,7 +7,9 @@ search - + From b9a9da655be045affc1362ef8c18be07727daa2b Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Wed, 13 Jun 2012 17:20:36 +0530 Subject: [PATCH 096/232] [IMP] Improved the Search View. bzr revid: mdi@tinyerp.com-20120613115036-uqil467z4ackhq23 --- openerp/addons/base/res/res_lang_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/res/res_lang_view.xml b/openerp/addons/base/res/res_lang_view.xml index 7e3519e3641..4b226b4d69c 100644 --- a/openerp/addons/base/res/res_lang_view.xml +++ b/openerp/addons/base/res/res_lang_view.xml @@ -109,7 +109,7 @@ From 6db119b7d8bba577e330e29df3449a673f1e47f7 Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Wed, 13 Jun 2012 18:11:57 +0530 Subject: [PATCH 097/232] [IMP]hr_* : improve search code in xml bzr revid: cha@tinyerp.com-20120613124157-z5zpn42aao3w3cf2 --- addons/hr/hr_department_view.xml | 3 +- addons/hr/hr_view.xml | 30 +++++++------- addons/hr_attendance/hr_attendance_view.xml | 4 +- addons/hr_contract/hr_contract_view.xml | 32 ++++++++------- addons/hr_evaluation/hr_evaluation_view.xml | 40 +++++++++---------- addons/hr_expense/hr_expense_view.xml | 12 +++--- .../report/hr_expense_report_view.xml | 1 - addons/hr_holidays/hr_holidays_view.xml | 20 +++++----- addons/hr_payroll/hr_payroll_view.xml | 31 +++++++------- .../hr_payroll_account_view.xml | 6 +-- addons/hr_recruitment/hr_recruitment_view.xml | 9 ++--- .../report/hr_recruitment_report_view.xml | 15 +++---- addons/hr_timesheet/hr_timesheet_view.xml | 3 +- .../hr_timesheet_invoice_view.xml | 2 +- .../hr_timesheet_invoice_report_view.xml | 21 +++++----- .../report/report_analytic_view.xml | 5 ++- .../hr_timesheet_sheet_view.xml | 7 ++-- 17 files changed, 124 insertions(+), 117 deletions(-) diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml index d6fd393edf8..3d4699c754c 100644 --- a/addons/hr/hr_department_view.xml +++ b/addons/hr/hr_department_view.xml @@ -41,7 +41,8 @@ search - + + diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index bed32142a39..d3e09edef72 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -108,20 +108,20 @@ search - - - + + + - - - - - - + + + + + + @@ -404,6 +404,8 @@ search + + - - - + - - - + + + diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml index c2c964565ad..06d4a9e2e04 100644 --- a/addons/hr_attendance/hr_attendance_view.xml +++ b/addons/hr_attendance/hr_attendance_view.xml @@ -52,12 +52,12 @@ search - + + - diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml index 6f2ad46e913..d890f597f68 100644 --- a/addons/hr_contract/hr_contract_view.xml +++ b/addons/hr_contract/hr_contract_view.xml @@ -39,23 +39,25 @@ - - - - - - - - + + + + + + + + + + - - - - - - + + + + + + @@ -162,7 +164,7 @@ - + diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml index aa5ac0e90e0..2fc701ad100 100644 --- a/addons/hr_evaluation/hr_evaluation_view.xml +++ b/addons/hr_evaluation/hr_evaluation_view.xml @@ -9,7 +9,8 @@ - + + @@ -227,27 +228,27 @@ - - - - - - - - - + + + + + + + + + - - - - - - + + + + + + @@ -326,7 +327,6 @@ - diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml index 24537fc81bc..8b9b12e7672 100644 --- a/addons/hr_expense/hr_expense_view.xml +++ b/addons/hr_expense/hr_expense_view.xml @@ -135,6 +135,10 @@ + + + + @@ -142,12 +146,8 @@ help="Expenses to Invoice"/> - - - - - - + + diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml index 51cb1b99f29..20125f28a7e 100644 --- a/addons/hr_expense/report/hr_expense_report_view.xml +++ b/addons/hr_expense/report/hr_expense_report_view.xml @@ -57,7 +57,6 @@ help = "Confirm Expenses"/> - diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml index c48e4699215..cf2658ff1c2 100644 --- a/addons/hr_holidays/hr_holidays_view.xml +++ b/addons/hr_holidays/hr_holidays_view.xml @@ -8,14 +8,14 @@ - - - - - - - + + + + + + + @@ -349,7 +349,8 @@ search - + + @@ -415,7 +416,8 @@ search - + + diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml index a8bb5ea83c8..28bfa61406e 100644 --- a/addons/hr_payroll/hr_payroll_view.xml +++ b/addons/hr_payroll/hr_payroll_view.xml @@ -93,8 +93,7 @@ - - + @@ -212,8 +211,8 @@ - - + + @@ -383,13 +382,14 @@ + + + + - - - @@ -464,8 +464,7 @@ search - - + @@ -518,7 +517,8 @@ search - + + @@ -648,8 +648,8 @@ - - + + @@ -689,12 +689,13 @@ search - - + - + + + diff --git a/addons/hr_payroll_account/hr_payroll_account_view.xml b/addons/hr_payroll_account/hr_payroll_account_view.xml index acc48224afa..99ff06beb6d 100644 --- a/addons/hr_payroll_account/hr_payroll_account_view.xml +++ b/addons/hr_payroll_account/hr_payroll_account_view.xml @@ -60,10 +60,10 @@ search - - + + - + diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml index f8873f35b81..a8604869214 100644 --- a/addons/hr_recruitment/hr_recruitment_view.xml +++ b/addons/hr_recruitment/hr_recruitment_view.xml @@ -178,6 +178,8 @@ search + + - + - - - - + diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml index 90dce4f907d..c4e4a2f1da5 100644 --- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml +++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml @@ -65,15 +65,14 @@ icon="terp-camera_test" domain="[('state','=','done')]" help = "Hired employees"/> - - - - - - + + + + @@ -102,9 +101,7 @@ - - - + diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml index ba0fb98b142..35a19193e3f 100644 --- a/addons/hr_timesheet/hr_timesheet_view.xml +++ b/addons/hr_timesheet/hr_timesheet_view.xml @@ -60,9 +60,10 @@ + + - diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml index c18ac4de667..39705f02a33 100644 --- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml +++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml @@ -150,7 +150,7 @@ - + diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml index 07cffe9ea2c..e802813a1fb 100644 --- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml +++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml @@ -47,12 +47,12 @@ - - - + + @@ -150,9 +150,10 @@ - - + + + @@ -282,10 +283,11 @@ - - + + + @@ -350,10 +352,11 @@ - - + + + diff --git a/addons/hr_timesheet_invoice/report/report_analytic_view.xml b/addons/hr_timesheet_invoice/report/report_analytic_view.xml index c32ae7a076b..70737793834 100644 --- a/addons/hr_timesheet_invoice/report/report_analytic_view.xml +++ b/addons/hr_timesheet_invoice/report/report_analytic_view.xml @@ -114,10 +114,11 @@ - - + + + diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml index 43c2e313641..290b5ce58fd 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml @@ -167,11 +167,12 @@ + + - @@ -238,7 +239,7 @@ form - + @@ -254,7 +255,7 @@ search - + From 0b4699a8446a54e1a6ad672ab3ab45a7c9bc2fec Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Thu, 14 Jun 2012 11:40:42 +0530 Subject: [PATCH 098/232] [IMP]purchase_* : improve search code in xml bzr revid: cha@tinyerp.com-20120614061042-5uphhv6znjb3cavw --- addons/purchase/purchase_view.xml | 14 +++++------ .../purchase/report/purchase_report_view.xml | 24 +++++++++---------- addons/purchase/stock_view.xml | 6 ++--- .../purchase_requisition_view.xml | 4 ++-- 4 files changed, 22 insertions(+), 26 deletions(-) diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index 12151822075..100d844444e 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -220,13 +220,13 @@ + + - - @@ -240,7 +240,6 @@ - @@ -253,13 +252,13 @@ + + - - @@ -273,7 +272,6 @@ - @@ -441,9 +439,9 @@ - + - + diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml index 10672be504a..4cf91053666 100644 --- a/addons/purchase/report/purchase_report_view.xml +++ b/addons/purchase/report/purchase_report_view.xml @@ -53,18 +53,18 @@ search - - - - - - + + + + + + diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml index 3abf56c9ec4..3b064060432 100644 --- a/addons/purchase/stock_view.xml +++ b/addons/purchase/stock_view.xml @@ -65,19 +65,17 @@ + + - - - - diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml index dc13be5b1ec..83dd6f306b7 100644 --- a/addons/purchase_requisition/purchase_requisition_view.xml +++ b/addons/purchase_requisition/purchase_requisition_view.xml @@ -124,13 +124,13 @@ + + - - From c72db103165da712b0c4f9e6e7368e9dd76365b2 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Thu, 14 Jun 2012 11:50:14 +0530 Subject: [PATCH 099/232] [IMP] account : Improved the Search View. bzr revid: mdi@tinyerp.com-20120614062014-67g2w19n9ksz007r --- .../report/account_analytic_entries_report_view.xml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml index 9759e31ad78..88829372096 100644 --- a/addons/account/report/account_analytic_entries_report_view.xml +++ b/addons/account/report/account_analytic_entries_report_view.xml @@ -35,12 +35,16 @@ + + + + - - From 4f491cf61d02bece6407b086857c34152b8091c3 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Thu, 14 Jun 2012 11:52:11 +0530 Subject: [PATCH 100/232] [IMP] account : Improved the Search View. bzr revid: mdi@tinyerp.com-20120614062211-5xilxzaqph1yty04 --- addons/account/report/account_entries_report_view.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml index 92906604f63..f2b0cceddc0 100644 --- a/addons/account/report/account_entries_report_view.xml +++ b/addons/account/report/account_entries_report_view.xml @@ -68,6 +68,10 @@ + + + + - - - - From 52757b4f15c47c400579590044ee94ccc11a459d Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Thu, 14 Jun 2012 11:53:29 +0530 Subject: [PATCH 101/232] [IMP] account : Improved the Search View. bzr revid: mdi@tinyerp.com-20120614062329-hmobg0z29o39gc7s --- addons/account/report/account_invoice_report_view.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml index b5d3881a966..c322e26d165 100644 --- a/addons/account/report/account_invoice_report_view.xml +++ b/addons/account/report/account_invoice_report_view.xml @@ -56,6 +56,8 @@ + + - From 78fb3a6e27ea7d707c1b676fb3c22a47257efb73 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Thu, 14 Jun 2012 11:56:01 +0530 Subject: [PATCH 102/232] [IMP] account : Improved the Search View. bzr revid: mdi@tinyerp.com-20120614062601-p8f8sjp6ulb6a7g0 --- addons/account/account_invoice_view.xml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index 931769095a3..7666f1734e9 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -407,22 +407,20 @@ + + - + - - - - From e5390a33bb65d17e792e9e587d24aed5e4d8aed8 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Thu, 14 Jun 2012 11:58:22 +0530 Subject: [PATCH 103/232] [IMP] account : Improved the Search View. bzr revid: mdi@tinyerp.com-20120614062822-im29b27wgwavbmjv --- addons/account/report/account_report_view.xml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/addons/account/report/account_report_view.xml b/addons/account/report/account_report_view.xml index eae45c12815..d0dfc990522 100644 --- a/addons/account/report/account_report_view.xml +++ b/addons/account/report/account_report_view.xml @@ -151,7 +151,9 @@ search - + @@ -214,7 +216,9 @@ search - + From 2f2fccdd22fd1e3ba53dbb1051755637fc3e12e0 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Thu, 14 Jun 2012 12:01:00 +0530 Subject: [PATCH 104/232] [IMP] account : Improved the Search View. bzr revid: mdi@tinyerp.com-20120614063100-v5eybpqmatu8xgx4 --- addons/account/report/account_treasury_report_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account/report/account_treasury_report_view.xml b/addons/account/report/account_treasury_report_view.xml index eceb1e5c760..a4538a90055 100644 --- a/addons/account/report/account_treasury_report_view.xml +++ b/addons/account/report/account_treasury_report_view.xml @@ -36,12 +36,12 @@ search - + - + From 9bf1ac7f43462b6031a068a2a9325c1d570b7df5 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Thu, 14 Jun 2012 12:06:22 +0530 Subject: [PATCH 105/232] [IMP] account : Improved the Search View. bzr revid: mdi@tinyerp.com-20120614063622-7xxt88fhhfsmw4xq --- addons/account/account_view.xml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index f21137e0d32..7bae6f3d38e 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -65,11 +65,13 @@ + + - - @@ -141,10 +143,11 @@ - + - - + From 2af5d0f1411b9d1b4ba8163abadb8d4c60efbeb2 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Thu, 14 Jun 2012 12:10:03 +0530 Subject: [PATCH 106/232] [IMP] account : Improved the Search View. bzr revid: mdi@tinyerp.com-20120614064003-564awk5en5gb36oa --- addons/account/account_view.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 7bae6f3d38e..72677981bc2 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -220,11 +220,13 @@ + + - - From d0cd006418841a027cc53271eee26faa460d15e0 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Thu, 14 Jun 2012 12:11:49 +0530 Subject: [PATCH 107/232] [IMP] account : Improved the Search View. bzr revid: mdi@tinyerp.com-20120614064149-5b3ireayw30w4j0d --- addons/account/account_view.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 72677981bc2..b38bf40a29f 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -384,7 +384,9 @@ search - + From a261d769385968fffa0737b807921e6086e6d8c7 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Thu, 14 Jun 2012 12:15:16 +0530 Subject: [PATCH 108/232] [IMP] account : Improved the Search View. bzr revid: mdi@tinyerp.com-20120614064516-1xge1f7rq1k50efi --- addons/account/account_view.xml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index b38bf40a29f..6df2b8895ae 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -447,13 +447,15 @@ + + - + - - From c0e7da0dd172926e7a15c3d437738846029450d1 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Thu, 14 Jun 2012 12:20:04 +0530 Subject: [PATCH 109/232] [IMP] account : Improved the Search View. bzr revid: mdi@tinyerp.com-20120614065004-fa3bm9b7p1my2h5j --- addons/account/account_view.xml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 6df2b8895ae..359c3a617dd 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -530,12 +530,15 @@ + + + - - From 226408651bc9be179c491da0078f6e39f3ebc458 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Thu, 14 Jun 2012 12:23:08 +0530 Subject: [PATCH 110/232] [IMP] account : Improved the Search View. bzr revid: mdi@tinyerp.com-20120614065308-h96ax6i17nohubld --- addons/account/account_view.xml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 359c3a617dd..e5dcd3f9640 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -576,11 +576,14 @@ + + + - - From 67e6d46ad08927a27f67d778c788757de684ef08 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Thu, 14 Jun 2012 12:25:06 +0530 Subject: [PATCH 111/232] [IMP] account : Improved the Search View. bzr revid: mdi@tinyerp.com-20120614065506-j7gpjsin3pakcgu6 --- addons/account/account_view.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index e5dcd3f9640..eac0994edbf 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -708,8 +708,9 @@ search - - + From e6c2875caa13395564641fe608ff1b6c64971d3f Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Thu, 14 Jun 2012 12:28:20 +0530 Subject: [PATCH 112/232] [IMP] account : Improved the Search View. bzr revid: mdi@tinyerp.com-20120614065820-xz77lkhvy6k32rf2 --- addons/account/account_view.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index eac0994edbf..77c708e11d2 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -810,8 +810,9 @@ search - - + From a0c7792e743c52d96cac7bd92094016b7e352ca6 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Thu, 14 Jun 2012 12:31:09 +0530 Subject: [PATCH 113/232] [IMP] account : Improved the Search View. bzr revid: mdi@tinyerp.com-20120614070109-1pdoynmzelku9h15 --- addons/account/account_view.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 77c708e11d2..6161cd5dcf7 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -898,8 +898,9 @@ - - + From d20ee477d5ca6806efba5eb2c5d0fb7899d703c0 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Thu, 14 Jun 2012 12:36:48 +0530 Subject: [PATCH 114/232] [IMP] account : Improved the Search View. bzr revid: mdi@tinyerp.com-20120614070648-iox3jx2e4gc0rl6j --- addons/account/account_view.xml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 6161cd5dcf7..49901625b5a 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -1165,6 +1165,8 @@ + + @@ -1179,12 +1181,8 @@ - - - - From 8e983d42c2776de2e8818f999e50ce0a26e461a4 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Thu, 14 Jun 2012 12:40:50 +0530 Subject: [PATCH 115/232] [IMP] account : Improved the Search View. bzr revid: mdi@tinyerp.com-20120614071050-co8fa35bk80jw4w9 --- addons/account/account_view.xml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 49901625b5a..ec34cc09c7b 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -1408,18 +1408,17 @@ + + + - - - - - - From a85126a5cc596d839b73fc4ccc4e1bbb147ca928 Mon Sep 17 00:00:00 2001 From: "Rajesh Prajapati (OpenERP)" Date: Thu, 14 Jun 2012 12:43:13 +0530 Subject: [PATCH 116/232] [IMP]sale_* : improve search code in xml bzr revid: rpr@tinyerp.com-20120614071313-4cqcxpqsx6ad417b --- addons/sale/sale_view.xml | 45 ++++++++++++------------------- addons/sale_crm/sale_crm_view.xml | 10 +++---- 2 files changed, 22 insertions(+), 33 deletions(-) diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index e028eb8d044..16f0246ab6f 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -90,6 +90,7 @@ + @@ -148,16 +149,11 @@
    -
    - -
    - - - - - + + + - - - + +
    -
    - +
  • @@ -131,18 +131,78 @@ - + -
  • +
  • - - + +
    - +
    • + +

    + + + + +
    +

    +

    +     + + +

    + + + +

    +

    From:

    +

    Subject:

    +

    + + +

    + + +     + From ac2bd8624ccc2ed6a89e119ba5591588fc1f705b Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Fri, 15 Jun 2012 18:42:31 +0530 Subject: [PATCH 153/232] [IMP]event_* : improve search code in xml bzr revid: cha@tinyerp.com-20120615131231-p2jxm11m2nr1beb3 --- addons/event/event_view.xml | 32 +++++++-------- .../report/report_event_registration_view.xml | 41 +++++++++---------- 2 files changed, 36 insertions(+), 37 deletions(-) diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index 01b41833a65..1714cf32cf8 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -265,21 +265,21 @@ + + - - - - - - + + + + @@ -337,6 +337,7 @@ + @@ -448,19 +449,18 @@ + + - - - - - - + + + diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml index 89ba191dab6..7ae6c0fae2e 100644 --- a/addons/event/report/report_event_registration_view.xml +++ b/addons/event/report/report_event_registration_view.xml @@ -53,27 +53,21 @@ - - - - - - - + + - + string="My Events" + help="My Events" + domain="[('user_id','=',uid)]"/> + + + @@ -81,7 +75,6 @@ - @@ -103,6 +96,12 @@ + + + From e8c290282f74e46765f424e46635ba924669141b Mon Sep 17 00:00:00 2001 From: Antonin Bourguignon Date: Fri, 15 Jun 2012 16:25:45 +0200 Subject: [PATCH 154/232] [MERGE] handling of nl2br from tde's branch bzr revid: abo@openerp.com-20120615142545-icxqla225h0fkkw6 --- addons/mail/static/src/js/mail.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js index 2920df7033d..1d0c659b669 100644 --- a/addons/mail/static/src/js/mail.js +++ b/addons/mail/static/src/js/mail.js @@ -268,6 +268,7 @@ openerp.mail = function(session) { * Display a record */ display_comment: function (record) { + record.body = this.do_text_nl2br(record.body, true); if (record.type == 'email') { record.mini_url = ('/mail/static/src/img/email_icon.png'); } else { record.mini_url = this.thread_get_avatar('res.users', 'avatar', record.user_id[0]); } // body text manipulation @@ -428,11 +429,18 @@ openerp.mail = function(session) { else return string.slice(0, max_length); }, + /** Removes html tags, except b, em, br */ do_clean_text: function (string) { - var html = $('
    ').text(string.replace(/\s+/g, ' ')).html().replace(new RegExp('<(/)?(b|em)\\s*>', 'gi'), '<$1$2>'); + var html = $('
    ').text(string.replace(/\s+/g, ' ')).html().replace(new RegExp('<(/)?(b|em|br|br /)\\s*>', 'gi'), '<$1$2>'); return html; }, + /** Replaces line bracks by html line breaks (br) */ + do_text_nl2br: function (str, is_xhtml) { + var break_tag = (is_xhtml || typeof is_xhtml === 'undefined') ? '
    ' : '
    '; + return (str + '').replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '$1'+ break_tag +'$2'); + }, + /** * * var regex_login = new RegExp(/(^|\s)@((\w|@|\.)*)/g); From 3ebcb195d0ba17f0348dd3f23083b4358738ae3a Mon Sep 17 00:00:00 2001 From: Antonin Bourguignon Date: Fri, 15 Jun 2012 19:26:47 +0200 Subject: [PATCH 155/232] [IMP] continue to improve new messages layout bzr revid: abo@openerp.com-20120615172647-vfnbd2x4ve0q6w3g --- addons/mail/mail_message_demo.xml | 20 +++--- addons/mail/static/src/css/mail.css | 97 ++++++++++++++++++++++++++--- addons/mail/static/src/xml/mail.xml | 71 ++++++++------------- 3 files changed, 125 insertions(+), 63 deletions(-) diff --git a/addons/mail/mail_message_demo.xml b/addons/mail/mail_message_demo.xml index 5ae97e24d65..18da3a9d083 100644 --- a/addons/mail/mail_message_demo.xml +++ b/addons/mail/mail_message_demo.xml @@ -5,45 +5,45 @@ A cool blogpost about something clean mail.group - + html - sit amet, consectetur adipiscing elit. Pellentesque et quam sapien, in sagittis tellus. + sit amet, consectetur adipiscing elit. Pellentesque et quam sapien, in sagittis tellus. Praesent vel massa sed massa consequat egestas in tristique orci. Praesent iaculis libero et neque vehicula iaculis. Vivamus placerat tincidunt orci ac ornare. Proin ut dolor fringilla velit ultricies consequat. Maecenas sit amet ipsum non leo interdum imperdiet. Donec sapien mi, varius a consequat id, consectetur sit amet nulla. Fusce tempus elit volutpat mi auctor adipiscing. Nam congue luctus suscipit. Duis vestibulum dapibus enim vitae dignissim. Sed tellus libero, venenatis ut mollis ut, luctus quis dui. Sed rhoncus pulvinar orci in consectetur. Nulla turpis leo, rhoncus ut egestas sit amet, consectetur vitae urna. Mauris in dolor in sapien tempus vehicula.]]> comment - + Reply mail.group - + html tremendous blogpost (first comment) !]]> comment - + Reply mail.group - + html +Would it be possible to learn more about the author (second comment) ?]]> comment - + Reply mail.group - + html Donec viverra congue dui eu blandit. In lacinia molestie nulla, ut sagittis risus feugiat eu. (third comment)]]> comment - + diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css index f8975d67b78..55efc7ff42c 100644 --- a/addons/mail/static/src/css/mail.css +++ b/addons/mail/static/src/css/mail.css @@ -56,6 +56,7 @@ } .openerp div.oe_mail_msg_content { + position: relative; width: 486px; } @@ -284,20 +285,98 @@ -box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); } -.openerp p.oe_mail_msg { +.openerp div.oe_mail_msg { padding: 0; margin: 0 0 4px 0; } -.openerp a.oe_mail_oe_intlink { - color: #8786b7; -} - .openerp .oe_mail_oe_bold { font-weight: bold; } -/*.openerp .oe_mail_oe_space:after {*/ - /*content: " · ";*/ - /*margin-right: 2px;*/ -/*}*/ +/* ------------------------------ */ +/* New layouts' style */ +/* ------------------------------ */ + +.openerp .oe_mail_msg .oe_mail_msg_title { + font-size: 1.3em; + font-weight: bold; +} +.openerp .oe_mail_msg .oe_mail_msg_title a:link, +.openerp .oe_mail_msg .oe_mail_msg_title a:visited { + color: #4C4C4C; + text-decoration: none; +} + +.openerp .oe_mail_msg_intlinks, +.openerp .oe_mail_msg_subtitle { + color: #888; +} +.openerp .oe_mail_msg_intlinks a:link { + color: #8786b7; +} + +/* Gear menu */ +.openerp .oe_mail_msg_comment a.oe_gear_menuaction { + position: absolute; + top: 0px; + right: 3px; + display: none; + color: #4c4c4c; + cursor: pointer; +} +.openerp .oe_mail_msg_comment:hover .oe_gear_menuaction { + display: block; +} +.openerp .oe_mail_msg_comment a.oe_gear_menuaction:hover { + text-decoration: none; +} +.openerp .oe_mail_msg_comment a.oe_gear_menuaction:hover { + text-decoration: none; +} +.openerp .oe_mail_msg_comment ul.oe_gear_menu { + list-style-type: none; + display: none; + position: absolute; + top: 30px; + right: -140px; + padding: 4px; + border: 1px solid #afafb6; + min-width: 160px; + overflow-x: hidden; + z-index: 900; + background: white; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); + -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); + -box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); +} +.openerp .oe_mail_msg_comment a.oe_gear_menuaction:hover ~ .oe_gear_menu { + display: block; +} +.openerp .oe_mail_msg_comment ul.oe_gear_menu > li { + float: none; +} +.openerp .oe_mail_msg_comment .oe_gear_menu > li > a { + display: block; + padding: 3px 6px; + line-height: 14px; + color: #4c4c4c; + text-decoration: none; +} +.openerp .oe_mail_msg_comment .oe_gear_menu > li > a:hover { + background: #f0f0fa; + background: -moz-linear-gradient(#f0f0fa, #eeeef6); + background: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6)); + background: -webkit-linear-gradient(#f0f0fa, #eeeef6); + -moz-box-shadow: none; + -webkit-box-shadow: none; + -box-shadow: none; +} +.openerp .oe_mail_msg_comment .oe_gear_menu p { + margin-left: 12px; +} + + diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index 69012ae77ee..7458f972fa2 100644 --- a/addons/mail/static/src/xml/mail.xml +++ b/addons/mail/static/src/xml/mail.xml @@ -65,9 +65,9 @@
    - +
    - +
    @@ -138,21 +138,39 @@
    - - +
    - +
    -

    + B +

    +
    + + +

    + +

    +     +

    + + · + +

    -
    -
      + + +
      +
      • Reply ·
        • @@ -166,43 +184,8 @@
      • Hide ·
        • -
      • - - by - -
      -

      - - - -

      - - - -

      -

      From:

      -

      Subject:

      -

      - - -

      - - +
    From 7e1bbf696e4209760af57da900fd97063ede14f5 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Mon, 18 Jun 2012 10:23:41 +0530 Subject: [PATCH 156/232] [IMP] email_template : Improved the Search View. bzr revid: mdi@tinyerp.com-20120618045341-dadyvs5qx233rye7 --- addons/email_template/email_template_view.xml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml index 1403721af53..213e6a78943 100644 --- a/addons/email_template/email_template_view.xml +++ b/addons/email_template/email_template_view.xml @@ -126,13 +126,10 @@ - + - - - - - From dc194b1ab53e49310e2f6d23caecceb51064a0ef Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Mon, 18 Jun 2012 10:59:01 +0530 Subject: [PATCH 157/232] [IMP] fetchmail : Improved the Search View. bzr revid: mdi@tinyerp.com-20120618052901-3jz8v48ydylru451 --- addons/fetchmail/fetchmail_view.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml index d19fb4c4ca1..c990fd5f7a8 100644 --- a/addons/fetchmail/fetchmail_view.xml +++ b/addons/fetchmail/fetchmail_view.xml @@ -77,12 +77,14 @@ search + + - - From c30cc74bcf0926c5a27fe44b840ac2c815a298b5 Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Mon, 18 Jun 2012 11:19:35 +0530 Subject: [PATCH 158/232] [IMP]purchase_* : improve filter_domain bzr revid: cha@tinyerp.com-20120618054935-87rbozf518wslmyb --- 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 3b064060432..974cabb0585 100644 --- a/addons/purchase/stock_view.xml +++ b/addons/purchase/stock_view.xml @@ -65,7 +65,7 @@ - + From 81cc6f45cd36a776b7bb92d0a6190838f5767e8b Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Mon, 18 Jun 2012 11:26:24 +0530 Subject: [PATCH 159/232] [IMP] launch : Improved the Search View. bzr revid: mdi@tinyerp.com-20120618055624-ckyuicdch6mujg7o --- addons/lunch/lunch_view.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml index 8e449b58e24..37069007638 100644 --- a/addons/lunch/lunch_view.xml +++ b/addons/lunch/lunch_view.xml @@ -71,11 +71,12 @@ search + + - @@ -181,8 +182,8 @@ search - + @@ -192,7 +193,6 @@ - @@ -290,7 +290,7 @@ search - + @@ -364,10 +364,10 @@ + - From 4bb2af1475109856068f35e75dde9eb01c534537 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Mon, 18 Jun 2012 11:52:52 +0530 Subject: [PATCH 160/232] [IMP] audittrail : Improved the Search View. bzr revid: mdi@tinyerp.com-20120618062252-h1ju1p1f0k3olnri --- addons/audittrail/audittrail_view.xml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/addons/audittrail/audittrail_view.xml b/addons/audittrail/audittrail_view.xml index 5f8e2392842..507809d10d4 100644 --- a/addons/audittrail/audittrail_view.xml +++ b/addons/audittrail/audittrail_view.xml @@ -62,9 +62,7 @@ - + @@ -170,9 +168,7 @@ - + From 3019c4efd45ac240fbf08712c079dcca697549f3 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Mon, 18 Jun 2012 11:55:40 +0530 Subject: [PATCH 161/232] [IMP] base : Improved the Search View. bzr revid: mdi@tinyerp.com-20120618062540-wlalcz7mr9rirkp5 --- addons/base_calendar/base_calendar_view.xml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml index a20e61e5245..a856d6e718c 100644 --- a/addons/base_calendar/base_calendar_view.xml +++ b/addons/base_calendar/base_calendar_view.xml @@ -94,9 +94,7 @@ search - + - + Date: Mon, 18 Jun 2012 11:57:12 +0530 Subject: [PATCH 162/232] [IMP] board : Improved the Search View. bzr revid: mdi@tinyerp.com-20120618062712-kdrg0npgggu9j97d --- addons/board/board_view.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/addons/board/board_view.xml b/addons/board/board_view.xml index 0ce5e2aa2dc..b4c96a9976f 100644 --- a/addons/board/board_view.xml +++ b/addons/board/board_view.xml @@ -8,9 +8,7 @@ search - + From 837b5920a618a4d29fbdda4c4e2ad2d7639d1658 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Mon, 18 Jun 2012 11:58:43 +0530 Subject: [PATCH 163/232] [IMP] caldav : Improved the Search View. bzr revid: mdi@tinyerp.com-20120618062843-blnv2e6d00qrlmc0 --- addons/caldav/caldav_view.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml index 2fed2fa3f98..0f49dfbb39c 100644 --- a/addons/caldav/caldav_view.xml +++ b/addons/caldav/caldav_view.xml @@ -158,9 +158,7 @@ search - + From dafb1992d76806e9d172724fd8b5120aaaa1c031 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Mon, 18 Jun 2012 12:07:39 +0530 Subject: [PATCH 164/232] [IMP] email_template : Improved the Search View. bzr revid: mdi@tinyerp.com-20120618063739-8lc5v1qtpa0dr6fu --- addons/email_template/email_template_view.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml index 213e6a78943..40e1d096372 100644 --- a/addons/email_template/email_template_view.xml +++ b/addons/email_template/email_template_view.xml @@ -126,9 +126,7 @@ - + From cdee75e26193a01754da515caccb5ca78473947e Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Mon, 18 Jun 2012 12:08:59 +0530 Subject: [PATCH 165/232] [IMP] fetchmail : Improved the Search View. bzr revid: mdi@tinyerp.com-20120618063859-3fg1aejih4c5tvbb --- addons/fetchmail/fetchmail_view.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml index c990fd5f7a8..faff48708d6 100644 --- a/addons/fetchmail/fetchmail_view.xml +++ b/addons/fetchmail/fetchmail_view.xml @@ -77,9 +77,7 @@ search - + From 5f6dc27e33205df1cc665ba2194a78f080ea5367 Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Mon, 18 Jun 2012 12:18:58 +0530 Subject: [PATCH 166/232] [IMP]stock : improve search code in xml bzr revid: cha@tinyerp.com-20120618064858-psi6okocl87rbdc4 --- addons/stock/stock_view.xml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 6d9869fe904..812787da040 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -281,7 +281,7 @@ - + @@ -388,7 +388,7 @@ - + @@ -871,7 +871,7 @@ - + @@ -936,6 +936,7 @@ + @@ -983,7 +984,7 @@ - + @@ -1095,7 +1096,7 @@ - + From 700f2d219eb44a9a54b4c93d955f9ce3b88f4cbb Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Mon, 18 Jun 2012 12:20:45 +0530 Subject: [PATCH 167/232] [IMP] mail : Improved the Search View. bzr revid: mdi@tinyerp.com-20120618065045-f7fttuso82gmqs1e --- addons/mail/mail_group_view.xml | 4 ++-- addons/mail/mail_message_view.xml | 13 +++++-------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml index 67b2efc84a0..fd70bedd77c 100644 --- a/addons/mail/mail_group_view.xml +++ b/addons/mail/mail_group_view.xml @@ -96,8 +96,8 @@ search - - + + diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml index 1f7ec2297de..9f0977faa25 100644 --- a/addons/mail/mail_message_view.xml +++ b/addons/mail/mail_message_view.xml @@ -52,9 +52,9 @@ 20 - - + + @@ -164,6 +164,9 @@ search + + + @@ -173,16 +176,10 @@ - - - - - - From 88176945009cabf235f39bdcddc1049392f40783 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Mon, 18 Jun 2012 14:03:21 +0530 Subject: [PATCH 168/232] [IMP] marketing_campaign : Improved the Search View. bzr revid: mdi@tinyerp.com-20120618083321-lnjpfwj2xfwuf30i --- .../marketing_campaign_view.xml | 176 +++++++++--------- .../report/campaign_analysis_view.xml | 9 +- 2 files changed, 94 insertions(+), 91 deletions(-) diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml index 4e9658d98a4..cbb4233aace 100644 --- a/addons/marketing_campaign/marketing_campaign_view.xml +++ b/addons/marketing_campaign/marketing_campaign_view.xml @@ -81,31 +81,32 @@ - - marketing.campaign.search - marketing.campaign - search - - - - - - - - - - - - - - - - - - - - - + + marketing.campaign.search + marketing.campaign + search + + + + + + + + + + + + + + + + + + + + + + Campaigns @@ -185,34 +186,35 @@ - - marketing.campaign.segment.search - marketing.campaign.segment - search - - - - - - - - - - - - - - - - - - - - - - - - + + marketing.campaign.segment.search + marketing.campaign.segment + search + + + + + + + + + + + + + + + + + + + + + + + + + Segments @@ -382,41 +384,41 @@ - - marketing.campaign.workitem.search - marketing.campaign.workitem - search - - - - - - - - - + + marketing.campaign.workitem.search + marketing.campaign.workitem + search + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + Campaign Followup diff --git a/addons/marketing_campaign/report/campaign_analysis_view.xml b/addons/marketing_campaign/report/campaign_analysis_view.xml index 2a3b8c80d48..730f327408e 100644 --- a/addons/marketing_campaign/report/campaign_analysis_view.xml +++ b/addons/marketing_campaign/report/campaign_analysis_view.xml @@ -31,7 +31,9 @@ search - + + + @@ -47,13 +49,12 @@ - - - + + From 2349b7a6f2613043e1a7d0049514337462584783 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Mon, 18 Jun 2012 14:38:24 +0530 Subject: [PATCH 169/232] [IMP] membership : Improved the Search View. bzr revid: mdi@tinyerp.com-20120618090824-uc2mggpi6tee059v --- addons/membership/membership_view.xml | 62 +++++++++---------- .../report/report_membership_view.xml | 4 +- 2 files changed, 34 insertions(+), 32 deletions(-) diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml index 58672e9a6cc..d539eccce7b 100644 --- a/addons/membership/membership_view.xml +++ b/addons/membership/membership_view.xml @@ -14,17 +14,17 @@ search - - - - - - - - - - - + + + + + + + + + + + @@ -162,26 +162,26 @@ res.partner search - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/addons/membership/report/report_membership_view.xml b/addons/membership/report/report_membership_view.xml index ff04354c7ae..94790e47021 100644 --- a/addons/membership/report/report_membership_view.xml +++ b/addons/membership/report/report_membership_view.xml @@ -36,13 +36,15 @@ + + + - From 0d06cd0235cdce3e83f9b94225d62cb1794c16fd Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Mon, 18 Jun 2012 14:45:02 +0530 Subject: [PATCH 170/232] [IMP]mrp : improve search code in xml bzr revid: cha@tinyerp.com-20120618091502-kblo7qm9y5nebjhp --- addons/mrp/mrp_view.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index acc4002289f..a7eb2009295 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -189,7 +189,7 @@ - + @@ -288,7 +288,7 @@ search - + @@ -388,7 +388,7 @@ - + @@ -775,7 +775,7 @@ - + Date: Mon, 18 Jun 2012 15:03:57 +0530 Subject: [PATCH 171/232] [IMP]sale_* : improve search code in xml bzr revid: rpr@tinyerp.com-20120618093357-akc9497ojot04qsg --- addons/sale/report/sale_report_view.xml | 73 ++++++++++++------------- 1 file changed, 35 insertions(+), 38 deletions(-) diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml index 9cb332d69e2..6f37a9f729d 100644 --- a/addons/sale/report/sale_report_view.xml +++ b/addons/sale/report/sale_report_view.xml @@ -50,56 +50,53 @@ search - + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 942258253017f74ac1a987a5b052259e1616c118 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Mon, 18 Jun 2012 15:11:59 +0530 Subject: [PATCH 172/232] [IMP] Improved the Search View. bzr revid: mdi@tinyerp.com-20120618094159-uykwrqonzcvnd762 --- openerp/addons/base/ir/ir.xml | 72 ++++++------------- .../base/ir/ir_config_parameter_view.xml | 4 +- openerp/addons/base/ir/ir_filters.xml | 4 +- .../addons/base/ir/workflow/workflow_view.xml | 20 ++---- openerp/addons/base/module/module_view.xml | 4 +- .../publisher_warranty_view.xml | 4 +- openerp/addons/base/res/ir_property_view.xml | 4 +- openerp/addons/base/res/res_bank_view.xml | 4 +- openerp/addons/base/res/res_company_view.xml | 4 +- openerp/addons/base/res/res_currency_view.xml | 8 +-- openerp/addons/base/res/res_lang_view.xml | 4 +- openerp/addons/base/res/res_partner_view.xml | 4 +- openerp/addons/base/res/res_request_view.xml | 4 +- openerp/addons/base/res/res_users_view.xml | 4 +- openerp/addons/base/res/res_widget_view.xml | 4 +- 15 files changed, 44 insertions(+), 104 deletions(-) diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml index a3e2a04f888..9e25a349e87 100644 --- a/openerp/addons/base/ir/ir.xml +++ b/openerp/addons/base/ir/ir.xml @@ -72,8 +72,8 @@ + filter_domain="['|', '|', ('name','ilike',self), ('model','ilike',self), ('key2','ilike',self)]" + string="Client Action"/> @@ -202,9 +202,7 @@ search - + @@ -257,9 +255,7 @@ search - + @@ -309,9 +305,7 @@ search - + @@ -397,8 +391,8 @@ + filter_domain="['|', '|', '|', '|', ('name','ilike',self), ('model','ilike',self), ('type','ilike',self), ('report_name','ilike',self), ('report_type','ilike',self)]" + string="Report"/> @@ -499,9 +493,7 @@ - + @@ -571,8 +563,8 @@ + filter_domain="['|', '|', ('name','ilike',self), ('type','ilike',self), ('wiz_name','ilike',self)]" + string="Wizard"/> @@ -659,9 +651,7 @@ search - + - + search - + search - + + filter_domain="['|', '|', ('name','ilike',self), ('model','ilike',self), ('module','ilike',self)]" + string="External Identifier"/> search - + @@ -1376,9 +1358,7 @@ search - + @@ -1462,9 +1442,7 @@ - + @@ -1559,9 +1537,7 @@ - + @@ -1700,9 +1676,7 @@ - + @@ -1911,8 +1885,8 @@ + filter_domain="['|', '|', ('name','ilike',self), ('smtp_host','ilike',self), ('smtp_user','ilike',self)]" + string="Outgoing Mail Server"/> diff --git a/openerp/addons/base/ir/ir_config_parameter_view.xml b/openerp/addons/base/ir/ir_config_parameter_view.xml index 5e6db1255a6..3b11402ff64 100644 --- a/openerp/addons/base/ir/ir_config_parameter_view.xml +++ b/openerp/addons/base/ir/ir_config_parameter_view.xml @@ -7,9 +7,7 @@ search - + diff --git a/openerp/addons/base/ir/ir_filters.xml b/openerp/addons/base/ir/ir_filters.xml index 44e41efc5a5..3e8e45f7e0c 100644 --- a/openerp/addons/base/ir/ir_filters.xml +++ b/openerp/addons/base/ir/ir_filters.xml @@ -51,9 +51,7 @@ search - + diff --git a/openerp/addons/base/ir/workflow/workflow_view.xml b/openerp/addons/base/ir/workflow/workflow_view.xml index deb58509802..b82d5a6016c 100644 --- a/openerp/addons/base/ir/workflow/workflow_view.xml +++ b/openerp/addons/base/ir/workflow/workflow_view.xml @@ -31,9 +31,7 @@ search - + @@ -163,9 +161,7 @@ search - + @@ -238,9 +234,7 @@ search - + @@ -297,9 +291,7 @@ search - + @@ -362,9 +354,7 @@ search - + diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml index 182e0582788..808fe25f19f 100644 --- a/openerp/addons/base/module/module_view.xml +++ b/openerp/addons/base/module/module_view.xml @@ -42,9 +42,7 @@ - + diff --git a/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml b/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml index d1277df4dcf..ce110ceb366 100644 --- a/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml +++ b/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml @@ -55,9 +55,7 @@ search - + diff --git a/openerp/addons/base/res/ir_property_view.xml b/openerp/addons/base/res/ir_property_view.xml index 9e67774bab9..15e1f8acb45 100644 --- a/openerp/addons/base/res/ir_property_view.xml +++ b/openerp/addons/base/res/ir_property_view.xml @@ -8,9 +8,7 @@ search - + search - + diff --git a/openerp/addons/base/res/res_company_view.xml b/openerp/addons/base/res/res_company_view.xml index 76273cac7d5..4fcfb336966 100644 --- a/openerp/addons/base/res/res_company_view.xml +++ b/openerp/addons/base/res/res_company_view.xml @@ -171,9 +171,7 @@ - + diff --git a/openerp/addons/base/res/res_currency_view.xml b/openerp/addons/base/res/res_currency_view.xml index a80c4d37e87..fe5ed0d1f3e 100644 --- a/openerp/addons/base/res/res_currency_view.xml +++ b/openerp/addons/base/res/res_currency_view.xml @@ -8,9 +8,7 @@ search - + @@ -111,9 +109,7 @@ search - + diff --git a/openerp/addons/base/res/res_lang_view.xml b/openerp/addons/base/res/res_lang_view.xml index 4b226b4d69c..290815711df 100644 --- a/openerp/addons/base/res/res_lang_view.xml +++ b/openerp/addons/base/res/res_lang_view.xml @@ -109,8 +109,8 @@ + filter_domain="['|', '|', ('name','ilike',self), ('code','ilike',self), ('iso_code','ilike',self)]" + string="Language"/> diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml index 0c1617609b3..c8103f69d4b 100644 --- a/openerp/addons/base/res/res_partner_view.xml +++ b/openerp/addons/base/res/res_partner_view.xml @@ -249,8 +249,8 @@ + filter_domain="['|','|',('name','ilike',self),('parent_id','ilike',self),('ref','=',self)]" + string="Partner"/> diff --git a/openerp/addons/base/res/res_request_view.xml b/openerp/addons/base/res/res_request_view.xml index 46eeaa6e2e1..3fa6505a5a5 100644 --- a/openerp/addons/base/res/res_request_view.xml +++ b/openerp/addons/base/res/res_request_view.xml @@ -32,9 +32,7 @@ search - + diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml index 1138a5638c1..9099cca1fcd 100644 --- a/openerp/addons/base/res/res_users_view.xml +++ b/openerp/addons/base/res/res_users_view.xml @@ -148,9 +148,7 @@ search - + diff --git a/openerp/addons/base/res/res_widget_view.xml b/openerp/addons/base/res/res_widget_view.xml index bac4ef44606..24132b60bcf 100644 --- a/openerp/addons/base/res/res_widget_view.xml +++ b/openerp/addons/base/res/res_widget_view.xml @@ -7,9 +7,7 @@ search - + From 2dd01eab4f9a40c63fa8801743573ec6767a1bf2 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Mon, 18 Jun 2012 15:32:39 +0530 Subject: [PATCH 173/232] [IMP] multi_company : Improved the Search View. bzr revid: mdi@tinyerp.com-20120618100239-g1yw6euetfr3qf19 --- addons/multi_company/res_company_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/multi_company/res_company_view.xml b/addons/multi_company/res_company_view.xml index db0be0d09f4..31617f26bac 100644 --- a/addons/multi_company/res_company_view.xml +++ b/addons/multi_company/res_company_view.xml @@ -49,7 +49,7 @@ - + From cb29e746f3e5e6e617af1aba5ace39152313609f Mon Sep 17 00:00:00 2001 From: "Rajesh Prajapati (OpenERP)" Date: Mon, 18 Jun 2012 15:33:56 +0530 Subject: [PATCH 174/232] [IMP]sale_* : improve search code in xml bzr revid: rpr@tinyerp.com-20120618100356-sf2uxhikgh218j3g --- addons/sale/report/sale_report_view.xml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml index 6f37a9f729d..092ef26c125 100644 --- a/addons/sale/report/sale_report_view.xml +++ b/addons/sale/report/sale_report_view.xml @@ -50,6 +50,7 @@ search + @@ -70,15 +71,15 @@ - - + + + - - - - + + + @@ -96,7 +97,7 @@ - + From 07307dcdde1bc174218b31a2ac0039a83a99bcb3 Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Mon, 18 Jun 2012 16:30:09 +0530 Subject: [PATCH 175/232] [IMP]process : improve search code in xml bzr revid: cha@tinyerp.com-20120618110009-ncikr3rb7wb705i5 --- addons/process/process_view.xml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/addons/process/process_view.xml b/addons/process/process_view.xml index 268820f92d3..292a01a9fb0 100644 --- a/addons/process/process_view.xml +++ b/addons/process/process_view.xml @@ -108,7 +108,8 @@ - + + @@ -205,7 +206,8 @@ - + + @@ -295,7 +297,8 @@ - + + From 665dcdc66106a698d86099b3824b1577fd5e94e1 Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Mon, 18 Jun 2012 18:30:50 +0530 Subject: [PATCH 176/232] [IMP]procurement : improve search code in xml bzr revid: cha@tinyerp.com-20120618130050-kvatkti5u0py4bmp --- addons/procurement/procurement_view.xml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml index c9a6d55c9d4..8c41d2ef7ff 100644 --- a/addons/procurement/procurement_view.xml +++ b/addons/procurement/procurement_view.xml @@ -106,17 +106,18 @@ + + + + - - - @@ -186,7 +187,8 @@ - + + From ca7d45dc6b124b1ec90e9f3deb275fa5b55b47f5 Mon Sep 17 00:00:00 2001 From: "Purnendu Singh (OpenERP)" Date: Mon, 18 Jun 2012 18:54:37 +0530 Subject: [PATCH 177/232] [IMP] project_*: Update search views bzr revid: psi@tinyerp.com-20120618132437-2yuhcs84vmc768go --- addons/project/project_view.xml | 49 ++++++++--------- addons/project/report/project_cumulative.xml | 15 +++--- addons/project/report/project_report_view.xml | 53 +++++++++---------- addons/project_gtd/project_gtd_view.xml | 26 +++------ addons/project_issue/project_issue_view.xml | 25 ++++----- .../report/project_issue_report_view.xml | 18 +++---- .../project_long_term_view.xml | 29 +++++----- .../project_timesheet_view.xml | 9 ++-- .../report/task_report_view.xml | 18 +++---- 9 files changed, 111 insertions(+), 131 deletions(-) diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 9e2549766f9..cc8edd4084e 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -133,26 +133,23 @@ + + - - + - - - - - + + - - - - - - + + + + + + @@ -588,19 +585,19 @@ + + - - - - + + + + - - - - + @@ -678,11 +675,11 @@ search - - + + - - + + diff --git a/addons/project/report/project_cumulative.xml b/addons/project/report/project_cumulative.xml index e597928f154..b4bb8f6835b 100644 --- a/addons/project/report/project_cumulative.xml +++ b/addons/project/report/project_cumulative.xml @@ -55,20 +55,19 @@ + + - - - - - - - - + + + + + diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml index c237ed8854c..c27323d4c3c 100644 --- a/addons/project/report/project_report_view.xml +++ b/addons/project/report/project_report_view.xml @@ -62,6 +62,10 @@ + + + + - - + - - - - - - - - - - + + + + + + + @@ -103,12 +104,6 @@ - - - - - - diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml index c8e87093c0e..31bde5d18b0 100644 --- a/addons/project_gtd/project_gtd_view.xml +++ b/addons/project_gtd/project_gtd_view.xml @@ -111,26 +111,16 @@ 50 + + - - - - - - - - - + + + + + + diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index ee5d7926d95..d553fcbf129 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -10,7 +10,7 @@ search - + @@ -152,15 +152,16 @@ + + + - - - - + + @@ -304,17 +305,17 @@ search - - - - - + + + + - + + + diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml index bc6a020512d..10d4ccdac34 100644 --- a/addons/project_issue/report/project_issue_report_view.xml +++ b/addons/project_issue/report/project_issue_report_view.xml @@ -52,27 +52,26 @@ search - + + + - + - - - - + - @@ -108,8 +107,7 @@ - - + diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index 541738ed69d..3286e9a4c3d 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -70,16 +70,16 @@ - - - + + + - - - - + + + + @@ -272,18 +272,19 @@ + + + + + + - - - - - - + - + diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml index 0a485470bc7..61b7a8aa1af 100644 --- a/addons/project_timesheet/project_timesheet_view.xml +++ b/addons/project_timesheet/project_timesheet_view.xml @@ -70,8 +70,7 @@ - - + @@ -81,9 +80,9 @@ search - - - + + + diff --git a/addons/project_timesheet/report/task_report_view.xml b/addons/project_timesheet/report/task_report_view.xml index 6d430347c01..58784bdddb1 100644 --- a/addons/project_timesheet/report/task_report_view.xml +++ b/addons/project_timesheet/report/task_report_view.xml @@ -29,20 +29,20 @@ report.timesheet.task.user search - - + + + + - - - - - + + + + - - + From a1ead34ba5167a70e4f6501bd27c7585d4fc2839 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Tue, 19 Jun 2012 10:59:37 +0530 Subject: [PATCH 178/232] [IMP] point_of_sale : Improved the Search View. bzr revid: mdi@tinyerp.com-20120619052937-ndi4f77pxnzpb3zi --- .../point_of_sale/account_statement_view.xml | 10 +++-- addons/point_of_sale/point_of_sale_view.xml | 5 ++- .../report/pos_order_report_view.xml | 10 ++--- .../report/report_cash_register_view.xml | 44 +++++++++---------- 4 files changed, 36 insertions(+), 33 deletions(-) diff --git a/addons/point_of_sale/account_statement_view.xml b/addons/point_of_sale/account_statement_view.xml index e5ade747840..d7941758821 100644 --- a/addons/point_of_sale/account_statement_view.xml +++ b/addons/point_of_sale/account_statement_view.xml @@ -27,10 +27,11 @@ + + + - - @@ -52,11 +53,12 @@ + + + - - diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml index b832da7ef5b..6f8c0177787 100644 --- a/addons/point_of_sale/point_of_sale_view.xml +++ b/addons/point_of_sale/point_of_sale_view.xml @@ -138,15 +138,16 @@ search + + + - - diff --git a/addons/point_of_sale/report/pos_order_report_view.xml b/addons/point_of_sale/report/pos_order_report_view.xml index b3a9990023c..255af0cdd30 100644 --- a/addons/point_of_sale/report/pos_order_report_view.xml +++ b/addons/point_of_sale/report/pos_order_report_view.xml @@ -35,21 +35,21 @@ + + - - - - - + + + diff --git a/addons/point_of_sale/report/report_cash_register_view.xml b/addons/point_of_sale/report/report_cash_register_view.xml index 3cbc315ce0f..fb25e4e4487 100644 --- a/addons/point_of_sale/report/report_cash_register_view.xml +++ b/addons/point_of_sale/report/report_cash_register_view.xml @@ -21,40 +21,40 @@ - report.cash.register.search - report.cash.register - search - - - - - + report.cash.register.search + report.cash.register + search + + + + - + + - - + + - - - + + + - + - - - + + + From 9552c958b0838085682a921064aaff771fa9e637 Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Tue, 19 Jun 2012 11:24:23 +0530 Subject: [PATCH 179/232] [IMP]resource : improve search code in xml bzr revid: cha@tinyerp.com-20120619055423-cvie9crywtzy41sv --- addons/resource/resource_view.xml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml index 4da1a465c42..28eec61044d 100644 --- a/addons/resource/resource_view.xml +++ b/addons/resource/resource_view.xml @@ -11,12 +11,13 @@ + + - - + @@ -39,7 +40,8 @@ - + + @@ -54,7 +56,8 @@ - + + From 682738f93c1a198d39fc9ff5008249e24226f7e9 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Tue, 19 Jun 2012 11:26:24 +0530 Subject: [PATCH 180/232] [IMP] report_intrastat : Improved the Search View. bzr revid: mdi@tinyerp.com-20120619055624-wdoyhvpj6780opr1 --- addons/report_intrastat/report_intrastat_view.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/addons/report_intrastat/report_intrastat_view.xml b/addons/report_intrastat/report_intrastat_view.xml index 51354b9aa09..c481296196c 100644 --- a/addons/report_intrastat/report_intrastat_view.xml +++ b/addons/report_intrastat/report_intrastat_view.xml @@ -100,10 +100,9 @@ - - - + + From a6bbbbfea33b2f126ca8ab9fa2aa40b1b2c790cf Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Tue, 19 Jun 2012 11:56:25 +0530 Subject: [PATCH 181/232] [IMP] share : Improved the Search View. bzr revid: mdi@tinyerp.com-20120619062625-4race6q3rdzcsldx --- addons/share/res_users_view.xml | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/addons/share/res_users_view.xml b/addons/share/res_users_view.xml index 52e154c1667..3da6c47dec7 100644 --- a/addons/share/res_users_view.xml +++ b/addons/share/res_users_view.xml @@ -7,11 +7,12 @@ search - - - - + + + + + @@ -29,11 +30,12 @@ - - - - + + + + + From cc617d663feb27a8361bb18ec4e58cc63c2ebec4 Mon Sep 17 00:00:00 2001 From: "Rajesh Prajapati (OpenERP)" Date: Tue, 19 Jun 2012 12:12:51 +0530 Subject: [PATCH 182/232] [IMP]crm_* : improve search code in xml bzr revid: rpr@tinyerp.com-20120619064251-r1oolovp41h6ymw8 --- addons/crm/crm_lead_view.xml | 95 ++++++--------- addons/crm/crm_meeting_view.xml | 114 ++++++++---------- addons/crm/crm_phonecall_view.xml | 63 +++++----- addons/crm/crm_report_view.xml | 5 +- addons/crm/report/crm_lead_report_view.xml | 6 +- .../crm/report/crm_phonecall_report_view.xml | 5 +- addons/crm/res_partner_view.xml | 23 +--- addons/crm_claim/crm_claim_view.xml | 6 +- .../report/crm_claim_report_view.xml | 17 +-- .../crm_fundraising/crm_fundraising_view.xml | 11 +- .../report/crm_fundraising_report_view.xml | 19 ++- addons/crm_helpdesk/crm_helpdesk_view.xml | 9 +- .../report/crm_helpdesk_report_view.xml | 19 ++- addons/crm_partner_assign/crm_lead_view.xml | 1 - .../report/crm_lead_report_view.xml | 6 +- .../report/crm_partner_report_view.xml | 2 +- 16 files changed, 165 insertions(+), 236 deletions(-) diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 2b7760c1716..7feb379c1a7 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -13,7 +13,7 @@ search - + @@ -53,25 +53,6 @@ - - - - @@ -93,16 +74,6 @@ on_change="onchange_stage_id(stage_id)"/> -
    -
    -     @@ -650,7 +650,7 @@ - + From 4dbe82473921a2335dce292f9b70ef2a8bab3858 Mon Sep 17 00:00:00 2001 From: "Purnendu Singh (OpenERP)" Date: Wed, 20 Jun 2012 14:50:36 +0530 Subject: [PATCH 194/232] [IMP] hr_attendance: small fix bzr revid: psi@tinyerp.com-20120620092036-3sqcq8cswvrpbi8x --- addons/hr_attendance/hr_attendance_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml index c86de82ec16..bfe92340b7c 100644 --- a/addons/hr_attendance/hr_attendance_view.xml +++ b/addons/hr_attendance/hr_attendance_view.xml @@ -54,7 +54,7 @@ search - + From 6292e896a186562682757952c27385adf9996592 Mon Sep 17 00:00:00 2001 From: "Foram Katharotiya (OpenERP)" Date: Wed, 20 Jun 2012 17:21:42 +0530 Subject: [PATCH 195/232] [IMP] solve Can not `import openerp.tests`. bzr revid: fka@tinyerp.com-20120620115142-euaid51ad2xgwevc --- openerp/tests/test_ir_sequence.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/tests/test_ir_sequence.py b/openerp/tests/test_ir_sequence.py index 2943676d1bc..fcc5888e47e 100644 --- a/openerp/tests/test_ir_sequence.py +++ b/openerp/tests/test_ir_sequence.py @@ -114,7 +114,7 @@ class test_ir_sequence_change_implementation(unittest2.TestCase): d = dict(code='test_sequence_type_3', name='Test sequence type') c = registry('ir.sequence.type').create(cr, ADMIN_USER_ID, d, {}) assert c - d = dict(code='test_sequence_type_3', name='Test sequence', 'implementation': 'standard') + d = dict(code='test_sequence_type_3', name='Test sequence') c = registry('ir.sequence').create(cr, ADMIN_USER_ID, d, {}) assert c d = dict(code='test_sequence_type_4', name='Test sequence type') From 7d53b3977f9698d47583902f2c7be523f8bd8f27 Mon Sep 17 00:00:00 2001 From: Antonin Bourguignon Date: Wed, 20 Jun 2012 16:02:04 +0200 Subject: [PATCH 196/232] [IMP] attachments display and accessibility in mail messages a user can now download an attachment in one click bzr revid: abo@openerp.com-20120620140204-1mphi5tjyp57i74t --- addons/mail/mail_thread.py | 3 +- addons/mail/static/src/css/mail.css | 82 +++++++++++++++-------------- addons/mail/static/src/js/mail.js | 13 ++++- addons/mail/static/src/xml/mail.xml | 2 +- 4 files changed, 57 insertions(+), 43 deletions(-) diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py index 11fc203d890..0f404155f42 100644 --- a/addons/mail/mail_thread.py +++ b/addons/mail/mail_thread.py @@ -423,7 +423,7 @@ class mail_thread(osv.osv): map_id_to_name[attach_id] = '' # use empty string as a placeholder ids = map_id_to_name.keys() - names = self.pool.get('ir.attachment').name_get(cr, uid, ids) + names = self.pool.get('ir.attachment').name_get(cr, uid, ids, context=context) # convert the list of tuples into a dictionnary for name in names: @@ -436,7 +436,6 @@ class mail_thread(osv.osv): for attach_id in msg["attachment_ids"]: msg["attachments"].append({'id': attach_id, 'name': map_id_to_name[attach_id]}) - """ Sort and return messages """ msgs = sorted(msgs, key=lambda d: (-d['id'])) return msgs diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css index 2f2daa4692a..2a253154fde 100644 --- a/addons/mail/static/src/css/mail.css +++ b/addons/mail/static/src/css/mail.css @@ -327,59 +327,59 @@ /* Gear menu */ .openerp .oe_mail_msg_content a.oe_gear_menuaction { - position: absolute; - top: 0px; - right: 3px; - display: none; - color: #4c4c4c; - cursor: pointer; + position: absolute; + top: 0px; + right: 3px; + display: none; + color: #4c4c4c; + cursor: pointer; } .openerp .oe_mail_msg_content:hover .oe_gear_menuaction { - display: block; + display: block; } .openerp .oe_mail_msg_content a.oe_gear_menuaction:hover { - text-decoration: none; + text-decoration: none; } .openerp .oe_mail_msg_content ul.oe_gear_menu { - list-style-type: none; - display: none; - position: absolute; - top: 30px; - right: -140px; - padding: 4px; - border: 1px solid #afafb6; - min-width: 160px; - overflow-x: hidden; - z-index: 900; - background: white; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); - -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); - -box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); + list-style-type: none; + display: none; + position: absolute; + top: 30px; + right: -140px; + padding: 4px; + border: 1px solid #afafb6; + min-width: 160px; + overflow-x: hidden; + z-index: 900; + background: white; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); + -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); + -box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); } .openerp .oe_mail_msg_content ul.oe_gear_menu > li { float: none; } .openerp .oe_mail_msg_content .oe_gear_menu > li > a { - display: block; - padding: 3px 6px; - line-height: 14px; - color: #4c4c4c; - text-decoration: none; + display: block; + padding: 3px 6px; + line-height: 14px; + color: #4c4c4c; + text-decoration: none; } .openerp .oe_mail_msg_content .oe_gear_menu > li > a:hover { - background: #f0f0fa; - background: -moz-linear-gradient(#f0f0fa, #eeeef6); - background: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6)); - background: -webkit-linear-gradient(#f0f0fa, #eeeef6); - -moz-box-shadow: none; - -webkit-box-shadow: none; - -box-shadow: none; + background: #f0f0fa; + background: -moz-linear-gradient(#f0f0fa, #eeeef6); + background: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6)); + background: -webkit-linear-gradient(#f0f0fa, #eeeef6); + -moz-box-shadow: none; + -webkit-box-shadow: none; + -box-shadow: none; } .openerp .oe_mail_msg_content .oe_gear_menu p { - margin-left: 12px; + margin-left: 12px; } /* Attachments */ @@ -387,11 +387,15 @@ display: none; width: 100%; border-top: 1px solid #CCC; - margin-top: .5em; + margin: .5em 0 0 0; padding: .5em 0; + list-style-position: inside; } .openerp ul.oe_mail_msg_attachments li { float: none; + margin: 0; + padding: 0; + list-style-type: square; } diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js index 0abd48f098f..8f0e2c8303a 100644 --- a/addons/mail/static/src/js/mail.js +++ b/addons/mail/static/src/js/mail.js @@ -249,10 +249,21 @@ openerp.mail = function(session) { $.when(defer).then(function (records) { if (records.length <= self.params.limit) self.display.show_more = false; else { self.display.show_more = true; records.pop(); } + + //build attachments download urls + for (var k in records) { + if (records[k].attachments) { + for (var l in records[k].attachments) { + records[k].attachments[l].url = self.session.origin + '/web/binary/saveas?session_id=' + self.session.session_id + '&model=ir.attachment&field=datas&filename_field=datas_fname&id='+records[k].attachments[l].id; + } + } + } + self.display_comments(records); if (self.display.show_more == true) self.$element.find('div.oe_mail_thread_more:last').show(); else self.$element.find('div.oe_mail_thread_more:last').hide(); - }); + }); + return defer; }, diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index adedb8e6bc3..87b82899cd6 100644 --- a/addons/mail/static/src/xml/mail.xml +++ b/addons/mail/static/src/xml/mail.xml @@ -202,7 +202,7 @@
    • - +
      • From 231b8ca886f0879186ce2a5ed82632ccec271557 Mon Sep 17 00:00:00 2001 From: Antonin Bourguignon Date: Wed, 20 Jun 2012 16:32:22 +0200 Subject: [PATCH 197/232] [IMP] better markup, remove some dead code bzr revid: abo@openerp.com-20120620143222-oyw84qxbzlia7lb6 --- addons/mail/static/src/js/mail.js | 2 +- addons/mail/static/src/xml/mail.xml | 86 ++--------------------------- 2 files changed, 6 insertions(+), 82 deletions(-) diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js index 8f0e2c8303a..6faf8dbd40c 100644 --- a/addons/mail/static/src/js/mail.js +++ b/addons/mail/static/src/js/mail.js @@ -325,7 +325,7 @@ openerp.mail = function(session) { record.date = session.web.format_value(record.date, {type:"datetime"}); // render // OPTIONS - $(session.web.qweb.render('mail.Thread.new', {'record': record, 'thread': this, 'params': this.params, 'display': this.display}) + $(session.web.qweb.render('mail.Thread.default', {'record': record, 'thread': this, 'params': this.params, 'display': this.display}) ).appendTo(this.$element.children('div.oe_mail_thread_display:first')); // truncated: hide full-text, show summary, add buttons if (record.tr_body) { diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index 87b82899cd6..e972e2d3f28 100644 --- a/addons/mail/static/src/xml/mail.xml +++ b/addons/mail/static/src/xml/mail.xml @@ -29,8 +29,7 @@

      History and Comments

      -
      -
      +
      @@ -44,7 +43,7 @@
      -
        +
        User img
        @@ -55,96 +54,21 @@
        -
      +
      -
    • - - +
      - +
      • -

      - - - - -
      -

      -

      -       - - -

      - - - -

      -

      From:

      -

      Subject:

      -

      - - -

      - - -       - - - -
    • -
      - - -
      - -
      - -
      -
      • - - B
        From 688ced2225e6491a78c9a100aed8ed7984a7fbc1 Mon Sep 17 00:00:00 2001 From: Antonin Bourguignon Date: Wed, 20 Jun 2012 17:54:34 +0200 Subject: [PATCH 198/232] [ADD] introduce timeago.js (check the end of mail.js) bzr revid: abo@openerp.com-20120620155434-8qos8oooxfwxkm6u --- addons/mail/static/src/js/mail.js | 192 +++++++++++++++++++++++++--- addons/mail/static/src/xml/mail.xml | 2 +- 2 files changed, 177 insertions(+), 17 deletions(-) diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js index 6faf8dbd40c..d3d67d0f6ee 100644 --- a/addons/mail/static/src/js/mail.js +++ b/addons/mail/static/src/js/mail.js @@ -5,21 +5,21 @@ openerp.mail = function(session) { var mail = session.mail = {}; /** - * Add records to sorted_comments array - * @param {Array} records records from mail.message sorted by date desc - * @returns {Object} cs comments_structure: dict - * cs.model_to_root_ids = {model: [root_ids], } - * cs.new_root_ids = [new_root_ids] - * cs.root_ids = [root_ids] - * cs.msgs = {record.id: record,} - * cs.tree_struct = {record.id: { - * 'level': record_level in hierarchy, 0 is root, - * 'msg_nbr': number of childs, - * 'direct_childs': [msg_ids], - * 'all_childs': [msg_ids], - * 'for_thread_msgs': [records], - * 'ancestors': [msg_ids], } } - */ + * Add records to sorted_comments array + * @param {Array} records records from mail.message sorted by date desc + * @returns {Object} cs comments_structure: dict + * cs.model_to_root_ids = {model: [root_ids], } + * cs.new_root_ids = [new_root_ids] + * cs.root_ids = [root_ids] + * cs.msgs = {record.id: record,} + * cs.tree_struct = {record.id: { + * 'level': record_level in hierarchy, 0 is root, + * 'msg_nbr': number of childs, + * 'direct_childs': [msg_ids], + * 'all_childs': [msg_ids], + * 'for_thread_msgs': [records], + * 'ancestors': [msg_ids], } } + */ function tools_sort_comments(cs, records, parent_id) { var cur_iter = 0; var max_iter = 10; var modif = true; while ( modif && (cur_iter++) < max_iter) { @@ -250,8 +250,10 @@ openerp.mail = function(session) { if (records.length <= self.params.limit) self.display.show_more = false; else { self.display.show_more = true; records.pop(); } - //build attachments download urls + //build attachments download urls and compute time-relative from dates for (var k in records) { + records[k].timerelative = $.timeago(records[k].date); + if (records[k].attachments) { for (var l in records[k].attachments) { records[k].attachments[l].url = self.session.origin + '/web/binary/saveas?session_id=' + self.session.session_id + '&model=ir.attachment&field=datas&filename_field=datas_fname&id='+records[k].attachments[l].id; @@ -839,6 +841,164 @@ openerp.mail = function(session) { var call_done = this.ds_users.call('message_append_note', [[this.session.uid], 'Tweet', body_text, false, 'comment', 'html']).then(this.proxy('init_and_fetch_comments')); }, }); + + /** + * Compute relative time from a date (ISO format) + * Code from http://timeago.yarp.com/ + * + * + * + * Timeago is a jQuery plugin that makes it easy to support automatically + * updating fuzzy timestamps (e.g. "4 minutes ago" or "about 1 day ago"). + * + * @name timeago + * @version 0.11.3 + * @requires jQuery v1.2.3+ + * @author Ryan McGeary + * @license MIT License - http://www.opensource.org/licenses/mit-license.php + * + * For usage and examples, visit: + * http://timeago.yarp.com/ + * + * Copyright (c) 2008-2012, Ryan McGeary (ryan -[at]- mcgeary [*dot*] org) + */ + (function($) { + $.timeago = function(timestamp) { + if (timestamp instanceof Date) { + return inWords(timestamp); + } else if (typeof timestamp === "string") { + return inWords($.timeago.parse(timestamp)); + } else if (typeof timestamp === "number") { + return inWords(new Date(timestamp)); + } else { + return inWords($.timeago.datetime(timestamp)); + } + }; + var $t = $.timeago; + + $.extend($.timeago, { + settings: { + refreshMillis: 60000, + allowFuture: false, + strings: { + prefixAgo: null, + prefixFromNow: null, + suffixAgo: "ago", + suffixFromNow: "from now", + seconds: "less than a minute", + minute: "about a minute", + minutes: "%d minutes", + hour: "about an hour", + hours: "about %d hours", + day: "a day", + days: "%d days", + month: "about a month", + months: "%d months", + year: "about a year", + years: "%d years", + wordSeparator: " ", + numbers: [] + } + }, + inWords: function(distanceMillis) { + var $l = this.settings.strings; + var prefix = $l.prefixAgo; + var suffix = $l.suffixAgo; + if (this.settings.allowFuture) { + if (distanceMillis < 0) { + prefix = $l.prefixFromNow; + suffix = $l.suffixFromNow; + } + } + + var seconds = Math.abs(distanceMillis) / 1000; + var minutes = seconds / 60; + var hours = minutes / 60; + var days = hours / 24; + var years = days / 365; + + function substitute(stringOrFunction, number) { + var string = $.isFunction(stringOrFunction) ? stringOrFunction(number, distanceMillis) : stringOrFunction; + var value = ($l.numbers && $l.numbers[number]) || number; + return string.replace(/%d/i, value); + } + + var words = seconds < 45 && substitute($l.seconds, Math.round(seconds)) || + seconds < 90 && substitute($l.minute, 1) || + minutes < 45 && substitute($l.minutes, Math.round(minutes)) || + minutes < 90 && substitute($l.hour, 1) || + hours < 24 && substitute($l.hours, Math.round(hours)) || + hours < 42 && substitute($l.day, 1) || + days < 30 && substitute($l.days, Math.round(days)) || + days < 45 && substitute($l.month, 1) || + days < 365 && substitute($l.months, Math.round(days / 30)) || + years < 1.5 && substitute($l.year, 1) || + substitute($l.years, Math.round(years)); + + var separator = $l.wordSeparator === undefined ? " " : $l.wordSeparator; + return $.trim([prefix, words, suffix].join(separator)); + }, + parse: function(iso8601) { + var s = $.trim(iso8601); + s = s.replace(/\.\d\d\d+/,""); // remove milliseconds + s = s.replace(/-/,"/").replace(/-/,"/"); + s = s.replace(/T/," ").replace(/Z/," UTC"); + s = s.replace(/([\+\-]\d\d)\:?(\d\d)/," $1$2"); // -04:00 -> -0400 + return new Date(s); + }, + datetime: function(elem) { + var iso8601 = $t.isTime(elem) ? $(elem).attr("datetime") : $(elem).attr("title"); + return $t.parse(iso8601); + }, + isTime: function(elem) { + // jQuery's `is()` doesn't play well with HTML5 in IE + return $(elem).get(0).tagName.toLowerCase() === "time"; // $(elem).is("time"); + } + }); + + $.fn.timeago = function() { + var self = this; + self.each(refresh); + + var $s = $t.settings; + if ($s.refreshMillis > 0) { + setInterval(function() { self.each(refresh); }, $s.refreshMillis); + } + return self; + }; + + function refresh() { + var data = prepareData(this); + if (!isNaN(data.datetime)) { + $(this).text(inWords(data.datetime)); + } + return this; + } + + function prepareData(element) { + element = $(element); + if (!element.data("timeago")) { + element.data("timeago", { datetime: $t.datetime(element) }); + var text = $.trim(element.text()); + if (text.length > 0 && !($t.isTime(element) && element.attr("title"))) { + element.attr("title", text); + } + } + return element.data("timeago"); + } + + function inWords(date) { + return $t.inWords(distance(date)); + } + + function distance(date) { + return (new Date().getTime() - date.getTime()); + } + + // fix for IE6 suckage + document.createElement("abbr"); + document.createElement("time"); + }(jQuery)); }; // vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax: diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index e972e2d3f28..fe371de5728 100644 --- a/addons/mail/static/src/xml/mail.xml +++ b/addons/mail/static/src/xml/mail.xml @@ -97,7 +97,7 @@ · - +

        From 86b2f33f712d04a0088cf940a9858d92c329dd9e Mon Sep 17 00:00:00 2001 From: Antonin Bourguignon Date: Wed, 20 Jun 2012 19:47:43 +0200 Subject: [PATCH 199/232] [IMP] slightly refactor timeago.js for l18n's sake bzr revid: abo@openerp.com-20120620174743-s603skiqcisu2yhm --- addons/mail/i18n/fr.po | 34 +++++++++++++++++++-- addons/mail/static/src/js/mail.js | 51 +++++++++++++++++++------------ 2 files changed, 62 insertions(+), 23 deletions(-) diff --git a/addons/mail/i18n/fr.po b/addons/mail/i18n/fr.po index 9062a02c6d4..8ac20093e62 100644 --- a/addons/mail/i18n/fr.po +++ b/addons/mail/i18n/fr.po @@ -166,17 +166,17 @@ msgstr "" #. module: mail #: view:mail.message:0 field:mail.message,state:0 msgid "State" -msgstr "" +msgstr "État" #. module: mail #: view:mail.message:0 msgid "Reply" -msgstr "" +msgstr "Répondre" #. module: mail #: view:mail.message:0 selection:mail.message,state:0 msgid "Sent" -msgstr "" +msgstr "Envoyé" #. module: mail #: help:mail.compose.message,subtype:0 help:mail.message,subtype:0 @@ -514,6 +514,34 @@ msgstr "" msgid "Preferred response address for the message" msgstr "Adresse de réponse préférée pour le message" +#. openerp-web +msgid "about a minute ago" +msgstr "il y a une minute" + +#. openerp-web +msgid "%d minutes ago" +msgstr "il y a %d minutes" + +#. openerp-web +msgid "a day ago" +msgstr "il y a un jour" + +#. openerp-web +msgid "%d days ago" +msgstr "il y a %d jours" + +#. openerp-web +msgid "a month ago" +msgstr "il y a un mois" + +#. openerp-web +msgid "%d months ago" +msgstr "il y a %d mois" + +#. openerp-web +msgid "History and Comments" +msgstr "Historique et commentaires" + #~ msgid "Text contents" #~ msgstr "Contenu du texte" diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js index d3d67d0f6ee..cbc3ef518bc 100644 --- a/addons/mail/static/src/js/mail.js +++ b/addons/mail/static/src/js/mail.js @@ -841,10 +841,13 @@ openerp.mail = function(session) { var call_done = this.ds_users.call('message_append_note', [[this.session.uid], 'Tweet', body_text, false, 'comment', 'html']).then(this.proxy('init_and_fetch_comments')); }, }); - + + + /** * Compute relative time from a date (ISO format) * Code from http://timeago.yarp.com/ + * Please note that the library has been slightly refactored for i18n's sake. * * * @@ -910,33 +913,41 @@ openerp.mail = function(session) { suffix = $l.suffixFromNow; } } - + var seconds = Math.abs(distanceMillis) / 1000; var minutes = seconds / 60; var hours = minutes / 60; var days = hours / 24; var years = days / 365; - - function substitute(stringOrFunction, number) { + + function convert(stringOrFunction, number) { var string = $.isFunction(stringOrFunction) ? stringOrFunction(number, distanceMillis) : stringOrFunction; - var value = ($l.numbers && $l.numbers[number]) || number; - return string.replace(/%d/i, value); + + // return the proper string and the numeric value that goes in it + return stringAndNumber = {'string': string, 'value': ($l.numbers && $l.numbers[number]) || number}; } - - var words = seconds < 45 && substitute($l.seconds, Math.round(seconds)) || - seconds < 90 && substitute($l.minute, 1) || - minutes < 45 && substitute($l.minutes, Math.round(minutes)) || - minutes < 90 && substitute($l.hour, 1) || - hours < 24 && substitute($l.hours, Math.round(hours)) || - hours < 42 && substitute($l.day, 1) || - days < 30 && substitute($l.days, Math.round(days)) || - days < 45 && substitute($l.month, 1) || - days < 365 && substitute($l.months, Math.round(days / 30)) || - years < 1.5 && substitute($l.year, 1) || - substitute($l.years, Math.round(years)); - + + var stringAndNumber = seconds < 45 && convert($l.seconds, Math.round(seconds)) || + seconds < 90 && convert($l.minute, 1) || + minutes < 45 && convert($l.minutes, Math.round(minutes)) || + minutes < 90 && convert($l.hour, 1) || + hours < 24 && convert($l.hours, Math.round(hours)) || + hours < 42 && convert($l.day, 1) || + days < 30 && convert($l.days, Math.round(days)) || + days < 45 && convert($l.month, 1) || + days < 365 && convert($l.months, Math.round(days / 30)) || + years < 1.5 && convert($l.year, 1) || + convert($l.years, Math.round(years)); + + var string = stringAndNumber.string; + var value = stringAndNumber.value; var separator = $l.wordSeparator === undefined ? " " : $l.wordSeparator; - return $.trim([prefix, words, suffix].join(separator)); + + // compose and translate the final string + var finalString = $.trim([prefix, string, suffix].join(separator)); + var translatedFinalString = _.str.sprintf(_t(finalString), value); + + return translatedFinalString; }, parse: function(iso8601) { var s = $.trim(iso8601); From 04448834bab55b53da17314a7400020ec3831a66 Mon Sep 17 00:00:00 2001 From: "Sbh (Openerp)" Date: Thu, 21 Jun 2012 14:54:49 +0530 Subject: [PATCH 200/232] [REVERT] revert changes of test_osv_expression.yml bzr revid: sbh@tinyerp.com-20120621092449-bz1bzdadrl13t50j --- .../addons/base/test/test_osv_expression.yml | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/openerp/addons/base/test/test_osv_expression.yml b/openerp/addons/base/test/test_osv_expression.yml index 0165b61b275..0fe6c98c359 100644 --- a/openerp/addons/base/test/test_osv_expression.yml +++ b/openerp/addons/base/test/test_osv_expression.yml @@ -75,7 +75,7 @@ Trying the "in" operator, for scalar value - !python {model: res.partner }: | - ids = self.search(cr, uid, [('parent_id','=','Agrolait')]) + ids = self.search(cr, uid, [('parent_id','in','Agrolait')]) assert len(ids) >= 1, ids - Trying the "in" operator for list value @@ -229,7 +229,7 @@ res_0.sort() res_1 = self.search(cr, uid, [('parent_id', 'not in', [max_partner_id + 1])]) # get all rows, included null parent_id res_1.sort() - res_2 = self.search(cr, uid, [('parent_id', '!=', False)]) # get rows with not null parent_id, deprecated syntax + res_2 = self.search(cr, uid, [('parent_id', 'not in', False)]) # get rows with not null parent_id, deprecated syntax res_2.sort() res_3 = self.search(cr, uid, [('parent_id', 'not in', [])]) # get all rows, included null parent_id res_3.sort() @@ -249,7 +249,7 @@ res_5.sort() res_6 = self.search(cr, uid, [('parent_id', 'in', [max_partner_id + 1])]) res_6.sort() - res_7 = self.search(cr, uid, [('parent_id', '=', False)]) + res_7 = self.search(cr, uid, [('parent_id', 'in', False)]) res_7.sort() res_8 = self.search(cr, uid, [('parent_id', 'in', [])]) res_8.sort() @@ -270,7 +270,7 @@ res_10.sort() res_11 = self.search(cr, uid, ['!', ('parent_id', 'in', [max_partner_id + 1])]) res_11.sort() - res_12 = self.search(cr, uid, ['!', ('parent_id', '=', False)]) + res_12 = self.search(cr, uid, ['!', ('parent_id', 'in', False)]) res_12.sort() res_13 = self.search(cr, uid, ['!', ('parent_id', 'in', [])]) res_13.sort() @@ -291,7 +291,7 @@ res_16.sort() assert res_16 == partner_ids - res_17 = self.search(cr, uid, [('website', '!=', False)]) + res_17 = self.search(cr, uid, [('website', 'not in', False)]) res_17.sort() assert res_17 == with_website @@ -306,21 +306,21 @@ assert res_101 == [], 'res_101: expected %r, got %r' % ([], res_101) assert res_102 == company_ids, 'res_102: expected %r, got %r' % (company_ids, res_102) - - Property of the query (one2many != False). + Property of the query (one2many not in False). - !python {model: res.currency }: | ids = self.search(cr, uid, []) referenced_companies = set([x.company_id.id for x in self.browse(cr, uid, ids)]) - companies = set(self.pool.get('res.company').search(cr, uid, [('currency_ids', '!=', False)])) + companies = set(self.pool.get('res.company').search(cr, uid, [('currency_ids', 'not in', False)])) assert referenced_companies == companies - - Property of the query (one2many = False). + Property of the query (one2many in False). - !python {model: res.currency }: | ids = self.search(cr, uid, []) referenced_companies = set([x.company_id.id for x in self.browse(cr, uid, ids)]) unreferenced_companies = set(self.pool.get('res.company').search(cr, uid, [])).difference(referenced_companies) - companies = set(self.pool.get('res.company').search(cr, uid, [('currency_ids', '=', False)])) + companies = set(self.pool.get('res.company').search(cr, uid, [('currency_ids', 'in', False)])) assert unreferenced_companies == companies - Equivalent queries. @@ -331,7 +331,7 @@ res_1 = self.search(cr, uid, [('name', 'not like', 'probably_unexisting_name')]) res_2 = self.search(cr, uid, [('id', 'not in', [max_currency_id + 1003])]) res_3 = self.search(cr, uid, [('id', 'not in', [])]) - res_4 = self.search(cr, uid, [('id', '!=', False)]) + res_4 = self.search(cr, uid, [('id', 'not in', False)]) res_0.sort() res_1.sort() res_2.sort() @@ -414,7 +414,7 @@ # get the companies referenced by some currency (this is normally the main company) res_10 = self.search(cr, uid, [('currency_ids', 'not like', 'probably_unexisting_name')]) res_11 = self.search(cr, uid, [('currency_ids', 'not in', [max_currency_id + 1])]) - res_12 = self.search(cr, uid, [('currency_ids', '!=', False)]) + res_12 = self.search(cr, uid, [('currency_ids', 'not in', False)]) res_13 = self.search(cr, uid, [('currency_ids', 'not in', [])]) res_10.sort() res_11.sort() @@ -526,5 +526,3 @@ !python {model: res.partner }: | res_ids = self.search(cr, uid, [('child_ids.country_id','=','Belgium'),('active','=',False)]) assert len(res_ids) != 0, "Record not Found with country Belgium and active False." - - From c7ea0c3761e6a4be80209f4f1b0b8798cf4bded6 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 21 Jun 2012 11:55:23 +0200 Subject: [PATCH 201/232] [IMP] Code styling bzr revid: fme@openerp.com-20120621095523-tfc8r2pan80f9a3i --- addons/web_dashboard/static/src/js/dashboard.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js index a27c5f30bb5..e08113d02ab 100644 --- a/addons/web_dashboard/static/src/js/dashboard.js +++ b/addons/web_dashboard/static/src/js/dashboard.js @@ -231,14 +231,14 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({ } }, renderElement: function() { - var self = this; var check = _.detect(this.node.children, function(column, column_index) { return _.detect(column.children,function(element){ return element.tag === "action"? element: false; }); }); - if (!check) - return self.no_result(); + if (!check) { + return this.no_result(); + } // We should start with three columns available for (var i = this.node.children.length; i < 3; i++) { this.node.children.push({ @@ -250,8 +250,8 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({ var rendered = QWeb.render(this.form_template, this); this.$element.html(rendered); }, - no_result: function () { - if (this.view.options.action.help){ + no_result: function() { + if (this.view.options.action.help) { this.$element.append( $('
        ') .append($('', { src: '/web_dashboard/static/src/img/view_todo_arrow.png' })) From 2a640918c7332c8102793706531015ebfd417672 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Thu, 21 Jun 2012 13:19:33 +0200 Subject: [PATCH 202/232] [FIX] potential problem with create & edit in m2o, it should not set a default_name bzr revid: nicolas.vanhoren@openerp.com-20120621111933-s9wmabv4bh8p7n1n --- addons/web/static/src/js/view_form.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 12651148a0c..9a2b2b8bdb1 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2409,7 +2409,7 @@ instance.web.form.CompletionFieldMixin = { } // create... values.push({label: _t("   Create and Edit..."), action: function() { - self._search_create_popup("form", undefined, {"default_name": search_val}); + self._search_create_popup("form", undefined, {}); }}); return values; From 7a48f76737f3b4d90935b1546236139ec144cb3c Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 21 Jun 2012 13:34:45 +0200 Subject: [PATCH 203/232] [FIX] Fixed oe_form_field_boolean css bzr revid: fme@openerp.com-20120621113445-u7gx1ztrwxc7tn5d --- addons/web/static/src/css/base.css | 1 + addons/web/static/src/css/base.sass | 1 + 2 files changed, 2 insertions(+) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index e381ca5b573..05217f8e10a 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1806,6 +1806,7 @@ } .openerp .oe_form .oe_form_field_boolean { padding-top: 4px; + width: auto; } .openerp .oe_form .oe_form_field_many2manytags .text-wrap { width: 100% !important; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 7b54f079ddb..c34cec6b1b1 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1438,6 +1438,7 @@ $colour4: #8a89ba white-space: nowrap .oe_form_field_boolean padding-top: 4px + width: auto .oe_form_field_many2manytags .text-wrap width: 100% !important From c8e5450ba3a0976b84777a89b4e1142abbf7af13 Mon Sep 17 00:00:00 2001 From: Antonin Bourguignon Date: Thu, 21 Jun 2012 14:48:43 +0200 Subject: [PATCH 204/232] [IMP] use the default openerp dropdown menu implementation. also improve markup (ul.oe_mail_wall_threads is now a list of li.oe_mail_wall_thread) more markup and css improvements to come bzr revid: abo@openerp.com-20120621124843-klk1oy2rxdcd08uh --- addons/mail/static/src/css/mail.css | 78 ++++------------------------- addons/mail/static/src/js/mail.js | 14 +++--- addons/mail/static/src/xml/mail.xml | 31 ++++++------ 3 files changed, 34 insertions(+), 89 deletions(-) diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css index 2a253154fde..41f1331ef6f 100644 --- a/addons/mail/static/src/css/mail.css +++ b/addons/mail/static/src/css/mail.css @@ -170,7 +170,7 @@ margin-left: 66px; } -.openerp div.oe_mail_thread_subthread li.oe_mail_thread_msg:last-child { +.openerp div.oe_mail_thread_subthread .oe_mail_thread_msg:last-child { margin-bottom: 8px; } @@ -179,13 +179,13 @@ border-bottom: 1px solid #D2D9E7; } -.openerp li.oe_mail_thread_msg:after { +.openerp .oe_mail_thread_msg:after { content: ""; display: block; clear: both; } -.openerp li.oe_mail_thread_msg > div:after { +.openerp .oe_mail_thread_msg > div:after { content: ""; display: block; clear: both; @@ -246,15 +246,6 @@ /* Styling (should be openerp) */ /* ------------------------------ */ -.openerp ul.oe_mail { - padding: 0; - margin: 0; -} - -.openerp li.oe_mail { - list-style-type: none; -} - .openerp input.oe_mail, textarea.oe_mail { width: 432px; padding: 4px; @@ -291,7 +282,7 @@ } /* ------------------------------ */ -/* New layouts' style */ +/* Messages layout */ /* ------------------------------ */ .openerp .oe_mail_msg .oe_mail_msg_title { @@ -325,64 +316,20 @@ font-weight: bold; } -/* Gear menu */ -.openerp .oe_mail_msg_content a.oe_gear_menuaction { +/* Dropdown menu */ +.openerp .oe_mail_msg_content .oe_dropdown_toggle { position: absolute; top: 0px; right: 3px; - display: none; - color: #4c4c4c; - cursor: pointer; } -.openerp .oe_mail_msg_content:hover .oe_gear_menuaction { - display: block; +.openerp .oe_mail_msg_content .oe_dropdown_arrow:after { + border-top: 4px solid transparent; } -.openerp .oe_mail_msg_content a.oe_gear_menuaction:hover { - text-decoration: none; -} -.openerp .oe_mail_msg_content ul.oe_gear_menu { - list-style-type: none; - display: none; - position: absolute; - top: 30px; - right: -140px; - padding: 4px; - border: 1px solid #afafb6; - min-width: 160px; - overflow-x: hidden; - z-index: 900; - background: white; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); - -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); - -box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); -} -.openerp .oe_mail_msg_content ul.oe_gear_menu > li { - float: none; -} -.openerp .oe_mail_msg_content .oe_gear_menu > li > a { - display: block; - padding: 3px 6px; - line-height: 14px; - color: #4c4c4c; - text-decoration: none; -} -.openerp .oe_mail_msg_content .oe_gear_menu > li > a:hover { - background: #f0f0fa; - background: -moz-linear-gradient(#f0f0fa, #eeeef6); - background: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6)); - background: -webkit-linear-gradient(#f0f0fa, #eeeef6); - -moz-box-shadow: none; - -webkit-box-shadow: none; - -box-shadow: none; -} -.openerp .oe_mail_msg_content .oe_gear_menu p { - margin-left: 12px; +.openerp .oe_mail_msg_content:hover .oe_dropdown_arrow:after { + border-top: 4px solid #404040; } -/* Attachments */ +/* Attachments list */ .openerp ul.oe_mail_msg_attachments { display: none; width: 100%; @@ -397,6 +344,3 @@ padding: 0; list-style-type: square; } - - - diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js index cbc3ef518bc..9b209c137a2 100644 --- a/addons/mail/static/src/js/mail.js +++ b/addons/mail/static/src/js/mail.js @@ -182,7 +182,7 @@ openerp.mail = function(session) { var msg_id = event.srcElement.dataset.id; if (! msg_id) return false; var call_defer = self.ds_msg.unlink([parseInt(msg_id)]); - $(event.srcElement).parents('li.oe_mail_thread_msg').eq(0).hide(); + $(event.srcElement).parents('.oe_mail_thread_msg').eq(0).hide(); if (self.params.thread_level > 0) { $(event.srcElement).parents('ul.oe_mail_thread').eq(0).hide(); } @@ -196,9 +196,9 @@ openerp.mail = function(session) { if (! msg_id) return false; //console.log(msg_id); var call_defer = self.ds.call('message_remove_pushed_notifications', [[self.params.res_id], [parseInt(msg_id)], true]); - $(event.srcElement).parents('li.oe_mail_thread_msg').eq(0).hide(); + $(event.srcElement).parents('.oe_mail_thread_msg').eq(0).hide(); if (self.params.thread_level > 0) { - $(event.srcElement).parents('ul.oe_mail_thread').eq(0).hide(); + $(event.srcElement).parents('.oe_mail_thread').eq(0).hide(); } return false; }); @@ -300,7 +300,7 @@ openerp.mail = function(session) { self.display_comment(record); self.thread = new mail.Thread(self, {'res_model': self.params.res_model, 'res_id': self.params.res_id, 'uid': self.params.uid, 'records': sub_msgs, 'thread_level': (self.params.thread_level-1), 'parent_id': record.id}); - self.$element.find('li.oe_mail_thread_msg:last').append('
        '); + self.$element.find('.oe_mail_thread_msg:last').append('
        '); self.thread.appendTo(self.$element.find('div.oe_mail_thread_subthread:last')); } else if (self.params.thread_level == 0) { @@ -749,7 +749,7 @@ openerp.mail = function(session) { this.search['context'] = _.extend(this.params.context, this.search_results.context); this.display_show_more = true; this.comments_structure = {'root_ids': [], 'new_root_ids': [], 'msgs': {}, 'tree_struct': {}, 'model_to_root_ids': {}}; - this.$element.find('div.oe_mail_wall_threads').empty(); + this.$element.find('ul.oe_mail_wall_threads').empty(); return this.fetch_comments(this.params.limit, 0); }, @@ -782,13 +782,13 @@ openerp.mail = function(session) { var model_name = self.comments_structure.msgs[root_id]['model']; var res_id = self.comments_structure.msgs[root_id]['res_id']; var render_res = session.web.qweb.render('WallThreadContainer', {}); - $('
        ').html(render_res).appendTo(self.$element.find('div.oe_mail_wall_threads')); + $('
      • ').html(render_res).appendTo(self.$element.find('ul.oe_mail_wall_threads')); var thread = new mail.Thread(self, { 'res_model': model_name, 'res_id': res_id, 'uid': self.session.uid, 'records': records, 'parent_id': false, 'thread_level': self.params.thread_level, 'show_hide': true} ); self.thread_list.push(thread); - return thread.appendTo(self.$element.find('div.oe_mail_wall_thread:last')); + return thread.appendTo(self.$element.find('li.oe_mail_wall_thread:last')); }); // update TODO this.comments_structure['root_ids'] = _.union(this.comments_structure['root_ids'], this.comments_structure['new_root_ids']); diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index fe371de5728..a5d669a4f00 100644 --- a/addons/mail/static/src/xml/mail.xml +++ b/addons/mail/static/src/xml/mail.xml @@ -15,8 +15,8 @@
        • -
        -
        +
          +
        @@ -57,7 +57,7 @@
        -
      • +
        @@ -66,22 +66,23 @@
        -
        • +
        - B - +
        From e65eeb26b808881562ccf372b947c455b6cfdd6d Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 21 Jun 2012 15:07:58 +0200 Subject: [PATCH 205/232] [FIX] Fixed oe_inline. WARNING: We're using too much !important's bzr revid: fme@openerp.com-20120621130758-dgr0n3uksq4o1uh2 --- addons/web/static/src/css/base.css | 4 ++-- addons/web/static/src/css/base.sass | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 05217f8e10a..1bc566db860 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -215,8 +215,8 @@ .openerp .oe_bold { font-weight: bold; } -.openerp .oe_inline  { - width: auto; +.openerp .oe_inline { + width: auto !important; } .openerp .oe_highlight { color: white; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index c34cec6b1b1..07026bc69d1 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -220,8 +220,8 @@ $colour4: #8a89ba color: #888 .oe_bold font-weight: bold - .oe_inline  - width: auto + .oe_inline + width: auto !important .oe_highlight color: white background: #DC5F59 From f91d828ef55e018096f71b5ee553a944881551a4 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 21 Jun 2012 15:47:44 +0200 Subject: [PATCH 206/232] [FIX] Removed duplicate field in tasks form view bzr revid: fme@openerp.com-20120621134744-7qiwzfxcim8p0ba9 --- addons/project/project_view.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index d9cba469bc4..7588de7348f 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -361,7 +361,6 @@ - From e0f324ac25b0f89065c39bec8b6d216f0365009d Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 21 Jun 2012 16:06:42 +0200 Subject: [PATCH 207/232] [FIX] field text width bzr revid: fme@openerp.com-20120621140642-s96lwuycykbxo719 --- addons/web/static/src/css/base.css | 2 +- addons/web/static/src/css/base.sass | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 1bc566db860..b5276c982d6 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1720,7 +1720,7 @@ .openerp .oe_form .oe_form_field_selection select { width: inherit; } -.openerp .oe_form .oe_form_sheet textarea { +.openerp .oe_form .oe_form_field_text.oe_inline, .openerp .oe_form .oe_form_field_text.oe_inline > textarea { width: 500px; } .openerp .oe_form .oe_form_field_float input { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 07026bc69d1..4db214a7a48 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1378,7 +1378,7 @@ $colour4: #8a89ba .oe_form_field_text textarea, .oe_form_field_selection select width: inherit - .oe_form_sheet textarea + .oe_form_field_text.oe_inline, .oe_form_field_text.oe_inline > textarea width: 500px .oe_form_field_float input width: 100px From b821d42061465fe6f49449cecc2e87c2b57079da Mon Sep 17 00:00:00 2001 From: Antonin Bourguignon Date: Thu, 21 Jun 2012 17:00:02 +0200 Subject: [PATCH 208/232] [IMP] properly prefix templates names with 'mail.' use 'main' and 'aside' instead of 'left' and 'right' in the mail main boxes' class names bzr revid: abo@openerp.com-20120621150002-u7saes5bc06bt51l --- addons/mail/static/src/css/mail.css | 69 ++++++++++++++++++----------- addons/mail/static/src/js/mail.js | 20 ++++----- addons/mail/static/src/xml/mail.xml | 16 +++---- 3 files changed, 60 insertions(+), 45 deletions(-) diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css index 41f1331ef6f..e9b2b8ebd79 100644 --- a/addons/mail/static/src/css/mail.css +++ b/addons/mail/static/src/css/mail.css @@ -9,35 +9,19 @@ background: white; } -.openerp div.oe_mail_wall_act { +.openerp div.oe_mail_wall_action { padding: 8px; background: #eee; border: 1px solid #ccc; } -.openerp div.oe_mail_wall_act:after { +.openerp div.oe_mail_wall_action:after { content: ""; display: block; clear: both; } -/* 2 columns view */ -.openerp div.oe_mail_wall_left { - float: left; - width: 560px; - margin: 8px; -} - -.openerp div.oe_mail_wall_right { - margin-left: 565px; - margin: 8px; -} - -.openerp div.oe_mail_wall_threads { - margin-top: 8px; -} - -.openerp textarea.oe_mail_wall_action_textarea { +.openerp .oe_mail_wall_action textarea { width: 474px; height: 60px; padding: 4px; @@ -45,11 +29,31 @@ float: right; } -.openerp div.oe_mail_wall_threads textarea { +/* 2 columns view */ +.openerp div.oe_mail_wall_main { + float: left; + width: 560px; + margin: 8px; +} + +.openerp div.oe_mail_wall_aside { + margin-left: 565px; + margin: 8px; +} + +/* Threads */ +.openerp .oe_mail_wall_threads { + margin-top: 8px; +} +.openerp .oe_mail_wall_threads textarea { height: 40px; padding: 4px; } +.openerp .oe_mail_wall_thread:first .oe_mail_msg_notification { + border-top: 0; +} + .openerp div.oe_mail_thread_subthread img { width: 28px; height: 28px; @@ -149,14 +153,14 @@ /* ThreadDisplay */ /* ------------------------------ */ -.openerp div.oe_mail_thread_act { +.openerp div.oe_mail_thread_action { white-space: normal; padding: 8px; background: #eee; - border-top: 1px solid #ccc + border-top: 1px solid #ccc; } -.openerp div.oe_mail_thread_act:after { +.openerp div.oe_mail_thread_action:after { content: ""; display: block; clear: both; @@ -191,13 +195,22 @@ clear: both; } -.openerp .oe_mail_msg_notification, .openerp .oe_mail_msg_comment, .openerp .oe_mail_msg_email { +.openerp .oe_mail_msg_notification, +.openerp .oe_mail_msg_comment, +.openerp .oe_mail_msg_email { padding: 8px; } -.openerp .oe_mail_msg_comment, .openerp .oe_mail_msg_email, .openerp .oe_mail_msg_notification { +.openerp .oe_mail_msg_comment, +.openerp .oe_mail_msg_email, +.openerp .oe_mail_msg_notification { background: white; - border-top: 1px solid #ccc + border-top: 1px solid #ccc; +} +.openerp .oe_mail_wall_threads > .oe_mail_wall_thread:first-child > .oe_mail_msg_comment, +.openerp .oe_mail_wall_threads > .oe_mail_wall_thread:first-child > .oe_mail_msg_email, +.openerp .oe_mail_wall_threads > .oe_mail_wall_thread:first-child > .oe_mail_msg_notification { + border-top: 0; } .openerp .oe_email_icon { @@ -209,7 +222,9 @@ background: #eee; } -.openerp .oe_mail_msg_notification:after, .openerp .oe_mail_msg_comment:after, .openerp .oe_mail_msg_email:after { +.openerp .oe_mail_msg_notification:after, +.openerp .oe_mail_msg_comment:after, +.openerp .oe_mail_msg_email:after { content: ""; display: block; clear: both; diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js index 9b209c137a2..7339af7c612 100644 --- a/addons/mail/static/src/js/mail.js +++ b/addons/mail/static/src/js/mail.js @@ -72,7 +72,7 @@ openerp.mail = function(session) { * either it will fetch [limit] messages related to [res_model]:[res_id]. */ mail.Thread = session.web.Widget.extend({ - template: 'Thread', + template: 'mail.Thread', /** * @param {Object} parent parent @@ -122,7 +122,7 @@ openerp.mail = function(session) { this._super.apply(this, arguments); // customize display if (! this.display.show_post_comment) { - this.$element.find('div.oe_mail_thread_act').hide(); + this.$element.find('div.oe_mail_thread_action').hide(); } // add events this.add_events(); @@ -171,7 +171,7 @@ openerp.mail = function(session) { }); // event: click on 'reply' in msg this.$element.find('div.oe_mail_thread_display').delegate('a.oe_mail_msg_reply', 'click', function (event) { - var act_dom = $(this).parents('div.oe_mail_thread_display').find('div.oe_mail_thread_act:first'); + var act_dom = $(this).parents('div.oe_mail_thread_display').find('div.oe_mail_thread_action:first'); act_dom.toggle(); event.preventDefault(); }); @@ -184,7 +184,7 @@ openerp.mail = function(session) { var call_defer = self.ds_msg.unlink([parseInt(msg_id)]); $(event.srcElement).parents('.oe_mail_thread_msg').eq(0).hide(); if (self.params.thread_level > 0) { - $(event.srcElement).parents('ul.oe_mail_thread').eq(0).hide(); + $(event.srcElement).parents('.oe_mail_thread').eq(0).hide(); } return false; }); @@ -539,7 +539,7 @@ openerp.mail = function(session) { /* ThreadView widget: thread of comments */ mail.RecordThread = session.web.form.AbstractField.extend({ // QWeb template to use when rendering the object - template: 'RecordThread', + template: 'mail.RecordThread', init: function() { this._super.apply(this, arguments); @@ -581,7 +581,7 @@ openerp.mail = function(session) { this._super.apply(this, arguments); var self = this; this.reinit(); - if (! this.view.datarecord.id) { this.$element.find('ul.oe_mail_thread').hide(); return; } + if (! this.view.datarecord.id) { this.$element.find('.oe_mail_thread').hide(); return; } // fetch followers var fetch_sub_done = this.fetch_subscribers(); // create and render Thread widget @@ -645,7 +645,7 @@ openerp.mail = function(session) { /* WallView widget: a wall of messages */ mail.WallView = session.web.Widget.extend({ - template: 'Wall', + template: 'mail.Wall', /** * @param {Object} parent parent @@ -695,7 +695,7 @@ openerp.mail = function(session) { add_event_handlers: function () { var self = this; // post a comment - this.$element.find('button.oe_mail_wall_button_comment').click(function () { return self.do_comment(); }); + this.$element.find('.oe_mail_wall_action button').click(function () { return self.do_comment(); }); // display more threads this.$element.find('button.oe_mail_wall_button_more').click(function () { return self.do_more(); }); }, @@ -781,7 +781,7 @@ openerp.mail = function(session) { var records = self.comments_structure.tree_struct[root_id]['for_thread_msgs']; var model_name = self.comments_structure.msgs[root_id]['model']; var res_id = self.comments_structure.msgs[root_id]['res_id']; - var render_res = session.web.qweb.render('WallThreadContainer', {}); + var render_res = session.web.qweb.render('mail.WallThreadContainer', {}); $('
      • ').html(render_res).appendTo(self.$element.find('ul.oe_mail_wall_threads')); var thread = new mail.Thread(self, { 'res_model': model_name, 'res_id': res_id, 'uid': self.session.uid, 'records': records, @@ -835,7 +835,7 @@ openerp.mail = function(session) { /** Action: Posts a comment */ do_comment: function () { - var comment_node = this.$element.find('textarea.oe_mail_wall_action_textarea'); + var comment_node = this.$element.find('.oe_mail_wall_action textarea'); var body_text = comment_node.val(); comment_node.val(''); var call_done = this.ds_users.call('message_append_note', [[this.session.uid], 'Tweet', body_text, false, 'comment', 'html']).then(this.proxy('init_and_fetch_comments')); diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index a5d669a4f00..7f74f3f5d80 100644 --- a/addons/mail/static/src/xml/mail.xml +++ b/addons/mail/static/src/xml/mail.xml @@ -1,15 +1,15 @@