Browse Source

[FIX] Bug Fixed 'invoice_stock_move'

pull/150/head
Ajmal JK 6 years ago
parent
commit
62e37e5c3d
  1. 2
      invoice_stock_move/__manifest__.py
  2. 5
      invoice_stock_move/doc/RELEASE_NOTES.md
  3. 111
      invoice_stock_move/models/invoice_stock.py
  4. 4
      invoice_stock_move/views/invoice_stock_move_view.xml

2
invoice_stock_move/__manifest__.py

@ -18,7 +18,7 @@
############################################################################## ##############################################################################
{ {
'name': "Stock Picking From Invoice", 'name': "Stock Picking From Invoice",
'version': '12.0.1.0.0', 'version': '12.0.1.1.1',
'summary': """Stock Picking From Customer/Supplier Invoice""", 'summary': """Stock Picking From Customer/Supplier Invoice""",
'description': """This Module Enables To Create Stocks Picking From Customer/Supplier Invoice""", 'description': """This Module Enables To Create Stocks Picking From Customer/Supplier Invoice""",
'author': "Cybrosys Techno Solutions", 'author': "Cybrosys Techno Solutions",

5
invoice_stock_move/doc/RELEASE_NOTES.md

@ -3,3 +3,8 @@
#### 19.02.2019 #### 19.02.2019
#### Version 12.0.1.0.0 #### Version 12.0.1.0.0
#### Module Migrated #### Module Migrated
#### 20.01.2020
#### Version 12.0.1.1.1
#### FIX
- Bug Fixed.

111
invoice_stock_move/models/invoice_stock.py

@ -18,6 +18,7 @@
# #
############################################################################## ##############################################################################
from odoo.exceptions import UserError from odoo.exceptions import UserError
from odoo.tools.safe_eval import safe_eval
from odoo import models, fields, api, _ from odoo import models, fields, api, _
@ -79,7 +80,8 @@ class InvoiceStockMove(models.Model):
picking = self.env['stock.picking'].create(pick) picking = self.env['stock.picking'].create(pick)
self.invoice_picking_id = picking.id self.invoice_picking_id = picking.id
self.picking_count = len(picking) self.picking_count = len(picking)
moves = order.invoice_line_ids.filtered(lambda r: r.product_id.type in ['product', 'consu'])._create_stock_moves(picking) moves = order.invoice_line_ids.filtered(
lambda r: r.product_id.type in ['product', 'consu'])._create_stock_moves(picking)
move_ids = moves._action_confirm() move_ids = moves._action_confirm()
move_ids._action_assign() move_ids._action_assign()
@ -101,7 +103,8 @@ class InvoiceStockMove(models.Model):
picking = self.env['stock.picking'].create(pick) picking = self.env['stock.picking'].create(pick)
self.invoice_picking_id = picking.id self.invoice_picking_id = picking.id
self.picking_count = len(picking) self.picking_count = len(picking)
moves = order.invoice_line_ids.filtered(lambda r: r.product_id.type in ['product', 'consu'])._create_stock_moves_transfer(picking) moves = order.invoice_line_ids.filtered(
lambda r: r.product_id.type in ['product', 'consu'])._create_stock_moves_transfer(picking)
move_ids = moves._action_confirm() move_ids = moves._action_confirm()
move_ids._action_assign() move_ids._action_assign()
@ -186,5 +189,109 @@ class SupplierInvoiceLine(models.Model):
done += moves.create(template) done += moves.create(template)
return done return done
class AccountInvoiceRefund(models.TransientModel):
_inherit = 'account.invoice.refund'
@api.multi
def compute_refund(self, mode='refund'):
company_id = self.env.context.get('company_id') or self.env.user.company_id.id
inv_obj = self.env['account.invoice']
inv_tax_obj = self.env['account.invoice.tax']
inv_line_obj = self.env['account.invoice.line']
context = dict(self._context or {})
xml_id = False
for form in self:
created_inv = []
date = False
description = False
for inv in inv_obj.browse(context.get('active_ids')):
if inv.state in ['draft', 'cancel']:
raise UserError(_('Cannot create credit note for the draft/cancelled invoice.'))
if inv.reconciled and mode in ('cancel', 'modify'):
raise UserError(_(
'Cannot create a credit note for the invoice which is already reconciled, invoice should be'
' unreconciled first, then only you can add credit note for this invoice.'))
date = form.date or False
description = form.description or inv.name
refund = inv.refund(form.date_invoice, date, description, inv.journal_id.id)
created_inv.append(refund.id)
if inv.picking_transfer_id.code == 'outgoing':
data = self.env['stock.picking.type'].search(
[('warehouse_id.company_id', '=', company_id), ('code', '=', 'incoming')], limit=1)
refund.picking_transfer_id = data.id
if inv.picking_type_id.code == 'incoming':
data = self.env['stock.picking.type'].search(
[('warehouse_id.company_id', '=', company_id), ('code', '=', 'outgoing')], limit=1)
refund.picking_type_id = data.id
if mode in ('cancel', 'modify'):
movelines = inv.move_id.line_ids
to_reconcile_ids = {}
to_reconcile_lines = self.env['account.move.line']
for line in movelines:
if line.account_id.id == inv.account_id.id:
to_reconcile_lines += line
to_reconcile_ids.setdefault(line.account_id.id, []).append(line.id)
if line.reconciled:
line.remove_move_reconcile()
refund.action_invoice_open()
for tmpline in refund.move_id.line_ids:
if tmpline.account_id.id == inv.account_id.id:
to_reconcile_lines += tmpline
to_reconcile_lines.filtered(lambda l: l.reconciled == False).reconcile()
if mode == 'modify':
invoice = inv.read(inv_obj._get_refund_modify_read_fields())
invoice = invoice[0]
del invoice['id']
invoice_lines = inv_line_obj.browse(invoice['invoice_line_ids'])
invoice_lines = inv_obj.with_context(mode='modify')._refund_cleanup_lines(invoice_lines)
tax_lines = inv_tax_obj.browse(invoice['tax_line_ids'])
tax_lines = inv_obj._refund_cleanup_lines(tax_lines)
invoice.update({
'type': inv.type,
'date_invoice': form.date_invoice,
'state': 'draft',
'number': False,
'invoice_line_ids': invoice_lines,
'tax_line_ids': tax_lines,
'date': date,
'origin': inv.origin,
'fiscal_position_id': inv.fiscal_position_id.id,
})
for field in inv_obj._get_refund_common_fields():
if inv_obj._fields[field].type == 'many2one':
invoice[field] = invoice[field] and invoice[field][0]
else:
invoice[field] = invoice[field] or False
inv_refund = inv_obj.create(invoice)
body = _(
'Correction of <a href=# data-oe-model=account.invoice data-oe-id=%d>%s</a><br>Reason: %s') % (
inv.id, inv.number, description)
inv_refund.message_post(body=body)
if inv_refund.payment_term_id.id:
inv_refund._onchange_payment_term_date_invoice()
created_inv.append(inv_refund.id)
xml_id = inv.type == 'out_invoice' and 'action_invoice_out_refund' or \
inv.type == 'out_refund' and 'action_invoice_tree1' or \
inv.type == 'in_invoice' and 'action_invoice_in_refund' or \
inv.type == 'in_refund' and 'action_invoice_tree2'
if xml_id:
result = self.env.ref('account.%s' % (xml_id)).read()[0]
if mode == 'modify':
# When refund method is `modify` then it will directly open the new draft bill/invoice in form view
if inv_refund.type == 'in_invoice':
view_ref = self.env.ref('account.invoice_supplier_form')
else:
view_ref = self.env.ref('account.invoice_form')
result['views'] = [(view_ref.id, 'form')]
result['res_id'] = inv_refund.id
else:
invoice_domain = safe_eval(result['domain'])
invoice_domain.append(('id', 'in', created_inv))
result['domain'] = invoice_domain
return result
return True

4
invoice_stock_move/views/invoice_stock_move_view.xml

@ -8,7 +8,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="//header" position="inside"> <xpath expr="//header" position="inside">
<button name="action_stock_transfer" string="Transfer" type="object" class="oe_highlight" <button name="action_stock_transfer" string="Transfer" type="object" class="oe_highlight"
attrs="{'invisible':[('origin', '!=', False)]}"/> attrs="{'invisible':['|',('state', '=', 'draft'),('picking_count', '=', 1)]}"/>
</xpath> </xpath>
<xpath expr="//field[@name='date_due']" position="after"> <xpath expr="//field[@name='date_due']" position="after">
<field name="picking_transfer_id"/> <field name="picking_transfer_id"/>
@ -34,7 +34,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="//header" position="inside"> <xpath expr="//header" position="inside">
<button name="action_stock_receive" string="Receive" class="oe_highlight" <button name="action_stock_receive" string="Receive" class="oe_highlight"
type="object" attrs="{'invisible':[('origin', '!=', False)]}"/> type="object" attrs="{'invisible':['|',('state', '=', 'draft'),('picking_count', '=', 1)]}"/>
</xpath> </xpath>
<xpath expr="//field[@name='date_due']" position="after"> <xpath expr="//field[@name='date_due']" position="after">
<field name="picking_type_id"/> <field name="picking_type_id"/>

Loading…
Cancel
Save