Manas Solanki f60bd60012 Fix the demo for the schools (#8879) ...

* Fix the demo for the schools

* Fix for the demo

https://github.com/frappe/erpnext/issues/6347

2017-06-01 18:30:35 +05:30

..

accounts

Merge branch 'master' into develop

2017-05-30 15:59:04 +05:30

buying

Annual billing amount in party dashboard based on grand total

2017-05-24 16:46:56 +05:30

change_log

Change log for version 8

2017-03-30 16:00:43 +05:30

config

Merge the student group and student batch (#8663)

2017-05-09 15:32:52 +05:30

controllers

Set change amount automatically only if it is a cash transaction (#9065)

2017-05-30 15:35:01 +05:30

crm

Merge branch 'master' into develop

2017-05-30 22:52:39 +05:30

demo

Fix the demo for the schools (#8879)

2017-06-01 18:30:35 +05:30

docs

[minor] removed the {next} for last page (#9002)

2017-05-24 18:35:35 +05:30

hr

Correction in the validation message (#9079)

2017-05-30 15:56:48 +05:30

hub_node

…

maintenance

[minor] remove order_type as setter in multiselect (#8906)

2017-05-19 11:09:12 +05:30

manufacturing

Merge branch 'master' into develop

2017-05-30 15:59:04 +05:30

patches

Fixed merge conflict

2017-05-24 18:39:16 +05:30

portal

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

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

projects

Merge branch 'master' into develop

2017-05-30 15:59:04 +05:30

public

Merge branch 'master' into develop

2017-05-30 15:59:04 +05:30

schools

Fix the demo for the schools (#8879)

2017-06-01 18:30:35 +05:30

selling

Annual billing amount in party dashboard based on grand total

2017-05-24 16:46:56 +05:30

setup

Fixed merge conflict

2017-05-24 18:39:16 +05:30

shopping_cart

Revert "View Attachments in portal (#8830)"

2017-05-24 17:33:07 +05:30

startup

[enhance] Show notification for draft state records if doctype is submittable

2017-04-28 09:59:29 +05:30

stock

Merge branch 'master' into develop

2017-05-30 15:59:04 +05:30

support

[enhancement] Changed Issue Description and Resolution to Text Editor (#8346)

2017-04-06 14:56:44 +05:30

templates

Revert "Website Specification Labls should not be capitalised by default (#8798)"

2017-05-24 17:33:07 +05:30

tests

Issue 8842 (#8869)

2017-05-19 11:42:45 +05:30

translations

[rename] zh-tw -> zh-TW

2017-05-19 18:27:53 +05:30

utilities

[minor] remove student batch name from activation.py

2017-05-19 14:53:32 +05:30

__init__.py

bumped to version 8.0.42

2017-05-30 23:22:38 +06:00

exceptions.py

…

hooks.py

updating serial no status from scheduler #9061 (#9066)

2017-05-30 15:35:58 +05:30

modules.txt

…

patches.txt

Fixed merge conflict

2017-05-24 18:39:16 +05:30