Commit graph

918 commits

Author SHA1 Message Date
Rushabh Mehta
5a582564e3 [fix] add data integration to sync sequence 2018-04-06 13:20:11 +05:30
Nabin Hait
82f1058ad4 Merge branch 'master' into develop 2018-04-04 11:23:21 +05:30
Suraj Shetty
0be4342649 User permissions redux (#5314)
* [start] removing simpler user permission structure

* permission changes
removed "apply user permission" from has_permission

* test fixes and other supporting fixes

* Removed Apply user permission code

* additional check to see if user has some user permissions related to a doctype

* test fixes

* removed a test

* Permission changes
- Code to restrict access if module is blocked for user.
- [Fix] ignore user perm if applicable

* List view restrictions ui changes

* removed unwanted apply user perm code

* permission (block module fix)

* permission fix

* change user permission
user permission will not be applied if user doesn't have role permission

* removed left "apply_user_permissions" property

* add user permission help template

* perm js refactor

* ui / ux changes
restrict list view before entering view if user is not permitterd
add description for if owner check in role permission manager

* codacy fixes

* permission code fix
add controller permission check
add blocked module check in build_permission

* optimized get blocked module method
2018-04-03 10:42:04 +05:30
Achilles Rasquinha
496a63f07f fix _cast_result 2018-04-02 14:23:20 +05:30
Shreya Shah
e2732751a2 able to pass filters (#5323) 2018-04-02 10:43:04 +05:30
Achilles Rasquinha
0fc518ace4 python 3 fixes 2018-03-31 18:15:43 +05:30
Achilles Rasquinha
b4be0a79c1 fix timestamp mismatch for all singles 2018-03-31 17:34:36 +05:30
Achilles Rasquinha
6598be192f cast for standard fieldnames 2018-03-31 14:57:42 +05:30
Achilles Rasquinha
6340b5c4bf val to value 2018-03-29 10:36:41 +05:30
Achilles Rasquinha
05ad109bcb cast singles fieldtype 2018-03-29 09:56:44 +05:30
Nabin Hait
3f3d9e52c8 Fixed merge conflict 2018-03-23 15:16:18 +05:30
Nabin Hait
3dab3478db Minor fix in autonaming 2018-03-22 12:14:21 +05:30
Nabin Hait
1e55b7cc68 Fixed merge conflict 2018-03-09 16:37:43 +05:30
Achilles Rasquinha
cf1a07256e safe_decode for user_settings 2018-03-09 11:19:20 +05:30
Achilles Rasquinha
fc94489220 added safe encode 2018-03-08 15:10:01 +05:30
rohitwaghchaure
553702d671 Read only fields not update if the field has already value (#5126) 2018-03-08 12:02:17 +05:30
Nabin Hait
7b0a7e029d Fixed merge conflict 2018-03-05 14:46:18 +05:30
Faris Ansari
2fc96e1419 Remember columns state for each user (#5102)
* Remember columns state for each user

* Chart

* python 3 fix

* Toggle message refactor, Tree structure DataTable update
2018-03-05 11:02:23 +05:30
Nabin Hait
aa442e33b0 update linked docs if not single 2018-02-27 15:54:07 +05:30
Nabin Hait
b5ecdf22fd Update territory and customer_group patch optimization (#5073) 2018-02-27 15:51:26 +05:30
Zarrar
22534536ce optimize update_linked_doctype util and get_fetch (#5071) 2018-02-27 15:50:00 +05:30
Rushabh Mehta
1aad5d072a [optimize] get_link_fields 2018-02-27 15:49:52 +05:30
Achilles Rasquinha
c2fb0c3bde conditional check for single docs (#5060) 2018-02-27 15:49:39 +05:30
Zarrar
a56fe9a8fb added function to update link-link based dependent values (#5048) 2018-02-27 15:49:28 +05:30
Nabin Hait
cb4d3f1adf
Update territory and customer_group patch optimization (#5073) 2018-02-25 10:41:11 +05:30
Zarrar
c78c564eac optimize update_linked_doctype util and get_fetch (#5071) 2018-02-23 17:40:00 +05:30
Rushabh Mehta
f987f27943 [optimize] get_link_fields 2018-02-23 11:55:52 +05:30
Achilles Rasquinha
7e6153c4d2 conditional check for single docs (#5060) 2018-02-22 18:05:38 +05:30
Zarrar
21bc53e351 added function to update link-link based dependent values (#5048) 2018-02-22 10:56:44 +05:30
Rushabh Mehta
ac93a5d4bd python 3 fixes 2018-02-21 17:55:51 +05:30
Achilles Rasquinha
ec3aedf358
Merge pull request #5009 from achillesrasquinha/restore-progress
Show Progress of Database Restore
2018-02-20 11:33:11 +05:30
Achilles Rasquinha
b5393fd1ee [FIX] empty if pipe not found 2018-02-20 11:19:33 +05:30
Faris Ansari
e581be9fa8 Add translation support for DocFields (#5002)
* Initial changes for Translation

* Merged translate app into frappe core

* Minor typo fix

* Fixes while syncing translations

* Set defaults

* Fixes on setup

* Improve Code Quality

* Could Code Quality be Improved?

* Small code tweaks

* Minor typo fix

* Addition of Translatable Property

* Small fixes for Codacy Comments

* Simplify code

* Show translations in grid

* Remove enabled from Language

* Revert render_template logic

* typo

* Cleanup unused methods

* move patch to erpnext

* fix codacy

* Update patches.txt

* Update patches.txt
2018-02-16 15:12:12 +05:30
Shreya Shah
5d9d64423d Print progress bar on new line (#5018) 2018-02-15 17:53:56 +05:30
Prateeksha Singh
3e181bae51
Merge pull request #5011 from pratu16x7/treeview-fixes
[minor] more treeview decoupling
2018-02-15 11:07:04 +05:30
Prateeksha Singh
041496474d more treeview decoupling 2018-02-15 11:06:10 +05:30
Achilles Rasquinha
86aa97bdc2 show progress of database restore 2018-02-14 20:14:36 +05:30
Saurabh
676fdc0098 Merge branch 'master' into develop 2018-02-14 11:43:00 +05:30
Faris Ansari
3e15c148bd [hotfix] Deadlock fix rename doc (#5001)
* [deadlock fix] rename_version before delete_doc

* Move delete_doc to end of rename_doc
2018-02-13 16:01:58 +05:30
Saurabh
40d818af90 [hotfix] sanitize fields to avoid mysql injection (#4994)
* [fix] sanitize fields to avoid mysql injection

* sanitize sql statements to avoid subqueries

* Added test cases

* Raise exception if mysql injection found in fields and related test-cases

* [fix] riase exception if blacklistes function or keyworkds found in fields
2018-02-13 14:45:51 +05:30
Achilles Rasquinha
4433250cda Python 3 fixes 2018-02-13 12:27:02 +05:30
Achilles Rasquinha
473d3eb6be Fixes for Python 3 (#4940)
* Fixed dict_keys and lists

* [FIX] config.get keys must be list

* [FIX] pickle all objects

* [FIX] get versions in unicode

* [FIX] get log versions

* debugging

* Fixed commit ID reference

* Fixed branch reference

* Fixed doc keys to list

* [LOG] test log

* [LOG] test log

* Convert iterators to list

* removed logs

* [FIX] Trial to load templates

* Fixed codacy
2018-01-31 10:51:13 +05:30
Nabin Hait
0a8664c3b7 Merge branch 'master' into develop 2018-01-30 19:02:36 +05:30
Nabin Hait
63fbff77ae Escape value for using in mysql regexp 2018-01-30 19:01:34 +05:30
Martino Migliavacca
1fbde5c85d Fiscal Year in naming series (#4727) 2018-01-23 14:53:37 +05:30
Rohit Waghchaure
87a0b6213b Merge branch 'master' into develop 2018-01-19 13:06:50 +05:30
rohitwaghchaure
97e18c809e [Fix] Date between filter not working properly on report and listview (#4810) 2018-01-18 15:39:12 +05:30
Nabin Hait
268e9b2a58 Merge branch 'master' into develop 2018-01-17 18:48:53 +05:30
Faris Ansari
aa7d93cfdb Generic Append number in naming (#4845)
* Generic append_number_if_name_exists

* Add test
2018-01-17 18:45:37 +05:30
Saurabh
c62ddaabaa Merge branch 'master' into develop 2018-01-12 16:50:19 +05:30