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

15884 commits

This branch
This branch
All branches
Author SHA1 Message Date
Zarrar
e76b3eef4e [Enhance] New DocField - 'Fetch From' (#5563) 
* add new docfield fetch_from - serves as add_fetch

* replace options.split with fetch_from.split

* copied data from options to fetch_from

* patch to update fetch_from for docfield, custom_field and property_setter

* update tests according to fetch_from change
 2018-05-23 11:07:57 +05:30
Prateeksha Singh
4d96fcc557 [query-perf-log] Add execution time for debug opt in frappe.db.sql (#5592) 
* [query-perf-log] Add execution time for debug opt in frappe.db.sql

* Update database.py
 2018-05-23 10:41:05 +05:30
Prateeksha Singh
80c0b45e0a
Merge pull request #5591 from codingCoffee/merge_conflict 
fixed merge conflict
 2018-05-22 21:35:22 +05:30
Ameya Shenoy
21114bddf1
fixed merge conflict 2018-05-22 21:31:08 +05:30
Ameya Shenoy
06851e7376
Merge branch 'master' into develop 2018-05-22 08:45:40 +00:00
Ameya Shenoy
67fcbaa06b
Merge branch 'hotfix' 2018-05-22 08:43:16 +00:00
Ameya Shenoy
0a45e6af9c bumped to version 10.1.32 2018-05-22 08:43:16 +00:00
Stavros Anastasiadis
9607b336a4 Select fields to allow in quick entry (#5461) 2018-05-22 11:49:32 +05:30
ci2014
0a9192d791 Use email instead of user name for building exclude list from thread_notify (#5502) 
* Update email.py

* Get the correct Email Address for Administrator

Get the correct Email Address for the Administrator User as well. I see no reason why.
 2018-05-22 11:44:34 +05:30
Saurabh
7798dfc0d3 [fix] handle worker timeout issue while taking backup to dropbox (#5450) 2018-05-22 11:43:06 +05:30
tarokobear
e85e52a591 Account for documents with integer names so they can be deleted. (#5567) 2018-05-22 11:23:59 +05:30
Prateeksha Singh
e3115bfbc7 [docs-portal] Search the Docs (#5558) 
* [docs-portal] search documentation

* [doc-search] remove search-result template

* [portal-search][minor] add search result section title

* [portal-search] make search result section macro

* [portal-search] two-col layout for more sections
 2018-05-22 10:23:13 +05:30
Faris Ansari
8689bbd855 Reportview fixes (#5582) 
* Reportview- Dynamic row height disabled by default, enable using checkbox

* Always show filter row in Query Report
 2018-05-22 10:17:15 +05:30
Sharath C
873d3c85e8 Add Custom Jinja methods from hooks.py (#5585) 2018-05-22 10:16:38 +05:30
Prateeksha Singh
8246194e78
Merge pull request #5584 from pratu16x7/hotfix 
[hotfix][charts] update, without new build system
 2018-05-21 18:31:22 +05:30
Prateeksha Singh
2e76a75b4b [charts] update, without new build system 2018-05-21 18:03:33 +05:30
Faris Ansari
2f1f174bfd Listview fixes (#5581) 
* Remove annoying message when kanban is changed

* [fix] view_user_settings getter

* Set last_view on kanban view change
 2018-05-21 16:16:54 +05:30
Zarrar
dba5b789f4 update patch - fix order_by for older settings (#5580) 2018-05-21 16:16:25 +05:30
rohitwaghchaure
915e9cf876
Merge pull request #5579 from rohitwaghchaure/gstin_not_displaying_in_company_address 
[Fix] GSTIN number not showing in the company address
 2018-05-21 15:18:53 +05:30
Rohit Waghchaure
20492e365d [Fix] GSTIN number not showing in the company address 2018-05-21 15:10:12 +05:30
Faris Ansari
fb3560a555
[fix][patch] Create contact for user (#5578) 2018-05-21 15:09:54 +05:30
Faris Ansari
0f7e231160 Listview fixes (#5577) 
- update sort_by and sort_order on sort_selector change
 2018-05-21 14:38:50 +05:30
Zarrar
27ad949156 [Fix] Sort data when added from quick entry in the list (#5575) 
* sort data in list
use sort_by and sort_order individually instead of combining them into one order_by

* patch to update user_settings
- remove order_by and insert sort_by and sort_order in user_settings
 2018-05-21 12:53:06 +05:30
Valmik
467604ba93 Function to remove a slide from the list of slides (#5570) 2018-05-21 12:28:57 +05:30
Rushabh Mehta
1fc8cec2c6
[minor] removed duplicate notify_by_email 2018-05-21 12:27:54 +05:30
Charles-Henri Decultot
f0ed11061d Calendar connector improvements (#5571) 
* Calendar connector improvements

* Development cleanup
 2018-05-21 12:21:15 +05:30
Faris Ansari
a682745488
Datatable fixes (#5569) 
- duplicate Add column dropdown item
- Add column dialog should show Label instead of fieldname
 2018-05-18 13:33:48 +05:30
rohitwaghchaure
ae0ec7c8f1
Merge pull request #5566 from Zlash65/fix-patch 
[Minor] Patch fix for migration
 2018-05-18 12:47:50 +05:30
Zlash65
76045cb7f1 refresh meta filter for DocType and DocField after column drop 2018-05-17 19:37:18 +05:30
Suraj Shetty
8f386d709f Allow everything for Admin (#5561) 
- Return every available roles if the user is admin
This will allow admin to access doctype even if doctype
has docperm with only disabled roles
- No more need to add roles for admin on every new role creation
 2018-05-17 12:33:38 +05:30
Rushabh Mehta
a2e1af2a55
Revert "Replace frappe.db.sql to frappe.get_list to apply permissions" (#5559) 
* Revert "[minor] remove in_dialog old property"

This reverts commit b4650f42a1.

* Revert "JWT response does not contain email attribute for Office 365, reading upn instead (#5525)"

This reverts commit 51f5988a76.

* Revert "Fix "frappe.is_user_logged_in" js function (#5548)"

This reverts commit affe5b8659.

* Revert "[Translation] Updated Translations (#5552)"

This reverts commit f3930a7026.

* Revert "Fix a bug with whitelisted method (#5551)"

This reverts commit 92e4db1dd9.

* Revert "Python 3 fixes for PR bot (#5554)"

This reverts commit 7b003a71bc.

* Revert "Replace frappe.db.sql to frappe.get_list to apply permissions (#5556)"

This reverts commit 2e52177f51.
 2018-05-16 12:57:43 +05:30
Rushabh Mehta
b4650f42a1 [minor] remove in_dialog old property 2018-05-16 12:51:01 +05:30
yogeshak
51f5988a76 JWT response does not contain email attribute for Office 365, reading upn instead (#5525) 2018-05-16 11:13:17 +05:30
Erick Jimenez
affe5b8659 Fix "frappe.is_user_logged_in" js function (#5548) 
* Fix is_user_logged_in js function

* Add missing semicolon
 2018-05-16 11:12:31 +05:30
Frappe PR Bot
f3930a7026 [Translation] Updated Translations (#5552) 2018-05-16 11:12:06 +05:30
Suraj Shetty
92e4db1dd9 Fix a bug with whitelisted method (#5551) 
- Add additional check to avoid wrong user set
 2018-05-16 11:11:37 +05:30
Ameya Shenoy
7b003a71bc Python 3 fixes for PR bot (#5554) 
In python 2 writing to file can be done by reading the file as 'w' or
'wb', however, in python 3 if we're writing 'utf-8' encoded stuff to a
file, it needs to be opened using the 'wb' argument. 'b' here stands for
binary.
 2018-05-16 11:11:04 +05:30
Suraj Shetty
2e52177f51 Replace frappe.db.sql to frappe.get_list to apply permissions (#5556) 
* Replace frappe.db.sql with frappe.get_list
- Permission check for treeviews

* Optimize get_role_permissions
- Avoid setting of roles each time when is_perm_appicable is called

* Fix codacy
- Remove trailing whitespace
 2018-05-16 11:10:45 +05:30
Saurabh
f1b35c82f4 [fix] resolved merge conflicts 2018-05-15 12:56:21 +05:30
Saurabh
757f37aa7a Merge branch 'hotfix' 2018-05-15 12:51:03 +05:30
Saurabh
b42eb308a7 bumped to version 10.1.31 2018-05-15 13:21:03 +06:00
Saurabh
c3b97bc456
Merge pull request #5544 from codingCoffee/opti_addr_contact 
optimized addr_and_contact report by @nabinhait
 2018-05-15 12:08:27 +05:30
Saurabh
c1a338f8c0
Merge pull request #5491 from codingCoffee/decimal_fix 
added handler for decimal object in response
 2018-05-15 11:54:31 +05:30
Saurabh
488e4a5426
Merge pull request #5550 from netchampfaris/hotfix 
Quick Kanban Board
 2018-05-15 11:53:49 +05:30
Faris Ansari
3d5c09d41a
fix codacy 2018-05-15 11:30:52 +05:30
Zarrar
b2873be5fb [Fix] Email and Contact fixes (#5519) 
* use multiselect for email dialog, improv email fetch query

* patch to create contact for all user

* append number if same name found for company

* update tests
 2018-05-14 19:21:35 +05:30
Faris Ansari
4015238512 Quick Kanban Board 
- dont create project implicitly, results in Deadlock most of the time
- add explicit field to set the project
 2018-05-14 12:43:28 +05:30
Prateeksha Singh
da2e00e570
Merge pull request #5547 from pratu16x7/jsBarcode-import 
[purge] remove jsbarcode lib, import
 2018-05-11 15:57:48 +05:30
Prateeksha Singh
d54980b665 [purge] remove jsbarcode lib, import 2018-05-11 15:52:56 +05:30
Rushabh Mehta
cca360e8ef [minor] dont render .min.js files as jinja templates 2018-05-10 22:28:42 +05:30