Commit graph

14298 commits

Author SHA1 Message Date
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
Nabin Hait
812ea70dc8 Reload sms settings from json (#4355) 2017-10-21 10:45:10 +05:30
Nabin Hait
b8ee39b7cf Merge branch 'develop' into staging 2017-10-19 10:57:10 +05:30
Makarand Bauskar
03ea138ca5 [hotfix] ingore_mandatory fields while saving the sms settings in add_sms_sender_name_as_paramenters patch (#4342) 2017-10-18 17:09:13 +05:30
mbauskar
ee7508347d resolved merge conflicts 2017-10-18 16:22:06 +05:30
mbauskar
de1037b6b8 Merge branch 'hotfix' 2017-10-18 16:19:55 +05:30
mbauskar
165b59cdcb bumped to version 9.1.8 2017-10-18 16:49:55 +06:00
Faris Ansari
8eac4bc124 Styling for Attach control (#4340)
* Update attach.js

* Add attach control styling to form.less

* Add margin
2017-10-18 12:54:58 +05:30
Faris Ansari
4b3d13b0ed [fix] Form set viewers (#4341) 2017-10-18 10:02:20 +03:00
Barakat
14ba7ce375 Stop reloading the HTML content after every document change (#4307) 2017-10-18 10:01:29 +03:00
Prateeksha Singh
1e253b9d13 [controls] Barcode Control (#4335)
* [start] display barcode based on input

* [wip]

* [barcode] use set_value

* parse and set

* remove quagga

* [barcode] set in db

* [fix] set height

* cleanup

* remove from build.json, require instead

* [fix] declare JsBarcode global in .eslintrc
2017-10-18 12:24:58 +05:30
Juan F Fernández
3c8689e4a2 [FIX] Fixed problem with margins in pdf (see #3451 #4235 #4239) (#4297) 2017-10-18 09:21:36 +03:00
Revant Nandgaonkar
4df6135c3c enqueue_after_commit option added to frappe.enqueue (#4167)
* enqueue_after_commit option added to frappe.enqueue

* Fixes

Codacy https://www.codacy.com/app/frappe/frappe/pullRequest?prid=934733
clear frappe.flags.enqueue_after_commit after executing enqueued jobs

* sync_global_search() uses enqueue_after_commit=True

* Update database.py

* webhooks enqueue after commit

* Update __init__.py
2017-10-18 11:43:02 +05:30
Valmik
5aa676c688 [fix] make test records for dependencies for app tests (#4336) 2017-10-18 11:38:14 +05:30
Omar Jaber
071947cd32 Fix fields style in reports for RTL direction (#4178)
This code will fix fields style of the reports in RTL direction
2017-10-17 15:19:04 +03:00
Aditya Hase
d5d9fd5283 More Python 3 compatibility Frappe test fixes (#4321)
* stream object should be BytesIO instead of StringIO

* Convert filter to list explicitly before checking length

* Decode sent_email and content before string operations
2017-10-17 17:45:49 +05:30
Aditya Hase
38d63f7dc7 Python 3 compatibility Frappe test fixes (#4318)
* Read image file in binary mode

* Read files in binary mode

* Don't use bytestrings unnecessarily

* Correctly convert byte strings to unicode in frappe.as_unicode

* Convert content to bytes before writing to file
2017-10-17 17:45:25 +05:30
Nabin Hait
aca3658f36 Removed SMS sender field from SMS Settings (#4334)
* Removed SMS sender field from SMS Settings

* patch for sms sender name
2017-10-17 15:09:13 +03:00
Faris Ansari
c06383a260 Disable socketio file upload in text editor frappe/erpnext#10991 (#4333) 2017-10-17 17:16:00 +05:30
Shridhar Patil
51c944fd24 Hide email footer in report (#4323)
* Hide footer in auto email reports

https://github.com/frappe/frappe/issues/3249

* convert to int to comapare
2017-10-17 14:48:54 +05:30
Makarand Bauskar
99fa65cb1a [hotfix] fixed patch sequence and removed the update_email_queue patch (#4330) 2017-10-17 14:47:06 +05:30