From eb15758cb49892287d4912d47fecb134b90f4699 Mon Sep 17 00:00:00 2001 From: "Khushboo Bhatt (Open ERP)" Date: Wed, 12 Sep 2012 15:48:39 +0530 Subject: [PATCH 1/5] [FIX]account_analytic_analysis:added menu tooltip on contract and template of contract bzr revid: kbh@tinyerp.com-20120912101839-lwgzfitz5qsjqvoo --- .../account_analytic_analysis_menu.xml | 11 ++++++++++- .../account_analytic_analysis_view.xml | 10 ++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml index 9e5be21cf70..ef993b4cd9e 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml +++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml @@ -73,9 +73,18 @@ account.analytic.account form tree,form,graph - {'default_type':'contract'} + {'default_type':'contract', 'search_default_draft':1, 'search_default_pending':1, 'search_default_open':1, 'search_default_renew':1} [('type','=','contract')] + +

+ Click to create a new contract. +

+ You can use the way you invoice each contract (timesheet, fixed price, charge employees expenses). +

+ A template can be used to set automatically all invoicing information. +

+
tree,form
[('type','=','template')] {'search_default_type':'template','default_type' : 'template'} + +

+ Click here to create a Template of contract. +

+ Templates are used to prefigure contract/project that + can be selected by the salespoeple to create their customer + contract/project from the menu Sales/Contracts. +

+
+ From 2b937d693c0dce98b2cea3a10b5771b9bf3cde78 Mon Sep 17 00:00:00 2001 From: "Khushboo Bhatt (Open ERP)" Date: Wed, 12 Sep 2012 16:09:25 +0530 Subject: [PATCH 2/5] [FIX]account_analytic_analysis:current start date added in contract view bzr revid: kbh@tinyerp.com-20120912103925-8qirkjqfyfsv5xpc --- .../account_analytic_analysis_view.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml index d8fdca8b64e..e790467d4da 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml +++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml @@ -18,6 +18,16 @@ + +

+

+
+

+ +

+
+
- From efd9581812c70bda7c4bc93d296cfeeebba557f6 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Fri, 14 Sep 2012 15:01:26 +0530 Subject: [PATCH 5/5] [IMP] apply default group_analytic_account_for_sales bzr revid: tpa@tinyerp.com-20120914093126-81ihp3pltq37yav6 --- addons/account_analytic_analysis/__openerp__.py | 1 + .../security/account_analytic_analysis_security.xml | 10 ++++++++++ 2 files changed, 11 insertions(+) create mode 100644 addons/account_analytic_analysis/security/account_analytic_analysis_security.xml diff --git a/addons/account_analytic_analysis/__openerp__.py b/addons/account_analytic_analysis/__openerp__.py index 40b67289fb1..3e8c579b729 100644 --- a/addons/account_analytic_analysis/__openerp__.py +++ b/addons/account_analytic_analysis/__openerp__.py @@ -36,6 +36,7 @@ Adds menu to show relevant information to each manager.You can also view the rep 'depends': ['hr_timesheet_invoice', 'sale'], #although sale is technically not required to install this module, all menuitems are located under 'Sales' application 'data': [ 'security/ir.model.access.csv', + 'security/account_analytic_analysis_security.xml', 'account_analytic_analysis_view.xml', 'account_analytic_analysis_menu.xml', 'account_analytic_analysis_cron.xml', diff --git a/addons/account_analytic_analysis/security/account_analytic_analysis_security.xml b/addons/account_analytic_analysis/security/account_analytic_analysis_security.xml new file mode 100644 index 00000000000..8bcc7f2d7f0 --- /dev/null +++ b/addons/account_analytic_analysis/security/account_analytic_analysis_security.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file