Nabin Hait fa06ee80e9 Fixed merge conflict

2018-07-27 12:54:00 +05:30

..

accounts

Fixed merge conflict

2018-07-27 12:54:00 +05:30

agriculture

[Minor] Fix Crop Cycle test record (#14901)

2018-07-15 20:04:24 +05:30

assets

Fix finance book getter error when book doesn't exist (#14987)

2018-07-23 14:16:35 +05:30

buying

Resolved merge conflicts

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

change_log

Email alert renamed to Notification (#14618)

2018-06-21 09:17:52 +05:30

commands

…

config

[Feature][Enhance] Healthcare Inpatient (#14940)

2018-07-23 13:05:35 +05:30

controllers

Resolved merge conflicts

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

crm

[minor] fixes to moment.defaultDateFormat and daily work summary eplies

2018-06-25 22:38:20 +05:30

demo

Fixed merge conflict

2018-07-27 12:54:00 +05:30

domains

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

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

education

Fixed merge conflict

2018-07-27 12:54:00 +05:30

erpnext_integrations

Merge pull request #14945 from chdecultot/gocardless_corrections

2018-07-26 11:41:43 +05:30

healthcare

Updated appointment availability to consider appointment duration in healthcare domain (#15011)

2018-07-27 11:02:03 +05:30

hotels

…

hr

Salary Slip tests for tax calc on benefits, additional salary (#14985)

2018-07-26 14:39:59 +05:30

hub

…

hub_node

[hub][minor] remove links #14309

2018-06-04 10:26:49 +05:30

maintenance

[Enhance] Department added wherever applicable (#14121)

2018-05-23 11:11:36 +05:30

manufacturing

[Minor] Moved mandatory Company field from More Information section to top (#14950)

2018-07-19 14:39:31 +05:30

non_profit

Resolved merge conflicts

2018-07-06 13:18:44 +05:30

patches

Fixed merge conflict

2018-07-27 12:54:00 +05:30

portal

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

projects

Added more status in task web form

2018-07-24 11:33:05 +05:30

public

semicolon

2018-07-25 17:07:26 +05:30

regional

Fixed merge conflict

2018-07-27 12:54:00 +05:30

restaurant

…

selling

Resolved merge conflicts

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

setup

delete version log while deleting company transaction (#15021)

2018-07-27 10:32:17 +05:30

shopping_cart

Travis (#14354)

2018-06-05 12:56:10 +05:30

startup

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

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

stock

Fixed merge conflict

2018-07-27 12:54:00 +05:30

support

Increase margin (#15016)

2018-07-27 10:57:32 +05:30

templates

Merge pull request #14945 from chdecultot/gocardless_corrections

2018-07-26 11:41:43 +05:30

tests

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

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

translations

[Translation] Updated Translations (#14849)

2018-07-09 16:56:49 +05:30

utilities

[fix] resolve conflicts

2018-05-31 17:32:17 +05:30

www

Certfication Application Doctype and webform,Certfied Consultant DocType (#14528)

2018-06-15 10:04:19 +05:30

__init__.py

Fixed merge conflict

2018-07-27 12:54:00 +05:30

exceptions.py

…

hooks.py

Update staging version to support symentic versioning

2018-07-19 13:36:32 +05:30

modules.txt

…

patches.txt

Merge patch and delete fields from subscription (#14941)

2018-07-19 14:33:31 +05:30