[FIX]: Fix issue in sale module
bzr revid: aja@tinyerp.com-20121121043126-0ej6ij6f0dr7ysn8
This commit is contained in:
parent
d9d127403b
commit
277fbe16ae
|
@ -60,14 +60,13 @@
|
|||
or view
|
||||
</span>
|
||||
|
||||
<span attrs="{'invisible': [('fix_price_to_invoice','<>',0.0)]}" class="oe_grey">
|
||||
<span attrs="{'invisible': ['|',('fix_price_to_invoice','<>',0.0 ),('partner_id','=',False)]}" class="oe_grey">
|
||||
No order to invoice, create
|
||||
</span>
|
||||
<button name="%(action_sales_order)d" string="Sale Orders"
|
||||
<button name="%(action_sales_order)d" string="Sale Orders"
|
||||
type="action"
|
||||
class="oe_link"
|
||||
context="{'default_partner_id': [partner_id], 'search_default_partner_id': [partner_id],'search_default_project_id': [active_id],'default_project_id': [active_id]}"
|
||||
/>
|
||||
/></span>
|
||||
</td>
|
||||
</tr><tr>
|
||||
<td class="oe_timesheet_grey">
|
||||
|
|
|
@ -36,6 +36,7 @@
|
|||
<button
|
||||
name="open_hr_expense"
|
||||
class="oe_link"
|
||||
context="{'active_id': active_id}"
|
||||
string="expenses" type="object"/>
|
||||
</td>
|
||||
</tr>
|
||||
|
|
|
@ -71,7 +71,7 @@ class account_analytic_line(osv.osv):
|
|||
partner = account.partner_id
|
||||
if (not partner) or not (account.pricelist_id):
|
||||
raise osv.except_osv(_('Analytic Account incomplete !'),
|
||||
_('Please fill in the Partner or Customer and Sale Pricelist fields in the Analytic Account:\n%s.') % (account.name,))
|
||||
_('Contract form incomplete. Please fill in the Customer and Pricelist fields the contract form'))
|
||||
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue