Saurabh d7897f1c53 Resolved merge conflicts

2018-07-18 17:08:16 +05:30

..

__init__.py

configs

2014-02-07 18:16:11 +05:30

accounts.py

Subscription test and fixes (#14875)

2018-07-13 17:41:36 +05:30

agriculture.py

Merge the Land Unit doctype with the Location doctype (#14613)

2018-07-13 12:50:04 +05:30

assets.py

Renamed asset adjustment to asset value adjustment (#14532)

2018-06-15 13:06:28 +05:30

buying.py

New Report Address and Contacts (#14307)

2018-06-05 10:44:36 +05:30

crm.py

Fixes for #13071 (#13234)

2018-03-08 16:23:59 +05:30

desktop.py

[Enhance][Fix] Healthcare - DocType and Fields renaming (#14861)

2018-07-16 18:08:53 +05:30

docs.py

[docs] cleanup

2017-07-31 17:40:17 +05:30

education.py

Student Report Card (#13346)

2018-03-21 17:50:42 +05:30

erpnext_integrations.py

Refactor shopify (#13588)

2018-05-16 11:33:47 +05:30

healthcare.py

[Enhance][Fix] Healthcare - DocType and Fields renaming (#14861)

2018-07-16 18:08:53 +05:30

hr.py

Resolved merge conflicts

2018-07-18 17:08:16 +05:30

hub_node.py

Hub (#10934)

2017-10-05 11:17:30 +05:30

learn.py

[ Enhance ] Production to Work Order (#12902)

2018-03-20 12:38:43 +05:30

maintenance.py

[minor] update font awesome icons

2016-12-07 11:09:02 +05:30

manufacturing.py

[ Enhance ] Production to Work Order (#12902)

2018-03-20 12:38:43 +05:30

non_profit.py

Loan Management for the Members (Non Profit Module) (#13149)

2018-04-24 12:19:36 +05:30

projects.py

Daily Reminder (#12938)

2018-03-20 11:58:15 +05:30

selling.py

New Report Address and Contacts (#14307)

2018-06-05 10:44:36 +05:30

setup.py

Success Action (#13666)

2018-05-03 19:06:32 +05:30

stock.py

[enhance] Item Alternative (#13121)

2018-03-28 11:51:44 +05:30

support.py

[enhance] Report for analysis of support hours count

2017-06-26 17:04:52 +05:30

website.py

[css] portal

2016-04-22 18:53:21 +05:30