Nabin Hait cd9c45f816 Fixed merge conflict

2016-10-07 16:53:07 +05:30

..

js

…

tests

[fix] removed bad import

2016-06-09 16:57:16 +05:30

__init__.py

…

accounts_controller.py

Documentation for payments

2016-10-06 16:49:39 +05:30

buying_controller.py

Fixed version conflict

2016-10-05 17:18:36 +05:30

item_variant.py

[fix] variant error message

2016-07-18 14:40:14 +05:30

print_settings.py

…

queries.py

Minor fixes

2016-09-05 11:51:45 +05:30

recurring_document.py

…

sales_and_purchase_return.py

[Enhancement] Purchase return for rejected qty

2016-09-05 00:43:17 +05:30

selling_controller.py

Documentation for payments

2016-10-06 16:49:39 +05:30

status_updater.py

Fixed merge conflict

2016-10-07 16:53:07 +05:30

stock_controller.py

[fix] Repost only distinct purchase receipts and invoices

2016-08-19 16:39:50 +05:30

taxes_and_totals.py

[POS] Currency format issue

2016-08-31 02:04:53 +05:30

trends.py

[minor][fix] for condition maker

2016-10-03 12:48:25 +05:30

website_list_for_contact.py

[Enhancement] Supplier quotation added on supplier portal

2016-09-21 17:07:25 +05:30