Debit/Credit note creation on purchase/sales return
This commit is contained in:
Anand Doshi
parent
3801804a8a
commit
110047ea5b
@ -1,4 +1,6 @@
|
||||
import webnotes
|
||||
from webnotes.utils import flt
|
||||
from webnotes.model.code import get_obj
|
||||
|
||||
def get_default_bank_account():
|
||||
"""
|
||||
@ -11,3 +13,208 @@ def get_default_bank_account():
|
||||
WHERE name=%s AND docstatus<2""", company)
|
||||
|
||||
if res: return res[0][0]
|
||||
|
||||
|
||||
def get_new_jv_details():
|
||||
"""
|
||||
Get details which will help create new jv on sales/purchase return
|
||||
"""
|
||||
doclist = webnotes.form_dict.get('doclist')
|
||||
fiscal_year = webnotes.form_dict.get('fiscal_year')
|
||||
if not (isinstance(doclist, basestring) and isinstance(fiscal_year, basestring)): return
|
||||
|
||||
import json
|
||||
doclist = json.loads(doclist)
|
||||
doc, children = doclist[0], doclist[1:]
|
||||
|
||||
if doc.get('return_type')=='Sales Return':
|
||||
if doc.get('sales_invoice_no'):
|
||||
return get_invoice_details(doc, children, fiscal_year)
|
||||
elif doc.get('delivery_note_no'):
|
||||
return get_delivery_note_details(doc, children, fiscal_year)
|
||||
|
||||
elif doc.get('purchase_receipt_no'):
|
||||
return get_purchase_receipt_details(doc, children, fiscal_year)
|
||||
|
||||
|
||||
def get_invoice_details(doc, children, fiscal_year):
|
||||
"""
|
||||
Gets details from an invoice to make new jv
|
||||
Returns [{
|
||||
'account': ,
|
||||
'balance': ,
|
||||
'debit': ,
|
||||
'credit': ,
|
||||
'against_invoice': ,
|
||||
'against_payable':
|
||||
}, { ... }, ...]
|
||||
"""
|
||||
if doc.get('return_type')=='Sales Return':
|
||||
obj = get_obj('Receivable Voucher', doc.get('sales_invoice_no'), with_children=1)
|
||||
else:
|
||||
obj = get_obj('Payable Voucher', doc.get('purchase_invoice_no'), with_children=1)
|
||||
if not obj.doc.docstatus==1: return
|
||||
|
||||
# Build invoice account jv detail record
|
||||
invoice_rec = get_invoice_account_jv_record(doc, children, fiscal_year, obj)
|
||||
|
||||
# Build item accountwise jv detail records
|
||||
item_accountwise_list = get_item_accountwise_jv_record(doc, children, fiscal_year, obj)
|
||||
|
||||
return [invoice_rec] + item_accountwise_list
|
||||
|
||||
|
||||
def get_invoice_account_jv_record(doc, children, fiscal_year, obj):
|
||||
"""
|
||||
Build customer/supplier account jv detail record
|
||||
"""
|
||||
# Calculate total return amount
|
||||
total_amt = sum([(flt(ch.get('rate')) * flt(ch.get('returned_qty'))) for ch in children])
|
||||
|
||||
ret = {}
|
||||
|
||||
if doc.get('return_type')=='Sales Return':
|
||||
account = obj.doc.debit_to
|
||||
ret['against_invoice'] = doc.get('sales_invoice_no')
|
||||
ret['credit'] = total_amt
|
||||
else:
|
||||
account = obj.doc.credit_to
|
||||
ret['against_voucher'] = doc.get('purchase_invoice_no')
|
||||
ret['debit'] = total_amt
|
||||
|
||||
ret.update({
|
||||
'account': account,
|
||||
'balance': get_obj('GL Control').get_bal(account + "~~~" + fiscal_year)
|
||||
})
|
||||
|
||||
return ret
|
||||
|
||||
|
||||
def get_item_accountwise_jv_record(doc, children, fiscal_year, obj):
|
||||
"""
|
||||
Build item accountwise jv detail records
|
||||
"""
|
||||
if doc.get('return_type')=='Sales Return':
|
||||
amt_field = 'debit'
|
||||
ac_field = 'income_account'
|
||||
else:
|
||||
amt_field = 'credit'
|
||||
ac_field = 'expense_head'
|
||||
|
||||
inv_children = dict([[ic.fields.get('item_code'), ic] for ic in obj.doclist if ic.fields.get('item_code')])
|
||||
|
||||
accwise_list = []
|
||||
|
||||
for ch in children:
|
||||
inv_ch = inv_children.get(ch.get('item_code'))
|
||||
if not inv_ch: continue
|
||||
|
||||
amount = flt(ch.get('rate')) * flt(ch.get('returned_qty'))
|
||||
|
||||
accounts = [[jvd['account'], jvd['cost_center']] for jvd in accwise_list]
|
||||
|
||||
if [inv_ch.fields.get(ac_field), inv_ch.fields.get('cost_center')] not in accounts:
|
||||
rec = {
|
||||
'account': inv_ch.fields.get(ac_field),
|
||||
'cost_center': inv_ch.fields.get('cost_center'),
|
||||
'balance': get_obj('GL Control').get_bal(inv_ch.fields.get(ac_field) + "~~~" + fiscal_year)
|
||||
}
|
||||
rec[amt_field] = amount
|
||||
accwise_list.append(rec)
|
||||
else:
|
||||
rec = accwise_list[accounts.index([inv_ch.fields.get(ac_field), inv_ch.fields.get('cost_center')])]
|
||||
rec[amt_field] = rec[amt_field] + amount
|
||||
|
||||
return accwise_list
|
||||
|
||||
|
||||
def get_jv_details_from_inv_list(doc, children, fiscal_year, inv_list, jv_details_list):
|
||||
"""
|
||||
Get invoice details and make jv detail records
|
||||
"""
|
||||
for inv in inv_list:
|
||||
if not inv[0]: continue
|
||||
|
||||
if doc.get('return_type')=='Sales Return':
|
||||
doc['sales_invoice_no'] = inv[0]
|
||||
else:
|
||||
doc['purchase_invoice_no'] = inv[0]
|
||||
|
||||
jv_details = get_invoice_details(doc, children, fiscal_year)
|
||||
|
||||
if jv_details and len(jv_details)>1: jv_details_list.extend(jv_details)
|
||||
|
||||
return jv_details_list
|
||||
|
||||
|
||||
def get_prev_doc_list(obj, prev_doctype):
|
||||
"""
|
||||
Returns a list of previous doc's names
|
||||
"""
|
||||
prevdoc_list = []
|
||||
for ch in obj.doclist:
|
||||
if ch.fields.get('prevdoc_docname') and ch.fields.get('prevdoc_doctype')==prev_doctype:
|
||||
prevdoc_list.append(ch.fields.get('prevdoc_docname'))
|
||||
return prevdoc_list
|
||||
|
||||
|
||||
def get_inv_list(table, field, value):
|
||||
"""
|
||||
Returns invoice list
|
||||
"""
|
||||
if isinstance(value, basestring):
|
||||
return webnotes.conn.sql("""\
|
||||
SELECT DISTINCT parent FROM `%s`
|
||||
WHERE %s='%s' AND docstatus=1""" % (table, field, value))
|
||||
elif isinstance(value, list):
|
||||
return webnotes.conn.sql("""\
|
||||
SELECT DISTINCT parent FROM `%s`
|
||||
WHERE %s IN ("%s") AND docstatus=1""" % (table, field, '", "'.join(value)))
|
||||
else:
|
||||
return []
|
||||
|
||||
|
||||
def get_delivery_note_details(doc, children, fiscal_year):
|
||||
"""
|
||||
Gets sales invoice numbers from delivery note details
|
||||
and returns detail records for jv
|
||||
"""
|
||||
jv_details_list = []
|
||||
|
||||
dn_obj = get_obj('Delivery Note', doc['delivery_note_no'], with_children=1)
|
||||
|
||||
inv_list = get_inv_list('tabRV Detail', 'delivery_note', doc['delivery_note_no'])
|
||||
|
||||
if inv_list:
|
||||
jv_details_list = get_jv_details_from_inv_list(doc, children, fiscal_year, inv_list, jv_details_list)
|
||||
|
||||
if not (inv_list and jv_details_list):
|
||||
so_list = get_prev_doc_list(dn_obj, 'Sales Order')
|
||||
inv_list = get_inv_list('tabRV Detail', 'sales_order', so_list)
|
||||
if inv_list:
|
||||
jv_details_list = get_jv_details_from_inv_list(doc, children, fiscal_year, inv_list, jv_details_list)
|
||||
|
||||
return jv_details_list
|
||||
|
||||
|
||||
def get_purchase_receipt_details(doc, children, fiscal_year):
|
||||
"""
|
||||
Gets purchase invoice numbers from purchase receipt details
|
||||
and returns detail records for jv
|
||||
"""
|
||||
jv_details_list = []
|
||||
|
||||
pr_obj = get_obj('Purchase Receipt', doc['purchase_receipt_no'], with_children=1)
|
||||
|
||||
inv_list = get_inv_list('tabPV Detail', 'purchase_receipt', doc['purchase_receipt_no'])
|
||||
|
||||
if inv_list:
|
||||
jv_details_list = get_jv_details_from_inv_list(doc, children, fiscal_year, inv_list, jv_details_list)
|
||||
|
||||
if not (inv_list and jv_details_list):
|
||||
po_list = get_prev_doc_list(pr_obj, 'Purchase Order')
|
||||
inv_list = get_inv_list('tabPV Detail', 'purchase_order', po_list)
|
||||
if inv_list:
|
||||
jv_details_list = get_jv_details_from_inv_list(doc, children, fiscal_year, inv_list, jv_details_list)
|
||||
|
||||
return jv_details_list
|
||||
|
||||
@ -26,11 +26,23 @@ cur_frm.fields_dict.purchase_receipt_no.get_query = function(doc) {
|
||||
// Hide/unhide based on return type
|
||||
//----------------------------------
|
||||
cur_frm.cscript.return_type = function(doc, cdt, cdn) {
|
||||
hide_field(['purchase_receipt_no', 'delivery_note_no', 'sales_invoice_no', 'return_details', 'Get Items', 'Make Excise Invoice', 'Make Stock Entry', 'Make Debit Note', 'Make Credit Note']);
|
||||
if(doc.return_type == 'Sales Return')
|
||||
unhide_field(['delivery_note_no', 'sales_invoice_no', 'Get Items', 'return_details', 'Make Credit Note', 'Make Stock Entry', 'Make Excise Invoice']);
|
||||
else if(doc.return_type == 'Purchase Return')
|
||||
unhide_field(['purchase_receipt_no', 'Get Items', 'return_details', 'Make Debit Note', 'Make Stock Entry', 'Make Excise Invoice']);
|
||||
var cp = locals['Control Panel']['Control Panel'];
|
||||
hide_field(['purchase_receipt_no', 'delivery_note_no', 'sales_invoice_no',
|
||||
'return_details', 'Get Items', 'Make Excise Invoice', 'Make Stock Entry',
|
||||
'Make Debit Note', 'Make Credit Note']);
|
||||
|
||||
if(doc.return_type == 'Sales Return') {
|
||||
unhide_field(['delivery_note_no', 'sales_invoice_no', 'Get Items',
|
||||
'return_details', 'Make Credit Note', 'Make Stock Entry']);
|
||||
|
||||
if(cp.country == 'India') { unhide_field(['Make Excise Invoice']); }
|
||||
|
||||
} else if(doc.return_type == 'Purchase Return') {
|
||||
unhide_field(['purchase_receipt_no', 'Get Items', 'return_details',
|
||||
'Make Debit Note', 'Make Stock Entry']);
|
||||
|
||||
if(cp.country == 'India') { unhide_field(['Make Excise Invoice']); }
|
||||
}
|
||||
|
||||
cur_frm.cscript.clear_fields(doc);
|
||||
}
|
||||
@ -151,17 +163,34 @@ cur_frm.cscript['Make Excise Invoice'] = function(doc) {
|
||||
// Make debit note
|
||||
//------------------------------
|
||||
cur_frm.cscript['Make Debit Note'] = function(doc) {
|
||||
cur_frm.cscript.make_jv(doc, 'Debit Note');
|
||||
var doclist = make_doclist(doc.doctype, doc.name);
|
||||
$c('accounts.get_new_jv_details', {
|
||||
doclist: JSON.stringify(doclist),
|
||||
fiscal_year: sys_defaults.fiscal_year
|
||||
}, function(r, rt) {
|
||||
if(!r.exc) {
|
||||
cur_frm.cscript.make_jv(doc, 'Debit Note', r.message);
|
||||
}
|
||||
});
|
||||
}
|
||||
// Make credit note
|
||||
//------------------------------
|
||||
cur_frm.cscript['Make Credit Note'] = function(doc) {
|
||||
cur_frm.cscript.make_jv(doc, 'Credit Note');
|
||||
var doclist = make_doclist(doc.doctype, doc.name);
|
||||
$c('accounts.get_new_jv_details', {
|
||||
doclist: JSON.stringify(doclist),
|
||||
fiscal_year: sys_defaults.fiscal_year
|
||||
}, function(r, rt) {
|
||||
if(!r.exc) {
|
||||
cur_frm.cscript.make_jv(doc, 'Credit Note', r.message);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
// Make JV
|
||||
//--------------------------------
|
||||
cur_frm.cscript.make_jv = function(doc, dr_or_cr) {
|
||||
cur_frm.cscript.make_jv = function(doc, dr_or_cr, children) {
|
||||
var jv = LocalDB.create('Journal Voucher');
|
||||
jv = locals['Journal Voucher'][jv];
|
||||
|
||||
@ -172,5 +201,13 @@ cur_frm.cscript.make_jv = function(doc, dr_or_cr) {
|
||||
jv.posting_date = dateutil.obj_to_str(new Date());
|
||||
jv.voucher_date = dateutil.obj_to_str(new Date());
|
||||
|
||||
loaddoc('Journal Voucher',jv.name);
|
||||
// Add children
|
||||
if(children) {
|
||||
for(var i=0; i<children.length; i++) {
|
||||
var ch = LocalDB.add_child(jv, 'Journal Voucher Detail', 'entries');
|
||||
$.extend(ch, children[i]);
|
||||
}
|
||||
}
|
||||
|
||||
loaddoc('Journal Voucher', jv.name);
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user