diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 9fbdac14a23..e39df20f92e 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -429,7 +429,6 @@ class sale_order(osv.osv): 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}) lines.append(inv_line_id) - inv = { 'name': order.client_order_ref or order.name, 'origin': order.name, @@ -462,7 +461,7 @@ class sale_order(osv.osv): invoices = {} invoice_ids = [] picking_obj = self.pool.get('stock.picking') - + invoice=self.pool.get('account.invoice') if context is None: context = {} # If date was specified, use it as date invoiced, usefull when invoices are generated this month and put the @@ -477,7 +476,6 @@ class sale_order(osv.osv): created_lines = self.pool.get('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: for o in self.browse(cr, uid, ids): for i in o.invoice_ids: @@ -486,11 +484,14 @@ class sale_order(osv.osv): 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) + temp_order='' for o, l in val: + temp_order=o.name + ',' + temp_order self.write(cr, uid, [o.id], {'state': 'progress'}) if o.order_policy == 'picking': picking_obj.write(cr, uid, map(lambda x: x.id, o.picking_ids), {'invoice_state': 'invoiced'}) cr.execute('insert into sale_order_invoice_rel (order_id,invoice_id) values (%s,%s)', (o.id, res)) + invoice.write(cr, uid, [res], {'origin': temp_order}) else: for order, il in val: res = self._make_invoice(cr, uid, order, il, context=context) @@ -1102,7 +1103,7 @@ class sale_order_line(osv.osv): "You have to change either the product, the quantity or the pricelist." } else: - result.update({'price_unit': price}) + result.update({'price_unit': price,'purchase_price' : product_obj.standard_price}) return {'value': result, 'domain': domain, 'warning': warning} def product_uom_change(self, cursor, user, ids, pricelist, product, qty=0, diff --git a/addons/sale/test/advance_invoice.yml b/addons/sale/test/advance_invoice.yml index 870b3ec0428..8b93b031d39 100644 --- a/addons/sale/test/advance_invoice.yml +++ b/addons/sale/test/advance_invoice.yml @@ -65,7 +65,6 @@ - !record {model: account.account, id: account_account_receivable0}: code: AR - company_id: base.main_company currency_mode: current name: Receivable parent_id: account_account_minimalchart0 @@ -79,7 +78,6 @@ - !record {model: account.account, id: account_account_cash0}: code: C - company_id: base.main_company currency_mode: current name: Cash parent_id: account_account_minimalchart0 @@ -142,7 +140,6 @@ - !record {model: account.journal, id: account_journal_bankjournal0}: code: BNK - company_id: base.main_company default_credit_account_id: account_account_cash0 default_debit_account_id: account_account_cash0 name: Bank Journal diff --git a/addons/sale/test/prepaid_sale_order.yml b/addons/sale/test/prepaid_sale_order.yml index 03f5ddf8aae..ce344bb23ae 100644 --- a/addons/sale/test/prepaid_sale_order.yml +++ b/addons/sale/test/prepaid_sale_order.yml @@ -78,7 +78,6 @@ - !record {model: account.account, id: account_account_cash0}: code: C - company_id: base.main_company currency_mode: current name: Cash parent_id: account_account_minimalchart0 diff --git a/addons/sale/test/so_make_invoice.yml b/addons/sale/test/so_make_invoice.yml index e34b11ffb2b..c5860ed875e 100644 --- a/addons/sale/test/so_make_invoice.yml +++ b/addons/sale/test/so_make_invoice.yml @@ -65,7 +65,6 @@ - !record {model: account.account, id: account_account_receivable0}: code: AR - company_id: base.main_company currency_mode: current name: Receivable parent_id: account_account_minimalchart0 @@ -79,7 +78,6 @@ - !record {model: account.account, id: account_account_cash0}: code: C - company_id: base.main_company currency_mode: current name: Cash parent_id: account_account_minimalchart0 @@ -142,7 +140,6 @@ - !record {model: account.journal, id: account_journal_bankjournal0}: code: BNK - company_id: base.main_company default_credit_account_id: account_account_cash0 default_debit_account_id: account_account_cash0 name: Bank Journal diff --git a/addons/sale/test/so_make_line_invoice.yml b/addons/sale/test/so_make_line_invoice.yml index de5782c8517..c09e4bf2c11 100644 --- a/addons/sale/test/so_make_line_invoice.yml +++ b/addons/sale/test/so_make_line_invoice.yml @@ -65,7 +65,6 @@ - !record {model: account.account, id: account_account_receivable0}: code: AR - company_id: base.main_company currency_mode: current name: Receivable parent_id: account_account_minimalchart0 @@ -79,7 +78,6 @@ - !record {model: account.account, id: account_account_cash0}: code: C - company_id: base.main_company currency_mode: current name: Cash parent_id: account_account_minimalchart0 @@ -142,7 +140,6 @@ - !record {model: account.journal, id: account_journal_bankjournal0}: code: BNK - company_id: base.main_company default_credit_account_id: account_account_cash0 default_debit_account_id: account_account_cash0 name: Bank Journal diff --git a/addons/sale/wizard/sale_make_invoice.py b/addons/sale/wizard/sale_make_invoice.py index 0ce2705ac77..850fc2e25d4 100644 --- a/addons/sale/wizard/sale_make_invoice.py +++ b/addons/sale/wizard/sale_make_invoice.py @@ -26,7 +26,7 @@ class sale_make_invoice(osv.osv_memory): _name = "sale.make.invoice" _description = "Sale Make Invoice" _columns = { - 'grouped': fields.boolean('Group the invoices'), + 'grouped': fields.boolean('Group the invoices', help='Check the box to group the invoices for the same customers'), 'invoice_date':fields.date('Invoice Date'), } _default = { @@ -50,11 +50,11 @@ class sale_make_invoice(osv.osv_memory): for o in order_obj.browse(cr, uid, context.get(('active_ids'),[]), context): for i in o.invoice_ids: newinv.append(i.id) - + mod_obj =self.pool.get('ir.model.data') result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter') - id = mod_obj.read(cr, uid, result, ['res_id']) + id = mod_obj.read(cr, uid, result, ['res_id']) return { 'domain': "[('id','in', ["+','.join(map(str,newinv))+"])]", 'name': 'Invoices', @@ -64,7 +64,7 @@ class sale_make_invoice(osv.osv_memory): 'view_id': False, 'context': "{'type':'out_refund'}", 'type': 'ir.actions.act_window', - 'search_view_id': id['id'] + 'search_view_id': id['res_id'] } sale_make_invoice() diff --git a/addons/sale/wizard/sale_make_invoice.xml b/addons/sale/wizard/sale_make_invoice.xml index ade720be1f4..e019786c40d 100644 --- a/addons/sale/wizard/sale_make_invoice.xml +++ b/addons/sale/wizard/sale_make_invoice.xml @@ -6,14 +6,15 @@ sale.make.invoice form -
- - + + + + - +