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

fix(Sales Invoice): Reset disposal_date on returning the Asset

Browse Source
This commit is contained in:
GangaManoj 2021-07-02 15:45:52 +05:30
parent 4cf3d9ac20
commit f8ee8058e7
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -932,15 +932,16 @@ class SalesInvoice(SellingController):
if self.is_return: if self.is_return:
fixed_asset_gl_entries = get_gl_entries_on_asset_movement(asset, fixed_asset_gl_entries = get_gl_entries_on_asset_movement(asset,
item.base_net_amount, item.finance_book, True) item.base_net_amount, item.finance_book, True)
asset.db_set("disposal_date", None)
else: else:
fixed_asset_gl_entries = get_gl_entries_on_asset_movement(asset, fixed_asset_gl_entries = get_gl_entries_on_asset_movement(asset,
item.base_net_amount, item.finance_book) item.base_net_amount, item.finance_book)
asset.db_set("disposal_date", self.posting_date)
for gle in fixed_asset_gl_entries: for gle in fixed_asset_gl_entries:
gle["against"] = self.customer gle["against"] = self.customer
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)
self.set_asset_status(asset) self.set_asset_status(asset)
else: else: