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

17678 commits

This branch
This branch
All branches
Author SHA1 Message Date
Shridhar Patil
9d5a365f63 primary key should not have default value 2019-01-11 17:51:06 +05:30
Rushabh Mehta
61b7b1c0f4 fix(patch): set_backup_limit.py 2019-01-11 16:23:32 +05:30
Suraj Shetty
4c9ce1701c fix: Remove quotes from desktop icon options (#6746) 
* Show icon label instead of value

* Replicate link, icon & color while making a user copy of icon
 2019-01-10 15:32:42 +05:30
Suraj Shetty
bd7dce75c3
Merge pull request #6700 from Kratos-Freyja/develop 
fix: Users list doctype with Postgres
 2019-01-09 10:05:52 +05:30
Saurabh
835fc2c1a3 Merge branch 'staging' into develop 2019-01-08 16:09:28 +05:30
Saurabh
22b1987dfa bumped to version 11.0.3-beta.48 2019-01-08 16:37:36 +06:00
Suraj Shetty
d2b7a45429
Revert fix: Remove extra bracket 🤦‍♂️ 2019-01-08 15:51:50 +05:30
Saurabh
f8810bbf9d
Merge pull request #6738 from surajshetty3416/fix-image-upload 
fix: No permission for System Settings while uploading image
 2019-01-08 15:34:19 +05:30
Suraj Shetty
b0cadea875
Merge pull request #6706 from netchampfaris/cast-numeric-values 
fix: Cast numeric values to int
 2019-01-08 15:14:10 +05:30
Suraj Shetty
cfca17c1be Commonify code 2019-01-08 14:27:16 +05:30
Nabin Hait
1d686e470b
fix(comp_dashboard): Company dashboard if goal is zero. (#6719) 2019-01-08 14:16:04 +05:30
Deepesh Garg
84d3e63859 feat: Links in auto email report (#6710) 
* feat: Link for fields in auto email report

* fix: Typo fix

* Added options for delimiter columns and option for dynamic links

* fix: Exclude currency from links

* fix: Test case for auto email report

* fix(Codacy): Removed unused import

* fix(test): Fix test case for auto email report

* fix(test): Fix test case for auto email report
 2019-01-08 14:14:40 +05:30
Deepesh Garg
900392efa3 fix : Auto email report fix for XLSX and CSV format (#6729) 2019-01-08 14:09:10 +05:30
Suraj Shetty
c038318446 Remove unwanted network request to check setting 
- check use_socketio_to_upload_file flag from
frappe.boot.sysdefaults.use_socketio_to_upload_file
instead of making network request
 2019-01-08 13:03:00 +05:30
Suraj Shetty
90b6baccf8
fix: Remove extra bracket 2019-01-08 12:30:23 +05:30
Suraj Shetty
507e37e603
fix: use ORM instead of manually adding quotes 2019-01-08 12:27:25 +05:30
Faris Ansari
b7c4593200 Merge branch 'develop' of https://github.com/frappe/frappe into cast-numeric-values 2019-01-08 12:21:25 +05:30
Deepesh Garg
817d0744f8 feat: Function for linking reports with filters (#6718) 2019-01-08 10:43:27 +05:30
Deepesh Garg
d4c2ff74c7 fix(UI Test): Cypress test case fix (#6734) 
* fix(UI Test): Fix test cases for login

* fix: add missing semicolon
 2019-01-07 21:56:44 +05:30
Deepesh Garg
c274882fd0 Display all filters in report view (#6722) 2019-01-07 08:56:36 +05:30
Frappe Bot
1197271700 Fixed merge conflict 2019-01-05 09:06:05 +00:00
Frappe Bot
0e5d378a8c Merge branch 'staging-fixes' into staging 2019-01-05 09:03:59 +00:00
Frappe Bot
727e000ab8 bumped to version 11.0.3-beta.47 2019-01-05 09:03:59 +00:00
Suraj Shetty
9adbbd44c8 fix(permission): Role permission check with if_owner enabled (#6726) 
* Allow user to access list even if there is only a docperm with if owner enabled

* Add test to check if user gets access to the list

- User should be able to access list even if the user has only
 role for which docperm is created with if_owner check

* Remove commented code
 2019-01-05 14:31:40 +05:30
Saurabh
aa2f23efc4
Merge pull request #6724 from surajshetty3416/fix-patch-for-mac-users 
fix(patch): Move frappe.db.commit() after transactional query
 2019-01-04 13:34:04 +05:30
Suraj Shetty
f42ca945d3 fix(patch): Move frappe.db.commit() after transaction statement 2019-01-04 13:28:30 +05:30
Sagar Vora
f91c277c86
Merge pull request #6723 from surajshetty3416/fix-patch-for-mac-users 
fix: rename view log patch for mac users
 2019-01-04 12:12:23 +05:30
Suraj Shetty
eb2b91d302 Fix rename view log patch for mac users 
for mac users direct renaming would not work
since mysql for mac saves table name in lower case,
so while renaming `tabView log` to `tabView Log` we get
"Table 'tabView Log' already exists" error

# more info https://stackoverflow.com/a/44753093/5955589
https://dev.mysql.com/doc/refman/8.0/en/server-system-variables.html#sysvar_lower_case_table_names
 2019-01-04 11:58:52 +05:30
Sagar Vora
6c1f2a236c
Merge pull request #6716 from saurabh6790/fix_modified_date 
fix: update modified date for Dropbox Settings Doctype
 2019-01-04 10:58:24 +05:30
Sagar Vora
a45a37b95a
Merge pull request #6721 from surajshetty3416/fix-patch 
fix(patch): Rearrange patch execution to fix a patch failure
 2019-01-04 09:56:39 +05:30
Suraj Shetty
281b213f9d Rearrage patch execution to fix a patch failure 
- Should fix "Column 'apply_user_permissions' cannot be null" while
 executing reload_and_rename_view_log patch
 2019-01-04 07:40:06 +05:30
Rushabh Mehta
7299168d90 fix: prepared_report.py 2019-01-03 18:29:22 +05:30
Rushabh Mehta
b2c7faff2c fix: prepared report should not open in a new tab 2019-01-03 18:06:30 +05:30
Rushabh Mehta
d272a5a76b fix: prepared report should not open in a new tab 2019-01-03 18:05:54 +05:30
Sagar Vora
67777b1b7c
Merge pull request #6498 from ElasticRun/series-key 
fix: refactor primary key in series patch
 2019-01-03 16:53:32 +05:30
Saurabh
f5607f5b1b fix: update modified date for Dropbox Settings Doctype 2019-01-03 16:45:39 +05:30
Sagar Vora
c2d8201032
Merge pull request #6709 from sagarvora/remove_useless_file 
minor: remove unused patch
 2019-01-03 16:36:55 +05:30
Sagar Vora
53b11e3d0d fix(core): rename "View log" to "View Log" and patch (#6708) 2019-01-03 16:34:08 +05:30
Sagar Vora
0520c97ba5
Merge branch 'develop' into series-key 2019-01-03 16:33:05 +05:30
Sagar Vora
ae6d1cf725 fix: change patch directory 2019-01-03 16:27:30 +05:30
Rushabh Mehta
e46acc9bda fix(test): fixed quote issue 2019-01-03 16:11:58 +05:30
Rushabh Mehta
b66d233360 merge: staging-fixes for latest test fixes 2019-01-03 15:28:36 +05:30
Himanshu Mishra
9e2894f003
Merge branch 'develop' into series-key 2019-01-03 15:25:20 +05:30
Sagar Vora
b12abda507 fix(chat): register last_seen only if last_message exists (#6712) 2019-01-03 12:55:09 +05:30
Sagar Vora
bedcc52cbe minor: remove useless patch 2019-01-02 13:07:40 +05:30
Shivam Mishra
12798c9ee5 Fixed Addresses and Contacts Report (#6651) 
* Fixed Addresses and Contacts Report

* minor change

* [Report Fix] Added test cases for Addresses and Contacts Report

* [Report Fix] Fixed a small typo 'Doctype' - 'DocType'

* [Report Fix] Fixed code formatting

* [Code Formatting] Removed unused variables

* [Code Formatting] Removed unused variable doc
 2019-01-02 09:12:07 +05:30
Shivam Mishra
b86663490c [Base 64 Fix]: Added check for base64 image in abs_url (#6688) 
* [Base 64 Fix]: Added check for base64 image in abs_url

The abs_url filter used in website appends a '/' before every link.
This broke the website image display.

* fix(abs_url): add check for all image types

* Update utils.py
 2019-01-02 09:11:05 +05:30
Charles-Henri Decultot
06ea7499ab [Fix] Transaction log corrections (#6693) 
* Transaction log corrections + improvements

* Remove unused import

* Timestamp format

* Add system manager to permissions
 2019-01-02 09:10:50 +05:30
Faris Ansari
8e854fa494 fix: Delete deprecated App Installer page (#6686) 2019-01-02 09:08:49 +05:30
Faris Ansari
6303089e4a test: Add test for get_single_value 2019-01-01 18:43:40 +05:30