diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index a1cc078642b..42953c70407 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -59,7 +59,7 @@
child_complete_ids
-
+
diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index aff71cfef7b..325867ca225 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -467,7 +467,7 @@ class account_analytic_account(osv.osv):
'charge_expenses' : fields.boolean('Charge Expenses'),
'month_ids': fields.function(_analysis_all, multi='analytic_analysis', type='many2many', relation='account_analytic_analysis.summary.month', string='Month'),
'user_ids': fields.function(_analysis_all, multi='analytic_analysis', type="many2many", relation='account_analytic_analysis.summary.user', string='User'),
- 'template_id':fields.many2one('account.analytic.account', 'Template Of Contract'),
+ 'template_id':fields.many2one('account.analytic.account', 'Template of Contract'),
'expense_invoiced' : fields.function(_expense_invoiced_calc, type="float"),
'expense_to_invoice' : fields.function(_expense_to_invoice_calc, type='float'),
'remaining_expense' : fields.function(_remaining_expnse_calc, type="float"),
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 772dcd57e12..dac62cf5e12 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -178,11 +178,12 @@ class account_analytic_account(osv.osv):
}, string='Currency', type='many2one', relation='res.currency'),
}
- def on_change_partner_id(self, cr, uid, ids,partner_id, context={}):
+ def on_change_partner_id(self, cr, uid, ids,partner_id, name, context={}):
res={}
if partner_id:
part = self.pool.get('res.partner').browse(cr, uid, partner_id,context=context)
- res['name'] = part.name
+ if not name:
+ res['name'] = part.name
if part.user_id:res['user_id'] = part.user_id.id
return {'value': res}
diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index c6b653698d7..376b1eb733b 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -11,11 +11,11 @@
-
+
-
+
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index 257fde74ce9..e83cd2c6d22 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -77,8 +77,8 @@ class account_analytic_account(osv.osv):
_defaults = {
'pricelist_id': lambda self, cr, uid, ctx: ctx.get('pricelist_id', False),
}
- def on_change_partner_id(self, cr, uid, ids,partner_id, context={}):
- res = super(account_analytic_account,self).on_change_partner_id(cr, uid, ids,partner_id, context=context)
+ def on_change_partner_id(self, cr, uid, ids,partner_id, name, context={}):
+ res = super(account_analytic_account,self).on_change_partner_id(cr, uid, ids,partner_id, name, context=context)
part = self.pool.get('res.partner').browse(cr, uid, partner_id,context=context)
pricelist = part.property_product_pricelist and part.property_product_pricelist.id or False
if pricelist:res['value']['pricelist_id'] = pricelist
diff --git a/addons/project/project.py b/addons/project/project.py
index 25997b1a91e..cd274f1cc5c 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -78,7 +78,7 @@ class project(osv.osv):
members = self.pool.get('res.users').browse(cr, uid, vals.get('members')[0][-1], context)
else:
members = project_id.members or False
- select = vals.get('privacy_visility') or project_id.privacy_visility or False
+ select = vals.get('privacy_visibility') or project_id.privacy_visibility or False
if select=='follower' and members:
member_list = [member.id for member in members]
followers = self.message_get_subscribers_ids(cr, uid, ids, context=context)
@@ -220,7 +220,7 @@ class project(osv.osv):
'type_ids': fields.many2many('project.task.type', 'project_task_type_rel', 'project_id', 'type_id', 'Tasks Stages', states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
'task_count': fields.function(_task_count, type='integer', string="Open Tasks"),
'color': fields.integer('Color Index'),
- 'privacy_visility': fields.selection([('public','Public'), ('follower','Followers Only')], 'Privacy / Visility', select=True),
+ 'privacy_visibility': fields.selection([('public','Public'), ('follower','Followers Only')], 'Privacy / Visibility', select=True),
}
def dummy(self, cr, uid, ids, context):
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 613461e0440..6918e476148 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -46,7 +46,7 @@
-
+
@@ -627,12 +627,6 @@
-