Manas Solanki 1879f08c7c

Merge branch 'develop' into deferred-account

2018-05-15 15:20:44 +05:30

..

accounts

Merge branch 'develop' into deferred-account

2018-05-15 15:20:44 +05:30

agriculture

…

assets

Code cleanup

2018-05-14 19:09:44 +05:30

buying

Resolve merge conflicts from enterprise_sprint branch

2018-05-14 21:15:46 +05:30

change_log

…

commands

…

config

Resolve merge conflicts from enterprise_sprint branch

2018-05-14 21:15:46 +05:30

controllers

[fix] resolved merge conflicts

2018-05-15 13:02:40 +05:30

crm

…

demo

config/utility level changes

2018-05-14 11:45:38 +05:30

docs

Resolve merge conflicts from enterprise_sprint branch

2018-05-14 21:15:46 +05:30

domains

…

education

Resolve merge conflicts from enterprise_sprint branch

2018-05-14 21:15:46 +05:30

erpnext_integrations

…

healthcare

[Healthcare] Fix UI (#14011)

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

hotels

…

hr

Update employee_onboarding.py

2018-05-15 14:32:37 +05:30

hub

…

hub_node

controller and other changes

2018-05-14 11:45:38 +05:30

maintenance

…

manufacturing

[fix] Get items from BOM error in python 3 (#14012)

2018-05-14 14:05:52 +05:30

non_profit

Remove the duplicate description

2018-04-27 12:46:56 +05:30

patches

skip abbr, reload doc, disable edit for root department node'

2018-05-15 13:53:40 +05:30

portal

…

projects

[fix] resolved merge conflicts

2018-05-15 13:02:40 +05:30

public

[fix] resolved merge conflicts

2018-05-15 13:02:40 +05:30

regional

Resolve merge conflicts from enterprise_sprint branch

2018-05-14 21:15:46 +05:30

restaurant

…

selling

[fix] resolved merge conflicts

2018-05-15 13:02:40 +05:30

setup

Merge branch 'develop' into deferred-account

2018-05-15 15:20:44 +05:30

shopping_cart

[fix] honour the shopping cart setting when showing the stock and non-stock item (#13988)

2018-05-14 14:30:30 +05:30

startup

Resolve merge conflicts from enterprise_sprint branch

2018-05-14 21:15:46 +05:30

stock

Merge branch 'develop' into deferred-account

2018-05-15 15:20:44 +05:30

support

…

templates

[fix] resolved merge conflicts

2018-05-15 13:02:40 +05:30

tests

…

translations

…

utilities

Resolve merge conflicts from enterprise_sprint branch

2018-05-14 21:15:46 +05:30

__init__.py

bumped to version 10.1.32

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

exceptions.py

…

hooks.py

Merge branch 'develop' into deferred-account

2018-05-15 15:20:44 +05:30

modules.txt

…

patches.txt

Resolve merge conflicts from enterprise_sprint branch

2018-05-14 21:15:46 +05:30