vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
15623 commits 1 branch 0 tags 587 MiB
Commit graph

15623 commits

This branch
This branch
All branches
Author SHA1 Message Date
Suraj Shetty
8041d04bf9 Patch for user permissions (#5389) 
* Drop column apply_user_permissions from DocPerm and Custom DocPerm

* add patches.txt

* add __init__.py
 2018-04-05 16:32:28 +05:30
Prateeksha Singh
a8b62f3cff
Merge pull request #5388 from pratu16x7/hub 
[rename][minor] get_user_page_or_report()
 2018-04-05 14:53:15 +05:30
Prateeksha Singh
8106b3839e [add] allowed app icons 2018-04-05 14:43:28 +05:30
Suraj Shetty
b123d4ab10 clears user permission which will allow creation of records (#5384) 
* clears user permission which allow creation of records

* py3 fix

* minor ui fix
 2018-04-05 10:46:24 +05:30
Faris Ansari
dc69074886
Dedupe filters in listview (#5382) 2018-04-04 21:08:35 +05:30
Faris Ansari
2b0236acba
[filters] Remove invalid field in fieldselect (#5381) 2018-04-04 18:34:00 +05:30
Rushabh Mehta
52b6c2a9e9
Delete ISSUE_TEMPLATE.md 2018-04-04 16:38:01 +05:30
Suraj Shetty
ba91496378 Permission fixes (#5368) 
* ui-fixes
- change help text
- remove if owner description and change label to Only If Creator
- adjust icon size (restricted list)
- add tags.less in build json

* remove block module for user check

* label change for module access
Rename module access section to desktop in user doctype to avoid confusion
 2018-04-04 12:54:18 +05:30
Nabin Hait
82f1058ad4 Merge branch 'master' into develop 2018-04-04 11:23:21 +05:30
Nabin Hait
0d8ab5aac5 Merge branch 'hotfix' 2018-04-04 11:23:19 +05:30
Nabin Hait
15823b07c6 bumped to version 10.1.17 2018-04-04 11:53:19 +06:00
Manas Solanki
80e20c47c3 fix the import for item variant (#5344) 2018-04-04 11:08:26 +05:30
Achilles Rasquinha
414abfc24b
Merge pull request #5367 from frappe-pr-bot/translations-2018-04-03 
[Translation] Updated Translations
 2018-04-03 23:08:51 +05:30
frappe-pr-bot
f123eae4ca [Translation] Updated Translations 2018-04-03 15:48:59 +02:00
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
022e89cc9f updated translations (#5361) 2018-04-02 23:37:16 +05:30
Rushabh Mehta
d6f09c5325
[optimize] frappe.db.count with cache (#5355) 2018-04-02 19:24:41 +05:30
Shreya Shah
71d59f7ba3 sync.js fixes (#5358) 2018-04-02 19:23:59 +05:30
Zarrar
1654f2dfb1 fix clicking of upgrade button (#5356) 2018-04-02 18:31:41 +05:30
Zarrar
edd089d4a1 append now_time to the filename incase of duplicate (#5313) 2018-04-02 18:22:12 +05:30
Faris Ansari
0a837cd62d Add breadcrumbs in about and contact page (#5345) 
- fixes frappe/erpnext#12868
 2018-04-02 18:16:18 +05:30
Achilles Rasquinha
14f3bfb4c0
Merge pull request #5352 from achillesrasquinha/hf-fixes 
[hotfix] get valid traceback
 2018-04-02 16:42:18 +05:30
Achilles Rasquinha
91a297d85d get valid traceback 2018-04-02 16:41:09 +05:30
Achilles Rasquinha
ee31da8d7b
Merge pull request #5350 from achillesrasquinha/fix-cast-single 
fix cast singles
 2018-04-02 16:07:47 +05:30
Achilles Rasquinha
c973394bce fix cast singles 2018-04-02 16:06:21 +05:30
Achilles Rasquinha
00bae09ed1
Merge pull request #5349 from achillesrasquinha/mock 
frappe.mock
 2018-04-02 15:50:24 +05:30
Achilles Rasquinha
30b0ce8f64 remove other requirements 2018-04-02 15:32:06 +05:30
Achilles Rasquinha
fdc17c9542 added frappe.mock 2018-04-02 15:31:18 +05:30
Achilles Rasquinha
d07eee53b7
Merge pull request #5347 from achillesrasquinha/fixes 
fix _cast_result
 2018-04-02 14:24:13 +05:30
Achilles Rasquinha
496a63f07f fix _cast_result 2018-04-02 14:23:20 +05:30
Achilles Rasquinha
614359e347
Merge pull request #5343 from achillesrasquinha/wc-fix 
fix chat token
 2018-04-02 11:33:23 +05:30
Achilles Rasquinha
6199c2edf9 fix chat token 2018-04-02 11:31:29 +05:30
Shreya Shah
e2732751a2 able to pass filters (#5323) 2018-04-02 10:43:04 +05:30
Zarrar
2897ac7dc0 add_child configurable to be hidden for a node (#5319) 2018-04-02 10:41:20 +05:30
rohitwaghchaure
04885ec241
Merge pull request #5342 from rohitwaghchaure/letter_head_issue_for_salary_slip 
[Fix] Letterhead not disaplying in PDF, if salary slip print sent auto from the system
 2018-04-01 23:06:27 +05:30
Rohit Waghchaure
19a0e0409b [Fix] Letterhead not disaplying in PDF, if salary slip print sent auto from the system 2018-04-01 17:24:53 +05:30
Achilles Rasquinha
666f25d673
Python 2 and 3 Compatible 💥 💥 💥 2018-04-01 01:36:46 +05:30
Achilles Rasquinha
d2bf875b8e
Merge pull request #5341 from achillesrasquinha/python3 
fix fmt_money
 2018-04-01 01:34:11 +05:30
Achilles Rasquinha
cd13493952 fix fmt_moeny 2018-04-01 01:21:49 +05:30
Achilles Rasquinha
6c7ea22329 fix fmt_moeny 2018-04-01 01:06:20 +05:30
Achilles Rasquinha
1ac98702dd fix fmt_moeny 2018-04-01 00:46:57 +05:30
Achilles Rasquinha
701d59b5ae fix decimal split 2018-04-01 00:44:31 +05:30
Achilles Rasquinha
2396b105fc fix fmt_moeny 2018-04-01 00:31:37 +05:30
Achilles Rasquinha
b083baa443 fix fmt_moeny 2018-04-01 00:04:39 +05:30
Achilles Rasquinha
159a20e5f8 fix fmt_moeny 2018-03-31 23:59:10 +05:30
Achilles Rasquinha
095ae65ad4
Merge pull request #5340 from achillesrasquinha/python3 
compatible key iterations
 2018-03-31 18:43:58 +05:30
Achilles Rasquinha
0fc518ace4 python 3 fixes 2018-03-31 18:15:43 +05:30
Achilles Rasquinha
d0bd66a4c2
Merge pull request #5339 from achillesrasquinha/fixes 
fix data import test case
 2018-03-31 18:12:05 +05:30
Achilles Rasquinha
3a5c090bde fix test case 2018-03-31 18:01:11 +05:30
Achilles Rasquinha
0563788cb2 fix data import test case 2018-03-31 17:47:16 +05:30