for id in ids:
res[id] = [0.0, 0.0]
cr.execute('''SELECT
- p.sale_id,sum(m.product_qty), mp.state as mp_state
+ p.sale_id, sum(m.product_qty), mp.state as mp_state
FROM
stock_move m
LEFT JOIN
LEFT JOIN
procurement_order mp on (mp.move_id=m.id)
WHERE
- p.sale_id IN %s GROUP BY mp.state, p.sale_id''',(tuple(ids),))
+ p.sale_id IN %s GROUP BY mp.state, p.sale_id''', (tuple(ids),))
for oid, nbr, mp_state in cr.fetchall():
if mp_state == 'cancel':
continue
'invoice_quantity': fields.selection([('order', 'Ordered Quantities'), ('procurement', 'Shipped Quantities')], 'Invoice on', help="The sale order will automatically create the invoice proposition (draft invoice). Ordered and delivered quantities may not be the same. You have to choose if you want your invoice based on ordered or shipped quantities. If the product is a service, shipped quantities means hours spent on the associated tasks.", required=True),
'payment_term': fields.many2one('account.payment.term', 'Payment Term'),
'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position'),
- 'company_id': fields.many2one('res.company','Company')
+ 'company_id': fields.related('shop_id','company_id',type='many2one',relation='res.company',string='Company',store=True)
}
_defaults = {
- 'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'sale.order', context=c),
'picking_policy': 'direct',
'date_order': time.strftime('%Y-%m-%d'),
'order_policy': 'manual',
def action_cancel_draft(self, cr, uid, ids, *args):
if not len(ids):
return False
- cr.execute('select id from sale_order_line where order_id IN %s and state=%s',(tuple(ids),'cancel'))
+ cr.execute('select id from sale_order_line where order_id IN %s and state=%s', (tuple(ids), 'cancel'))
line_ids = map(lambda x: x[0], cr.fetchall())
self.write(cr, uid, ids, {'state': 'draft', 'invoice_ids': [], 'shipped': 0})
self.pool.get('sale.order.line').write(cr, uid, line_ids, {'invoiced': False, 'state': 'draft', 'invoice_lines': [(6, 0, [])]})
wf_service.trg_delete(uid, 'sale.order', inv_id, cr)
wf_service.trg_create(uid, 'sale.order', inv_id, cr)
for (id,name) in self.name_get(cr, uid, ids):
- message = _('Sale order ') + " '" + name + "' "+ _("is in draft state")
+ message = _("The sale order '%s' has been set in draft state.") %(name,)
self.log(cr, uid, id, message)
return True
def _make_invoice(self, cr, uid, order, lines, context=None):
journal_obj = self.pool.get('account.journal')
inv_obj = self.pool.get('account.invoice')
-
+ obj_invoice_line = self.pool.get('account.invoice.line')
if context is None:
context = {}
- journal_ids = journal_obj.search(cr, uid, [('type', '=','sale'),('company_id', '=', order.company_id.id)], limit=1)
+ journal_ids = journal_obj.search(cr, uid, [('type', '=', 'sale'), ('company_id', '=', order.company_id.id)], limit=1)
if not journal_ids:
raise osv.except_osv(_('Error !'),
_('There is no sale journal defined for this company: "%s" (id:%d)') % (order.company_id.name, order.company_id.id))
for preinv in order.invoice_ids:
if preinv.state not in ('cancel',) and preinv.id not in from_line_invoice_ids:
for preline in preinv.invoice_line:
- inv_line_id = self.pool.get('account.invoice.line').copy(cr, uid, preline.id, {'invoice_id': False, 'price_unit': -preline.price_unit})
+ inv_line_id = obj_invoice_line.copy(cr, uid, preline.id, {'invoice_id': False, 'price_unit': -preline.price_unit})
lines.append(inv_line_id)
inv = {
'name': order.client_order_ref or order.name,
'comment': order.note,
'payment_term': pay_term,
'fiscal_position': order.fiscal_position.id or order.partner_id.property_account_position.id,
- 'date_invoice' : context.get('date_invoice',False),
- 'company_id' : order.company_id.id,
+ 'date_invoice': context.get('date_invoice',False),
+ 'company_id': order.company_id.id,
'user_id':order.user_id and order.user_id.id or False
}
inv.update(self._inv_get(cr, uid, order))
return inv_id
def manual_invoice(self, cr, uid, ids, context=None):
+ mod_obj = self.pool.get('ir.model.data')
wf_service = netsvc.LocalService("workflow")
inv_ids = set()
inv_ids1 = set()
inv_ids1.add(record.id)
inv_ids = list(inv_ids1.difference(inv_ids))
+ result = mod_obj._get_id(cr, uid, 'account', 'invoice_form')
+ res = mod_obj.read(cr, uid, result, ['res_id'])
result = {
- 'name': 'Invoices',
+ 'name': 'Customer Invoices',
'view_type': 'form',
- 'view_mode': 'form,tree',
+ 'view_mode': 'form',
+ 'view_id': [res['res_id']],
'res_model': 'account.invoice',
- 'view_id': False,
- 'context': "{'type':'out_refund'}",
+ 'context': "{'type':'out_invoice'}",
'type': 'ir.actions.act_window',
- 'res_id': inv_ids[0],
- 'nodestroy' :True
- }
+ 'nodestroy' :True,
+ 'target': 'current',
+ 'res_id': inv_ids and inv_ids[0] or False,
+ }
return result
invoice_ids = []
picking_obj = self.pool.get('stock.picking')
invoice = self.pool.get('account.invoice')
+ obj_sale_order_line = self.pool.get('sale.order.line')
if context is None:
context = {}
# If date was specified, use it as date invoiced, usefull when invoices are generated this month and put the
continue
elif (line.state in states):
lines.append(line.id)
- created_lines = self.pool.get('sale.order.line').invoice_line_create(cr, uid, lines)
+ created_lines = obj_sale_order_line.invoice_line_create(cr, uid, lines)
if created_lines:
invoices.setdefault(o.partner_id.id, []).append((o, created_lines))
if not invoices:
return i.id
for val in invoices.values():
if grouped:
- res = self._make_invoice(cr, uid, val[0][0], reduce(lambda x,y: x + y, [l for o,l in val], []), context=context)
+ res = self._make_invoice(cr, uid, val[0][0], reduce(lambda x, y: x + y, [l for o, l in val], []), context=context)
invoice_ref = ''
for o, l in val:
invoice_ref += o.name + '|'
# Update the sale order state.
#
if order.state == 'invoice_except':
- self.write(cr, uid, [order.id], {'state' : 'progress'}, context=context)
+ self.write(cr, uid, [order.id], {'state': 'progress'}, context=context)
return True
def action_cancel(self, cr, uid, ids, context=None):
+ wf_service = netsvc.LocalService("workflow")
if context is None:
context = {}
sale_order_line_obj = self.pool.get('sale.order.line')
_('You must first cancel all picking attached to this sale order.'))
for r in self.read(cr, uid, ids, ['picking_ids']):
for pick in r['picking_ids']:
- wf_service = netsvc.LocalService("workflow")
wf_service.trg_validate(uid, 'stock.picking', pick, 'button_cancel', cr)
for inv in sale.invoice_ids:
if inv.state not in ('draft', 'cancel'):
_('You must first cancel all invoices attached to this sale order.'))
for r in self.read(cr, uid, ids, ['invoice_ids']):
for inv in r['invoice_ids']:
- wf_service = netsvc.LocalService("workflow")
wf_service.trg_validate(uid, 'account.invoice', inv, 'invoice_cancel', cr)
sale_order_line_obj.write(cr, uid, [l.id for l in sale.order_line],
{'state': 'cancel'})
- message = _('Sale order') + " '" + sale.name + _(" is cancelled")
+ message = _("The sale order '%s' has been cancelled.") % (sale.name,)
self.log(cr, uid, sale.id, message)
self.write(cr, uid, ids, {'state': 'cancel'})
return True
else:
self.write(cr, uid, [o.id], {'state': 'progress', 'date_confirm': time.strftime('%Y-%m-%d')})
self.pool.get('sale.order.line').button_confirm(cr, uid, [x.id for x in o.order_line])
- message = _('Quotation') + " '" + o.name + "' "+ _("is converted to Sale order")
+ message = _("The quotation '%s' has been converted to a sale order.") % (o.name,)
self.log(cr, uid, o.id, message)
return True
return canceled
def action_ship_create(self, cr, uid, ids, *args):
+ wf_service = netsvc.LocalService("workflow")
picking_id = False
company = self.pool.get('res.users').browse(cr, uid, uid).company_id
for order in self.browse(cr, uid, ids, context={}):
val = {}
for proc_id in proc_ids:
- wf_service = netsvc.LocalService("workflow")
wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_confirm', cr)
if picking_id:
- wf_service = netsvc.LocalService("workflow")
wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr)
if order.state == 'shipping_except':
'salesman_id':fields.related('order_id', 'user_id', type='many2one', relation='res.users', string='Salesman'),
'company_id': fields.related('order_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True, states={'draft':[('readonly',False)]}),
}
- _order = 'sequence, id'
+ _order = 'sequence, id desc'
_defaults = {
'discount': 0.0,
'delay': 0.0,
raise osv.except_osv(
_('Could not cancel sale order line!'),
_('You must first cancel stock moves attached to this sale order line.'))
- message = _('Sale order line') + " '" + line.name + "' "+_("is cancelled")
- self.log(cr, uid, id, message)
return self.write(cr, uid, ids, {'state': 'cancel'})
def button_confirm(self, cr, uid, ids, context=None):
projects / odoo / odoo.git / blobdiff