nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-20 13:39:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3755 from nabinhait/fix1

Browse Source 
repost stock for product bundle materials
This commit is contained in:
Nabin Hait
2015-07-30 14:54:21 +05:30
parent 2f443a5789 d8546c4316
commit fe53651287
3 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/hr/doctype/leave_application/leave_application.py
View File

@@ -239,14 +239,15 @@ def get_total_leave_days(leave_app):
if not leave_app.half_day: if not leave_app.half_day:
tot_days = date_diff(leave_app.to_date, leave_app.from_date) + 1 tot_days = date_diff(leave_app.to_date, leave_app.from_date) + 1
if frappe.db.get_value("Leave Type", leave_app.leave_type, "include_holiday"): if frappe.db.get_value("Leave Type", leave_app.leave_type, "include_holiday"):
ret = {
'total_leave_days' : flt(tot_days)
}
else:
holidays = leave_app.get_holidays() holidays = leave_app.get_holidays()
ret = { ret = {
'total_leave_days' : flt(tot_days)-flt(holidays) 'total_leave_days' : flt(tot_days)-flt(holidays)
} }
else:
ret = {
'total_leave_days' : flt(tot_days)
}
return ret return ret
@frappe.whitelist() @frappe.whitelist()

4
erpnext/patches.txt
View File

@@ -181,6 +181,6 @@ erpnext.patches.v5_1.rename_roles
erpnext.patches.v5_1.default_bom erpnext.patches.v5_1.default_bom
execute:frappe.delete_doc("DocType", "Party Type") execute:frappe.delete_doc("DocType", "Party Type")
execute:frappe.delete_doc("Module Def", "Contacts") execute:frappe.delete_doc("Module Def", "Contacts")
erpnext.patches.v5_4.fix_reserved_qty_and_sle_for_packed_items erpnext.patches.v5_4.fix_reserved_qty_and_sle_for_packed_items # 30-07-2015
execute:frappe.reload_doctype("Leave Type") execute:frappe.reload_doctype("Leave Type")
execute:frappe.db.sql("update `tabLeave Type` set include_holiday=1") execute:frappe.db.sql("update `tabLeave Type` set include_holiday=0")

18
erpnext/patches/v5_4/fix_reserved_qty_and_sle_for_packed_items.py
View File

@@ -10,15 +10,19 @@ def execute():
where docstatus = 2 and ifnull(update_stock, 0) = 1""") where docstatus = 2 and ifnull(update_stock, 0) = 1""")
if cancelled_invoices: if cancelled_invoices:
repost_for = frappe.db.sql("""select distinct item_code, warehouse from `tabStock Ledger Entry`
where voucher_type = 'Sales Invoice' and voucher_no in (%s)"""
% (', '.join(['%s']*len(cancelled_invoices))), tuple(cancelled_invoices))
frappe.db.sql("""delete from `tabStock Ledger Entry` frappe.db.sql("""delete from `tabStock Ledger Entry`
where voucher_type = 'Sales Invoice' and voucher_no in (%s)""" where voucher_type = 'Sales Invoice' and voucher_no in (%s)"""
% (', '.join(['%s']*len(cancelled_invoices))), tuple(cancelled_invoices)) % (', '.join(['%s']*len(cancelled_invoices))), tuple(cancelled_invoices))
for item_code, warehouse in frappe.db.sql("select item_code, warehouse from tabBin where ifnull(reserved_qty, 0) < 0"): for item_code, warehouse in repost_for:
repost_actual_qty(item_code, warehouse)
repost_actual_qty(item_code, warehouse)
update_bin_qty(item_code, warehouse, {
"reserved_qty": get_reserved_qty(item_code, warehouse)
})
for item_code, warehouse in frappe.db.sql("""select distinct item_code, warehouse
from `tabPacked Item` where parenttype = 'Sales Invoice' and docstatus = 1"""):
update_bin_qty(item_code, warehouse, {
"reserved_qty": get_reserved_qty(item_code, warehouse)
})