mbauskar ea832b8157 resolved merge conflicts

2017-09-14 15:32:10 +05:30

..

tests

[Enhance] Subscription module (#10089)

2017-09-07 16:14:22 +05:30

__init__.py

moved modules inside erpnext folder

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

accounts_controller.py

[Enhance] Subscription module (#10089)

2017-09-07 16:14:22 +05:30

buying_controller.py

Print Settings for printing taxes with zero amount (#10782)

2017-09-14 15:17:38 +05:30

item_variant.py

[minor] set description to '' if template description is not available (#10244)

2017-08-02 18:16:53 +05:30

print_settings.py

[fix] compact print format not longer ignores format builder

2017-01-25 08:20:43 +08:00

queries.py

[fix] warehouse query fixes https://github.com/frappe/erpnext/issues/10537 (#10538)

2017-08-24 15:23:33 +05:30

sales_and_purchase_return.py

remove bracket (#9284)

2017-06-14 15:51:47 +05:30

selling_controller.py

Print Settings for printing taxes with zero amount (#10782)

2017-09-14 15:17:38 +05:30

status_updater.py

Fix #4587: Status does not display "Pending" in report filter (#9104)

2017-06-07 12:02:07 +05:30

stock_controller.py

Added is_perpetual_inventory_enabled method

2017-06-20 11:26:37 +05:30

taxes_and_totals.py

Tax breakup for actual amount and fixes in itemised purchase register (#10515)

2017-08-24 16:22:28 +05:30

trends.py

[enhance] Stock qty added in purchase invoice

2017-04-11 18:29:52 +05:30

website_list_for_contact.py

[hotfix] fixed Not Permitted issue for System user while accessing documents on portal (#10725)

2017-09-10 12:04:28 +05:30