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

fix: removed stock value and account balance out of sync validation (#19729)

Browse Source 
* fix: revert value out of sync feature

* fix: removed stock value and account balance out of sync validation
This commit is contained in:
rohitwaghchaure 2019-11-28 16:43:39 +05:30 committed by Nabin Hait
parent 30245a0673
commit 1511154aa8
1 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
erpnext/accounts/general_ledger.py
View File

@ -162,33 +162,34 @@ def validate_account_for_perpetual_inventory(gl_map):
frappe.throw(_("Account: {0} can only be updated via Stock Transactions") frappe.throw(_("Account: {0} can only be updated via Stock Transactions")
.format(account), StockAccountInvalidTransaction) .format(account), StockAccountInvalidTransaction)
elif account_bal != stock_bal: # This has been comment for a temporary, will add this code again on release of immutable ledger
precision = get_field_precision(frappe.get_meta("GL Entry").get_field("debit"), # elif account_bal != stock_bal:
currency=frappe.get_cached_value('Company', gl_map[0].company, "default_currency")) # precision = get_field_precision(frappe.get_meta("GL Entry").get_field("debit"),
# currency=frappe.get_cached_value('Company', gl_map[0].company, "default_currency"))
diff = flt(stock_bal - account_bal, precision) # diff = flt(stock_bal - account_bal, precision)
error_reason = _("Stock Value ({0}) and Account Balance ({1}) are out of sync for account {2} and it's linked warehouses.").format( # error_reason = _("Stock Value ({0}) and Account Balance ({1}) are out of sync for account {2} and it's linked warehouses.").format(
stock_bal, account_bal, frappe.bold(account)) # stock_bal, account_bal, frappe.bold(account))
error_resolution = _("Please create adjustment Journal Entry for amount {0} ").format(frappe.bold(diff)) # error_resolution = _("Please create adjustment Journal Entry for amount {0} ").format(frappe.bold(diff))
stock_adjustment_account = frappe.db.get_value("Company",gl_map[0].company,"stock_adjustment_account") # stock_adjustment_account = frappe.db.get_value("Company",gl_map[0].company,"stock_adjustment_account")
db_or_cr_warehouse_account =('credit_in_account_currency' if diff < 0 else 'debit_in_account_currency') # db_or_cr_warehouse_account =('credit_in_account_currency' if diff < 0 else 'debit_in_account_currency')
db_or_cr_stock_adjustment_account = ('debit_in_account_currency' if diff < 0 else 'credit_in_account_currency') # db_or_cr_stock_adjustment_account = ('debit_in_account_currency' if diff < 0 else 'credit_in_account_currency')
journal_entry_args = { # journal_entry_args = {
'accounts':[ # 'accounts':[
{'account': account, db_or_cr_warehouse_account : abs(diff)}, # {'account': account, db_or_cr_warehouse_account : abs(diff)},
{'account': stock_adjustment_account, db_or_cr_stock_adjustment_account : abs(diff) }] # {'account': stock_adjustment_account, db_or_cr_stock_adjustment_account : abs(diff) }]
} # }
frappe.msgprint(msg="""{0}<br></br>{1}<br></br>""".format(error_reason, error_resolution), # frappe.msgprint(msg="""{0}<br></br>{1}<br></br>""".format(error_reason, error_resolution),
raise_exception=StockValueAndAccountBalanceOutOfSync, # raise_exception=StockValueAndAccountBalanceOutOfSync,
title=_('Values Out Of Sync'), # title=_('Values Out Of Sync'),
primary_action={ # primary_action={
'label': _('Make Journal Entry'), # 'label': _('Make Journal Entry'),
'client_action': 'erpnext.route_to_adjustment_jv', # 'client_action': 'erpnext.route_to_adjustment_jv',
'args': journal_entry_args # 'args': journal_entry_args
}) # })
def validate_cwip_accounts(gl_map): def validate_cwip_accounts(gl_map):
cwip_enabled = any([cint(ac.enable_cwip_accounting) for ac in frappe.db.get_all("Asset Category","enable_cwip_accounting")]) cwip_enabled = any([cint(ac.enable_cwip_accounting) for ac in frappe.db.get_all("Asset Category","enable_cwip_accounting")])