Saurabh 2735701aab resolved merge conflicts

2018-02-14 11:51:09 +05:30

..

tests

Python 3 fixes [merge asap] (#12884)

2018-02-13 14:42:40 +05:30

__init__.py

moved modules inside erpnext folder

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

accounts_controller.py

Fixed merge conflict

2018-02-12 15:59:55 +05:30

buying_controller.py

Deduct Rejected Item's Raw materials in SubContracting (#12837)

2018-02-12 11:59:07 +05:30

item_variant.py

Python 3 fixes [merge asap] (#12884)

2018-02-13 14:42:40 +05:30

print_settings.py

[fix] compact print format not longer ignores format builder

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

queries.py

Fixed merge conflict

2018-02-12 15:59:55 +05:30

sales_and_purchase_return.py

Invalid return against purchase invoice Error - Issue#11834 (#11835)

2017-12-04 11:16:34 +05:30

selling_controller.py

[Fix] Not able to save sales order (#12851)

2018-02-12 11:27:37 +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

[hotfix] Advance Total validation

2018-02-08 13:33:52 +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