Commit graph

15927 commits

Author SHA1 Message Date
Alchez
0dcf3ca61d [Improvements] Auto-publish pages with date ranges (#5430)
* Add feature for auto-(un)publishing Web Pages

* Move some publish logic to frontend

* Cleanup some logic

* Remove arbitrary limits and add check for start date
2018-05-30 11:34:05 +05:30
Suraj Shetty
c71c132ba2 Workflow actions (#5598)
* Init workflow actions

- WIP code
- Add hooks to create and update
workflow action on document status changes.
- Tweak listview to show host document on list view item click
- Add new doctype "Pending Workflow Action"
- Add allow_self_approval check in Workflow master

* Rename doctypes

- Rename "Workflow Action" to "Workflow Action Master"
- Rename "Pending Workflow Action" to "Workflow Action"
- Remove irrelevant files

* Clear old workflow action on docstatus change

- Add check for user permission before creating a workflow action record
- Make doctype changes to support the Workflow Action  System

* Show host document only if workflow action status is open

* Send workflow action mail notifications

* Add patch to rename `tabWorkflow Action` to `tab Workflow Master`

- Rename table to retain data in `tabWorkflow Action` as it
will be overwritten with new structure on migration

* Enqueue email

* Remove unused files

* Add hook for custom has_permission

* Optimize send_workflow_action_email method

* Add permission_query_condition hook

* Show notification based on status

* Override get_form_link in list view

* Refactor workflow action

- Add action link
- update workflow action hooks

* Avoid repeated creation of Worklow Actions

- Update hooks entry to avoid unwanted method call

* Fix error with frappe.db.count usage

* Fix ui/ux for Workflow Action

- Fix action url and improve response on action button click
- Fix workflow action template style

* Fix Codacy

* Add self approval check

* Fix codacy

* Fix test

* Fix python version confilct and a permission error

* Fix incorrect 'this' reference

* Update with requested changes

* Add next action email template option

* Fix string formatting

* Refactor workflow Action

- Make process_workflow_action smaller

* Fix bugs and errors due to refactor

* Fix workflow field caching

* Add a workflow action test

* Fix bugs with email template
2018-05-30 11:24:49 +05:30
Nabin Hait
5095eed157 get root of nestedset docs 2018-05-29 16:16:21 +05:30
Nabin Hait
b4f6cdf71e Patch fixes 2018-05-29 14:52:22 +05:30
Nabin Hait
c64c13c0a7 changed patch order 2018-05-29 11:21:20 +05:30
Nabin Hait
c49193c1c1
Fetch from property is now applicable for all fieldtypes except no_value_fields (#5624)
* Reload docperm

* Reload docperm

* Fetch from property is now applicable for all fieldtypes except no_value_fields
2018-05-29 10:54:45 +05:30
Faris Ansari
c4e8482da0
fix: get_contact_list in Email dialog (#5623) 2018-05-28 18:09:32 +05:30
Manas Solanki
5ea4fb6157
Update db_schema.py (#5622) 2018-05-28 16:02:32 +05:30
Faris Ansari
9e278308f0
fix: Don't add currency field if it does not exist (#5619)
closes #4995
2018-05-28 14:10:12 +05:30
Rushabh Mehta
6353912e79 [fix] bench_helper.py 2018-05-28 12:48:28 +05:30
Saurabh
56bf3bf40b [fix] resolved merge conflicts 2018-05-28 11:43:38 +05:30
Saurabh
af091ffddd Merge branch 'hotfix' 2018-05-28 11:24:31 +05:30
Saurabh
3079f1c5fe bumped to version 10.1.34 2018-05-28 11:54:31 +06:00
Rushabh Mehta
015a366e5f [fix] .travis.yml 2018-05-28 11:15:07 +05:30
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
Prateeksha Singh
2bb5dbe5c3 [model][std-fields] make 'Created By' a User Link field (#5600) 2018-05-25 10:58:53 +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
Manas Solanki
78c839eb5f handle Int overflow (#5607)
* handle the int overflow

 - convert the int to the bigint if the length is more than 11

* proper formatting
2018-05-25 10:47:44 +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
Sharath C
22a2c682c9 Jinja Customization from hooks.py bug fix (#5604)
* Jinja Customization from hooks.py bug fix

* Condition to check for site initialization added.
2018-05-24 14:26:18 +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