mbauskar f3be738b68 resolved merge conflicts

2017-08-04 11:07:07 +05:30

..

doctype

View Attachments in portal (#8830)

2017-05-19 16:04:10 +05:30

__init__.py

[fixes] setup wizard and other fixes related to cart

2015-09-23 12:50:35 +05:30

cart.py

Fix and improve shopping cart (#9348)

2017-06-20 12:51:32 +05:30

product.py

[fix] website stock not shown due to discount not set

2017-08-02 22:14:51 +05:30

test_shopping_cart.py

[fix] company graph based on base currency (#9950)

2017-07-26 18:17:11 +05:30

utils.py

[fixes] address and contact

2017-01-14 00:25:22 +05:30