rohitwaghchaure 7e75165826

Merge branch 'develop' into fixes_12829

2018-02-09 12:01:41 +05:30

..

accounts

Merge branch 'develop' into fixes_12829

2018-02-09 12:01:41 +05:30

agriculture

Update agriculture_analysis_criteria.json (#12478)

2018-01-15 12:33:03 +05:30

assets

Minor fixes for depr based on FY

2018-02-07 18:25:45 +05:30

buying

Fixed merge conflict

2018-02-03 09:14:53 +05:30

change_log

Version 10 change log

2017-12-25 12:25:52 +05:30

commands

…

config

Merge pull request #12813 from pratu16x7/hub-fixes

2018-02-08 10:47:16 +05:30

controllers

resolved merge conflicts

2018-02-08 15:17:15 +05:30

crm

[fix] primary button color for make

2018-01-23 16:08:52 +05:30

demo

modified leave application tests

2018-01-22 12:26:41 +05:30

docs

updated the docs for education

2018-02-08 20:12:41 +05:30

domains

Set the guardian role automatically. (#12136)

2017-12-22 10:50:10 +05:30

education

Merge pull request #12710 from achillesrasquinha/12704

2018-01-31 11:23:05 +05:30

erpnext_integrations

Add Github Connector (#11259)

2017-11-13 19:19:13 +05:30

healthcare

Fixed spacing

2018-01-30 14:05:18 +05:30

hr

Merge branch 'master' into develop

2018-02-07 16:07:20 +05:30

hub

…

hub_node

company page, deprecate custom page

2018-02-07 23:50:01 +05:30

maintenance

Added maintenance to Asset and enhanced maintenance for Asset Maintenance

2017-11-28 15:14:56 +05:30

manufacturing

Fixed merge conflict

2018-02-03 09:14:53 +05:30

non_profit

resolved merge conflicts

2018-01-24 11:24:10 +05:30

patches

Cleanup and fixes on GSTR-2

2018-02-05 16:09:51 +05:30

portal

Set the guardian role automatically. (#12136)

2017-12-22 10:50:10 +05:30

projects

fix for making the invoice from the timesheet (#12803)

2018-02-07 12:07:27 +05:30

public

Merge branch 'develop' into fixes_12829

2018-02-09 12:01:41 +05:30

regional

Cleanup and fixes on GSTR-2

2018-02-05 16:09:51 +05:30

restaurant

Deleted restaurant order entry test cases

2018-02-07 16:56:07 +05:30

selling

Merge branch 'develop' into fixes_12829

2018-02-09 12:01:41 +05:30

setup

Fixed merge conflict

2018-02-03 09:14:53 +05:30

shopping_cart

[Fix] For non stock item, not able to place an order from shopping cart (#12758)

2018-02-05 12:25:02 +05:30

startup

workflow patch fix

2018-01-24 18:50:01 +05:30

stock

resolved merge conflicts

2018-02-08 15:17:15 +05:30

support

[fix] primary button color for make

2018-01-23 16:08:52 +05:30

templates

Merge pull request #12581 from britlog/website-product-spinner

2018-01-31 15:58:04 +05:30

tests

[Minor] Fix adding child to root task issue (#12121)

2017-12-22 11:00:19 +05:30

translations

[Translation] Updated Translations (#12613)

2018-01-23 14:35:52 +05:30

utilities

Fixed merge conflict

2018-02-03 09:14:53 +05:30

__init__.py

bumped to version 10.0.21

2018-02-08 15:34:25 +06:00

exceptions.py

…

hooks.py

Cleanup and fixes on GSTR-2

2018-02-05 16:09:51 +05:30

modules.txt

[Agriculture Domain] (#11663)

2017-12-06 18:36:27 +05:30

patches.txt

Cleanup and fixes on GSTR-2

2018-02-05 16:09:51 +05:30