Rushabh Mehta b46900a4cb Merge branch 'master' into staging

2017-09-29 16:22:02 +05:30

..

accounts

Merge branch 'master' into staging

2017-09-29 16:22:02 +05:30

buying

Fixed merge conflict

2017-09-28 12:31:33 +05:30

change_log

change log for version 9

2017-09-26 12:41:43 +05:30

commands

[demo] make it faster, do not send user email

2017-06-16 16:55:32 +05:30

config

[Enahance] Update variants fields defined in the Item Varianst Settings, if template updated

2017-09-21 15:41:57 +05:30

controllers

Merge branch 'master' into staging

2017-09-29 16:22:02 +05:30

crm

Fixed indentation

2017-09-21 15:51:42 +05:30

demo

[minor] Added batch item in the demo data

2017-09-28 15:19:26 +05:30

docs

Revert "Advance against expense claim (#10632)" (#10877)

2017-09-25 11:27:39 +05:30

healthcare

[domain] Healthcare (#10664)

2017-09-13 12:52:30 +05:30

hr

[fix] https://github.com/frappe/erpnext/issues/10956

2017-09-28 15:21:36 +05:30

hub_node

…

maintenance

fixed merge conflicts

2017-06-15 13:42:47 +05:30

manufacturing

[fix] bom.py, dont use keyword

2017-09-29 15:50:17 +05:30

patches

Fixed merge conflict

2017-09-28 12:31:33 +05:30

portal

[hotfix] fixed the recursion error while saving the User (#8696)

2017-05-05 11:53:00 +05:30

projects

Update project.js (#10796)

2017-09-18 15:44:36 +05:30

public

Merge branch 'master' into develop

2017-09-27 13:05:21 +05:30

regional

[fix] Added billing address gstin number in the sales invoice and delivery note as well in the sales gst reports (#10872)

2017-09-28 11:05:03 +05:30

schools

only validate party account and ref doc party account in selected case (#10863)

2017-09-21 12:01:20 +05:30

selling

[fix] ‘NoneType’ object is not iterable onload of POS (#10941)

2017-09-28 10:56:27 +05:30

setup

install company fixtures while creating company (#10904)

2017-09-27 11:44:39 +05:30

shopping_cart

[fix] redirect to payment url if paying via web portal (#10265)

2017-08-08 11:29:11 +05:30

startup

resolved merge conflicts

2017-09-14 15:32:55 +05:30

stock

item price track_changes default to 1 (#10958)

2017-09-28 15:28:59 +05:30

support

Hide "Help Article" button for timeline Communication type "Comment". (#10541)

2017-08-25 12:44:33 +05:30

templates

Properly redirect supplier after quotations submit (#10903)

2017-09-27 12:53:38 +05:30

tests

Set default customer group and territory after install

2017-09-14 17:26:23 +05:30

translations

[Translation] Updated Translations (#10901)

2017-09-26 17:18:42 +05:30

utilities

[setup] remove translations from action name (#10911)

2017-09-26 13:07:24 +05:30

__init__.py

bumped to version 9.0.4

2017-09-29 16:52:01 +06:00

exceptions.py

…

hooks.py

Merge branch 'master' into develop

2017-09-27 13:05:21 +05:30

modules.txt

Fixed merge conflict

2017-09-21 12:53:41 +05:30

patches.txt

Fixed merge conflict

2017-09-28 12:31:33 +05:30