Commit graph

1014 commits

Author SHA1 Message Date
tundebabzy
27df2485d9 UnboundLocalError When Trying To Upload File #4692 (#4693)
* allow to attach empty files

* PEP8 compliance
2017-12-28 12:56:34 +05:30
Nabin Hait
8a09f915e9 Merge branch 'master' into develop 2017-12-25 13:30:48 +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
Rohit Waghchaure
0a367e837e [Fix] Decimal issue 2017-12-21 15:53:22 +05:30
Nabin Hait
2e46b1d70c Merge branch 'master' into develop 2017-12-15 12:52:55 +05:30
Manas Solanki
520bfc2ae4 New data import (#4601)
* created/moved the files

* added the model for the downloading the data

* add the file with the error data

* changes added other changes and fix codacy

* changes in the config and utils files

* fixed the test cases

* minor changes in the data keys dict

* changed the test file location

* fixed the tests

* set the route in the list view and show only erors

* minor fixes in the childtable import and log tables rendering

* Refactor Download dialog to use MultiCheck
2017-12-15 12:17:24 +05:30
tundebabzy
d5dcc0b98f Issue 4616 (#4617)
* fail silently when key not found

* PEP 8: spacing, docstrings

* codacy
2017-12-14 14:57:05 +05:30
Nabin Hait
7506c49dc4 Fixed Merge conflict 2017-12-12 19:08:53 +05:30
Faris Ansari
49b63d7680 Add is_image util (#4605) 2017-12-12 19:04:38 +05:30
Brown-Harry Boma
b9201dbdd0 Make improve page link generic in help documentation (#4586) 2017-12-12 12:53:59 +05:30
Achilles Rasquinha
79a8be3633 [HOTFIX] Currency Format on Print (#4584)
* [HOTFIX] fix currency issue on print

* [HOTFIX] fix currency issue on print

* added value check for format

* added value check for format

* fix codacy
2017-12-11 15:10:32 +05:30
Prateeksha Singh
d1aa5c60b4 [Multicheck control] (#4529)
* multicheck control

* [checkboxes] replace in domain settings

* [checkboxes] use in setup_wizard domains

* [multicheck] minor

* [multicheck] set and get value as an array

* [multicheck] make controls.less

* basic view control with value as array object

* load active domains

* selenium helper: multicheck

* [multicheck] make field if not present

* [multicheck] append control in an HTML field
2017-12-06 13:25:33 +05:30
Sushant Nadkar
0ca98a0c74 Added additional_offset parameter to scroll_to and login functions (#4545) 2017-11-30 14:27:53 +05:30
Zarrar
9927eecc9c fix issue with node delete for tree based doctypes (#4554) 2017-11-30 11:51:43 +05:30
rohitwaghchaure
ef7c6c3389 [fix] Item group test cases (#4555) 2017-11-30 11:48:59 +05:30
Zarrar
bef90ee10e making nestedset a bit more flexible (#4552) 2017-11-29 18:39:56 +05:30
Prateeksha Singh
b1e25ee7f4
Merge pull request #4524 from pratu16x7/update-charts
Update charts version
2017-11-24 14:19:51 +05:30
Saurabh
20fff6e874 Merge branch 'master' into develop 2017-11-22 18:02:53 +05:30
pratu16x7
7a41980b41 [charts] update color usage 2017-11-22 10:23:00 +05:30
rohitwaghchaure
922b1237e7 [Fix] Desktop icon page not showing for french language (#4518) 2017-11-21 15:57:49 +05:30
Valmik
fe9ae224f6 Add timeout to click method (#4500) 2017-11-17 11:34:38 +05:30
Nabin Hait
4b5893509a Fixed Merge Conflict 2017-11-14 13:56:42 +05:30
rohitwaghchaure
0db18fdf91 [Fix] Letterhead appearing on PDF even when not selected (#4484) 2017-11-14 13:43:33 +05:30
Rushabh Mehta
07532c93d0 [minor] selenium_testdriver.py where message has no length 2017-11-14 09:33:51 +05:30
Prateeksha Singh
3bb628ffdb update charts to latest (#4472) 2017-11-13 17:21:13 +05:30
Manas Solanki
3c7683e6a1 option to logout from all devices while changing password (#4419) 2017-11-10 12:11:22 +05:30
Nabin Hait
e7beaacc9e
Nestedset model fixes for changing parent and renaming (#4436)
* Nestedset model fixes for changing parent

* Rename function of File
2017-11-10 11:11:59 +05:30
Saurabh
8f07515b45 Merge branch 'master' into develop 2017-11-08 12:03:43 +05:30
Achilles Rasquinha
b8825ca116 Pure Python MySQL instead mysqlclient (with Python C API) (#4280)
* added PyMYSQL instead mysqlclient-python

* added pymysql import

* fixed db module import

* foxed self._conn wrapper

* updated cursor migration

* removed existent converters

* some more fixes towards API port

* modified travis

* updated doctype and revereted yml

* modified travis

* refreshed logging

* raw fix

* moved from hard coded constants to declarable instances

* moved from hard coded constants to declarable instances

* refactoring and logging

* moved to global import declaration

* fixed codacy

* unfixed codacy

* minor fix

* binary_type has a single

* deprecated alternative

* merged with latest

* fixed merge conflicts

* using deprecated alternative

* raw fix

* stupid fix

* using StringTypes instead

* brutal hack

* log

* tundebazy to the rescue

* fixed content_hash error

* frappe/database.py

* frappe/database.py

* updated database.py

* updated requirements

* updated requirements

* fixed codacy

* fixed codacy

* moved from DatabaseOperationalError to pymysql.InternalError

* moved from DatabaseOperationalError to pymysql.InternalError

* fixed codacy

* empty commit

* fixed codacy

* fixed codacy
2017-11-06 16:42:01 +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
Saurabh
26bad9c672
Merge pull request #4422 from saurabh6790/revert_encode
[fix] revert unicode decoding
2017-11-03 11:49:42 +05:30
Saurabh
133df77d31 [fix] revert unicode dencoding 2017-11-03 11:47:39 +05:30
Saurabh
a5ffa5755a Merge branch 'master' into develop 2017-10-31 12:26:48 +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
33644ebfb2 [fix] merge conflicts 2017-10-27 16:05:45 +05:30
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
joezsweet
299ab6198a Cron like events scheduler (#4339)
* - trigger new "cron" event
- check cron string syntax
- added croniter to requirements

* - run scheduler ever 60 sec
- trigger all enabled events
- enqueue if now >= next time execution since last one

* Update task-runner.md

* fixed tests

* fix triggering with now = True

* modified sobstitution to cron_map
modified annually label to annual

* ability to use labels defined in cron_map in cron string definition
2017-10-27 14:48:48 +05:30
Faris Ansari
affd84c469 [formatdate] Return empty string if no date provided (#4385) 2017-10-26 17:35:57 +05:30
Prateeksha Singh
56e0b470d6 Merge pull request #4364 from netchampfaris/calendar-view
Generic Calendar View for all DocTypes
2017-10-25 15:40:20 +05:30
Nabin Hait
627bc68cac Merge branch 'master' into staging 2017-10-25 14:01:07 +05:30
Nabin Hait
823366e6b9 Merge branch 'master' into develop 2017-10-25 14:01:06 +05:30
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
Faris Ansari
bc45beb868 Show record count in list header 2017-10-23 20:10:15 +05:30
Faris Ansari
5c9146fe9c [formatdate] Return empty string if no date provided (#4356) 2017-10-23 12:12:52 +05:30
mbauskar
ee7508347d resolved merge conflicts 2017-10-18 16:22:06 +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
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
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
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