Ameya Shenoy 4e96f55eff Merge branch 'master' into develop

2018-06-22 05:10:29 +00:00

..

accounts

Merge branch 'master' into develop

2018-06-22 05:10:29 +00:00

agriculture

[Agriculture] Sort crop tasks chronologically and optimize disease task creation (#14367)

2018-06-08 14:55:07 +05:30

assets

resolved merge conflict

2018-06-20 15:23:25 +05:30

buying

[Fix] Subscription method (#14604)

2018-06-21 12:58:14 +05:30

change_log

Email alert renamed to Notification (#14618)

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

commands

…

config

Change Restaurant icon type to module (#14578)

2018-06-19 10:43:08 +05:30

controllers

resolved merge conflict

2018-06-20 15:23:25 +05:30

crm

[minor] Fix

2018-06-14 16:43:47 +05:30

demo

Fix demo (#14365)

2018-06-06 15:05:31 +05:30

domains

…

education

…

erpnext_integrations

[Fix] Woocommerce test cases (#14513)

2018-06-14 09:13:39 +05:30

healthcare

Fix fields being hidden by default. (#14490)

2018-06-13 11:14:44 +05:30

hotels

…

hr

test fixes

2018-06-21 17:55:32 +05:30

hub

…

hub_node

…

maintenance

…

manufacturing

BOM Stock Calculation Report (#14561)

2018-06-21 11:27:54 +05:30

non_profit

Additional fields in Certified Consultant DocType (#14573)

2018-06-19 10:43:55 +05:30

patches

remove patch to add hra fields (#14552)

2018-06-18 15:43:45 +05:30

portal

…

projects

Update status if tasks have been completed (#14601)

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

public

[Fix] Subscription method (#14604)

2018-06-21 12:58:14 +05:30

regional

HRA fix (#14589)

2018-06-20 11:10:56 +05:30

restaurant

…

selling

Don't allow to sale asset item from POS (#14623)

2018-06-21 13:18:01 +05:30

setup

Job Applicant Source (#14543)

2018-06-21 10:47:54 +05:30

shopping_cart

…

startup

…

stock

improve performance of stock_value retrieval using tabBin instead of … (#14584)

2018-06-21 13:01:48 +05:30

support

…

templates

[portal] fix item-preview column #13077

2018-06-21 22:42:03 +05:30

tests

[Fix] Woocommerce test cases (#14513)

2018-06-14 09:13:39 +05:30

translations

[Translation] Updated Translations (#14615)

2018-06-21 10:34:28 +05:30

utilities

…

www

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

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

__init__.py

Merge branch 'master' into develop

2018-06-22 05:10:29 +00:00

exceptions.py

…

hooks.py

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

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

modules.txt

…

patches.txt

Change Restaurant icon type to module (#14578)

2018-06-19 10:43:08 +05:30