- You will also find several configuration options on your company data:
- address for the header and footer, overdue payments texts, etc.
+
+
+
+
+
+
+
+
+
+
+
+
@@ -51,22 +66,47 @@
sale.config.settings
form
-
diff --git a/addons/base_setup/res_partner_view.xml b/addons/base_setup/res_partner_view.xml
index 9a19a7e4666..5aa24b3474d 100644
--- a/addons/base_setup/res_partner_view.xml
+++ b/addons/base_setup/res_partner_view.xml
@@ -1,3 +1,4 @@
+
diff --git a/addons/base_setup/static/src/css/base_setup.css b/addons/base_setup/static/src/css/base_setup.css
new file mode 100644
index 00000000000..4e4b8a3c00a
--- /dev/null
+++ b/addons/base_setup/static/src/css/base_setup.css
@@ -0,0 +1,24 @@
+/* Remove bold from labels in config wizards */
+.oe_form_configuration .oe_form_group td:last-child .oe_form_label_help,
+.oe_form_configuration .oe_form_group td:last-child .oe_form_label {
+ font-weight: normal;
+}
+
+/* Separate .eo_link elements from the rest of the label's text */
+.oe_form_configuration .oe_form_group td:last-child .oe_link,
+.oe_form_configuration .oe_form_group td:last-child .oe_separate-from-text {
+ position: relative;
+ left: 2em;
+}
+.oe_form_configuration .oe_form_group td:last-child .oe_link:before,
+.oe_form_configuration .oe_form_group td:last-child .oe_separate-from-text:before {
+ content:"—";
+ padding-right: 1em;
+ color: grey;
+
+ /* Prevent the pseudo element's content to behave like its parent element */
+ position: absolute;
+ right: 100%;
+ bottom: 0; /* Parent element's height can vary */
+ pointer-events: none;
+}
diff --git a/addons/board/board.py b/addons/board/board.py
index 6c28aa33c40..985bc3cd09a 100644
--- a/addons/board/board.py
+++ b/addons/board/board.py
@@ -38,51 +38,15 @@ class board_board(osv.osv):
@param ids: List of Board's IDs
@return: arch of xml view.
"""
- board = self.pool.get('board.board').browse(cr, uid, ids, context=context)
- left = []
- right = []
- #start Loop
- for line in board.line_ids:
- linestr = '
- """ % ('\n'.join(left), '\n'.join(right))
-
+ """
return arch
- def write(self, cr, uid, ids, vals, context=None):
-
- """
- Writes values in one or several fields.
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param ids: List of Board's IDs
- @param vals: dictionary with values to update.
- dictionary must be with the form: {‘name_of_the_field’: value, ...}.
- @return: True
- """
- result = super(board_board, self).write(cr, uid, ids, vals, context=context)
-
- board = self.pool.get('board.board').browse(cr, uid, ids[0], context=context)
- view = self.create_view(cr, uid, ids[0], context=context)
- id = board.view_id.id
- cr.execute("update ir_ui_view set arch=%s where id=%s", (view, id))
- return result
-
def create(self, cr, user, vals, context=None):
"""
create new record.
@@ -106,7 +70,6 @@ class board_board(osv.osv):
})
super(board_board, self).write(cr, user, [id], {'view_id': view_id}, context)
-
return id
def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None,\
@@ -131,7 +94,6 @@ class board_board(osv.osv):
res['toolbar'] = {'print': [], 'action': [], 'relate': []}
return res
-
def _arch_preprocessing(self, cr, user, arch, context=None):
from lxml import etree
def remove_unauthorized_children(node):
@@ -150,13 +112,9 @@ class board_board(osv.osv):
archnode = etree.fromstring(encode(arch))
return etree.tostring(remove_unauthorized_children(archnode),pretty_print=True)
-
-
-
_columns = {
'name': fields.char('Dashboard', size=64, required=True),
'view_id': fields.many2one('ir.ui.view', 'Board View'),
- 'line_ids': fields.one2many('board.board.line', 'board_id', 'Action Views')
}
# the following lines added to let the button on dashboard work.
@@ -164,26 +122,4 @@ class board_board(osv.osv):
'name':lambda *args: 'Dashboard'
}
-class board_line(osv.osv):
- """
- Board Line
- """
- _name = 'board.board.line'
- _description = "Board Line"
- _order = 'position,sequence'
- _columns = {
- 'name': fields.char('Title', size=64, required=True),
- 'sequence': fields.integer('Sequence', help="Gives the sequence order\
- when displaying a list of board lines.", select=True),
- 'height': fields.integer('Height'),
- 'width': fields.integer('Width'),
- 'board_id': fields.many2one('board.board', 'Dashboard', required=True, ondelete='cascade'),
- 'action_id': fields.many2one('ir.actions.act_window', 'Action', required=True),
- 'position': fields.selection([('left','Left'),
- ('right','Right')], 'Position', required=True, select=True)
- }
- _defaults = {
- 'position': lambda *args: 'left'
- }
-
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/board/board_mydashboard_view.xml b/addons/board/board_mydashboard_view.xml
index f03e13499af..9d7e27d57d8 100644
--- a/addons/board/board_mydashboard_view.xml
+++ b/addons/board/board_mydashboard_view.xml
@@ -24,14 +24,19 @@
form
menu
- This is your personal dashboard.
- To customize it, go to any view in OpenERP, fill in the desired search filter,
- and click on 'Add to Dashboard' in the search options.
- The view will appear as an element in your dashboard.
- <p>
- You can drag and drop the elements to get your preferred dashboard layout.
- Click on the cross (in the upper right corner) to remove an element.
+
+
+
+ Your personal dashboard is empty.
+
+ To add your first report into this dashboard, go to any
+ menu, switch to list or graph view, and click 'Add to
+ Dashboard' in the extended search options.
+
+ You can filter and group data before inserting into the
+ dashboard using the search options.
+
+
diff --git a/addons/board/board_view.xml b/addons/board/board_view.xml
index bf8da9d0b5a..4a72b2f714a 100644
--- a/addons/board/board_view.xml
+++ b/addons/board/board_view.xml
@@ -9,7 +9,6 @@
@@ -33,28 +32,16 @@
form
-
@@ -70,8 +57,8 @@
+ groups="base.group_no_one"
+ sequence="2"/>
diff --git a/addons/board/security/ir.model.access.csv b/addons/board/security/ir.model.access.csv
index bc9e0844923..ec9d2e89f4b 100644
--- a/addons/board/security/ir.model.access.csv
+++ b/addons/board/security/ir.model.access.csv
@@ -1,5 +1,3 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_board_board all,board.board,model_board_board,,1,0,0,0
-access_board_board_line all,board.board.line,model_board_board_line,,1,0,0,0
access_board_board system,board.board system,model_board_board,base.group_system,1,1,1,1
-access_board_board_line system,board.board.line system,model_board_board_line,base.group_system,1,1,1,1
diff --git a/addons/board/wizard/board_menu_create.py b/addons/board/wizard/board_menu_create.py
index 3c46c7e4092..8c7909767f0 100644
--- a/addons/board/wizard/board_menu_create.py
+++ b/addons/board/wizard/board_menu_create.py
@@ -40,10 +40,6 @@ class board_menu_create(osv.osv_memory):
"""
data = context and context.get('active_id', False) or False
if data:
- board = self.pool.get('board.board').browse(cr, uid, data, context=context)
- if not board.line_ids:
- raise osv.except_osv(_('User Error!'),
- _('Please Insert Dashboard View(s) !'))
return False
@@ -67,6 +63,19 @@ class board_menu_create(osv.osv_memory):
'view_mode': 'form',
'res_model': 'board.board',
'view_id': board.view_id.id,
+ 'help': _('''
+
+ This dashboard is empty.
+
+ To add the first report into this dashboard, go to any
+ menu, switch to list or graph view, and click 'Add to
+ Dashboard' in the extended search options.
+
+ You can filter and group data before inserting into the
+ dashboard using the search options.
+
+
+ ''')
})
obj_menu = self.pool.get('ir.ui.menu')
#start Loop
@@ -74,7 +83,6 @@ class board_menu_create(osv.osv_memory):
obj_menu.create(cr, uid, {
'name': data.menu_name,
'parent_id': data.menu_parent_id.id,
- 'icon': 'STOCK_SELECT_COLOR',
'action': 'ir.actions.act_window,' + str(action_id)
}, context=context)
#End Loop
diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml
index 02025ab5261..a45a2231738 100644
--- a/addons/caldav/caldav_view.xml
+++ b/addons/caldav/caldav_view.xml
@@ -159,15 +159,15 @@
@@ -178,7 +178,6 @@
basic.calendar
form
tree,form
-
"Calendars" allow you to Customize calendar event and todo attribute with any of OpenERP model.Caledars provide iCal Import/Export functionality.Webdav server that provides remote access to calendar.Help You to synchronize Meeting with Calendars client.You can access Calendars using CalDAV clients, like sunbird, Calendar Evaluation, Mobile.
diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml
index d73939c759e..2d648295b6d 100644
--- a/addons/crm/board_crm_view.xml
+++ b/addons/crm/board_crm_view.xml
@@ -23,7 +23,7 @@
crm.lead.report
graph
-
+
@@ -65,16 +65,6 @@
{'search_default_Stage':1}
-
- Meetings
- crm.meeting
- calendar,tree,form,gantt
- {"calendar_default_user_id":uid}
- [('state','=','open'),('date','>',datetime.date.today().strftime("%Y-%m-%d %H:%M:%S"))]
-
-
CRM - Statistical Dashboard Form
board.board
@@ -85,7 +75,6 @@
+
+
+
+
+
website
@@ -23,21 +36,9 @@
Module CRM has been installed
- From the top menu Sales, manage your sales pipeline: leads,
- opportunities, meetings, phone calls, and customers. OpenERP
- ensures that all cases are successfully tracked by all parties.
- It can automatically send reminders, escalate requests, trigger
- specific methods and lots of other actions based on your own
- enterprise rules.
+ From the top menu Sales, you can: trace leads and opportunities, get accurate forecast on your sales pipeline, plan meetings and phonecalls, get realtime statistics and efficiently organize the communication with your prospects.
- In the Sales settings, you can configure an email gateway to
- automatically create leads from messages sent on a particular
- email address.
-
- To manage quotations and sale orders, install the module "Sales
- Management". With this module, you will be able to create
- quotations directly from opportunities.
-
+To manage quotations and sale orders, install the module "Sales Management".
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 3b6c6a19900..d5ec1309baa 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -245,7 +245,7 @@ class crm_lead(base_stage, osv.osv):
'company_currency': fields.related('company_id', 'currency_id', 'symbol', type='char', string='Company Currency', readonly=True),
'user_email': fields.related('user_id', 'user_email', type='char', string='User Email', readonly=True),
'user_login': fields.related('user_id', 'login', type='char', string='User Login', readonly=True),
-
+
# Fields for address, due to separation from crm and res.partner
'street': fields.char('Street', size=128),
'street2': fields.char('Street2', size=128),
@@ -278,7 +278,7 @@ class crm_lead(base_stage, osv.osv):
self.create_send_note(cr, uid, [obj_id], context=context)
return obj_id
- def onchange_stage_id(self, cr, uid, ids, stage_id, context={}):
+ def onchange_stage_id(self, cr, uid, ids, stage_id, context=None):
if not stage_id:
return {'value':{}}
stage = self.pool.get('crm.case.stage').browse(cr, uid, stage_id, context)
@@ -286,6 +286,14 @@ class crm_lead(base_stage, osv.osv):
return {'value':{}}
return {'value':{'probability': stage.probability}}
+ def on_change_partner(self, cr, uid, ids, partner_id, context=None):
+ result = {}
+ if partner_id:
+ partner = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
+ result = {'partner_name' : partner.name}
+ return {'value' : result}
+
+
def _check(self, cr, uid, ids=False, context=None):
""" Override of the base.stage method.
Function called by the scheduler to process cases for date actions
diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index 5f0912f058c..04758f4ffe0 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -10,13 +10,17 @@
{'default_type':'lead', 'stage_type':'lead'}
-
- <img src="http://www.thaicrmsoftware.com/wp-content/uploads/2011/11/lead-conversion.jpg" align="right" style="padding: 6px" width="306" height="223">
- <h2>Click here to create a Lead. </h2>
- <p>
- A lead is usually the first step in your sales cycle.
- <p>
- Once qualified, a lead may be converted into a business opportunity, while creating the related partner for further detailed tracking of any linked activities.
+
+
+ Click to create an unqualified lead.
+
+ A lead is usually the first step in your sales cycle. It can be
+ a contact with a new prospect, a company you target, a contact form
+ filled in your website, etc.
+
+ Once qualified, the lead can be converted into a business
+ opportunity and a new customer in your address book.
+
@@ -37,14 +41,23 @@
Opportunities
crm.lead
- kanban,tree,form,calendar
+ kanban,tree,graph,form,calendar
[('type','=','opportunity')]
{'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.
-
-You and your team(s) will be able to plan meetings and phone calls from opportunities, convert them into quotations, manage related documents, track all customer related activities, and much more.
+
+
+ Click to create a new opportunity.
+
+ OpenERP helps you keep track of your sales pipeline to follow
+ up potential sales and better forecast your future revenues.
+
+ You will be able to plan meetings and phone calls from
+ opportunities, convert them into quotations, attach related
+ documents, track all discussions, and much more.
+
+
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 2c139470fdf..d8dbe736553 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -51,7 +51,6 @@
@@ -64,7 +63,14 @@
crm.case.stage
form
Add specific stages to leads and opportunities allowing your sales to better organise their sales pipeline. Stages will allow them to easily track how a specific lead or opportunity is positioned in the sales cycle.
+
+
+ Click to set a new stage in your lead/opportunity pipeline.
+
+ Stages will allow salespersons to easily track how a specific
+ lead or opportunity is positioned in the sales cycle.
+
+
@@ -75,13 +81,22 @@
- Categories
+ Sales Tags
crm.case.categ
form
[('object_id.model', '=', 'crm.lead')]
- Create specific categories that fit your company's activities to better classify and analyse your leads and opportunities. Such categories could for instance reflect your product structure or the different types of sales you do.
+
+
+ Click to define a new sales tag.
+
+ Create specific tags that fit your company's activities
+ to better classify and analyse your leads and opportunities.
+ Such categories could for instance reflect your product
+ structure or the different types of sales you do.
+
+
-
-
-
-
-
@@ -187,6 +188,17 @@
icon="terp-mail-message-new" type="action" colspan="1"/>
-->
+
+
+
+
@@ -217,6 +229,20 @@
+
+
+ Opportunities
+ crm.lead
+ graph
+
+
+
+
+
+
+
Leads
@@ -351,44 +377,30 @@
search
-
-
@@ -454,9 +459,11 @@
@@ -604,56 +611,36 @@
search
-
-
diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index 5eada894074..ba8c4768c09 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -68,14 +68,18 @@
[]
{}
-
- Click on "Create" to log a new call.
- <p>
- This tool allows you to log your calls on the fly.
- <p>
- From this feature, you can trigger a request for another call, a meeting or an opportunity.
+
+
+ Click to log the summary of a phone call.
+
+ OpenERP allows you to log inbound calls on the fly to track the
+ history of the communication with a customer or to inform another
+ team member.
+
+ In order to follow up on the call, you can trigger a request for
+ another call, a meeting or an opportunity.
+
-
@@ -112,12 +116,16 @@
[('state','!=','done')]
- Click here to schedule a new call.
- <p>
- Scheduled calls list all the calls to be done by your sales team.
- <p>
- This information will be stored in the partner form to trace every contact you have with a customer.
+
+
+ Click to schedule a call
+
+ OpenERP allows you to easily define all the calls to be done
+ by your sales team and follow up based on their summary.
+
+ You can use the import feature to massicely import a new list of
+ prospects to qualify.
+
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index ac0fe3b4b98..f2c47ddee42 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -47,7 +47,14 @@
[('object_id.model', '=', 'crm.phonecall')]
Create specific phone call categories to better define the type of calls tracked in the system.
+
+
+ Click to add a new category.
+
+ Create specific phone call categories to better define the type of
+ calls tracked in the system.
+
+
search
-
-
diff --git a/addons/crm/crm_report_view.xml b/addons/crm/crm_report_view.xml
index c3ccde5360b..eaed4564424 100644
--- a/addons/crm/crm_report_view.xml
+++ b/addons/crm/crm_report_view.xml
@@ -69,15 +69,12 @@
search
-
-
+
@@ -157,14 +154,11 @@
search
-
-
+
@@ -229,14 +223,11 @@
search
-
-
+
@@ -318,14 +309,11 @@
search
-
-
+
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 3f6e97fa186..e3f7dfd500f 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -59,7 +59,18 @@
crm.case.channel
form
tree,form
-
Track from where is coming your leads and opportunities by creating specific channels that will be maintained at the creation of a document in the system. Some examples of channels can be: Website, Phone Call, Reseller, etc.
+
+
+ Click to define a new channel.
+
+ Use channels to track the soure of your leads and opportunities. Channels
+ are mostly used in reporting to analyse sales performance
+ related to marketing efforts.
+
+ Some examples of channels: company website, phone call
+ campaign, reseller, etc.
+
+
@@ -133,7 +144,15 @@
crm.case.section
form
-
Define a Sales Team to organize your different salesmen or sales departments into separate teams. Each team will work in its own list of opportunities, sales orders, etc. Each user can set a default team in his user preferences. The opportunities and sales order displayed, will automatically be filtered according to his team.
+
+
+ Click to define a new sales team.
+
+ Use sales team to organize your different salespersons or
+ departments into separate teams. Each team will work in
+ its own list of opportunities.
+
+
- Partners Segmentation
+ Contacts Segmentation
crm.segmentation
form
tree,form
- Create specific partner categories which you can assign to your partners to better manage your interactions with them. The segmentation tool is able to assign categories to partners according to criteria you set.
+
+
+ Click to define a new customer segmentation.
+
+ Create specific categories which you can assign to your
+ contacts to better manage your interactions with them. The
+ segmentation tool is able to assign categories to contacts
+ according to criteria you set.
+
+
+
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index f45b9d621da..9d0050be69c 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -70,47 +70,26 @@
search
-
-
-
-
- search
-
-
-
-
-
diff --git a/addons/crm/res_config.py b/addons/crm/res_config.py
index 563da4bd137..834a4dc7149 100644
--- a/addons/crm/res_config.py
+++ b/addons/crm/res_config.py
@@ -26,22 +26,22 @@ class crm_configuration(osv.osv_memory):
_inherit = ['sale.config.settings', 'fetchmail.config.settings']
_columns = {
- 'fetchmail_lead': fields.boolean("Create Leads from Incoming Mails",
+ 'fetchmail_lead': fields.boolean("create leads from incoming mails",
fetchmail_model='crm.lead', fetchmail_name='Incoming Leads',
help="""Allows you to configure your incoming mail server, and create leads from incoming emails."""),
- 'module_crm_caldav': fields.boolean("Caldav Synchronization",
+ 'module_crm_caldav': fields.boolean("applications with Caldav protocol",
help="""Use protocol caldav to synchronize meetings with other calendar applications (like Sunbird).
This installs the module crm_caldav."""),
- 'module_import_sugarcrm': fields.boolean("SugarCRM Import",
+ 'module_import_sugarcrm': fields.boolean("SugarCRM",
help="""Import SugarCRM leads, opportunities, users, accounts, contacts, employees, meetings, phonecalls, emails, project and project tasks data.
This installs the module import_sugarcrm."""),
- 'module_import_google': fields.boolean("Google Import",
+ 'module_import_google': fields.boolean("Google (Contacts and Calendar)",
help="""Import google contact in partner address and add google calendar events details in Meeting.
This installs the module import_google."""),
- 'module_wiki_sale_faq': fields.boolean("Install a Sales FAQ",
+ 'module_wiki_sale_faq': fields.boolean("share information with sales FAQ",
help="""This provides demo data, thereby creating a Wiki Group and a Wiki Page for Wiki Sale FAQ.
This installs the module wiki_sale_faq."""),
- 'module_google_map': fields.boolean("Google Maps on Customer",
+ 'module_google_map': fields.boolean("add google maps on customer",
help="""Locate customers on Google Map.
This installs the module google_map."""),
}
diff --git a/addons/crm/res_config_view.xml b/addons/crm/res_config_view.xml
index 96fa16eaa2d..c4e8b75f0d7 100644
--- a/addons/crm/res_config_view.xml
+++ b/addons/crm/res_config_view.xml
@@ -8,26 +8,56 @@
form
-
-
+
+
+
+
+
-
-
-
-
-
-
+
diff --git a/addons/crm/res_partner.py b/addons/crm/res_partner.py
index acf212a2305..31c45969f8e 100644
--- a/addons/crm/res_partner.py
+++ b/addons/crm/res_partner.py
@@ -46,6 +46,14 @@ class res_partner(osv.osv):
'meeting_count': fields.function(_opportunity_meeting_count, string="Meeting", type='integer', multi='opp_meet'),
}
+ def copy(self, cr, uid, record_id, default=None, context=None):
+ if default is None:
+ default = {}
+
+ default.update({'opportunity_ids': [], 'meeting_ids' : [], 'phonecall_ids' : []})
+
+ super(res_partner, self).copy(cr, uid, record_id, default, context)
+
def redirect_partner_form(self, cr, uid, partner_id, context=None):
search_view = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'view_res_partner_filter')
value = {
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 8ddf435138a..31040a33376 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -37,6 +37,7 @@
+
@@ -69,10 +70,17 @@
'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.
-
- You and your team(s) will be able to plan meetings and phone calls from opportunities, convert them into quotations, manage related documents, track all customer related activities, and much more.
+
+
+ Click to create an opportunity related to this customer.
+
+ Use opportunities to keep track of your sales pipeline, follow
+ up potential sales and better forecast your future revenues.
+
+ You will be able to plan meetings and phone calls from
+ opportunities, convert them into quotations, attach related
+ documents, track all discussions, and much more.
+
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 80e373160be..930c08408cd 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -15,7 +15,15 @@
[('object_id.model', '=', 'crm.claim')]
Create claim categories to better manage and classify your claims. Some example of claims can be: preventive action, corrective action.
+
+
+ Click to create a claim category.
+
+ Create claim categories to better manage and classify your
+ claims. Some example of claims can be: preventive action,
+ corrective action.
+
+
crm.claim.stage
form
You can create claim stages to categorize the status of every claim entered in the system. The stages define all the steps required for the resolution of a claim.
+
+
+ Click to setup a new stage in the processing of the claims.
+
+ You can create claim stages to categorize the status of every
+ claim entered in the system. The stages define all the steps
+ required for the resolution of a claim.
+
+
@@ -199,50 +215,22 @@
-
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index e92102f889d..adfb97a28f0 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -53,93 +53,43 @@
search
-
-
-
-
-
-
diff --git a/addons/crm_claim/res_config.py b/addons/crm_claim/res_config.py
index 05f7962e18b..cf260fcd163 100644
--- a/addons/crm_claim/res_config.py
+++ b/addons/crm_claim/res_config.py
@@ -26,7 +26,7 @@ class crm_claim_settings(osv.osv_memory):
_inherit = ['sale.config.settings', 'fetchmail.config.settings']
_columns = {
- 'fetchmail_claim': fields.boolean("Create Claims from Incoming Mails",
+ 'fetchmail_claim': fields.boolean("create claims from incoming mails",
fetchmail_model='crm.claim', fetchmail_name='Incoming Claims',
help="""Allows you to configure your incoming mail server, and create claims from incoming emails."""),
}
diff --git a/addons/crm_claim/res_config_view.xml b/addons/crm_claim/res_config_view.xml
index 327bf144544..043fd4f76b9 100644
--- a/addons/crm_claim/res_config_view.xml
+++ b/addons/crm_claim/res_config_view.xml
@@ -7,16 +7,16 @@
sale.config.settings
form
-
-
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 9e67a4001a7..7ee3f35d2a6 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -172,50 +172,24 @@
search
-
-
-
-
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index 5a3ed924567..028635b083c 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -77,74 +77,34 @@
search
-
-
-
-
-
-
diff --git a/addons/crm_helpdesk/crm_helpdesk_menu.xml b/addons/crm_helpdesk/crm_helpdesk_menu.xml
index 393428e091e..b70662e3339 100644
--- a/addons/crm_helpdesk/crm_helpdesk_menu.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_menu.xml
@@ -18,7 +18,18 @@
{"search_default_user_id":uid}
- Helpdesk and Support allow you to track your interventions. Select a customer, add notes and categorize interventions with partners if necessary. You can also assign a priority level. Use the OpenERP Issues system to manage your support activities. Issues can be connected to the email gateway: new emails may create issues, each of them automatically gets the history of the conversation with the customer.
+
+
+ Click to create a new request.
+
+ Helpdesk and Support allow you to track your interventions.
+
+ Use the OpenERP Issues system to manage your support
+ activities. Issues can be connected to the email gateway: new
+ emails may create issues, each of them automatically gets the
+ history of the conversation with the customer.
+
+
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 4c2d81f94e3..0fb0cbf825f 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -152,54 +152,24 @@
-
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index 6060c6c1f90..9aab23eab70 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -53,65 +53,34 @@
search
-
-
-
-
-
diff --git a/addons/crm_partner_assign/crm_lead_view.xml b/addons/crm_partner_assign/crm_lead_view.xml
index c45002c085c..258b16cea93 100644
--- a/addons/crm_partner_assign/crm_lead_view.xml
+++ b/addons/crm_partner_assign/crm_lead_view.xml
@@ -62,7 +62,6 @@
-
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 a9a0cf75d25..f88d7e91f00 100644
--- a/addons/crm_partner_assign/report/crm_lead_report_view.xml
+++ b/addons/crm_partner_assign/report/crm_lead_report_view.xml
@@ -9,72 +9,42 @@
search
-
-
-
+
-
-
+
+
-
-
+
diff --git a/addons/crm_partner_assign/report/crm_partner_report_view.xml b/addons/crm_partner_assign/report/crm_partner_report_view.xml
index d652848f0fe..af811f8f869 100644
--- a/addons/crm_partner_assign/report/crm_partner_report_view.xml
+++ b/addons/crm_partner_assign/report/crm_partner_report_view.xml
@@ -9,36 +9,30 @@
search
-
-
-
-
+
-
+
+
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 7a37cfcf4c6..464560a3c51 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -15,7 +15,7 @@
-
+
delivery.carrier.form
delivery.carrier
@@ -90,14 +90,26 @@
-
+
Delivery Method
ir.actions.act_window
delivery.carrier
form
tree,form
- Define the delivery methods you are using and their pricing in order to reinvoice the delivery costs when you are doing invoicing based on delivery orders
+
+
+ Click to define a new deliver method.
+
+ Each carrier (e.g. UPS) can have several delivery methods (e.g.
+ UPS Express, UPS Standard) with a set of pricing rules attached
+ to each method.
+
+ These methods allows to automaticaly compute the delivery price
+ according to your settings; on the sale order (based on the
+ quotation) or the invoice (based on the delivery orders).
+
+
@@ -152,7 +164,17 @@
delivery.grid
form
tree,form
- The delivery price list allows you to compute the cost and sales price of the delivery according to the weight of the products and other criteria. You can define several price lists for one delivery method, per country or a zone in a specific country defined by a postal code range.
+
+
+ Click to create a delivery price list for a specific region.
+
+ The delivery price list allows you to compute the cost and
+ sales price of the delivery according to the weight of the
+ products and other criteria. You can define several price lists
+ for each delivery method: per country or a zone in a specific
+ country defined by a postal code range.
+
+
@@ -299,7 +321,7 @@
stock.picking
-
+
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 1b1864cabe0..8dab7756b91 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -41,7 +41,6 @@
@@ -172,20 +171,15 @@
@@ -269,11 +263,7 @@
-
ir.actions.act_window
ir.attachment
form
- The Documents repository gives you access to all attachments, such as mails, project documents, invoices etc.
+
+
+ Click to create a new document.
+
+ The Documents repository gives you access to all attachments, such
+ as mails, project documents, invoices etc.
+
+
search
-
-
+
diff --git a/addons/document/wizard/document_configuration_view.xml b/addons/document/wizard/document_configuration_view.xml
index d924e471aca..47cc2c6da3d 100644
--- a/addons/document/wizard/document_configuration_view.xml
+++ b/addons/document/wizard/document_configuration_view.xml
@@ -1,3 +1,4 @@
+
@@ -29,15 +30,9 @@
form
new
-
-
- Knowledge Management
- 5
-
automatic
diff --git a/addons/document_ftp/ftpserver/ftpserver.py b/addons/document_ftp/ftpserver/ftpserver.py
index bd727427541..48ec4ad5ea0 100755
--- a/addons/document_ftp/ftpserver/ftpserver.py
+++ b/addons/document_ftp/ftpserver/ftpserver.py
@@ -5,7 +5,7 @@
# pyftpdlib is released under the MIT license, reproduced below:
# ======================================================================
# Copyright (C) 2007 Giampaolo Rodola'
-# Hacked by Fabien Pinckaers (C) 2008
+# Hacked by Fabien Pinckaers (C) 2008
#
# All Rights Reserved
#
diff --git a/addons/document_ftp/res_config_view.xml b/addons/document_ftp/res_config_view.xml
index 66f1c4ae944..a44d7af0c79 100644
--- a/addons/document_ftp/res_config_view.xml
+++ b/addons/document_ftp/res_config_view.xml
@@ -1,3 +1,4 @@
+
diff --git a/addons/document_ftp/wizard/ftp_configuration_view.xml b/addons/document_ftp/wizard/ftp_configuration_view.xml
index ed52a730023..95528b75594 100644
--- a/addons/document_ftp/wizard/ftp_configuration_view.xml
+++ b/addons/document_ftp/wizard/ftp_configuration_view.xml
@@ -1,3 +1,4 @@
+
@@ -35,10 +36,9 @@
form
new
-
+
automatic
diff --git a/addons/document_webdav/webdav_view.xml b/addons/document_webdav/webdav_view.xml
index 44af9f2af3a..35c37530f4d 100644
--- a/addons/document_webdav/webdav_view.xml
+++ b/addons/document_webdav/webdav_view.xml
@@ -38,10 +38,7 @@
search
-
search
-
search
-
-
-
diff --git a/addons/event/event.py b/addons/event/event.py
index 6a8cf9f8a0b..c3942642b3d 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -23,6 +23,7 @@ import time
from osv import fields, osv
from tools.translate import _
import decimal_precision as dp
+from openerp import SUPERUSER_ID
class event_type(osv.osv):
""" Event Type """
@@ -159,7 +160,7 @@ class event_event(osv.osv):
elif field == 'register_prospect':
number = reg_draft
elif field == 'register_avail':
- #the number of ticket is unlimited if the event.register_max field is not set.
+ #the number of ticket is unlimited if the event.register_max field is not set.
#In that cas we arbitrary set it to 9999, it is used in the kanban view to special case the display of the 'subscribe' button
number = event.register_max - reg_open if event.register_max != 0 else 9999
res[event.id][field] = number
@@ -178,7 +179,7 @@ class event_event(osv.osv):
if reg.state in ('open','done'):
res[event.id]= True
continue
- return res
+ return res
_columns = {
'name': fields.char('Name', size=64, required=True, translate=True, readonly=False, states={'done': [('readonly', True)]}),
@@ -189,7 +190,7 @@ class event_event(osv.osv):
'register_current': fields.function(_get_register, string='Confirmed Registrations', multi='register_numbers'),
'register_avail': fields.function(_get_register, string='Available Registrations', multi='register_numbers',type='integer'),
'register_prospect': fields.function(_get_register, string='Unconfirmed Registrations', multi='register_numbers'),
- 'register_attended': fields.function(_get_register, string='# of Participations', multi='register_numbers'),
+ 'register_attended': fields.function(_get_register, string='# of Participations', multi='register_numbers'),
'registration_ids': fields.one2many('event.registration', 'event_id', 'Registrations', readonly=False, states={'done': [('readonly', True)]}),
'date_begin': fields.datetime('Start Date', required=True, readonly=True, states={'draft': [('readonly', False)]}),
'date_end': fields.datetime('End Date', required=True, readonly=True, states={'draft': [('readonly', False)]}),
@@ -227,18 +228,18 @@ class event_event(osv.osv):
self.check_registration_limits_before(cr, uid, ids, num_of_seats, context=context)
user = user_pool.browse(cr, uid, uid, context=context)
curr_reg_ids = register_pool.search(cr, uid, [('user_id', '=', user.id), ('event_id', '=' , ids[0])])
- #the subscription is done with UID = 1 because in case we share the kanban view, we want anyone to be able to subscribe
+ #the subscription is done with SUPERUSER_ID because in case we share the kanban view, we want anyone to be able to subscribe
if not curr_reg_ids:
- curr_reg_ids = [register_pool.create(cr, 1, {'event_id': ids[0] ,'email': user.user_email, 'name':user.name, 'user_id': user.id, 'nb_register': num_of_seats})]
+ curr_reg_ids = [register_pool.create(cr, SUPERUSER_ID, {'event_id': ids[0] ,'email': user.user_email, 'name':user.name, 'user_id': user.id, 'nb_register': num_of_seats})]
else:
register_pool.write(cr, uid, curr_reg_ids, {'nb_register': num_of_seats}, context=context)
- return register_pool.confirm_registration(cr, 1, curr_reg_ids, context=context)
+ return register_pool.confirm_registration(cr, SUPERUSER_ID, curr_reg_ids, context=context)
def unsubscribe_to_event(self, cr, uid, ids, context=None):
register_pool = self.pool.get('event.registration')
- #the unsubscription is done with UID = 1 because in case we share the kanban view, we want anyone to be able to unsubscribe
- curr_reg_ids = register_pool.search(cr, 1, [('user_id', '=', uid), ('event_id', '=', ids[0])])
- return register_pool.button_reg_cancel(cr, 1, curr_reg_ids, context=context)
+ #the unsubscription is done with SUPERUSER_ID because in case we share the kanban view, we want anyone to be able to unsubscribe
+ curr_reg_ids = register_pool.search(cr, SUPERUSER_ID, [('user_id', '=', uid), ('event_id', '=', ids[0])])
+ return register_pool.button_reg_cancel(cr, SUPERUSER_ID, curr_reg_ids, context=context)
def _check_closing_date(self, cr, uid, ids, context=None):
for event in self.browse(cr, uid, ids, context=context):
@@ -260,7 +261,7 @@ class event_event(osv.osv):
'register_max': type_info.default_registration_max,
}
return {'value': dic}
-
+
# ----------------------------------------
# OpenChatter methods and notifications
# ----------------------------------------
@@ -415,7 +416,7 @@ class event_registration(osv.osv):
return {}
event_obj = self.pool.get('event.event')
data_event = event_obj.browse(cr, uid, event_id, context=context)
- return {'value':
+ return {'value':
{'event_begin_date': data_event.date_begin,
'event_end_date': data_event.date_end,
'company_id': data_event.company_id and data_event.company_id.id or False,
diff --git a/addons/event/event_data.xml b/addons/event/event_data.xml
index b34f9451f71..d8d75950bcc 100644
--- a/addons/event/event_data.xml
+++ b/addons/event/event_data.xml
@@ -1,15 +1,24 @@
+
+
+
+
Module Events Organisation has been installed
- Organize events and manage their registrations. You can
- automatically confirm and send acknowledgements of registrations
- by email.
-
+ From the top menu Events, you can organize events, manage registrations, automate communication around your event and sell events through your quotations.
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 890cb1be9e6..f3a0c5b321e 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -1,6 +1,7 @@
+
-
- Confirmed:
-
+
+ Confirmed:
+