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

19677 commits

This branch
This branch
All branches
Author SHA1 Message Date
Saurabh
605e024fda
Merge pull request #7568 from surajshetty3416/eps-ux 
fix(energy points): Show name of the user who actually reverted points
 2019-05-28 11:24:17 +05:30
Suraj Shetty
3a5288c661 fix: Show name of the user who actually reverted points 2019-05-28 08:20:22 +05:30
Rushabh Mehta
2e2c72629e fix(minor): communication.js remove old style print 2019-05-27 16:00:57 +05:30
Himanshu
cf2de1fa20 fix(patch): Reload Communication Link (#7555) 
* fix: reload comm_link

* Update patches.txt
 2019-05-27 13:44:12 +05:30
Rushabh Mehta
bfb149180c fix(minor): model.js 2019-05-26 17:52:55 +05:30
Himanshu
73c6520aef fix: Remove update_timeline_links from document.py (#7563) 2019-05-26 15:37:10 +05:30
rohitwaghchaure
a06b821602
Merge pull request #7560 from rohitwaghchaure/incorrect_schedule_in_the_auto_repeat_develop 
fix: incorrect schedule showing in the auto repeat when document is in the draft mode
 2019-05-25 14:11:56 +05:30
Faris Ansari
e9b0c2229d fix: Error message for invalid Workflow Transition (#7553) 
When you import a document of a DocType which has a workflow, you
shouldn't be able to set the workflow_state to a state except the first.
This patch shows a better error message.
 2019-05-25 11:56:20 +05:30
Rohit Waghchaure
30c401deee fix: incorrect schedule showing in the draft mode 2019-05-24 18:51:19 +05:30
Deepesh Garg
e6b8b1de0b fix: Refresh report again if route options are passed (#7557) 2019-05-24 18:03:03 +05:30
Rushabh Mehta
f239c885f2 fix(print.js): refactor for new form.js 2019-05-24 12:29:05 +05:30
Rushabh Mehta
6d32946f64 fix(minor): removed debug 2019-05-24 12:08:22 +05:30
Rushabh Mehta
17c43b4e1d fix(db_type) 2019-05-24 12:06:39 +05:30
Rushabh Mehta
1c893e44c0 fix: frappe.conf.db_type -> frappe.db.db_type 2019-05-24 11:44:28 +05:30
Rushabh Mehta
4c03f8b31c
Merge pull request #7537 from rmehta/yeah-form-js 
BREAKING CHANGE: refactor form.js and remove deprecated API
 2019-05-24 11:35:48 +05:30
Rushabh Mehta
7135c0d9e8 fix(various): after manual testing 2019-05-24 11:22:09 +05:30
Rushabh Mehta
adda5c3f6c fix(merge): merge latest changes 2019-05-24 09:10:33 +05:30
Rushabh Mehta
2ef6af8244 fix(minor): added frappe.db.db_type 2019-05-24 09:09:46 +05:30
Rushabh Mehta
d92606cea9 fix(sessions): handle separate ways of session expiry in postgres and mariadb 2019-05-24 09:09:46 +05:30
Rushabh Mehta
7107f335f2 fix(session): session expiry not querying correctly 2019-05-24 09:08:56 +05:30
Rushabh Mehta
0a14554a15 fix(session): session expiry not querying correctly 2019-05-24 09:08:56 +05:30
Rushabh Mehta
48775f55fa fix(linting) 2019-05-24 09:08:56 +05:30
Rushabh Mehta
9f5a632baf fix(linting) 2019-05-24 09:08:56 +05:30
Rushabh Mehta
81fa64d4bc refactor(form.js): remove very old API 2019-05-24 09:08:56 +05:30
Rushabh Mehta
83eb9c3acc refactor(form.js): wip 2019-05-24 09:08:56 +05:30
Rushabh Mehta
bedaa5453f refactor(form.js): the time has come 2019-05-24 09:08:20 +05:30
Anurag Mishra
dacdd3fdb5 fix: Bulk user permission unhandled condition(v12) (#7401) 
* fix: unhandled condition

* test: for update from apply_to_all to apply_to_all

* fix: refractor

* Update test_user_permission.py
 2019-05-24 08:36:41 +05:30
Rushabh Mehta
8e9336b476
Merge pull request #7545 from deepeshgarg007/datatable 
fix: Update frappe datatable
 2019-05-23 17:33:38 +05:30
Rushabh Mehta
fa814824f8
Merge pull request #7501 from netchampfaris/form-attachments 
fix: Upload form attachments to Attachments folder
 2019-05-23 17:32:55 +05:30
Faris Ansari
99c624bd9c
Merge branch 'develop' into form-attachments 2019-05-23 15:21:11 +05:30
deepeshgarg007
6b4c24fda6 Merge branch 'develop' of https://github.com/frappe/frappe into datatable 2019-05-23 15:16:56 +05:30
deepeshgarg007
7d49df12ce fix: Update frappe datatable 2019-05-23 15:16:29 +05:30
Rushabh Mehta
e944ba5ad1
Merge pull request #7274 from ci2014/patch-27 
Expose Recipients in Notifications
 2019-05-23 15:15:53 +05:30
Suraj Shetty
9883b1f751
Merge pull request #7541 from frappe/fix-has-perm 
fix: has permission decorator
 2019-05-23 15:11:10 +05:30
Rushabh Mehta
7cb648eb5b
Merge pull request #7453 from rmehta/remove-autodoc 
refactor: remove autodocs, no longer used
 2019-05-23 15:09:23 +05:30
Rushabh Mehta
64a672973d
Merge pull request #7445 from Alchez/develop-msgprint-primary-action 
feat(core): Allow action on msgprint and throw calls
 2019-05-23 15:01:50 +05:30
Rushabh Mehta
84201b9d3b
Merge pull request #7300 from rohitwaghchaure/feat_force_user_to_reset_password_develop 
feat: force user to reset password after x days
 2019-05-23 15:00:31 +05:30
Faris Ansari
32e066988a
fix(patch): Move files only from Home folder 2019-05-23 14:55:48 +05:30
Rushabh Mehta
2a4095dbe7
Merge pull request #7385 from netchampfaris/fix-set-lang-print-d 
fix: Set user language in print preview
 2019-05-23 14:50:55 +05:30
Mangesh-Khairnar
cc0ea13ec5
fix: has permission decorator 2019-05-23 13:04:59 +05:30
Himanshu
3bd1e22865 patch: rearange order for reload_doc (#7540) 2019-05-23 09:37:25 +05:30
Himanshu
51042b1359 fix(load): alias creation in get communications (#7538) 
* fix: alias creation

* fix: fix update_timeline_doc

* fix: add timeline link irrespective of comm medium
 2019-05-23 09:35:53 +05:30
Anurag Mishra
2ffc939fb5
fix: Doctype some tests and fix (#7536) 
* test: some tests and fix

* Update test_doctype.py
 2019-05-22 18:11:45 +05:30
Mangesh-Khairnar
1387c331bc fix: print format builder setup (#7531) 2019-05-22 15:04:42 +05:30
Rushabh Mehta
01dc6bee5b fix(delete_fields): handle commit for DDL separately for MariaDB and Postgres 2019-05-22 13:21:07 +05:30
Himanshu
2b14c95644 fix(Communication): New child doctype for Communication Timeline Links (#7524) 
* fix: separate child doctype for communication

* fix: reload doc before running the patches

* fix: update_timeline_doc

* fix: manipulatetimeline fields in Comm Links

* fix: test cases

* fix: reload comm_link before communication

* patch: remove redundant patch
 2019-05-21 20:48:55 +05:30
Prssanna Desai
6655e45273 fix: Increase font size in Module View (#7513) 2019-05-21 14:54:11 +05:30
Himanshu
0e7123d141 fix(Addresses and Contacts Report): Frappe throw when no record present (#7504) 2019-05-21 14:50:49 +05:30
Nabin Hait
d7527fab79 fix: Allow eligible fields to be updated from notifications (#7518) 2019-05-21 14:49:58 +05:30
Suraj Shetty
1fe6f7ceaa fix: Show "1 point" instead of "1 points" (#7489) 
* fix: Show "1 point" instead of "1 points"

* fix: Make text translatable

* fix: Format string twice to avoid duplicate code

- First formatting to add points text
- Second formatting to add variables aftter translation

* fix(energy point): Alert messages translation
 2019-05-21 13:18:51 +05:30