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

Merge branch 'develop' into payroll-entry-fixes

Browse Source
This commit is contained in:
Anurag Mishra 2020-12-30 13:22:13 +05:30 committed by GitHub
commit b7631af741
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py
View File

@ -47,21 +47,22 @@ def get_data(filters):
for d in gl_entries: for d in gl_entries:
asset_data = assets_details.get(d.against_voucher) asset_data = assets_details.get(d.against_voucher)
if not asset_data.get("accumulated_depreciation_amount"): if asset_data:
asset_data.accumulated_depreciation_amount = d.debit if not asset_data.get("accumulated_depreciation_amount"):
else: asset_data.accumulated_depreciation_amount = d.debit
asset_data.accumulated_depreciation_amount += d.debit else:
asset_data.accumulated_depreciation_amount += d.debit
row = frappe._dict(asset_data) row = frappe._dict(asset_data)
row.update({ row.update({
"depreciation_amount": d.debit, "depreciation_amount": d.debit,
"depreciation_date": d.posting_date, "depreciation_date": d.posting_date,
"amount_after_depreciation": (flt(row.gross_purchase_amount) - "amount_after_depreciation": (flt(row.gross_purchase_amount) -
flt(row.accumulated_depreciation_amount)), flt(row.accumulated_depreciation_amount)),
"depreciation_entry": d.voucher_no "depreciation_entry": d.voucher_no
}) })
data.append(row) data.append(row)
return data return data

19
erpnext/stock/doctype/stock_entry/stock_entry.py
View File

@ -259,11 +259,16 @@ class StockEntry(StockController):
item_code.append(item.item_code) item_code.append(item.item_code)
def validate_fg_completed_qty(self): def validate_fg_completed_qty(self):
item_wise_qty = {}
if self.purpose == "Manufacture" and self.work_order: if self.purpose == "Manufacture" and self.work_order:
for d in self.items: for d in self.items:
if d.is_finished_item and d.qty != self.fg_completed_qty: if d.is_finished_item:
frappe.throw(_("Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different") item_wise_qty.setdefault(d.item_code, []).append(d.qty)
.format(d.qty, self.fg_completed_qty))
for item_code, qty_list in iteritems(item_wise_qty):
if self.fg_completed_qty != sum(qty_list):
frappe.throw(_("The finished product {0} quantity {1} and For Quantity {2} cannot be different")
.format(frappe.bold(item_code), frappe.bold(sum(qty_list)), frappe.bold(self.fg_completed_qty)))
def validate_difference_account(self): def validate_difference_account(self):
if not cint(erpnext.is_perpetual_inventory_enabled(self.company)): if not cint(erpnext.is_perpetual_inventory_enabled(self.company)):
@ -319,7 +324,7 @@ class StockEntry(StockController):
if self.purpose == "Manufacture": if self.purpose == "Manufacture":
if validate_for_manufacture: if validate_for_manufacture:
if d.bom_no: if d.is_finished_item or d.is_scrap_item:
d.s_warehouse = None d.s_warehouse = None
if not d.t_warehouse: if not d.t_warehouse:
frappe.throw(_("Target warehouse is mandatory for row {0}").format(d.idx)) frappe.throw(_("Target warehouse is mandatory for row {0}").format(d.idx))
@ -699,7 +704,7 @@ class StockEntry(StockController):
# SLE for target warehouse # SLE for target warehouse
self.get_sle_for_target_warehouse(sl_entries, finished_item_row) self.get_sle_for_target_warehouse(sl_entries, finished_item_row)
# reverse sl entries if cancel # reverse sl entries if cancel
if self.docstatus == 2: if self.docstatus == 2:
sl_entries.reverse() sl_entries.reverse()
@ -727,9 +732,9 @@ class StockEntry(StockController):
sle.dependant_sle_voucher_detail_no = d.name sle.dependant_sle_voucher_detail_no = d.name
elif finished_item_row and (finished_item_row.item_code != d.item_code or finished_item_row.t_warehouse != d.s_warehouse): elif finished_item_row and (finished_item_row.item_code != d.item_code or finished_item_row.t_warehouse != d.s_warehouse):
sle.dependant_sle_voucher_detail_no = finished_item_row.name sle.dependant_sle_voucher_detail_no = finished_item_row.name
sl_entries.append(sle) sl_entries.append(sle)
def get_sle_for_target_warehouse(self, sl_entries, finished_item_row): def get_sle_for_target_warehouse(self, sl_entries, finished_item_row):
for d in self.get('items'): for d in self.get('items'):
if cstr(d.t_warehouse): if cstr(d.t_warehouse):

4
erpnext/stock/doctype/stock_settings/stock_settings.json
View File

@ -217,7 +217,7 @@
"fieldname": "role_allowed_to_create_edit_back_dated_transactions", "fieldname": "role_allowed_to_create_edit_back_dated_transactions",
"fieldtype": "Link", "fieldtype": "Link",
"label": "Role Allowed to Create/Edit Back-dated Transactions", "label": "Role Allowed to Create/Edit Back-dated Transactions",
"options": "User" "options": "Role"
}, },
{ {
"fieldname": "column_break_26", "fieldname": "column_break_26",
@ -234,7 +234,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"issingle": 1, "issingle": 1,
"links": [], "links": [],
"modified": "2020-11-23 22:26:54.225608", "modified": "2020-12-29 12:53:31.162247",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Stock Settings", "name": "Stock Settings",