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

19283 commits

This branch
This branch
All branches
Author SHA1 Message Date
Suraj Shetty
7ed02cd103 fix: Remove extra call for review points of form load 2019-04-22 22:33:59 +05:30
rohitwaghchaure
09f5102884 fix: Prepared report shows status as Queued even if job is failed (#7331) 2019-04-22 17:32:52 +05:30
Rushabh Mehta
21fc58a198 fix(milestone_tracker): doctype ui 2019-04-22 16:17:56 +05:30
rohitwaghchaure
0800b521ff fix: moved erpnext related methods from frappe to erpnext (#7332) 2019-04-22 15:56:30 +05:30
Suraj Shetty
aea23d9dbc
Merge pull request #7329 from prasadarr/develop-linkfixes 
fix: broken YouTube link for user help
 2019-04-22 14:07:15 +05:30
Prasad Ramesh
de9e87f206
fix broken YouTube link for user help 2019-04-22 13:07:25 +05:30
Suraj Shetty
5fc1173356
Merge pull request #7328 from netchampfaris/fix-file-upload-data-url 
fix: Grid Upload
 2019-04-22 12:43:20 +05:30
Faris Ansari
4b37818857 fix: Grid Upload 2019-04-22 11:45:40 +05:30
Anurag Mishra
b56830e2e5 fix: Cannot delete Issue because it is linked to Comments(v12) (#7270) 
* fix: Cannot delete Issue because it is linked to Comments

* fix: commonified code
 2019-04-22 11:27:58 +05:30
Rushabh Mehta
01242afc8f
Merge pull request #7304 from rmehta/milestone-tracker 
feat: Milestone Tracker. Track document lifecycle with milestones
 2019-04-22 11:08:49 +05:30
Rushabh Mehta
7391ef00c3
Merge pull request #7323 from rmehta/grid-move-row 
feat(grid): Move row to a particular id
 2019-04-22 11:08:28 +05:30
Suraj Shetty
943552de6a
Merge pull request #7294 from netchampfaris/show-hidden-fields-report-builder-d 
fix: Show Hidden fields in Report Builder
 2019-04-22 10:31:57 +05:30
Rushabh Mehta
425d6c4592
Merge pull request #7297 from netchampfaris/feat-full-width-container 
feat: Full Width Container
 2019-04-22 09:04:30 +05:30
Rushabh Mehta
c779ec93f6 fix(linting) 2019-04-22 08:59:13 +05:30
Deepesh Garg
63508953f2
Merge pull request #7325 from deepeshgarg007/custom-link-develop 
fix(query_report): Link field fixes for custom reports
 2019-04-21 22:31:19 +05:30
deepeshgarg007
19a6b6fbcb fix: Link field fixes for custom reports 2019-04-21 22:09:59 +05:30
Rushabh Mehta
ac721a6f34 feat(grid): Move row to a particular id 2019-04-21 21:06:06 +05:30
Shivam Mishra
6f6270d2c4
Merge pull request #7320 from netchampfaris/remove-frappe-upload-make 
refactor: Remove frappe.upload.make
 2019-04-21 19:25:13 +05:30
Deepesh Garg
dd3d60a961
Merge pull request #7301 from surajshetty3416/fix-auto-assignment 
fix: Change fieldtype of assign_condition from "Small Text" to "Code"
 2019-04-20 20:24:40 +05:30
Rushabh Mehta
0f1d8c7622 fix(for-patch): cache manager to ignore missing tables 2019-04-20 16:48:30 +05:30
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
Suraj Shetty
3d21bba74d test: fix fill_field command for code fieldtype 2019-04-20 14:01:19 +05:30
Faris Ansari
582863e5bb fix: Revert backslash in templates 2019-04-20 13:30:13 +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
Suraj Shetty
70eb99a5a4 Merge branch 'develop' of https://github.com/frappe/frappe into fix-auto-assignment 2019-04-20 12:12:37 +05:30
Faris Ansari
b465102a43
Merge branch 'develop' into feat-full-width-container 2019-04-20 11:54:25 +05:30
Faris Ansari
51d0607977
fix: Re-enable cypress test recording (#7319) 2019-04-20 11:45:55 +05:30
Faris Ansari
8cb95d1b84 refactor: Remove frappe.upload.make 2019-04-19 15:49:26 +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
3c35903728 Merge branch 'feat-full-width-container' of https://github.com/netchampfaris/frappe into feat-full-width-container 2019-04-19 15:26:41 +05:30
Faris Ansari
6ffc47f1e6 Merge branch 'develop' of https://github.com/frappe/frappe into feat-full-width-container 2019-04-19 15:25:45 +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
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
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