Nabin Hait e21e59614f Fixed merge conflict

2018-02-12 15:59:55 +05:30

..

accounts

Fixed merge conflict

2018-02-12 15:59:55 +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

Hotels (#11907)

2018-02-12 11:57:12 +05:30

controllers

Fixed merge conflict

2018-02-12 15:59:55 +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

Hotels (#11907)

2018-02-12 11:57:12 +05:30

domains

Hotels (#11907)

2018-02-12 11:57:12 +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

Physician - Set Details by User or Employee (#12558)

2018-02-12 11:33:44 +05:30

hotels

Hotels (#11907)

2018-02-12 11:57:12 +05:30

hr

Merge branch 'master' into develop

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

hub

Hub (#10934)

2017-10-05 11:17:30 +05:30

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

Fixed merge conflict

2018-02-12 15:59:55 +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

Report presentation currency (#12670)

2018-02-12 15:04:50 +05:30

regional

Minor fixes in gstr reports (#12848)

2018-02-09 15:30:55 +05:30

restaurant

Hotels (#11907)

2018-02-12 11:57:12 +05:30

selling

Fixed merge conflict

2018-02-12 15:59:55 +05:30

setup

Shareholder and related doctypes (#12215)

2018-02-12 11:32:47 +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

Fixed merge conflict

2018-02-12 15:59:55 +05:30

support

[fix] primary button color for make

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

templates

Fix bootstrap layout and move checkout button upper (#12063)

2018-02-12 11:28:57 +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

[Minor]Changed CustomerDisabled and CustomerFrozen to PartyDisabled and PartyFrozen

2016-01-25 21:25:11 +05:30

hooks.py

Cleanup and fixes on GSTR-2

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

modules.txt

Hotels (#11907)

2018-02-12 11:57:12 +05:30

patches.txt

Fixed merge conflict

2018-02-12 15:59:55 +05:30