Merge branch 'develop'
diff --git a/erpnext/__version__.py b/erpnext/__version__.py
index 3c9329b..64f6e28 100644
--- a/erpnext/__version__.py
+++ b/erpnext/__version__.py
@@ -1 +1 @@
-__version__ = '4.7.1'
+__version__ = '4.7.2'
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index de6f096..fe989d8 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -4,7 +4,7 @@
app_description = "Open Source Enterprise Resource Planning for Small and Midsized Organizations"
app_icon = "icon-th"
app_color = "#e74c3c"
-app_version = "4.7.1"
+app_version = "4.7.2"
error_report_email = "support@erpnext.com"
diff --git a/erpnext/patches/v4_2/fix_gl_entries_for_stock_transactions.py b/erpnext/patches/v4_2/fix_gl_entries_for_stock_transactions.py
index 2de3daa..a72b954 100644
--- a/erpnext/patches/v4_2/fix_gl_entries_for_stock_transactions.py
+++ b/erpnext/patches/v4_2/fix_gl_entries_for_stock_transactions.py
@@ -7,7 +7,7 @@
def execute():
from erpnext.utilities.repost_stock import repost
- repost(allow_zero_rate=True)
+ repost(allow_zero_rate=True, only_actual=True)
warehouse_account = frappe.db.sql("""select name, master_name from tabAccount
where ifnull(account_type, '') = 'Warehouse'""")
diff --git a/erpnext/utilities/repost_stock.py b/erpnext/utilities/repost_stock.py
index 4be9591..643bec9 100644
--- a/erpnext/utilities/repost_stock.py
+++ b/erpnext/utilities/repost_stock.py
@@ -9,7 +9,7 @@
from erpnext.stock.stock_ledger import update_entries_after
from erpnext.accounts.utils import get_fiscal_year
-def repost(allow_negative_stock=False, allow_zero_rate=False):
+def repost(only_actual=False, allow_negative_stock=False, allow_zero_rate=False):
"""
Repost everything!
"""
@@ -23,7 +23,7 @@
union
select item_code, warehouse from `tabStock Ledger Entry`) a"""):
try:
- repost_stock(d[0], d[1], allow_zero_rate)
+ repost_stock(d[0], d[1], allow_zero_rate, only_actual)
frappe.db.commit()
except:
frappe.db.rollback()
@@ -33,10 +33,10 @@
frappe.db.get_value("Stock Settings", None, "allow_negative_stock"))
frappe.db.auto_commit_on_many_writes = 0
-def repost_stock(item_code, warehouse, allow_zero_rate=False):
+def repost_stock(item_code, warehouse, allow_zero_rate=False, only_actual=False):
repost_actual_qty(item_code, warehouse, allow_zero_rate)
- if item_code and warehouse:
+ if item_code and warehouse and not only_actual:
update_bin_qty(item_code, warehouse, {
"reserved_qty": get_reserved_qty(item_code, warehouse),
"indented_qty": get_indented_qty(item_code, warehouse),
diff --git a/setup.py b/setup.py
index 11148e5..e567ea2 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
from setuptools import setup, find_packages
import os
-version = "4.7.1"
+version = "4.7.2"
with open("requirements.txt", "r") as f:
install_requires = f.readlines()