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

15910 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ameya Shenoy
55d91bbcf5 [fix] creates contact even in presence of bad char (#5618) 2018-05-28 11:03:30 +05:30
Rushabh Mehta
4aff164b69 [fix] for bench get-app 2018-05-27 14:28:42 +05:30
Ameya Shenoy
354efd5351 [fix] contact to user creation patch (#5617) 
- special charcters in name used to break user creation, this patch
prevents user creation in case of bad characters
 2018-05-27 14:19:19 +05:30
Suraj Shetty
555a80d8ac Treeview permissions (#5615) 
* 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

* Add parent filter

* Add ifnull check
 2018-05-27 12:48:49 +05:30
yimesgen
becefe7197 Update country_info.json (#5616) 2018-05-27 12:48:12 +05:30
Prateeksha Singh
23820cdb8d [fix] cached timestamp in frappe.model.with_doctype() (#5613) 
* [fix] cached timestamp in frappe.model.with_doctype()

* Update model.js
 2018-05-25 18:14:50 +05:30
Rushabh Mehta
5e09a3a9b8 [minor] strip special characters when making a fieldname 2018-05-25 15:48:00 +05:30
schilgod
bcaabe5163 Enhancement to allow User to login from any IP if two factor auth is enabled (#5209) 
* Enhancement to allow login from any IP if two factor auth is enabled

* Resolve Conflicts

* optimize code
 2018-05-25 10:50:24 +05:30
Nabin Hait
6a4a246ad7 Fetch From also applicable for Check fields (#5611) 2018-05-25 10:46:43 +05:30
Nabin Hait
8d8c49f43b fetch_from fixes in mapper 2018-05-25 09:55:58 +05:30
Nabin Hait
24a4972413 fetch_from fixes 2018-05-25 09:49:38 +05:30
Ameya Shenoy
949ec96fbc
Merge branch 'master' into develop 2018-05-24 08:43:19 +00:00
Ameya Shenoy
7a4787bb44
Merge branch 'hotfix' 2018-05-24 08:39:55 +00:00
Ameya Shenoy
9a32f55f40 bumped to version 10.1.33 2018-05-24 08:39:55 +00:00
Zarrar
c34f059b66 fix email query (#5605) 2018-05-24 13:01:07 +05:30
Ameya Shenoy
4f4a169526 Prevents circular linking of docs (#5589) 
* Prevents circular linking of docs

- also added test case to check if code to prevent circular linking of
doctypes works

* created a CircularLinkingError class

- this can be used later if circular linking error needs to be thrown
elsewhere
 2018-05-24 12:07:02 +05:30
Ameya Shenoy
188c4c87db [fix] global-setup-help (#5603) 
- custom jinja templates are taken if and only if a site is mentioned
- added test in travis as well
 2018-05-24 12:05:25 +05:30
Rushabh Mehta
f39c286409 [fix] calendar render for empty list, user_list.js 2018-05-23 17:06:42 +05:30
Rushabh Mehta
113446d661 [fix] ellipsis in navbar brand #5599 2018-05-23 16:22:52 +05:30
Rushabh Mehta
e853573e45 [minor] add pdfkit to requirements.txt 2018-05-23 16:13:34 +05:30
Nabin Hait
dcea529454
Update activity_log.json 2018-05-23 13:40:15 +05:30
Zarrar
076e1d5be0 run docfield patch prior to other patches (#5594) 2018-05-23 13:16:53 +05:30
rohitwaghchaure
3138234ae2 [Fix] Hyperlink showing in the pdf print (#5590) 2018-05-23 11:27:35 +05:30
Gaurav Naik
e38104dbeb modified address and contact js (#4862) (#5586) 
* modified aaddress and contact js

- temporary fix to handle route_history if docname is naming_series with a '/' in the name- permanant fix would be to modify route options
- PR linked to frappe/erpnext#12215

* considered cases with more '/'s in doc name
 2018-05-23 11:17:33 +05:30
Charles-Henri Decultot
85bd024b12 Allow several Stripe accounts (#5573) 
* Allow several Stripe accounts

* Addition of a sync patch

* Remove unused dependancy
 2018-05-23 11:16:21 +05:30
Sushant Nadkar
c86de780fc [fix] Button duplication on page trigger: refresh (#5564) 
* [fix] custom button duplication on page trigger: refresh

* added data-label to buttons to filter them more easily

* added encodeURIComponent to data-label

* Update page.js
 2018-05-23 11:15:27 +05:30
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