diff --git a/addons/account/configurable_account_chart.xml b/addons/account/configurable_account_chart.xml
index a6b271bedcb..73cb4499e20 100644
--- a/addons/account/configurable_account_chart.xml
+++ b/addons/account/configurable_account_chart.xml
@@ -154,7 +154,7 @@
1104
Bank Current Account
- other
+ view
diff --git a/addons/account/installer.py b/addons/account/installer.py
index 81993908be9..1cbed3cd2a7 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -32,6 +32,11 @@ class account_installer(osv.osv_memory):
_name = 'account.installer'
_inherit = 'res.config.installer'
+ def _get_default_accounts(self, cr, uid, context=None):
+ accounts = [{'acc_name':'Current','account_type':'cash'},
+ {'acc_name':'Deposit','account_type':'cash'}]
+ return accounts
+
def _get_charts(self, cr, uid, context=None):
modules = self.pool.get('ir.module.module')
ids = modules.search(cr, uid, [('category_id','=','Account Charts')])
@@ -77,6 +82,7 @@ class account_installer(osv.osv_memory):
'sale_tax':lambda *a:0.0,
'purchase_tax':lambda *a:0.0,
'charts':'configurable',
+ 'bank_accounts_id':_get_default_accounts
}
def on_change_start_date(self, cr, uid, id, start_date):
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/base_setup/base_setup_data.xml b/addons/base_setup/base_setup_data.xml
index 90d48de5eba..024accc77ce 100644
--- a/addons/base_setup/base_setup_data.xml
+++ b/addons/base_setup/base_setup_data.xml
@@ -7,23 +7,25 @@
form
diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 2b4a870236a..7a543f5466f 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -8,7 +8,7 @@
diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index eb108aef229..b348b0c8a60 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -11,7 +11,7 @@
Main Company Setup
- Information of your company will be used to custiomize your documents like Invoices, Sale Orders,...
+ Information of your company will be used to custiomise your documents like Invoices, Sale Orders,...
Configure Your Company
diff --git a/addons/base_setup/gtk_contact_form.py b/addons/base_setup/gtk_contact_form.py
index b1d01cecb66..354080df451 100644
--- a/addons/base_setup/gtk_contact_form.py
+++ b/addons/base_setup/gtk_contact_form.py
@@ -46,10 +46,10 @@ class base_gtkcontactform(osv.osv_memory):
return defaults
_columns = {
- 'name':fields.char('Your Name', size=64, required=True),
+ 'name':fields.char('Your Name', size=64),
'job':fields.char('Job Title', size=64,),
- 'email':fields.char('E-mail', size=64, required=True),
- 'phone':fields.char('Phone', size=64, required=True),
+ 'email':fields.char('E-mail', size=64),
+ 'phone':fields.char('Phone', size=64),
'total_employees':fields.selection([('1-5','1-5'),('5-20','5-20'),('20-100','20-100'),('100-500','100-500'),('500','500+')], 'No Of Employees', size=32),
'industry':fields.selection([('apparel','Apparel'),('banking','Banking'),('biotechnology','Biotechnology'),('chemicals','Chemicals'),('communications','Communications'),
('construction','Construction'),('consulting','Consulting'),('education','Education'),('electronics','Electronics'),('energy','Energy'),('engineering','Engineering'),
diff --git a/addons/base_setup/gtk_contact_form.xml b/addons/base_setup/gtk_contact_form.xml
index c4fe08207dd..f833f7051d6 100644
--- a/addons/base_setup/gtk_contact_form.xml
+++ b/addons/base_setup/gtk_contact_form.xml
@@ -31,10 +31,10 @@
-
+
-
-
+
+
diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index 13b37c67e1f..a92d5ab4b97 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -93,9 +93,9 @@ class base_setup_installer(osv.osv_memory):
def onchange_moduleselection(self, cr, uid, ids, *args):
- progress = self._progress(cr, uid) - (2.5 * len(filter(lambda x: x==1, args)))
- if progress <= 5.0:
- progress = 5.0
+ progress = self._progress(cr, uid) - round((len(filter(lambda x: x==1, args)))*80/len(args))
+ if progress <= 10.0:
+ progress = 10.0
return {'value':{'progress':progress}}
def modules_to_install(self, cr, uid, ids, context=None):
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
-
-
- The base Human Resources addon will help you manage your employee roster, but your can enhance it even further by installing a few HR-related applications.
+ The base Human Resources addon will help you manage your employee roster, but you can enhance it even further by installing a few HR-related applications.
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index aace987b764..a5e2b981c24 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -248,7 +248,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/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py
index e89d52659f4..25c61483391 100644
--- a/addons/hr_timesheet/hr_timesheet.py
+++ b/addons/hr_timesheet/hr_timesheet.py
@@ -43,7 +43,8 @@ class hr_analytic_timesheet(osv.osv):
_inherits = {'account.analytic.line': 'line_id'}
_order = "id desc"
_columns = {
- 'line_id' : fields.many2one('account.analytic.line', 'Analytic line', ondelete='cascade'),
+ 'line_id' : fields.many2one('account.analytic.line', 'Analytic line', ondelete='cascade'),
+ 'partner_id': fields.related('account_id', 'partner_id', type='many2one', string='Partner Id',relation='account.analytic.account',store=True),
}
def unlink(self, cr, uid, ids, context={}):
diff --git a/addons/partner_crm/__init__.py b/addons/partner_infotab/__init__.py
similarity index 97%
rename from addons/partner_crm/__init__.py
rename to addons/partner_infotab/__init__.py
index 4dd1f496527..a0a034ec9c5 100644
--- a/addons/partner_crm/__init__.py
+++ b/addons/partner_infotab/__init__.py
@@ -19,7 +19,7 @@
#
##############################################################################
-import partner_crm
+import partner_infotab
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/partner_crm/__openerp__.py b/addons/partner_infotab/__openerp__.py
similarity index 94%
rename from addons/partner_crm/__openerp__.py
rename to addons/partner_infotab/__openerp__.py
index d5bc49b1e5c..db44ac70762 100644
--- a/addons/partner_crm/__openerp__.py
+++ b/addons/partner_infotab/__openerp__.py
@@ -21,7 +21,7 @@
{
- 'name': 'Detailed info on partner form',
+ 'name': 'Detailed information on partner form',
'version': '1.0',
'category': 'Generic Modules/Base',
'description': """
@@ -44,7 +44,7 @@ It adds the following fields on the partner form:
'init_xml': [],
'update_xml': [
'security/ir.model.access.csv',
- 'partner_crm_view.xml'
+ 'partner_infotab_view.xml'
],
'demo_xml': [],
'installable': True,
diff --git a/addons/partner_crm/partner_crm.py b/addons/partner_infotab/partner_infotab.py
similarity index 91%
rename from addons/partner_crm/partner_crm.py
rename to addons/partner_infotab/partner_infotab.py
index 2162f850115..f448919c2ea 100644
--- a/addons/partner_crm/partner_crm.py
+++ b/addons/partner_infotab/partner_infotab.py
@@ -33,6 +33,8 @@ class res_partner(osv.osv):
'invoice_ids': fields.one2many('account.invoice.line', 'partner_id', 'Invoices'),
'contract_ids': fields.one2many('account.analytic.account', \
'partner_id', 'Contracts'),
+ 'account_line_ids': fields.one2many('hr.analytic.timesheet', \
+ 'partner_id', 'Anaylitic account lines '),
}
res_partner()
diff --git a/addons/partner_crm/partner_crm_view.xml b/addons/partner_infotab/partner_infotab_view.xml
similarity index 61%
rename from addons/partner_crm/partner_crm_view.xml
rename to addons/partner_infotab/partner_infotab_view.xml
index ab75f5c58ed..8aabbb242e9 100644
--- a/addons/partner_crm/partner_crm_view.xml
+++ b/addons/partner_infotab/partner_infotab_view.xml
@@ -11,19 +11,19 @@
-
-
-
-
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/addons/partner_crm/security/ir.model.access.csv b/addons/partner_infotab/security/ir.model.access.csv
similarity index 100%
rename from addons/partner_crm/security/ir.model.access.csv
rename to addons/partner_infotab/security/ir.model.access.csv
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"/>