Commit graph

15967 commits

Author SHA1 Message Date
Faris Ansari
a70d56fd04 Website related fixes (#5660)
* bench build --app app_name

* Use highlight.js as npm package

* Add fenced-code-blocks to markdown compiler

* Support for next-prev links
2018-06-07 11:14:25 +05:30
Rushabh Mehta
cfc7661159 [python-3] decode for verified_command.py 2018-06-06 14:35:48 +05:30
Saurabh
b08026ed4f
Merge pull request #5659 from saurabh6790/set_default_to_naming_series
[minor][fix] fix args for set_name_by_naming_series
2018-06-06 12:06:11 +05:30
Rushabh Mehta
dd189d4c99 [fix] set default naming_series in naming.py if not set 2018-06-06 12:00:27 +05:30
Saurabh
3d18f6116a [minor][fix] fix args for set_name_by_naming_series 2018-06-06 11:59:31 +05:30
Shreya Shah
c89da99db5 Fix sentence structure (#5656) 2018-06-06 11:24:56 +05:30
Rushabh Mehta
c32bcca4e8 [fix] set default naming_series in naming.py if not set 2018-06-06 11:24:20 +05:30
Rushabh Mehta
f9bcb11d35 [minor] website-fix 2018-06-06 11:07:54 +05:30
Saurabh
edf361b132 resolved merge conflicts 2018-06-05 15:14:42 +05:30
Saurabh
dd2c33e34a Merge branch 'hotfix' 2018-06-05 15:12:57 +05:30
Saurabh
8d0b33c5ca bumped to version 10.1.36 2018-06-05 15:42:57 +06:00
Faris Ansari
ad64ef5c4e
[fix] Incorrect email account as sender (#5657)
If there are multiple Email Accounts with the same append_to,
then the first one is fetched which is incorrect if there is an
Email Account for the current user.

Now it is first filtered by email_id, if not found falls back to old
behaviour.
2018-06-05 14:44:49 +05:30
Zarrar
ff83f97f44 fix filter query for get_children tree query (#5655) 2018-06-05 10:28:52 +05:30
Siddhi Sawant
70a6c231cc Auto Repeat Schedule HTML in Auto Repeat doctype (#5574)
* Auto Repeat Schedule HTML in Auto Repeat doctype

* [Minor changes] end_date and cur_frm

* [Auto repeat schedule] codacy fixes

* codacy fixes & latest revision in js

* Fixes codacy

* [Minor changes]

* Updated onload method & start_date condition

* changed .html source to doctype folder

* removed template reference from build.json

* fixes codacy
2018-06-05 10:28:09 +05:30
Prateeksha Singh
1239a38e0e [navbar] reduce items in-between space (#5654) 2018-06-04 14:11:14 +05:30
Nabin Hait
786db7de12 minor fix 2018-06-04 12:26:53 +05:30
Nabin Hait
6e00608556 import sync_user_settings in rename_field 2018-06-04 12:24:58 +05:30
Sushant Nadkar
2808000365 [UX Improvement] Removed uri encoding from search results on front end (#5626)
* removed uri encoding from search results on front end

* decode search string using html2text
2018-06-04 12:01:09 +05:30
Manas Solanki
a91da5f706 Update user settings (#5634)
* update the user settings on the rename of any records.

* also update the renamed fields in the user settings

* fix codacy
2018-06-04 11:53:03 +05:30
Suraj Shetty
90325ceccf [Improvement] Allow user to apply Workflow Action without login (#5637)
* Enqueue send email job

* Allow user to apply action without login

* Reorganize method

* Show username instead of email

* Refactor send email job

* Fix python 3 test

* Fix python 3 tests

- send user data list instead of dict-view
https://stackoverflow.com/a/16228268
2018-06-04 11:43:24 +05:30
Shreya Shah
2c05009df3 Modify Report Addresses and Contacts (#5642)
* Modify Report Addresses and Contacts

Removed party type references and moved that to a new report in ERPNext.

* Change label to Reference Type

* Rename labels
2018-06-01 18:04:59 +05:30
Suraj Shetty
84c811eca7 [fixes] Related to UX (#5647)
* Remove extra print msg

* Pass user value while checking role permission

* Hide submit & cancel option in list view if workflow is enabled

* Fix Codacy
2018-06-01 17:23:37 +05:30
Zarrar
bcde5a7d1a [Fix] Fix contact query for better performance (#5648)
* call for contact on change of field

* limit data, cache data for faster query
2018-06-01 17:22:27 +05:30
Alchez
88c31d27e3 Fix tuple index bug in string formatting (#5632) 2018-06-01 12:13:27 +05:30
Suraj Shetty
6e874fbac4 Fix custom script help (#5635) 2018-06-01 12:09:31 +05:30
mnatalia
a60c3ffb18 Update tag_editor.js (#5638)
Added possibility to translate.
2018-06-01 12:09:01 +05:30
Faris Ansari
22d90df864 NPM Audit fix (#5645)
- remove unused nightwatch
- update less to 3.0.4
2018-06-01 12:03:24 +05:30
Faris Ansari
d1ad73a6ed Remove fuse (#5644) 2018-06-01 11:54:40 +05:30
Saurabh
1865d543b1 Merge branch 'master' into develop 2018-05-31 17:21:13 +05:30
Saurabh
9cbc1ee7b6 Merge branch 'hotfix' 2018-05-31 17:21:12 +05:30
Saurabh
c903d05c1e bumped to version 10.1.35 2018-05-31 17:51:12 +06:00
Saurabh
5836470c43
Merge pull request #5636 from codingCoffee/management
Updated Issues and PR Templates
2018-05-31 17:19:58 +05:30
Ameya Shenoy
7aef384db2
Updated Issues and PR Templates 2018-05-30 19:20:13 +00:00
Saurabh
482ae80db0
Merge pull request #5633 from saurabh6790/sanitize_blacklisted_functions
[fix] Sanitize blacklisted functions
2018-05-30 15:29:53 +05:30
Saurabh
55eaba90f5 [fix] Sanitize blacklisted functions 2018-05-30 15:25:40 +05:30
Nabin Hait
418d654331
Fixed sanitizing fields for tabDeleted Documents (#5329) 2018-05-30 15:01:12 +05:30
Manas Solanki
01b6b74b6d [fix] linked with if there are multiple link field in the same doctype (#5587)
* [fix] linked with if there are multiple link field in the same doctype

* handle python 3 and fixed as per reviews
2018-05-30 11:43:39 +05:30
tundebabzy
2efcea9bbd DocType Naming With Multiple Fields (#5497)
* Update README.md

* refactor for better readability

adds ability to name by concatenating fields

add comments

PEP 8 fixes

throw error when field option autoname fails

adds concatenation option description to DocType doctype

* codacy

* remove explicit cast to `str`

* more pep8 fixes

* revert incorrect link

* code review - move internal functions to bottom of module
2018-05-30 11:37:49 +05:30
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
Ameya Shenoy
9249828235 [css] uncommited files additions (#5620) 2018-05-30 11:10:32 +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
Ameya Shenoy
b0c765a8d1 [fix] check if length exists (#5621) 2018-05-28 16:30:24 +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