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

19245 commits

This branch
This branch
All branches
Author SHA1 Message Date
Rushabh Mehta
ce5e0b6453
Merge pull request #7313 from netchampfaris/dynamic-filters-auto-email 
feat: Dynamic Date filters in Auto Email Report
 2019-04-20 14:33:30 +05:30
Faris Ansari
cd3f8b0b7e
fix(QueryReport): Expand/Collapse all for tree (#7214) 2019-04-20 13:15:16 +05:30
Faris Ansari
beb2727bb3
fix: Print Format UX (#7284) 
- Rename type Server and Client to Jinja
- Rename Js to JS
- Patch
- Reload Print Format when new one is created
- Missing Semicolon and sanity check
 2019-04-20 13:09:02 +05:30
Faris Ansari
51d0607977
fix: Re-enable cypress test recording (#7319) 2019-04-20 11:45:55 +05:30
Faris Ansari
9743c50419 fix: Remove unused import 2019-04-19 15:46:30 +05:30
Faris Ansari
43ce786071 style: Method could be a function 2019-04-19 15:46:14 +05:30
Faris Ansari
8146b662ac test: Dynamic Dates in Auto Email Report 2019-04-19 15:06:33 +05:30
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
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
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
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
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
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
b1c0f663ba
Merge branch 'develop' into report-filter-numeric-d 2019-04-16 23:57:36 +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
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
Faris Ansari
30639dd261 fix: Remove projectId to disable recording 2019-04-16 16:07:05 +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
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
karthikeyan5
2c9f5aeb90 feat(Raw Printing): added help text in UI 2019-04-16 15:40:56 +05:30
karthikeyan5
41fa048718 feat(Raw Printing): added "Enable Raw Printing" 
> added more comments in code
 2019-04-16 15:40:56 +05:30
karthikeyan5
68a1a549a1 fix(raw printing): more codacy fixes 2019-04-16 15:40:56 +05:30
karthikeyan5
8397383dd6 fix(Raw Printing): fixes as per PR review 
> fixing confusing naming in the UI and calling it "Raw Print"
> used import for sha256 library
> changed the Print Preview message for raw print
> same possible codacy fixes
 2019-04-16 15:40:56 +05:30
karthikeyan5
d569059fa0 fix(raw printing): more codacy fixes 2019-04-16 15:40:56 +05:30
karthikeyan5
92b8d82f94 fix(raw printing): codacy issues 2019-04-16 15:40:56 +05:30
karthikeyan5
043c413571 fix(Raw Printing): fixing code standard 2019-04-16 15:40:56 +05:30
karthikeyan5
70c256f81b feat(Raw Printing): Adding Support for qz-tray 2019-04-16 15:40:56 +05:30
Rushabh Mehta
2155c52d36 fix: link selection relevance 2019-04-16 15:38:00 +05:30
Rushabh Mehta
939fb8e277
Merge pull request #7252 from scmmishra/employee-imageview 
feat: added employee image view details
 2019-04-16 15:35:23 +05:30
deepeshgarg007
d04fa4c553 Merge branch 'develop' of https://github.com/frappe/frappe into prepared-report-fix 2019-04-16 15:35:07 +05:30
Rushabh Mehta
f5b459c4c8 fix(test): comments 2019-04-16 15:10:55 +05:30
Faris Ansari
012137d0eb fix: Allow numeric filter without using = 2019-04-16 13:49:39 +05:30
Faris Ansari
97600e5bc9 fix: Alignment 2019-04-16 13:20:32 +05:30
Faris Ansari
fc78e8eeed fix: Show help text for public/private toggle 2019-04-16 13:20:26 +05:30
deepeshgarg007
64187bb451 fix: Custom columns handling for prepared report 2019-04-16 12:53:37 +05:30
Suraj Shetty
4d88403401 fix: Disable submit button while doing network request 
- to avoid duplicate entries
 2019-04-16 12:08:24 +05:30
Rushabh Mehta
f34363956c feat(get_period_beginning): in frappe.desk.doctype.dashboard_chart.dashboard_chart 2019-04-16 11:11:58 +05:30