Nabin Hait 8fa503e177 Fixed conflict while merging v4 into v5

2015-02-10 16:44:00 +05:30

..

js

Address and contact creation from opportunity #1570

2014-05-02 11:42:24 +05:30

tests

Fixes for recurring document

2014-09-21 19:45:49 +05:30

__init__.py

moved modules inside erpnext folder

2013-12-11 10:43:52 +05:30

accounts_controller.py

Fixed conflict

2015-01-14 16:27:13 +05:30

buying_controller.py

Fixed conflict while merging v4 into v5

2015-02-10 16:37:18 +05:30

print_settings.py

[print] item tables - override description and uom

2015-02-04 17:02:24 +05:30

queries.py

[item variants] make variants, bom updates

2014-10-07 11:40:47 +05:30

recurring_document.py

fixed conflict while merging develop into v5

2014-12-31 13:24:36 +05:30

selling_controller.py

Fixed conflict while merging v4 into v5

2015-02-10 16:44:00 +05:30

status_updater.py

fixes for #2655

2015-02-06 15:51:20 +05:30

stock_controller.py

Fixed conflict while merging v4 into v5

2015-02-10 16:37:18 +05:30

trends.py

added translations to report py file.

2014-09-12 16:07:12 +05:30