Commit graph

14350 commits

Author SHA1 Message Date
Prateeksha Singh
875b965d40 use the new frappe charts :D (#4410) 2017-10-31 12:53:11 +05:30
Saurabh
a5ffa5755a Merge branch 'master' into develop 2017-10-31 12:26:48 +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
Rushabh Mehta
56363859d2 [patch] reload doctype before setting domain 2017-10-27 16:49:45 +05:30
Rushabh Mehta
4fa7730845 [fix] upload for customize form (#4397) 2017-10-27 16:44:49 +05:30
Saurabh
33644ebfb2 [fix] merge conflicts 2017-10-27 16:05:45 +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
Rushabh Mehta
8c246365aa Role Profile (#4395)
* Added doctype Role Profile

* Set role profile for user

* Fetch roles from role profile

* Added tests, updated user.js and role_profile.py

* update_roles on add/delete moved to user controller

* added py test

* improved naming

* validate_roles method added

* [minor] style
2017-10-27 15:34:04 +05:30
Javier Wong
1ca8707893 [fix] Workflow does not permit submission, duplication etc. (#4394)
If the user's roles does not contain the "Allow Edit For" role, the workflow pervents the user from performing functions such as Submit, Duplicate etc. even though the user's other roles actually allow them to perform such functions.
2017-10-27 15:33:50 +05:30
Manas Solanki
8804db7249 fix the set query for the dynamic field (#4390) 2017-10-27 15:32:54 +05:30
Britlog
355b1d98b6 Change mysqlclient package to avoid error in Debian (#4393) 2017-10-27 15:32:02 +05:30
Revant Nandgaonkar
ee33c36b55 UI fixes to Geolocation field (#4392)
One field in section takes up 2 col width instead of 1 col
2017-10-27 15:31:50 +05:30
Zarrar
14be497683 Fix tree (#4384)
* treeview trigger on filter type Link

* Make root visible if set_root is set

* better functionality
2017-10-27 15:28:56 +05:30
Zarrar
426aec34e1 restore cancel doc in draft state (#4379) 2017-10-27 15:26:47 +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
Manas Solanki
a279cdc4a2 attach print format in the emails before sending. (#4366) 2017-10-27 15:25:52 +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
Shreya Shah
7fa97e97fe Able to add options for customized form (#4369)
* exception added to add options

* Update customize_form.py

* Update customize_form.py
2017-10-27 15:18:44 +05:30
Javier Wong
bd8b57ee9a [fix] Do not show the Save Button if there is a Workflow without Local Changes and Print Preview is Toggled (#4362)
* [fix] Do not show the Save Button if there is a Workflow without Local Changes

The save button is currently shown when there is a workflow and when the print preview is shown and subsequently cleared, even though there were no local changes made.

* Improved Code Readability
2017-10-27 15:07:36 +05:30
Shreya Shah
183c481dd2 fixed select options in dialog (#4361) 2017-10-27 15:06:07 +05:30
almeidapaulopt
57dcc98ae8 [hotfix]Gsuite change code tag to pre (#4354)
* change code tag to pre

* gelete test files
2017-10-27 14:56:06 +05:30
Pawan Mehta
b20be20dce Added upload instructions to file related to bulk edit feature (ERPNext repo issue:#11207) (#4345)
* [fix] #4344

* Update grid.js
2017-10-27 14:55:37 +05:30
Makarand Bauskar
6574920ca0 [hotfix] ignore validate_length for single doctypes (#4343) 2017-10-27 14:49:38 +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
Saurabh
1cf3c33838 [fix] catch dropbox api malformed_path exception and log file path with traceback (#4332) 2017-10-27 14:47:10 +05:30
Saurabh
03da960fd5 Merge branch 'hotfix' 2017-10-26 20:52:30 +05:30
Saurabh
d88f3e2372 Merge branch 'master' into develop 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
vishalseshagiri
0529b4b85b Trigger map refresh if map_field is not empty, fixes incorrect map centering on load (#4387) 2017-10-26 18:40:56 +05:30
Faris Ansari
dd5bd8ef11 [minor][fix] Image view gallery (#4388) 2017-10-26 18:16:50 +05:30
Faris Ansari
5508651485 Browse attached images in Image View (#4374)
* Browse attached images in Image View #4141

* fix codacy
2017-10-26 17:45:53 +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
7539c0f0c9 Merge branch 'master' into develop 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
Revant Nandgaonkar
ebf3554754 Geolocation control (#4327)
* added static map field

* leaflet draw plugin added to map control

* Editable layer working no icons

* Save and load data in form field

* images and icons working

* Locate plugin added, and loads on geolocation

* organized map control code

* loads layer as per form

* new form clears editableLayers

* update: leaflet 1.2.0 and leaflet-draw 0.4.2

* changed to ERPNext colors

* Multiple map fields and fixes

* fixes codacy suggestions

* loaded geojson data editable

* Map layers editable

* add only one layer on draw:create

* code organized with helper functions

* Replaced Leaflet Draw with Leaflet Editable

* read values from database

* layers saved in db

* Using Patched Leaflet Draw (mobile-friendly)

* Working Map field with multiple forms open

* Leaflet Draw css image path fix

* Leaflet Draw

Fixes Leaflet draw css image paths
Fixes Circle marker and Circle

* locate to geolocation or set featurecollection as center

* [fix] leaflet fitBounds padding 50,50

* [Fix] Leaflet (auto) locate

* Map field basic test

* added refresh button on map

* Mute map geojson in print format

* renamed Map field to Geolocation

* Suggested changes and fixes

* eslint disable

* csslint allow important
2017-10-25 18:30:25 +05:30
Faris Ansari
b51d9a04b1 [enhance] build only changed files, get others from cache (#4380) 2017-10-25 18:02:06 +05:30
Saurabh
1b3cbb9a81 [fix] if doctype is specified consider doctype in filter (#4381) 2017-10-25 17:24:09 +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
Achilles Rasquinha
b5c4278341 BCC in Emails (#4377)
* added blank carbon copy

* [FEAT] BCC in emails

* removed test_communication, fixed comment

* fixed codacy
2017-10-25 15:33:30 +05:30