[IMP] sale: Removed/Corrected extra lines.

bzr revid: uco@tinyerp.com-20111125105237-uetukp6qx5oqujj2
This commit is contained in:
Ujjvala Collins (OpenERP) 2011-11-25 16:22:37 +05:30
parent ee90bb92a5
commit 0809ef942b
3 changed files with 7 additions and 1 deletions

View File

@ -43,6 +43,7 @@ class sale_shop(osv.osv):
_defaults = {
'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'sale.shop', context=c),
}
sale_shop()
class sale_order(osv.osv):
@ -455,8 +456,10 @@ class sale_order(osv.osv):
for record in self.pool.get('sale.order').browse(cr, uid, id).invoice_ids:
inv_ids1.add(record.id)
inv_ids = list(inv_ids1.difference(inv_ids))
res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_form')
res_id = res and res[1] or False,
return {
'name': _('Customer Invoices'),
'view_type': 'form',
@ -781,6 +784,7 @@ class sale_order(osv.osv):
picking_obj = self.pool.get('stock.picking')
procurement_obj = self.pool.get('procurement.order')
proc_ids = []
for line in order_lines:
if line.state == 'done':
continue
@ -1273,6 +1277,7 @@ class sale_order_line(osv.osv):
if rec.state not in ['draft', 'cancel']:
raise osv.except_osv(_('Invalid action !'), _('Cannot delete a sales order line which is in state \'%s\'!') %(rec.state,))
return super(sale_order_line, self).unlink(cr, uid, ids, context=context)
sale_order_line()
class sale_config_picking_policy(osv.osv_memory):

View File

@ -222,7 +222,6 @@
<field name="act_from" ref="act_ship"/>
<field name="act_to" ref="act_ship_except"/>
<field name="condition">test_state('canceled')</field>
</record>
<record id="trans_ship_except_ship" model="workflow.transition">
<field name="act_from" ref="act_ship_except"/>

View File

@ -197,4 +197,6 @@ class stock_picking(osv.osv):
return result
stock_picking()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: