Suraj Shetty 2f67647f7b Merge branch 'develop' of https://github.com/frappe/erpnext into fix-incorrect-translations		2020-01-29 15:06:50 +05:30
..
doctype	fixed conflicts	2019-10-15 14:18:59 +05:30
__init__.py	[fixes] setup wizard and other fixes related to cart	2015-09-23 12:50:35 +05:30
cart.py	fix: Incorrect translation syntax	2020-01-29 15:06:18 +05:30
product_info.py	fix: Product Page non-stock item status (#20383)	2020-01-24 15:52:27 +05:30
test_shopping_cart.py	fix: Missing commits from hotfix branch (#17997)	2019-07-03 10:34:31 +05:30
utils.py	[fixes] address and contact	2017-01-14 00:25:22 +05:30