[MERGE] with parent
bzr revid: fka@tinyerp.com-20130307111017-7uhh4ef7chk5f3jw
This commit is contained in:
commit
30bde6fd18
|
@ -56,7 +56,7 @@
|
||||||
<field class="oe_inline" name="remaining_ca" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
|
<field class="oe_inline" name="remaining_ca" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
|
||||||
</td><td>
|
</td><td>
|
||||||
<field class="oe_inline" name="fix_price_to_invoice" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
|
<field class="oe_inline" name="fix_price_to_invoice" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
|
||||||
</td><td attrs="{'invisible': [('fix_price_invoices','=',False)]}" class="oe_timesheet_action">
|
</td><td attrs="{'invisible': ['|',('fix_price_invoices','=',False),('type','=','template')]}" class="oe_timesheet_action">
|
||||||
<span attrs="{'invisible': [('fix_price_to_invoice','=',0.0)]}" class="oe_grey">
|
<span attrs="{'invisible': [('fix_price_to_invoice','=',0.0)]}" class="oe_grey">
|
||||||
<button name="open_sale_order_lines"
|
<button name="open_sale_order_lines"
|
||||||
class="oe_link"
|
class="oe_link"
|
||||||
|
@ -87,7 +87,7 @@
|
||||||
<field class="oe_inline" name="remaining_hours_to_invoice" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
|
<field class="oe_inline" name="remaining_hours_to_invoice" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
|
||||||
</td><td>
|
</td><td>
|
||||||
<field class="oe_inline" name="ca_to_invoice" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
|
<field class="oe_inline" name="ca_to_invoice" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
|
||||||
</td><td class="oe_timesheet_action" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}">
|
</td><td class="oe_timesheet_action" attrs="{'invisible': ['|',('invoice_on_timesheets','=',False),('type','=','template')]}">
|
||||||
<span attrs="{'invisible': [('ca_to_invoice','=',0.0)]}" class="oe_grey">
|
<span attrs="{'invisible': [('ca_to_invoice','=',0.0)]}" class="oe_grey">
|
||||||
<button name="%(hr_timesheet_invoice.action_hr_timesheet_invoice_create_final)d"
|
<button name="%(hr_timesheet_invoice.action_hr_timesheet_invoice_create_final)d"
|
||||||
type="action"
|
type="action"
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
<field class="oe_form_inline" name="remaining_expense" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
|
<field class="oe_form_inline" name="remaining_expense" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
|
||||||
</td><td>
|
</td><td>
|
||||||
<field class="oe_form_inline" name="expense_to_invoice" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
|
<field class="oe_form_inline" name="expense_to_invoice" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
|
||||||
</td><td attrs="{'invisible': [('charge_expenses','=',False)]}" class="oe_timesheet_action">
|
</td><td attrs="{'invisible': ['|',('charge_expenses','=',False),('type','=','template')]}" class="oe_timesheet_action">
|
||||||
<span attrs="{'invisible': [('expense_to_invoice','=',0)]}" class="oe_grey">
|
<span attrs="{'invisible': [('expense_to_invoice','=',0)]}" class="oe_grey">
|
||||||
<button
|
<button
|
||||||
name="hr_to_invoice_expense"
|
name="hr_to_invoice_expense"
|
||||||
|
|
|
@ -1021,17 +1021,4 @@ class account_invoice(osv.Model):
|
||||||
sale_order_obj.message_post(cr, uid, so_ids, body=_("Invoice paid"), context=context)
|
sale_order_obj.message_post(cr, uid, so_ids, body=_("Invoice paid"), context=context)
|
||||||
return res
|
return res
|
||||||
|
|
||||||
|
|
||||||
class stock_picking(osv.osv):
|
|
||||||
_inherit = 'stock.picking'
|
|
||||||
|
|
||||||
def action_done(self, cr, uid, ids, context=None):
|
|
||||||
""" Changes picking state to done. This method is called at the end of
|
|
||||||
the workflow by the activity "done".
|
|
||||||
"""
|
|
||||||
for record in self.browse(cr, uid, ids, context):
|
|
||||||
if record.type == "out" and record.sale_id:
|
|
||||||
self.pool.get('sale.order').message_post(cr, uid, [record.sale_id.id], body=_("Products delivered"), context=context)
|
|
||||||
return super(stock_picking, self).action_done(cr, uid, ids, context=context)
|
|
||||||
|
|
||||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
##############################################################################
|
##############################################################################
|
||||||
|
|
||||||
from openerp.osv import fields, osv
|
from openerp.osv import fields, osv
|
||||||
|
from openerp.tools.translate import _
|
||||||
|
|
||||||
class stock_move(osv.osv):
|
class stock_move(osv.osv):
|
||||||
_inherit = 'stock.move'
|
_inherit = 'stock.move'
|
||||||
|
@ -119,6 +120,15 @@ class stock_picking(osv.osv):
|
||||||
'invoice_ids': [(4, invoice_id)],
|
'invoice_ids': [(4, invoice_id)],
|
||||||
})
|
})
|
||||||
return super(stock_picking, self)._invoice_hook(cursor, user, picking, invoice_id)
|
return super(stock_picking, self)._invoice_hook(cursor, user, picking, invoice_id)
|
||||||
|
|
||||||
|
def action_done(self, cr, uid, ids, context=None):
|
||||||
|
""" Changes picking state to done. This method is called at the end of
|
||||||
|
the workflow by the activity "done".
|
||||||
|
"""
|
||||||
|
for record in self.browse(cr, uid, ids, context):
|
||||||
|
if record.type == "out" and record.sale_id:
|
||||||
|
self.pool.get('sale.order').message_post(cr, uid, [record.sale_id.id], body=_("Products delivered"), context=context)
|
||||||
|
return super(stock_picking, self).action_done(cr, uid, ids, context=context)
|
||||||
|
|
||||||
# Redefinition of the new field in order to update the model stock.picking.out in the orm
|
# Redefinition of the new field in order to update the model stock.picking.out in the orm
|
||||||
# FIXME: this is a temporary workaround because of a framework bug (ref: lp996816). It should be removed as soon as
|
# FIXME: this is a temporary workaround because of a framework bug (ref: lp996816). It should be removed as soon as
|
||||||
|
|
Loading…
Reference in New Issue