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

17275 commits

This branch
This branch
All branches
Author SHA1 Message Date
Suraj Shetty
574b970afd Merge branch 'staging-fixes' of https://github.com/frappe/frappe into staging-fixes 2018-12-25 12:23:00 +05:30
rohitwaghchaure
22fe10148a [Fix] Translation not working for the html data (#6647) 
* [Fix] Translation not working for the html data

* Test cases

* Fixed codacy

* Fixed is html method

* Fixed test cases
 2018-12-24 15:17:38 +05:30
pipech
4ee79078f2 fixed Cannot set Desktop Icon (#6666) 2018-12-24 14:58:31 +05:30
Zarrar
2075b2e16a add route to home in menu option (#6668) 2018-12-24 14:57:39 +05:30
rohitwaghchaure
574446e092 [Fix] Notification count not showing for the doctypes like purchase order, sales invoice (#6657) 2018-12-24 13:10:58 +05:30
Deepesh Garg
ed80e9dff1 [Fix]Quick entry with geolocation field issue fix (#6662) 
* Quick entry with geolocation field issue fix

* Codacy issue fix
 2018-12-24 13:06:30 +05:30
Faris Ansari
1d461ab5cc fix: Update datatable to 1.7.2 (#6665) 2018-12-24 13:05:58 +05:30
Rushabh Mehta
fafabac492 fix(test): test_report.py 2018-12-23 19:26:23 +05:30
Rushabh Mehta
5d658f251d fix(style): show some margin on headings for quill editor 2018-12-23 17:55:22 +05:30
Frappe Bot
de6b5f686c Merge branch 'staging-fixes' into staging 2018-12-21 05:45:40 +00:00
Frappe Bot
4b336622ae bumped to version 11.0.3-beta.40 2018-12-21 05:45:40 +00:00
Deepesh Garg
72e1ccc8f9 Changed modified timing to pickup changes (#6649) 
* Changed modified timing to pickup changes

* Update address.json
 2018-12-21 11:05:20 +05:30
Suraj Shetty
81911b9373
Merge branch 'staging-fixes' into staging-fixes 2018-12-20 12:27:06 +05:30
Suraj Shetty
432d22ba76 Add get_permitted_documents function 2018-12-19 19:59:58 +05:30
Frappe Bot
41b6ef94f5 Merge branch 'staging-fixes' into staging 2018-12-19 06:28:00 +00:00
Frappe Bot
c824248c58 bumped to version 11.0.3-beta.39 2018-12-19 06:28:00 +00:00
Frappe Bot
395972bf0b Merge branch 'master' into staging-fixes 2018-12-19 06:26:37 +00:00
Frappe Bot
cd50fecea0 Merge branch 'hotfix' 2018-12-19 06:19:04 +00:00
Frappe Bot
d63570059d bumped to version 10.1.68 2018-12-19 06:19:04 +00:00
Ameya Shenoy
48b6364941
Merge pull request #6648 from saurabh6790/paypal_subscription_date_fix 
[fix] setup subscription datetime in utc format
 2018-12-19 11:15:17 +05:30
Rushabh Mehta
d93848599a fix(patch): move fetch updation patch after user permissions 2018-12-19 09:27:25 +05:30
Saurabh
dcdc66b459 [fix] remove unwanted imports 2018-12-18 23:15:39 +05:30
Saurabh
30d8841694 [fix] setup subscription datetime in utc format 2018-12-18 23:12:47 +05:30
Suraj Shetty
45911faa23
Merge branch 'staging-fixes' into staging-fixes 2018-12-18 15:26:11 +05:30
Faris Ansari
c89b60dd29 fix(patch): Skip reports that dont have any json config set (#6641) 2018-12-18 14:24:33 +05:30
Faris Ansari
3ef0cc9128 Prevent removing ID column in Pick Columns (#6637) 
* fix(report-view): Always keep ID column

* fix: Import syntax

* chore: Add comment
 2018-12-18 10:58:00 +05:30
Saurabh
a62cac8ab7 bumped to version 11.0.3-beta.38 2018-12-18 10:49:37 +06:00
Shreya Shah
5e7e78c2de fix: comment mentions (#6611) 
* fix: replace br with div

* test: Add test coverage
 2018-12-18 09:01:55 +05:30
Shreya Shah
3128723b09 fix: pass parameters as list (#6625) 
* fix: pass parameters as list

* test: Add test case

* test: Add json data for test
 2018-12-18 09:01:29 +05:30
Saif
a0b2709a68 fix: bug in total row calculation for Currency field for list of dict values (#6615) 2018-12-18 09:01:09 +05:30
Rohan
ac82c04c2b fix(report): Only show generate button if it is a prepared report (#6619) 
* fix(report): Only show generate button if it is a prepared report

* Update query_report.js
 2018-12-18 08:59:26 +05:30
khushalti
0367fe3025 [Fix] - Corrected json format (#6621) 2018-12-18 08:56:37 +05:30
Zarrar
863c54b0fa [Fix] Json data for Report Builder based reports (#6624) 
* replace doctype name if already present

* patch to update json data for report builder based reports

* minor fix for auto email
 2018-12-18 08:56:10 +05:30
Shreya Shah
b247cae12e fix: pass parameters as list (#6626) 
* fix: pass parameters as list

* test: Add test case

* test: Add json file for test data
 2018-12-18 08:54:26 +05:30
Aditya Hase
50ad6bcdf6 fix(website): Correctly generate route for list item (#6620) 
Since route string for list-item in website list view was
generated from frappe.local.request.path, page part that
is acquired by ajax call used to contain incorrect route

e.g. /api/frappe.www.list.get/CC-SINV-2018-00006
instead of /invoices/ACC-SINV-2018-00006
 2018-12-17 21:21:04 +05:30
Ameya Shenoy
b7bac9cd49 fix(auto_email_report): max_reports_per_user (#6628) 
Option to modify the value for max_reports_per_user via the
site_config.json
 2018-12-17 16:07:44 +05:30
Saurabh
52073a2b59 [minor][fix] get_notifications_for_doctypes (#6634) 2018-12-17 16:06:56 +05:30
Faris Ansari
baa906c547 fix: Remove redundant import (#6614) 
* fix: Remove redundant import

* fix: import only required class using {reference}
 2018-12-17 14:30:27 +05:30
Faris Ansari
d6833996d3 fix: Include meta_block in Web Page (#6627) 2018-12-17 13:55:32 +05:30
Faris Ansari
09077ae327 fix: Update DataTable (#6622) 
- Now vertical scrollbar is shown always
 2018-12-17 13:48:02 +05:30
Faris Ansari
5f8d19133e fix(Chat): Show red indicator for unread threads (#6629) 
- Mark messages as read in background
 2018-12-17 10:06:12 +05:30
Saurabh
f42c5a83da bumped to version 11.0.3-beta.37 2018-12-13 11:02:39 +06:00
Aditya Hase
a23bd34e10 fix(report-view): Update Reports dropdown on creation of a Report (#6604) 
This is done by updating frappe.boot.user.all_reports on creation of Report

Also to ensure that reports are properly ordered,
report list is explicitly sorted by name
 2018-12-12 15:43:25 +05:30
Faris Ansari
5693080940 [UX] Report builder (#6608) 
* fix: Remove fixed height check

* fix(sort-selector): Set sort arrow correctly on load

* fix(query-report): Simplify help message

* fix(report-builder): Set dirty state when report settings are changed

- Also save the page_length when saving the report
 2018-12-12 14:11:23 +05:30
Sagar Vora
36364fa54d fix(ui): make footer appear at end of page (#6610) 2018-12-12 14:10:23 +05:30
Rushabh Mehta
0f5f04b409
fix(tests): one more attempt to fix the erratic test_scheduler.py (#6612) 
* debug(test_scheduler): please fail

* fix(tests): use flags instead of globals since cache is not trhead-safe
 2018-12-12 14:09:50 +05:30
Suraj Shetty
40fb7ac76f Init reference doctype 2018-12-12 13:50:20 +05:30
Suraj Shetty
ec1384dafe Fix faulty check 2018-12-12 13:23:05 +05:30
Suraj Shetty
039bd58a31 Fix minor bug 2018-12-12 13:17:12 +05:30
Suraj Shetty
70a8054020 Fix client side user permission check 2018-12-12 13:15:11 +05:30