From a15093819a441db1d85d0d7073898d3720f2cddb Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Wed, 12 May 2010 19:09:20 +0200 Subject: [PATCH] merge bzr revid: fp@tinyerp.com-20100512170920-0mgiujrnhkt5t6z7 --- .../account/project/analytic_account_demo.xml | 9 ++ .../board_crm/board_crm_statistical_view.xml | 2 +- addons/board_crm/board_crm_view.xml | 146 +++++++++--------- addons/crm/crm_report_view.xml | 42 ++--- addons/event/event_sequence.xml | 26 ++-- addons/hr_holidays/hr_holidays.py | 4 +- addons/sale_crm/process/sale_crm_process.xml | 17 +- addons/sale_crm/sale_crm.py | 2 +- addons/sale_crm/sale_crm_view.xml | 2 +- 9 files changed, 123 insertions(+), 127 deletions(-) diff --git a/addons/account/project/analytic_account_demo.xml b/addons/account/project/analytic_account_demo.xml index bb0738dbb65..98fcb8fa370 100644 --- a/addons/account/project/analytic_account_demo.xml +++ b/addons/account/project/analytic_account_demo.xml @@ -1,26 +1,35 @@ + + Analytic Chart + 0 + Leaves 1 + Internal 2 + Our Super Product 100 open + Project 1 101 + Project 2 102 + Training diff --git a/addons/board_crm/board_crm_statistical_view.xml b/addons/board_crm/board_crm_statistical_view.xml index 9a43e4e96c2..677dd3d0138 100644 --- a/addons/board_crm/board_crm_statistical_view.xml +++ b/addons/board_crm/board_crm_statistical_view.xml @@ -21,7 +21,7 @@ crm.opportunity.report graph - + diff --git a/addons/board_crm/board_crm_view.xml b/addons/board_crm/board_crm_view.xml index a0a816320df..94475a46a52 100644 --- a/addons/board_crm/board_crm_view.xml +++ b/addons/board_crm/board_crm_view.xml @@ -1,88 +1,88 @@ - - - CRM Configuration - - - crm.opportunity.user.graph1 - crm.opportunity.report - graph - - - - - - - - - crm.lead - form - tree,form - + + + CRM Configuration + + + crm.opportunity.user.graph1 + crm.opportunity.report + graph + + + + + + + + + crm.lead + form + tree,form + [('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')] - - - crm.meeting - form - tree,form - - [('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')] - - - - crm.lead.report - form - graph,tree,form - + + + crm.meeting + form + tree,form + [('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')] - + + + + crm.lead.report + form + graph,tree,form + + [('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')] + - - crm.opportunity.report - form - graph,tree,form - - [('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')] - + + crm.opportunity.report + form + graph,tree,form + + [('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')] + - - CRM - Dashboard Form - board.board - form - -
- + + CRM - Dashboard Form + board.board + form + + + - + - + - + - + - + - - + diff --git a/addons/crm/crm_report_view.xml b/addons/crm/crm_report_view.xml index 9535992ab6a..2992959bdd0 100644 --- a/addons/crm/crm_report_view.xml +++ b/addons/crm/crm_report_view.xml @@ -9,7 +9,7 @@ report.crm.case.section.categ2 tree - + @@ -31,7 +31,7 @@ report.crm.case.section.categ2 form - + @@ -49,11 +49,11 @@ - CRM Report - Sections and Type(Graph) + CRM Report - Teams and Type(Graph) report.crm.case.section.categ2 graph - + @@ -64,18 +64,18 @@ - CRM Report - Sections and Type(Select) + CRM Report - Teams and Type(Select) report.crm.case.section.categ2 search - + + help="Cases by Team and Type for this year" /> + help="Cases by Team and Type for this month" /> @@ -99,11 +99,11 @@ - CRM Report - Sections and Stage(Tree) + CRM Report - Teams and Stage(Tree) report.crm.case.section.stage tree - + @@ -120,11 +120,11 @@ - CRM Report - Sections and Stage(Form) + CRM Report - Teams and Stage(Form) report.crm.case.section.stage form - + @@ -141,11 +141,11 @@ - CRM Report - Sections and Stage(Graph) + CRM Report - Teams and Stage(Graph) report.crm.case.section.stage graph - + @@ -156,18 +156,18 @@ - CRM Report - Sections and Stage(Select) + CRM Report - Teams and Stage(Select) report.crm.case.section.stage search - + + help="Cases by Team and Stage for this year" /> + help="Cases by Team and Stage for this month" /> @@ -189,11 +189,11 @@ - CRM Report - Section, Category and Stage(Tree) + CRM Report - Team, Category and Stage(Tree) report.crm.case.section.categ.stage tree - + @@ -210,7 +210,7 @@ - CRM Report - Section, Category and Stage(Form) + CRM Report - Team, Category and Stage(Form) report.crm.case.section.categ.stage form diff --git a/addons/event/event_sequence.xml b/addons/event/event_sequence.xml index 52a41c11688..eb8d45137cf 100644 --- a/addons/event/event_sequence.xml +++ b/addons/event/event_sequence.xml @@ -2,20 +2,20 @@ - # - # Sequences for crm.case.section - # + # + # Sequences for crm.case.section + # - - Section Code - event.event - - - Section Code - event.event - C/ - 3 - + + Section Code + event.event + + + Section Code + event.event + C/ + 3 + diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py index cd0d86457d9..412d4218df8 100644 --- a/addons/hr_holidays/hr_holidays.py +++ b/addons/hr_holidays/hr_holidays.py @@ -73,7 +73,7 @@ class hr_holidays_status(osv.osv): 'name' : fields.char('Name', size=64, required=True, translate=True), 'categ_id': fields.many2one('crm.case.categ', 'Meeting Category', domain="[('object_id.model', '=', 'crm.meeting')]", help='If you link this type of leave with a category in the CRM, it will synchronize each leave asked with a case in this category, to display it in the company shared calendar for example.'), 'color_name' : fields.selection([('red', 'Red'), ('lightgreen', 'Light Green'), ('lightblue','Light Blue'), ('lightyellow', 'Light Yellow'), ('magenta', 'Magenta'),('lightcyan', 'Light Cyan'),('black', 'Black'),('lightpink', 'Light Pink'),('brown', 'Brown'),('violet', 'Violet'),('lightcoral', 'Light Coral'),('lightsalmon', 'Light Salmon'),('lavender', 'Lavender'),('wheat', 'Wheat'),('ivory', 'Ivory')],'Color in Report', required=True, help='This color will be used in the leaves summary located in Reporting\Leaves by Departement'), - 'limit' : fields.boolean('Allow to Override Limit', help='If you thick this checkbox, the system will allow, for this section, the employees to take more leaves than the available ones.'), + 'limit' : fields.boolean('Allow to Override Limit', help='If you thick this checkbox, the system will allow, for this team, the employees to take more leaves than the available ones.'), 'active' : fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the leave type without removing it."), 'max_leaves' : fields.function(_user_left_days, method=True, string='Maximum Leaves Allowed', help='This value is given by the sum of all holidays requests with a positive value.', multi='user_left_days'), 'leaves_taken' : fields.function(_user_left_days, method=True, string='Leaves Already Taken', help='This value is given by the sum of all holidays requests with a negative value.', multi='user_left_days'), @@ -200,7 +200,7 @@ class hr_holidays(osv.osv): if brows_obj.categ_id and brows_obj.categ_id.section_id and not brows_obj.categ_id.section_id.allow_unlink: warning = { 'title': "Warning for ", - 'message': "You won\'t be able to cancel this leave request because the CRM Section of the leave type disallows." + 'message': "You won\'t be able to cancel this leave request because the CRM Sales Team of the leave type disallows." } return {'warning': warning} diff --git a/addons/sale_crm/process/sale_crm_process.xml b/addons/sale_crm/process/sale_crm_process.xml index 1b469b32d46..44f78fcdd55 100644 --- a/addons/sale_crm/process/sale_crm_process.xml +++ b/addons/sale_crm/process/sale_crm_process.xml @@ -4,7 +4,6 @@ @@ -17,17 +16,6 @@ - - - - - - - - - - - @@ -49,9 +37,6 @@ - @@ -90,5 +75,7 @@ + --> + diff --git a/addons/sale_crm/sale_crm.py b/addons/sale_crm/sale_crm.py index bb4c2ba18ea..613d8af7b7a 100644 --- a/addons/sale_crm/sale_crm.py +++ b/addons/sale_crm/sale_crm.py @@ -25,7 +25,7 @@ class sale_order(osv.osv): _inherit = 'sale.order' _description = 'Sale orders' _columns = { - 'section_id': fields.many2one('crm.case.section', 'Section'), + 'section_id': fields.many2one('crm.case.section', 'Sales Team'), } def _get_section(self, cr, uid, context): diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml index f8242c18fbb..a9b2e4b8134 100644 --- a/addons/sale_crm/sale_crm_view.xml +++ b/addons/sale_crm/sale_crm_view.xml @@ -38,7 +38,7 @@ + help="My Sales Team"/>