Commit graph

14253 commits

Author SHA1 Message Date
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
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
crossxcell99
161ea7dc0e send via post request and specify header (#4316) 2017-10-17 12:46:58 +05:30
Rishabh Nambiar
0e412de72e [major] AWS S3 Integration for Frappé (#4272)
* Added S3 Integration, need to add backup limit

* Fix validation in s3 doctype

* Added auto-deletion of old backups and backup_limit usage

* Fixes for codacy PR review

* Improved exception handling.

* Update s3_backup_settings.py
2017-10-17 12:45:25 +05:30
Rushabh Mehta
f0e23a5a6c [refactor] domain and domain settings (#4163)
* [refactor] domain and domain settings

* [fix] test_domain.py

* [fix] patches

* [fix] domain activation after setup

* [fix] tests and lint

* [fix] tests and lint

* [enhance] better prompt naming

* [fix] setup wizard test

* [fix] testing

* [minor] new item in quick entry from form dashboard
2017-10-17 12:29:08 +05:30
Juan F Fernández
6efcd2e13d [HOTFIX] Fixed email sending on non ascii sender name (resolves #4313) (#4317) 2017-10-17 12:24:34 +05:30
Rushabh Mehta
69e08f8e97 [minor] web form (#4302) 2017-10-17 12:24:06 +05:30
Zarrar
f81bee7d05 minor fix to suppport treeview for task (#4279) 2017-10-17 12:23:42 +05:30
Javier Wong
5c42aa996a [fix] Hide Editable Grid Columns (#4270)
* [fix] Hide Editable Grid Columns

This fixes a bug where set_column_disp does not hide editable grid columns.

* [fix] Hide Editable Grid Columns - Additional Fixes

This fixes a bug where set_column_disp does not hide editable grid columns.

* [fix] Hide Editable Grid Columns - Additional Fixes

This fixes a bug where set_column_disp does not hide editable grid columns.

* [fix] Hide Editable Grid Columns - Additional Fixes

This fixes a bug where set_column_disp does not hide editable grid columns.

* Codacy Fixes
2017-10-17 12:22:52 +05:30
Prateeksha Singh
7e9cce2d3b C3 to Charts (#4228)
* make AxisGraph

* remove jquery and snap

* [major] refactor, svg animations, rename to charts

* remove c3, d3

* [Charts] renaming and namespacing

* [fix] codacy

* Replace in grid report with plot, fixes
2017-10-17 12:02:39 +05:30
Pawan Mehta
181d493dc2 [fix] #4267 - remove hard coded web-server port in ui tests (#4268)
* [fix] #4267

* Update selenium_testdriver.py
2017-10-17 11:59:07 +05:30
Faris Ansari
02c359d00f Don't show img tags in kanban card (#4326)
- https://discuss.erpnext.com/t/how-to-make-kanban-view-just-first-text-lines/29428
2017-10-17 11:54:52 +05:30
Rushabh Mehta
35a86a6d84 [fix] test_feedback_trigger.py 2017-10-17 11:33:56 +05:30
Rushabh Mehta
d5f0378f63 [fix] test_feedback_trigger.py 2017-10-17 10:43:21 +05:30
Makarand Bauskar
5eb5d1039f [minor] refactored the setup_email_inbox method to create sidebar menu (#4300) 2017-10-17 10:26:25 +05:30
Makarand Bauskar
a6ed912924 [minor] display title in user mention instead of docname (#4217)
* [minor] display title in user mention instead of docname

* [minor] added the reference number/name

* [minor] if title is name then use the doc.reference_name instead of frappe.db.get_value
2017-10-17 09:32:51 +05:30
mbauskar
ff43b65aac Merge branch 'master' into develop 2017-10-13 11:03:54 +05:30
mbauskar
52d7d7af11 Merge branch 'hotfix' 2017-10-13 11:03:54 +05:30
mbauskar
be3cbd790a bumped to version 9.1.7 2017-10-13 11:33:54 +06:00
Makarand Bauskar
beeaa3f6ab [hotfix] no_socketio while uploading file for data-import-tool (#4306) (#4310) 2017-10-13 10:51:38 +05:30
Makarand Bauskar
da144db4ec [hotfix] no_socketio while uploading file for data-import-tool (#4306) 2017-10-13 10:47:11 +05:30
mbauskar
6640774b75 Merge branch 'master' into develop 2017-10-11 14:38:27 +05:30
mbauskar
bc396d5cba Merge branch 'hotfix' 2017-10-11 14:38:26 +05:30
mbauskar
6757c5d61b bumped to version 9.1.6 2017-10-11 15:08:26 +06:00
Makarand Bauskar
ff954462a2 [minor] attach only image type files to Background Image field (#4283) 2017-10-11 14:37:12 +05:30
Makarand Bauskar
cf99dd268c [minor] update the doc status to Open for Received communication (#4295)
* [minor] update the doc status to Open for Received communication

* [minor] update the modified date on reply
2017-10-11 12:09:31 +05:30
Makarand Bauskar
007bb0d684 [hotfix] enable Update button if error occured after customize form save (#4294) 2017-10-10 13:56:25 +05:30
Makarand Bauskar
77f55a0ee1 [hotfix] fixed margin for disabled check field (#4293) 2017-10-10 13:48:20 +05:30
mbauskar
75c894f034 Merge branch 'hotfix' 2017-10-10 12:35:42 +05:30
mbauskar
ae6fa0b10f Merge branch 'master' into develop 2017-10-10 12:35:42 +05:30
mbauskar
57f6a39180 bumped to version 9.1.5 2017-10-10 13:05:42 +06:00
Saurabh
b3ee2d56fc Merge pull request #4291 from saurabh6790/upload_attendance_fix
[fix] missing dataurl in on_attach
2017-10-10 12:32:51 +05:30
Saurabh
f362f84238 [fix] missing dataurl in on_attach 2017-10-10 12:29:57 +05:30
Saurabh
ca3bbe75ae Merge branch 'hotfix' 2017-10-10 11:21:05 +05:30
Saurabh
0ddc375ad9 Merge branch 'master' into develop 2017-10-10 11:21:05 +05:30
Saurabh
2c25c9619d bumped to version 9.1.4 2017-10-10 11:51:05 +06:00
Saurabh
75ef8d5345 Merge pull request #4290 from saurabh6790/upload_attendance_fix
[fix] if no_socketio specified, upload file with FileReader
2017-10-10 11:19:55 +05:30
Saurabh
8744795c45 Merge pull request #4284 from saurabh6790/upload_attendance_fix
[hotfix] if no_socketio specified, upload file with FileReader
2017-10-10 11:14:39 +05:30
Faris Ansari
9099747116 Add get_password, fix total_pages (#4285) 2017-10-09 17:24:09 +05:30
Rushabh Mehta
b2a86325eb Update .travis.yml 2017-10-09 17:06:52 +05:30
Saurabh
884555b645 [fix] if no_socketio specified, upload file with FileReader 2017-10-09 16:12:00 +05:30
mbauskar
025baf5b9f Merge branch 'master' into develop 2017-10-09 15:17:33 +05:30
mbauskar
9439a808a1 Merge branch 'hotfix' 2017-10-09 15:17:32 +05:30
mbauskar
14898d1126 bumped to version 9.1.3 2017-10-09 15:47:32 +06:00