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

17896 commits

This branch
This branch
All branches
Author SHA1 Message Date
Shivam Mishra
bdfba147a2
Merge pull request #7429 from Anurag810/date_fix2 
fix: add parameter minutes(v11)
 2019-05-09 11:53:49 +05:30
Anurag Mishra
a42e18fcf1 fix: add parameter minutes 2019-05-08 17:30:24 +05:30
Sahil Khan
3619cb80d5 Merge branch 'hotfix' 2019-05-07 14:39:51 +05:30
Sahil Khan
9bbb5b2b5d bumped to version 11.1.27 2019-05-07 14:59:51 +05:50
Rushabh Mehta
9b3ae050d0 fix: error reporting (#7404) 
* fix(minor): fix error reporting exception JSON handling

* fix: dont show double messages
 2019-05-07 14:21:45 +05:30
rohitwaghchaure
7f346bf439
Merge pull request #7425 from rohitwaghchaure/plus_button_redirect_issue 
fix: create new from dashboard will not set the value in the dynamic link field
 2019-05-07 13:27:54 +05:30
Rohit Waghchaure
f1463ccc24 fix: create new from dashboard will not set the value in the dynamic link field 2019-05-07 12:23:27 +05:30
Rushabh Mehta
ac975eea13
Merge pull request #7417 from scmmishra/disable-customize-hotfix 
feat: disable customize option for single doctypes #7415
 2019-05-07 11:10:57 +05:30
Shivam Mishra
22771008f9 feat: disable customize option for single doctypes 2019-05-06 20:05:39 +05:30
Aditya Hase
b14d6e76b1 fix: Do not show locals to user (#7396) 2019-05-02 19:35:07 +05:30
Anurag Mishra
e5fbf7d438 fix: frappe.utils.add_to_date added parameter seconds to add and subtract seconds (#7393) 2019-05-02 15:05:06 +05:30
Sahil Khan
5c2bd35977 Merge branch 'hotfix' 2019-05-01 15:12:07 +05:30
Sahil Khan
49d2d838ad bumped to version 11.1.26 2019-05-01 15:32:07 +05:50
Nabin Hait
3522593e5e patch: remove user perm for page and report doctype (#7382) 
* fix: status options for integration request

* patch: remove user perm for page and report doctype
 2019-05-01 14:44:33 +05:30
Faris Ansari
b63a80cc89
fix: Set user language in print preview (#7384) 
The User language was set in the select control but the value didn't pass
correctly in the request, because `this.lang_code` wasn't set.
We also abort duplicate requests.
 2019-05-01 14:41:06 +05:30
Faris Ansari
7ed00ab60d
fix(UX): Don't set root_label as page title in tree (#7386) 
Root label is already shown in the Tree and in some cases the filter
 2019-05-01 14:40:11 +05:30
Suraj Shetty
a38709d432
Merge pull request #7376 from rohitwaghchaure/dont_raise_user_permissions 
fix: while saving employee user getting user permissions error
 2019-04-29 23:52:19 +05:30
Sahil Khan
a465fc6528 Merge branch 'hotfix' 2019-04-29 19:37:03 +05:30
Sahil Khan
362d31c231 bumped to version 11.1.25 2019-04-29 19:57:03 +05:50
Faris Ansari
d78ace4dc5
Revert "fix: "Border disappears on zoom out" issue" (#7377) 
This reverts commit e290d8fa23.
 2019-04-29 19:35:51 +05:30
Rohit Waghchaure
9f5e32cee0 fix: while saving employee user getting user permissions error 2019-04-29 19:10:12 +05:30
Sahil Khan
094520c4c9 Merge branch 'hotfix' 2019-04-29 16:33:37 +05:30
Sahil Khan
b0db49a273 bumped to version 11.1.24 2019-04-29 16:53:37 +05:50
rohitwaghchaure
911a69e41d
Merge pull request #7373 from rohitwaghchaure/show_total_not_working_for_gstr1 
fix: GSTR-1 report not working if show totals is enabled
 2019-04-29 15:47:58 +05:30
Rohit Waghchaure
a88b0a4ac2 fix: GSTR-1 report not working if show totals is enabled 2019-04-29 13:52:01 +05:30
Suraj Shetty
e290d8fa23 fix: "Border disappears on zoom out" issue (#7365) 
* fix: "Border disappears on zoom out" issue

* fix: Use before pseudo element to avoid element block
 2019-04-29 11:34:14 +05:30
Deepesh Garg
627064f823
Merge pull request #7367 from deepeshgarg007/rtl 
fix: RTL scrolling fix for reports
 2019-04-26 15:44:16 +05:30
deepeshgarg007
e39f477fdb fix: RTL support for reports 2019-04-26 15:30:13 +05:30
Deepesh Garg
7e69a994b1
Merge pull request #7366 from deepeshgarg007/datatable-rtl 
fix: Upgrade datatable to support RTL
 2019-04-26 14:09:58 +05:30
deepeshgarg007
194159d97b fix: Upgrade datatable to support RTL 2019-04-26 13:57:23 +05:30
Aditya Hase
38047b909f perf: Remove MANIFEST.in (#7361) 
Faster pip install -e frappe

https://stackoverflow.com/questions/24727709/do-python-projects-need-a-manifest-in-and-what-should-be-in-it
 2019-04-26 12:43:37 +05:30
Shivam Mishra
ef636e9fe9
Merge pull request #7363 from scmmishra/new-button-report 
fix: fixed Make new button for empty state in report view
 2019-04-26 12:43:25 +05:30
Shivam Mishra
fba37163bf fix: fixed Make new button for empty state in report view 2019-04-26 12:03:06 +05:30
Saif
d26b5e5e08 feat: Set initial depth of tree report (#7348) 2019-04-25 12:38:49 +05:30
Rushabh Mehta
91fb93a88b
Merge pull request #7350 from frappe/revert-7305-DocType-JSON-Field-Order 
Revert "feat: DocType JSON changes for cleaner Git Diffs"
 2019-04-24 17:04:47 +05:30
Rushabh Mehta
dd63977710
Revert "feat: DocType JSON changes for cleaner Git Diffs" 2019-04-24 17:04:29 +05:30
Rushabh Mehta
cbd3d5664c
Merge pull request #7346 from netchampfaris/report-column-width 
fix(ReportView): Remember column widths
 2019-04-24 14:47:10 +05:30
Rushabh Mehta
d676783ce5
Merge pull request #7136 from chdecultot/calendar_corrections 
fix: Google calendar connexion + data migration tool
 2019-04-24 14:36:13 +05:30
Rushabh Mehta
a6ddb424f3
Merge pull request #7305 from SaiFi0102/DocType-JSON-Field-Order 
feat: DocType JSON changes for cleaner Git Diffs
 2019-04-24 14:21:56 +05:30
Saif Ur Rehman
d7f90a9ebc style: Rename prepare_docdict_for_import to prepare_for_import 2019-04-24 13:07:15 +05:00
Faris Ansari
d09b26b563 fix(ReportView): Remember column widths 2019-04-24 12:38:13 +05:30
Shivam Mishra
08bf94677f
Merge pull request #7339 from scmmishra/chart-hotfix-profitability-analysis 
fix: Major bugs in query_report.js
 2019-04-24 09:57:14 +05:30
scmmishra
95f2f7d169 chore: Minor code improvements 2019-04-24 09:30:09 +05:30
scmmishra
20c0075817 Merge branch 'chart-hotfix-profitability-analysis' of github.com:scmmishra/frappe into chart-hotfix-profitability-analysis 2019-04-23 20:58:16 +05:30
scmmishra
755ae40143 fix (linting) 2019-04-23 20:53:38 +05:30
Shivam Mishra
8fd8665b88
Update query_report.js 
removed stray code
 2019-04-23 19:26:13 +05:30
scmmishra
6b57f423ac fix: removed stray console.log 2019-04-23 19:16:46 +05:30
scmmishra
a08d252576 fix: Fixed major bugs in query_report.js 2019-04-23 19:03:33 +05:30
scmmishra
8e836218b2 fix: Changed options for Make Chart dialog 2019-04-23 17:26:24 +05:30
Rushabh Mehta
9f925d3d7a
Merge pull request #7334 from adityahase/feat-touched-tables-hotfix 
feat: Maintain list of tables touched during migrate
 2019-04-23 10:51:40 +05:30