odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE]merge and remove conflicts 

bzr revid: sgo@tinyerp.com-20120528130727-d2czzzkspgwib2vd
This commit is contained in:
Sanjay Gohel (Open ERP) 2012-05-28 18:37:27 +05:30
parent 0e90703ad0 250702de4c
commit 911f71dd85
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/account_analytic_analysis/account_analytic_analysis_view.xml
View File

@ -44,10 +44,6 @@
<field name="pricelist_id" />
<field name="to_invoice" widget="selection" />
</group>
<separator colspan="4" string="Terms and Condition"/>
<group colspan="4" >
<field colspan="4" name="description" nolabel="1"/>
</group>
</xpath>
<xpath expr='//group[@name="contract"]' position="after">
<group col="6" colspan="3" class="oe_form_group_label_border">

5
addons/analytic/analytic.py
View File

@ -184,13 +184,12 @@ class account_analytic_account(osv.osv):
}, 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={}
if partner_id:
part = self.pool.get('res.partner').browse(cr, uid, partner_id,context=context)
res['name'] = part.name
if part.user_id:
res['user_id'] = part.user_id.id
if part.user_id:res['user_id'] = part.user_id.id
return {'value': res}
def _default_company(self, cr, uid, context=None):

2
addons/analytic/analytic_view.xml
View File

@ -28,6 +28,8 @@
<group colspan="2" col="2" name="project" class="oe_form_group_label_border">
<separator colspan="2" string="Project" name="project_sep" invisible="1"/>
</group>
<separator string="Terms and Condition" colspan="4"/>
<field colspan="4" name="description" nolabel="1"/>
</page>
</notebook>
</sheet>

9
addons/hr_timesheet_invoice/hr_timesheet_invoice.py
View File

@ -79,12 +79,11 @@ class account_analytic_account(osv.osv):
'pricelist_id': lambda self, cr, uid, ctx: ctx.get('pricelist_id', False),
'use_timesheets' : True,
}
def on_change_partner_id(self, cr, uid, id, partner_id, context={}):
res=super(account_analytic_account,self).on_change_partner_id(cr, uid, id, partner_id, context=context)
part = self.pool.get('res.partner').browse(cr, uid, partner_id)
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)
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
if pricelist:res['value']['pricelist_id'] = pricelist
return res
def set_close(self, cr, uid, ids, context=None):