Saif Ur Rehman d5c7410ad1 Merge branch 'staging' of https://github.com/frappe/erpnext.git into Item-Tax-Template ...

# Conflicts:
#	erpnext/buying/doctype/supplier/supplier.json
#	erpnext/patches.txt
#	erpnext/selling/doctype/customer/customer.json
#	erpnext/selling/doctype/sales_order/sales_order.json

2019-01-24 23:34:16 +05:00

..

doctype

Merge branch 'master' into staging-fixes

2019-01-22 15:37:05 +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 'staging' of https://github.com/frappe/erpnext.git into Item-Tax-Template

2019-01-24 23:34:16 +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