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

fix(Sales Invoice): Reset Asset status on issuing Credit Note

Browse Source
This commit is contained in:
GangaManoj 2021-06-22 23:12:56 +05:30
parent 721ff9438a
commit 8127208774
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/accounts/doctype/sales_invoice/sales_invoice.py
View File

@ -936,7 +936,8 @@ class SalesInvoice(SellingController):
gl_entries.append(self.get_gl_dict(gle, item=item)) gl_entries.append(self.get_gl_dict(gle, item=item))
asset.db_set("disposal_date", self.posting_date) asset.db_set("disposal_date", self.posting_date)
asset.set_status("Sold" if self.docstatus==1 else None) self.set_asset_status(asset)
else: else:
# Do not book income for transfer within same company # Do not book income for transfer within same company
if not self.is_internal_transfer(): if not self.is_internal_transfer():
@ -962,6 +963,12 @@ class SalesInvoice(SellingController):
erpnext.is_perpetual_inventory_enabled(self.company): erpnext.is_perpetual_inventory_enabled(self.company):
gl_entries += super(SalesInvoice, self).get_gl_entries() gl_entries += super(SalesInvoice, self).get_gl_entries()
def set_asset_status(self, asset):
if self.is_return:
asset.set_status()
else:
asset.set_status("Sold" if self.docstatus==1 else None)
def make_loyalty_point_redemption_gle(self, gl_entries): def make_loyalty_point_redemption_gle(self, gl_entries):
if cint(self.redeem_loyalty_points): if cint(self.redeem_loyalty_points):
gl_entries.append( gl_entries.append(