mbauskar 0e6933a1e8 resolved merge conflicts

2017-07-20 14:19:47 +05:30

..

tests

Multiple delivery dates in Sales Order and make DN based on selected delivery dates (#9933)

2017-07-20 10:30:59 +05:30

__init__.py

moved modules inside erpnext folder

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

accounts_controller.py

Remove newline from serial no values

2017-07-18 12:15:16 +05:30

buying_controller.py

Merge pull request #8987 from bcornwellmott/bom_convert_uom

2017-06-28 16:28:31 +05:30

item_variant.py

Inspection required before delivery isn't working for item variants (#9362)

2017-07-04 15:43:02 +05:30

print_settings.py

[fix] compact print format not longer ignores format builder

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

queries.py

Customer Query include Searchfields

2017-06-23 20:32:52 +03:00

recurring_document.py

[fixes] for recurring and tests

2017-03-14 19:13:39 +05:30

sales_and_purchase_return.py

remove bracket (#9284)

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

selling_controller.py

Selling price validation against last purchase rate / valuation rate (#8702)

2017-05-05 17:23:17 +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

Itemised tax breakup fix in docs other than invoice (#9961)

2017-07-20 13:32:01 +05:30

trends.py

[enhance] Stock qty added in purchase invoice

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

website_list_for_contact.py

[minor] added order by args to get_*_list methods (#8413)

2017-04-12 13:02:28 +05:30