diff options
| author | Denis Ledoux dle@openerp.com <> | 2012-11-08 10:28:38 +0100 |
|---|---|---|
| committer | Denis Ledoux dle@openerp.com <> | 2012-11-08 10:28:38 +0100 |
| commit | 981168dfc6d628c72d8469022c0b51e0f5ec00df (patch) | |
| tree | e7497e1366dcd0b7759ed6eae9d2fa8b50ff46c5 /addons/analytic | |
| parent | 9e56b3b6a8a761e02099146b338225d29dbc8c8a (diff) | |
| parent | 29fffbc97d8970513114b7b76763f002aa73e395 (diff) | |
[ADD][MERGE]Add functionnalities, merge with trunk
bzr revid: dle@openerp.com-20121108092838-fe89ohg9za3ln6y1
Diffstat (limited to 'addons/analytic')
| -rw-r--r-- | addons/analytic/analytic.py | 7 | ||||
| -rw-r--r-- | addons/analytic/analytic_view.xml | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py index fea0e330143..78c7e103946 100644 --- a/addons/analytic/analytic.py +++ b/addons/analytic/analytic.py @@ -180,7 +180,7 @@ class account_analytic_account(osv.osv): 'partner_id': fields.many2one('res.partner', 'Customer'), 'user_id': fields.many2one('res.users', 'Project Manager'), 'manager_id': fields.many2one('res.users', 'Account Manager'), - 'date_start': fields.date('Date Start'), + 'date_start': fields.date('Start Date'), 'date': fields.date('Date End', select=True), 'company_id': fields.many2one('res.company', 'Company', required=False), #not required because we want to allow different companies to use the same chart of account, except for leaf accounts. 'state': fields.selection([('template', 'Template'),('draft','New'),('open','In Progress'), ('cancelled', 'Cancelled'),('pending','To Renew'),('close','Closed')], 'Status', required=True,), @@ -305,7 +305,10 @@ class account_analytic_account(osv.osv): def create_send_note(self, cr, uid, ids, context=None): for obj in self.browse(cr, uid, ids, context=context): - self.message_post(cr, uid, [obj.id], body=_("Contract for <em>%s</em> has been <b>created</b>.") % (obj.partner_id.name), + message = _("Contract <b>created</b>.") + if obj.partner_id: + message = _("Contract for <em>%s</em> has been <b>created</b>.") % (obj.partner_id.name,) + self.message_post(cr, uid, [obj.id], body=message, subtype="analytic.mt_account_status", context=context) account_analytic_account() diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml index 2c6136f2629..17371f8609f 100644 --- a/addons/analytic/analytic_view.xml +++ b/addons/analytic/analytic_view.xml @@ -23,11 +23,11 @@ <group> <field name="partner_id" on_change="on_change_partner_id(partner_id, name)"/> <field name="manager_id"/> - <field name="code"/> <field name="currency_id" attrs="{'invisible': ['|',('type', '<>', 'view'), ('company_id', '<>', False)]}"/> </group> <group> - <field name="type"/> + <field name="code"/> + <field name="type" invisible="context.get('default_type', False)"/> <field name="parent_id" on_change="on_change_parent(parent_id)" attrs="{'invisible': [('type','in',['contract','template'])]}"/> <field name="template_id" on_change="on_change_template(template_id,context)" domain="[('type','=','template')]" attrs="{'invisible': [('type','in',['view', 'normal','template'])]}" context="{'default_type' : 'template'}"/> <field name="company_id" on_change="on_change_company(company_id)" widget="selection" groups="base.group_multi_company" attrs="{'required': [('type','<>','view')]}"/> |