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

19825 commits

This branch
This branch
All branches
Author SHA1 Message Date
Suraj Shetty
0290e1954d fix: Do not set page_length as null (#7314) 
Do not set page_length as null since due to this all the records are fetched at once which slows down the system if there are thousands of records
 2019-04-19 13:41:04 +05:30
Rushabh Mehta
7817b4e03b
Merge pull request #7088 from karthikeyan5/raw-printing 
feat(Raw Printing): Adding Support for qz-tray
 2019-04-19 11:43:47 +05:30
Faris Ansari
fa0d92f778 fix: Test 2019-04-18 19:56:58 +05:30
Faris Ansari
2cc6094f82 feat: Dynamic Date filters in Auto Email Report 2019-04-18 19:31:37 +05:30
Suraj Shetty
a9f24267b0 Merge branch 'develop' of https://github.com/frappe/frappe into fix-auto-assignment 2019-04-18 15:54:19 +05:30
rohitwaghchaure
7363ed21be
Merge pull request #7311 from rohitwaghchaure/not_able_to_create_lead_from_communication_develop 
fix: User not able to make lead from the communication
 2019-04-18 14:56:03 +05:30
rohitwaghchaure
4696610de2
Merge pull request #7309 from rohitwaghchaure/assign_to_notify_always_sending_emails_develop 
fix: On assignment, system sending an email to the assigned user even if notify to email is disabled(Cherry-picked)
 2019-04-18 14:55:41 +05:30
Rohit Waghchaure
3c01d85a3f fix: User not able to make lead from the communication 2019-04-18 13:20:12 +05:30
Suraj Shetty
4eaa9cfbf7 Merge branch 'develop' of https://github.com/frappe/frappe into fix-auto-assignment 2019-04-18 13:09:11 +05:30
Rohit Waghchaure
a62a11044a fix: On assignment, system sending an email to the assigned user even if notify to email is disabled 2019-04-18 12:39:22 +05:30
Rushabh Mehta
0496e5cd28 fix(tests) 2019-04-18 12:07:29 +05:30
Suraj Shetty
40978eed7c
Merge pull request #7296 from netchampfaris/report-filter-numeric-d 
fix: Allow numeric filter without using =
 2019-04-18 11:11:44 +05:30
Rushabh Mehta
7406ee31f2 fix: API change for version 2019-04-18 08:51:02 +05:30
Mangesh-Khairnar
fe007f426d fix: default user permission to handle small int values 2019-04-17 19:06:38 +05:30
Mangesh-Khairnar
1250a931ed fix: change raw sql to orm 2019-04-17 19:05:48 +05:30
Brian Pond
d0273b1b27 fix(mariadb): refactor db setup (#7049) 
* Fixed setup_db.py to support MariaDB version 10.3.  Added function for calculating versions, per MariaDB documentation.

* Major rewrite of setup_db.py. Reduced number of functions. Made fully compatible with MariaDB 10.3+. Removed references to client parameters in my.cnf that cannot be queried.  Applied PEP8 rules to python code.

* Adding missing print statement in setup_db.py

* Replaced 4-spaces with tabs, per ERPNext standards.

* Fixed broken test by substituing 'check_database_settings()'

Fixed the test in convert_to_barracuda_and_utf8mb4.py by calling the new function 'check_database_settings()'

* Cleaned up setup.py, to match latest version of Frappe develop
 2019-04-17 18:38:11 +05:30
Rushabh Mehta
7402f495d5 feat: Milestone Tracker. Track document lifecycle with milestones 2019-04-17 18:00:03 +05:30
Suraj Shetty
591e52aaf7
Merge pull request #7289 from deepeshgarg007/doctype-fix 
fix:Do not rename files and folders before rename for custom doctype
 2019-04-17 14:53:31 +05:30
Deepesh Garg
c93c8a0ea6
Merge pull request #7290 from surajshetty3416/fix-energy-point-ui 
fix: Ignore permission while creating a revert doc
 2019-04-17 14:51:45 +05:30
Suraj Shetty
964e0ce313
Merge pull request #7253 from netchampfaris/new-upload 
feat: New Upload Dialog
 2019-04-17 09:44:39 +05:30
Faris Ansari
106c35cd34
Merge branch 'develop' into new-upload 2019-04-16 23:57:45 +05:30
Faris Ansari
294b00f93e
Merge branch 'develop' into show-hidden-fields-report-builder-d 2019-04-16 23:57:38 +05:30
Faris Ansari
b1c0f663ba
Merge branch 'develop' into report-filter-numeric-d 2019-04-16 23:57:36 +05:30
Faris Ansari
168b8c9099
Merge branch 'develop' into feat-full-width-container 2019-04-16 23:57:19 +05:30
Mangesh-Khairnar
ff98540857 test: validate default value fetch in multiple user permission case 2019-04-16 23:37:52 +05:30
Mangesh-Khairnar
229c0d9a96 test: check default user permission overlap validation 2019-04-16 23:37:52 +05:30
Mangesh-Khairnar
9079e7965e feat: pass default value to add user permission 2019-04-16 23:37:52 +05:30
Mangesh-Khairnar
36750bae4d feat: add is default option in add/update dialog in user permission list 2019-04-16 23:37:52 +05:30
Mangesh-Khairnar
4aad4a2d3d style: change formatting for is default 2019-04-16 23:37:52 +05:30
Mangesh-Khairnar
01393b9838 feat: pass default value to create user permission via user permission list 2019-04-16 23:37:52 +05:30
Mangesh-Khairnar
1f5a304187 feat: fetch default value for link field based on user permission 2019-04-16 23:37:52 +05:30
Mangesh-Khairnar
b53ff42bcd feat: assign default value to link field based on the user permission 2019-04-16 23:37:52 +05:30
Mangesh-Khairnar
34256b8ff5 feat: add validation for overlap default entries 2019-04-16 23:37:52 +05:30
Mangesh-Khairnar
aa84910946 style: change comment formatting 2019-04-16 23:37:52 +05:30
Mangesh-Khairnar
a0a959d94e feat: add a is default field in user permission 2019-04-16 23:37:52 +05:30
Suraj Shetty
8d7e645c15 Merge branch 'develop' of https://github.com/frappe/frappe into fix-auto-assignment 2019-04-16 23:17:55 +05:30
Suraj Shetty
44520e45b8 Merge branch 'develop' of https://github.com/frappe/frappe into fix-energy-point-ui 2019-04-16 23:17:04 +05:30
Suraj Shetty
191b5f37f9
Merge pull request #7299 from netchampfaris/cypress-disable-runs 
fix: Remove projectId to disable recording
 2019-04-16 23:13:15 +05:30
Suraj Shetty
6875d8c55b fix: Remove default for user from review dialog 
- let users explicitly select whom they want to review
 2019-04-16 23:01:44 +05:30
deepeshgarg007
21bc4552df Merge branch 'develop' of https://github.com/frappe/frappe into doctype-fix 2019-04-16 21:26:46 +05:30
Faris Ansari
7a7ac3b85f fix: Remove --record flag 2019-04-16 18:39:22 +05:30
Suraj Shetty
d89f9080d3 fix: Change fieldtype of assign_condition from "Small Text" to "Code" 
- Small text fields gets sanitized unless ignore_xss_filter
 is explicitly enabled.
- Code fieldtype seems to be right fieldtype for such use case
 2019-04-16 17:52:16 +05:30
Suraj Shetty
a751e1c37a
Merge pull request #7279 from surajshetty3416/fix-offline-save-button 
fix: save button should not remain disabled when the system is offline
 2019-04-16 17:08:25 +05:30
Deepesh Garg
74816eeebf
Merge pull request #7291 from deepeshgarg007/prepared-report-fix 
fix: Custom columns handling for prepared report
 2019-04-16 16:34:53 +05:30
Sachin Mane
044d1e36a7 Merge branch 'develop' of https://github.com/ElasticRun/frappe into develop 2019-04-16 16:11:03 +05:30
Faris Ansari
30639dd261 fix: Remove projectId to disable recording 2019-04-16 16:07:05 +05:30
Suraj Shetty
0ea9a01704 Update frappe/public/js/frappe/request.js 
Co-Authored-By: sachinhub <sachin.mane@gmail.com>
 2019-04-16 16:00:07 +05:30
Suraj Shetty
95cd23826e Merge branch 'develop' of https://github.com/frappe/frappe into fix-energy-point-ui 2019-04-16 15:56:01 +05:30
Faris Ansari
06bc50b862 feat: Full Width Container 
Persistent using localStorage since container width should be per device
 2019-04-16 15:52:39 +05:30
karthikeyan5
2ec7c5132b fix(Raw Printing): fixes as per PR review 2 
> qz-tray.js and sha256.min.js are loaded only on demand
> renamed 'raw print settings' button to 'Printer Settings'
> removed commented code
> fixed spelling mistakes
 2019-04-16 15:40:56 +05:30