Saif Ur Rehman 3d275af67b Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 ... # Conflicts: # erpnext/buying/doctype/supplier/supplier.json # erpnext/patches.txt # erpnext/selling/doctype/customer/customer.json		2019-01-24 23:40:16 +05:00
..
doctype	Merge branch 'staging' into develop	2019-01-22 15:56:39 +05:30
__init__.py	[fixes] setup wizard and other fixes related to cart	2015-09-23 12:50:35 +05:30
cart.py	Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12	2019-01-22 16:20:40 +05:00
product_info.py	style: Remove unused imports	2019-01-23 00:28:37 +05:30
test_shopping_cart.py	Fix tests	2019-01-06 18:14:18 +05:00
utils.py	[fixes] address and contact	2017-01-14 00:25:22 +05:30