Nabin Hait a804d6d487 Fixed merge conflict

2018-08-29 13:34:58 +05:30

..

accounts

Fixed merge conflict

2018-08-29 13:34:58 +05:30

agriculture

Refactor Naming Series (#15070)

2018-08-28 13:44:48 +05:30

assets

Fixed merge conflict

2018-08-29 13:34:58 +05:30

buying

Fixed merge conflict

2018-08-29 13:34:58 +05:30

change_log

Email alert renamed to Notification (#14618)

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

commands

…

config

rectify item price route (#15223)

2018-08-27 11:44:13 +05:30

controllers

Fixed merge conflict

2018-08-29 13:34:58 +05:30

crm

Refactor Naming Series (#15070)

2018-08-28 13:44:48 +05:30

demo

monkey patching for demo (#15141)

2018-08-14 16:27:47 +05:30

domains

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

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

education

Fixed merge conflict

2018-08-29 13:34:58 +05:30

erpnext_integrations

erpnext: refactor async to is_async (#15231)

2018-08-28 14:11:58 +05:30

healthcare

Refactor Naming Series (#15070)

2018-08-28 13:44:48 +05:30

hotels

Refactor Naming Series (#15070)

2018-08-28 13:44:48 +05:30

hr

erpnext: refactor async to is_async (#15231)

2018-08-28 14:11:58 +05:30

hub

…

hub_node

Fixed merge conflict

2018-08-29 13:34:58 +05:30

maintenance

Refactor Naming Series (#15070)

2018-08-28 13:44:48 +05:30

manufacturing

Refactor Naming Series (#15070)

2018-08-28 13:44:48 +05:30

non_profit

Refactor Naming Series (#15070)

2018-08-28 13:44:48 +05:30

patches

Fixed merge conflict

2018-08-29 13:34:58 +05:30

portal

Fixed merge conflict

2018-08-29 13:34:58 +05:30

projects

Fixed merge conflict

2018-08-29 13:34:58 +05:30

public

Fixed merge conflict

2018-08-29 13:34:58 +05:30

regional

[Fix] Removed roles for Eway bill report (#15157)

2018-08-20 17:53:56 +05:30

restaurant

Refactor Naming Series (#15070)

2018-08-28 13:44:48 +05:30

selling

Fixed merge conflict

2018-08-29 13:34:58 +05:30

setup

Fixed merge conflict

2018-08-29 13:34:58 +05:30

shopping_cart

optimize(various)

2018-08-08 16:37:31 +05:30

startup

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

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

stock

Fixed merge conflict

2018-08-29 13:34:58 +05:30

support

Refactor Naming Series (#15070)

2018-08-28 13:44:48 +05:30

templates

Fixed merge conflict

2018-08-29 13:34:58 +05:30

tests

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

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

translations

Spelling updated from Maxiumm to Maximum (#15093)

2018-08-06 14:32:46 +05:30

utilities

Refactor Naming Series (#15070)

2018-08-28 13:44:48 +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-08-29 13:34:58 +05:30

exceptions.py

…

hooks.py

Cleaned up welcome email code (#15175)

2018-08-24 15:15:56 +05:30

modules.txt

…

patches.txt

Fixed merge conflict

2018-08-29 13:34:58 +05:30