Commit graph

14678 commits

Author SHA1 Message Date
Saurabh
0fffaeebf5 bumped to version 10.0.6 2018-01-02 12:41:29 +06:00
Manas Solanki
93885ec8a5 Fix the customization (#4704)
* keep the json file for parent and child table different

* skip the child table customization if its file exists

* update the json of the child tables also
2018-01-02 11:56:17 +05:30
Faris Ansari
909234ab9d Listview get_count fix (#4740) 2018-01-02 11:55:49 +05:30
Saurabh
7d150a49a3 [fix] pass is root parameter on node creation (#4730) 2018-01-01 16:12:10 +05:30
Manas Solanki
d5f970e2b7 provide translations in the background process (#4735) 2018-01-01 16:11:04 +05:30
Nabin Hait
01438f0cd5 Merge branch 'hotfix' 2017-12-28 19:41:26 +05:30
Nabin Hait
ae18969f1e bumped to version 10.0.5 2017-12-28 20:11:26 +06:00
Manas Solanki
7c6004e981 minor fix for the data import (#4706) 2017-12-28 19:34:35 +05:30
Nabin Hait
80004c10e4 Merge branch 'hotfix' 2017-12-28 13:12:22 +05:30
Nabin Hait
7920309056 bumped to version 10.0.4 2017-12-28 13:42:22 +06:00
rohitwaghchaure
5d6fdb8f05 Show zero rate column in the print if print_hide_if_no_value is disabled (#4694) 2017-12-28 13:08:54 +05:30
Manas Solanki
fa3c2a219d [Fix] Minor fix in data importer (#4690) 2017-12-28 12:37:02 +05:30
Frappe PR Bot
5b8c857fc0 [Translation] Updated Translations (#4696) 2017-12-28 12:32:58 +05:30
Nabin Hait
8895e89315 Merge branch 'develop' 2017-12-26 18:33:00 +05:30
Nabin Hait
7c2782e594 bumped to version 10.0.3 2017-12-26 19:03:00 +06:00
Vishal Dhayagude
42d8ca63fb [fix] Remove dirty call in sync.js (#4688) 2017-12-26 18:25:06 +05:30
Manas Solanki
98036fd018 don't throw error if there is autoname controller (#4687) 2017-12-26 16:11:10 +05:30
Nabin Hait
bf6d044446 Version 10 change log 2017-12-26 14:31:14 +05:30
Nabin Hait
2150d85f73 Merge branch 'master' into develop 2017-12-25 19:14:34 +05:30
Nabin Hait
4a336aa81f Merge branch 'hotfix' 2017-12-25 19:14:33 +05:30
Nabin Hait
8a78f40f21 bumped to version 10.0.2 2017-12-25 19:44:33 +06:00
Faris Ansari
6d03ebd1c6 Hotfix login (#4680)
* FIx XSS Sanitize

* Don't sanitize password
2017-12-25 18:48:59 +05:30
Prateeksha Singh
d75f44d059
Merge pull request #4682 from frappe/hotfix
[hotfix] remove setup fail message
2017-12-25 18:48:27 +05:30
Prateeksha Singh
51fd6fa2b7
[hotfix] remove setup fail message
Else it also appears for non-cloud users, where we don't receive an email: https://discuss.erpnext.com/t/initial-setup-failed-dont-worry-its-not-you-its-us/31948/5
2017-12-25 18:47:41 +05:30
Nabin Hait
c83d40bfe7 Merge branch 'hotfix' 2017-12-25 18:26:17 +05:30
Nabin Hait
289b48fcdf bumped to version 10.0.1 2017-12-25 18:56:17 +06:00
Faris Ansari
b5bf7ca6fe FIx XSS Sanitize (#4678) 2017-12-25 18:23:54 +05:30
rohitwaghchaure
337564eea2 [Fix] Sent email not displaying in the list (#4668) 2017-12-25 16:26:25 +05:30
Nabin Hait
ad1d894685 Merge branch 'develop' 2017-12-25 15:24:02 +05:30
Nabin Hait
70ee7e8d32 bumped to version 10.0.0 2017-12-25 15:54:01 +06:00
Nabin Hait
28a8da6531 Added domain settings in setup page 2017-12-25 15:20:36 +05:30
Faris Ansari
2f8e68b81d
fix frappe/erpnext#12112 (#4677) 2017-12-25 13:43:56 +05:30
tundebabzy
1bb960664e Add New Currency - XCD (#4660)
* adds XCD currency

* add as a new patch

* clean up
2017-12-25 13:39:48 +05:30
Manas Solanki
2385c07873 fix the User Permission for Page and Report (#4664)
* fix the User Permission for Page and Report

* make 'make_role_for' reqd
2017-12-25 13:38:38 +05:30
Zarrar
60875dfc00 splice error on console (#4669) 2017-12-25 13:37:56 +05:30
Faris Ansari
90c1bb1bfa [minor] Handle empty section name (#4676) 2017-12-25 13:32:12 +05:30
Nabin Hait
8855f7048f Merge branch 'hotfix' 2017-12-25 13:30:48 +05:30
Nabin Hait
8a09f915e9 Merge branch 'master' into develop 2017-12-25 13:30:48 +05:30
Nabin Hait
4ebe337e07 bumped to version 9.2.25 2017-12-25 14:00:48 +06:00
Nabin Hait
5624047d31 Version 10 change log 2017-12-25 12:26:43 +05:30
rohitwaghchaure
9bb4239dd5 [fix] Shipping address not fetch from purchase order in to purchase invoice & receipt. (#4672) 2017-12-25 11:27:56 +05:30
Prateeksha Singh
ae0234e7e6 [export-fields] export comma separated lines for long values (#4667)
* [export-fields] export comma separated lines for long values, fixes frappe/erpnext#12085

* Update xlsxutils.py
2017-12-22 11:11:13 +05:30
Prateeksha Singh
b9604a1ebb
Merge pull request #4665 from rohitwaghchaure/precision_issue
[Fix] Decimal issue
2017-12-22 11:02:51 +05:30
Rohit Waghchaure
0a367e837e [Fix] Decimal issue 2017-12-21 15:53:22 +05:30
Prateeksha Singh
d5ad0ff2e8 Setup stages (#4618)
* setup complete stages

* [setup] better setup-in-progress card

* restructure setup exception flow

* use setup_stages hook

* Add message for non-dev mode, fail instead of error

* message to not include commits in app setup stages
2017-12-21 11:55:49 +05:30
Prateeksha Singh
56bf54322f
Merge pull request #4659 from netchampfaris/fast-bench-build
Faster bench build in development
2017-12-20 14:22:54 +05:30
Prateeksha Singh
a3669c86a5
Merge pull request #4645 from netchampfaris/handle-json-request
Handle content_type application/json in request
2017-12-20 13:16:38 +05:30
Faris Ansari
1de429f275 Faster bench build in development 2017-12-20 12:36:35 +05:30
Manas Solanki
4e95459410 set the desktop icon while saving the domain settings (#4657)
* set the desktop icon while saving the domain settings

* delete the custom icon only if the setup not complete
2017-12-20 11:53:27 +05:30
Nabin Hait
8463937acd Enqueued communication patch if more than 1 lakh records 2017-12-20 11:48:30 +05:30