Commit graph

14318 commits

Author SHA1 Message Date
Saurabh
bdc87d437a [fix] set skip_errors params from data import tool (#4438) 2017-11-06 17:26:29 +05:30
Prateeksha Singh
a29a46d2ed
Merge pull request #4427 from rohitwaghchaure/illegal_char_issue_export
[fix] Not able to export general ledger report's data if data has illegal characters
2017-11-06 16:35:18 +05:30
Prateeksha Singh
50d55c93cf
Merge pull request #4432 from pratu16x7/hotfix1
[hotfix] setup complete state colors
2017-11-06 10:12:29 +05:30
pratu16x7
e9209151cf [fix] setup complete state colors 2017-11-06 10:10:01 +05:30
Saurabh
c2e5e76992 Merge branch 'hotfix' 2017-11-03 17:01:07 +05:30
Saurabh
e8efebf1c4 bumped to version 9.2.6 2017-11-03 17:31:07 +06:00
Nabin Hait
010a32d95a
[fix] Header for sms send request (#4417) 2017-11-03 16:20:53 +05:30
Rohit Waghchaure
f8928dc999 [fix] Not able to export general ledger report's data if data has illegal characters 2017-11-03 15:01:42 +05:30
rohitwaghchaure
de7c6be9ed [hotfix] User not able to modify modules in the user form (#4415) 2017-11-03 12:53:38 +05:30
Saurabh
a0973617ab Merge branch 'hotfix' 2017-11-03 11:52:59 +05:30
Saurabh
2b1b046c23 bumped to version 9.2.5 2017-11-03 12:22:58 +06:00
Saurabh
9d05f1298d
Merge pull request #4423 from saurabh6790/revert_encode
[fix] revert unicode decoding
2017-11-03 11:51:22 +05:30
Saurabh
133df77d31 [fix] revert unicode dencoding 2017-11-03 11:47:39 +05:30
Britlog
529ae92d1e Encoding error on web form rendering (#4418) 2017-11-03 09:41:43 +05:30
Saurabh
fba4743982 Merge branch 'hotfix' 2017-10-31 12:26:47 +05:30
Saurabh
60d89603e0 bumped to version 9.2.4 2017-10-31 12:56:47 +06:00
Saurabh
365689f0c1
Merge pull request #4407 from rohitwaghchaure/data_export_excel_issue
[hotfix] Not able to export general ledger report's data in excel
2017-10-31 12:10:37 +05:30
Rushabh Mehta
ba6d004fa6 [fix] patch for domain settings 2017-10-31 12:03:21 +05:30
Rohit Waghchaure
05808554a0 [fix] Not able to export general ledger report's data in excel 2017-10-30 13:42:49 +05:30
Saurabh
defcd5b92b Merge branch 'hotfix' 2017-10-27 16:03:20 +05:30
Saurabh
3d1017c4ee bumped to version 9.2.3 2017-10-27 16:33:20 +06:00
Faris Ansari
80054e0f28 Data Migration Tool Hotfix (#4396)
* Add get_source_value to utils, and use it to get value from object or dict

* GitHub connector

* fix codacy

* remove print statement

* Remove Github Connector

* Data Migration Connector

- Create new connection with boilerplate
- Add Run button in Data Migration Plan

* minor

* fix codacy

* remove pygithub

* Minor

- Remove button from form and add to custom button
- Remove is_custom field
- Add Connector Type 'Custom'
- Show New Connection button only in developer mode

* [fix] logging

- only store the name, not the whole json

* [fix] tests
2017-10-27 15:55:41 +05:30
Manas Solanki
8804db7249 fix the set query for the dynamic field (#4390) 2017-10-27 15:32:54 +05:30
Nabin Hait
80c63bb226 Save domain settings to create related custom fields for already enabled domain (#4378)
* Save domain settings to create related custom fields for already enabled domain

* Remove all domains from active domains after running test cases
2017-10-27 15:26:02 +05:30
Makarand Bauskar
39d831bc23 [hotfix] delete and sync the child table customization (#4371)
* [hotfix] delete and sync the child table customization

* Update utils.py
2017-10-27 15:23:50 +05:30
Makarand Bauskar
6574920ca0 [hotfix] ignore validate_length for single doctypes (#4343) 2017-10-27 14:49:38 +05:30
Saurabh
03da960fd5 Merge branch 'hotfix' 2017-10-26 20:52:30 +05:30
Saurabh
e3c437b401 bumped to version 9.2.2 2017-10-26 21:22:30 +06:00
Saurabh
7ee345ef99 Merge pull request #4391 from rohitwaghchaure/premium_button_issue
[Fix] Don't show upgrade button for paid site
2017-10-26 20:50:58 +05:30
Rohit Waghchaure
c47cce1cbc [Fix] Don't show upgrade button for paid site 2017-10-26 20:48:11 +05:30
Faris Ansari
affd84c469 [formatdate] Return empty string if no date provided (#4385) 2017-10-26 17:35:57 +05:30
Saurabh
402bfc39ba Merge branch 'hotfix' 2017-10-26 09:54:21 +05:30
Saurabh
c160d3a2ab bumped to version 9.2.1 2017-10-26 10:24:21 +06:00
Saurabh
01c4da0710 Merge pull request #4382 from saurabh6790/setup_wix_fix
[HOTFIX] translate domain
2017-10-26 09:52:30 +05:30
Saurabh
c1af5db270 [fix] translate domain 2017-10-26 09:42:39 +05:30
Saurabh
1b3cbb9a81 [fix] if doctype is specified consider doctype in filter (#4381) 2017-10-25 17:24:09 +05:30
Nabin Hait
6dc03128d2 Merge branch 'staging' 2017-10-25 14:01:47 +05:30
Nabin Hait
452266d3c2 bumped to version 9.2.0 2017-10-25 14:31:46 +06:00
Nabin Hait
627bc68cac Merge branch 'master' into staging 2017-10-25 14:01:07 +05:30
Nabin Hait
f86f19e9aa Merge branch 'hotfix' 2017-10-25 14:01:06 +05:30
Nabin Hait
897c171ecd bumped to version 9.1.11 2017-10-25 14:31:06 +06:00
tundebabzy
09863bdf38 System Setting Password Policy Issue (frappe/erpnext#11255) (#4353)
* use get for getting key

* PEP8 changes
2017-10-25 12:37:14 +05:30
tundebabzy
f5c66a0d38 cover NoneType use case (#4375) 2017-10-25 12:28:03 +05:30
Nabin Hait
8db6c97f8a Merge branch 'master' into staging 2017-10-23 13:02:09 +05:30
Nabin Hait
e19fc9bd53 Merge branch 'hotfix' 2017-10-23 13:02:08 +05:30
Nabin Hait
87c45d881e bumped to version 9.1.10 2017-10-23 13:32:08 +06:00
Nabin Hait
c4adaa653a [fix] Two factor authentication via SMS (#4359) 2017-10-23 13:01:30 +05:30
Nabin Hait
da53939d51 Merge branch 'master' into staging 2017-10-21 11:18:53 +05:30
Nabin Hait
137e6b4652 Merge branch 'hotfix' 2017-10-21 11:18:53 +05:30
Nabin Hait
69818cd075 bumped to version 9.1.9 2017-10-21 11:48:53 +06:00