Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Fix(Delivery Note): Fix issue credit note"

Browse Source
This commit is contained in:
rohitwaghchaure 2019-03-30 12:33:54 +05:30 committed by GitHub
parent 5fdbdd50f9
commit f3a1fa0bae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4152 additions and 4235 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8375
erpnext/stock/doctype/delivery_note/delivery_note.json
View File

File diff suppressed because it is too large Load Diff

12
erpnext/stock/doctype/delivery_note/delivery_note.py
View File

@ -212,6 +212,8 @@ class DeliveryNote(SellingController):
if not self.is_return:
self.check_credit_limit()
elif self.issue_credit_note:
self.make_return_invoice()
# Updating stock ledger should always be called after updating prevdoc status,
# because updating reserved qty in bin depends upon updated delivered qty in SO
self.update_stock_ledger()
@ -313,6 +315,16 @@ class DeliveryNote(SellingController):
self.load_from_db()
def make_return_invoice(self):
try:
return_invoice = make_sales_invoice(self.name)
return_invoice.is_return = True
return_invoice.save()
return_invoice.submit()
frappe.msgprint(_("Credit Note {0} has been created automatically").format(return_invoice.name))
except:
frappe.throw(_("Could not create Credit Note automatically, please uncheck 'Issue Credit Note' and submit again"))
def update_billed_amount_based_on_so(so_detail, update_modified=True):
# Billed against Sales Order directly
billed_against_so = frappe.db.sql("""select sum(amount) from `tabSales Invoice Item`