[IMP]:improved on_change code and add Terma and Condition in analytic view.
bzr revid: apa@tinyerp.com-20120528111830-znaex5pikedc3sn7
This commit is contained in:
parent
aeb03d8c4c
commit
250702de4c
|
@ -184,13 +184,12 @@ class account_analytic_account(osv.osv):
|
||||||
}, string='Currency', type='many2one', relation='res.currency'),
|
}, string='Currency', type='many2one', relation='res.currency'),
|
||||||
}
|
}
|
||||||
|
|
||||||
def on_change_partner_id(self, cr, uid, id, partner_id, context={}):
|
def on_change_partner_id(self, cr, uid, ids,partner_id, context={}):
|
||||||
res={}
|
res={}
|
||||||
if partner_id:
|
if partner_id:
|
||||||
part = self.pool.get('res.partner').browse(cr, uid, partner_id,context=context)
|
part = self.pool.get('res.partner').browse(cr, uid, partner_id,context=context)
|
||||||
res['name'] = part.name
|
res['name'] = part.name
|
||||||
if part.user_id:
|
if part.user_id:res['user_id'] = part.user_id.id
|
||||||
res['user_id'] = part.user_id.id
|
|
||||||
return {'value': res}
|
return {'value': res}
|
||||||
|
|
||||||
def _default_company(self, cr, uid, context=None):
|
def _default_company(self, cr, uid, context=None):
|
||||||
|
|
|
@ -28,6 +28,8 @@
|
||||||
<group colspan="2" col="2" name="project" class="oe_form_group_label_border">
|
<group colspan="2" col="2" name="project" class="oe_form_group_label_border">
|
||||||
<separator colspan="2" string="Project" name="project_sep" invisible="1"/>
|
<separator colspan="2" string="Project" name="project_sep" invisible="1"/>
|
||||||
</group>
|
</group>
|
||||||
|
<separator string="Terms and Condition" colspan="4"/>
|
||||||
|
<field colspan="4" name="description" nolabel="1"/>
|
||||||
</page>
|
</page>
|
||||||
</notebook>
|
</notebook>
|
||||||
</sheet>
|
</sheet>
|
||||||
|
|
|
@ -77,12 +77,11 @@ class account_analytic_account(osv.osv):
|
||||||
_defaults = {
|
_defaults = {
|
||||||
'pricelist_id': lambda self, cr, uid, ctx: ctx.get('pricelist_id', False),
|
'pricelist_id': lambda self, cr, uid, ctx: ctx.get('pricelist_id', False),
|
||||||
}
|
}
|
||||||
def on_change_partner_id(self, cr, uid, id, partner_id, context={}):
|
def on_change_partner_id(self, cr, uid, ids,partner_id, context={}):
|
||||||
res=super(account_analytic_account,self).on_change_partner_id(cr, uid, id, partner_id, context=context)
|
res = super(account_analytic_account,self).on_change_partner_id(cr, uid, ids,partner_id, context=context)
|
||||||
part = self.pool.get('res.partner').browse(cr, uid, partner_id)
|
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
|
pricelist = part.property_product_pricelist and part.property_product_pricelist.id or False
|
||||||
if pricelist:
|
if pricelist:res['value']['pricelist_id'] = pricelist
|
||||||
res['value']['pricelist_id'] = pricelist
|
|
||||||
return res
|
return res
|
||||||
|
|
||||||
def set_close(self, cr, uid, ids, context=None):
|
def set_close(self, cr, uid, ids, context=None):
|
||||||
|
|
|
@ -7,9 +7,6 @@
|
||||||
<field name="type">form</field>
|
<field name="type">form</field>
|
||||||
<field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
|
<field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<field name="partner_id" position="replace">
|
|
||||||
<field name="partner_id" on_change="on_change_partner_id(partner_id)" required="True"/>
|
|
||||||
</field>
|
|
||||||
<group name="contract" position="after">
|
<group name="contract" position="after">
|
||||||
<group colspan="2" col="2" name="invoice_data">
|
<group colspan="2" col="2" name="invoice_data">
|
||||||
<separator colspan="2" string="Invoicing Data"/>
|
<separator colspan="2" string="Invoicing Data"/>
|
||||||
|
|
Loading…
Reference in New Issue