Commit graph

5752 commits

Author SHA1 Message Date
mergify[bot]
1eac56a8f4
Merge pull request #9203 from hrwX/tags_caching
fix: use _user_tags instead of Tag Link
2020-01-09 14:35:00 +00:00
mergify[bot]
cf65112dbf
Merge pull request #8766 from gavindsouza/rename-doc-fix
fix(security): don't allow ignore_permissions in frappe.rename_doc
2020-01-09 08:13:23 +00:00
mergify[bot]
4d1733506a
Merge pull request #9212 from Alchez/dev-kanban-missing-data
fix: missing column data for Kanban board (develop)
2020-01-09 03:55:04 +00:00
Gavin D'souza
aa07305b90 Merge branch 'develop' of github.com:frappe/frappe into rename-doc-fix 2020-01-08 23:15:45 +05:30
mergify[bot]
1da20e6ebe
Merge pull request #9104 from gavindsouza/merge-docs-warn
fix(UX): Warn user about irreversible change while merging documents
2020-01-08 05:36:05 +00:00
Rohan Bansal
ade6794b3e fix: missing column datafor Kanban board 2020-01-07 17:32:18 +05:30
Gavin D'souza
ef54a4ec5d fix: frappe.confirm fixes 2020-01-07 13:05:47 +05:30
Himanshu Warekar
5754ef750b fix: use _user_tags instead of Tag Link 2020-01-05 22:09:20 +05:30
Gavin D'souza
9bf4221d45 fix: new_name variable undefined for document which cant be renamed 2020-01-02 13:02:46 +05:30
Suraj Shetty
cbcdc93fd6 refactor: Move "rename document title" code to separate function 2020-01-02 10:28:18 +05:30
Gavin D'souza
5fa802c203 fix(warn): added "Irreversible Change" warnings to merge document via
frappe.model.rename_doc JS API
2020-01-02 10:28:01 +05:30
Gavin D'souza
a4749de6a3 fix(warn): added "Irreversible Change" warnings to merge document via
toolbar rename
2020-01-02 10:27:25 +05:30
mergify[bot]
dab18b8f90
Merge pull request #9022 from Thunderbottom/chat-fix
fix(chat): refactor code to make chat work
2020-01-01 11:10:41 +00:00
Faris Ansari
a2075477fc fix: Bug in show/hide global cards (#9163)
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-01-01 09:11:40 +05:30
Suraj Shetty
d779c4fc32
Merge branch 'develop' into awesome-bar 2019-12-31 15:36:46 +05:30
deepeshgarg007
652e97eb71 fix: Fallback value for time format 2019-12-30 15:13:16 +05:30
Prssanna Desai
8425110af5 fix: hide Cancel button if workflow state and action for Cancel… (#9151) 2019-12-29 18:12:45 +05:30
mergify[bot]
1bd0cfdfde
Merge pull request #8820 from prssanna/mandatory-depends-on
feat: Add Mandatory Depends On and Read Only Depends On to Docfield
2019-12-27 10:17:38 +00:00
Shivam Mishra
8f875fa4b7 fix: formatting for check in prints (#9139)
* fix: formatting for check in prints

* refactor: remove important

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2019-12-27 15:41:42 +05:30
Chinmay D. Pai
4d4388edbf
fix(chat): separate keywords for user and token
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2019-12-27 13:17:55 +05:30
Shivam Mishra
4d9356fb20 feat: wider awesomebar 2019-12-27 12:13:47 +05:30
Rohan Bansal
13f602f054 fix: no data fallback on filters 2019-12-27 11:47:14 +05:30
mergify[bot]
71b45dee59
Merge pull request #9138 from developmentforpeople/fix-timeline-translatable-text
fix: Fix non translatable text for edit/delete comments in doctypes timeline
2019-12-26 19:14:17 +00:00
Development for People
3d7f422fc1 Fix non translatable text for edit/delete comments in doctypes timeline 2019-12-26 12:44:07 +01:00
deepeshgarg007
7c69ff4646 Merge branch 'develop' of https://github.com/frappe/frappe into mandatory-depends-on 2019-12-26 13:23:11 +05:30
Andrew McLeod
07cedc581d feat: Optionally remove seconds from datetime (#8531)
* fix: Add updated datepicker; fixed seconds formatting bug.
Seconds between 0 and 9 were not zero-padded.

* feat: Add framework for time format

* feat: datetime server-side formatters.

* tests: Added server-side datetime formatter tests

* feat: Update client-side datetime formatters

* tests: Add Cypress client-side formatting tests.

* fix: JSON errors

* fix: Update to not hard-code admin password

* fix: Change to using bulk_update rather than the REST API

* tests: Use Custom doctype for testing, not Standard

* fix: Codacy style fixes

* fix: Commonify update_datetime_picker in date.js, datetime.js, time.js
Fix order of time_format in System Settings
Restore get_user_fmt in utils/datetime.js

* feat: Drastically reduce scale of Cypress testing (to make tests faster)
Full testing is possible by setting 'fast_mode' to false in the spec file.

* fix: Fix issues with datepicker/timepicker expansion

* fix: typo

* style: Various style fixes as requested by DeppSource: Python

* fix: Timepicker not hiding on 'now' button. Force hiding on click.

* style: Codacy style fixes.

* fix: Use datepicker from node_modules

* test: Refactor Datetime UI tests

- cy.get_field
- cy.set_value
- cy.insert_doc with ignore_duplicate
- Nominal datetime tests to cover most formats
- Formatting with prettier

* test: Datetime UI tests; wait for cur_frm.doc.datetime to update

* tests: Add whitespace to typed input

- Clear input only for Time field

* test: Wait timeout 200

* test: Fix form test

Co-authored-by: Faris Ansari <netchampfaris@users.noreply.github.com>
2019-12-25 14:54:28 +05:30
Himanshu
a89c9671ac fix: use distinct for tag filters (#9126) 2019-12-25 07:49:02 +00:00
mergify[bot]
fbb0b6f89f
Merge pull request #9117 from hrwX/tag_total_develop
fix(Tag): distinct tag total
2019-12-25 06:03:57 +00:00
Himanshu Warekar
71ebd362a9 Merge branch 'tag_total_develop' of https://github.com/hrwx/frappe into tag_total_develop 2019-12-24 19:07:02 +05:30
Himanshu Warekar
51afdaf86a fix: ignore distinct for tag link 2019-12-24 19:06:38 +05:30
Faris Ansari
dcdf95a95f
fix(form-nav): Get filters from list_view (#9124)
* fix(form-nav): Get filters from list_view

- Fallback to user_settings
- Fix UI Test

* style: Missing semicolon
2019-12-24 18:31:01 +05:30
mergify[bot]
be1e41169d
Merge pull request #9114 from prssanna/grid-fix
fix: only scroll to top when going to a new page to add a row
2019-12-24 10:53:17 +00:00
prssanna
8c614a1575 fix: don't create filter tag if no filter is applied 2019-12-23 18:41:29 +05:30
prssanna
c08c5ab6d5 fix: only scroll to top when going to a new page to add a row 2019-12-23 18:34:30 +05:30
ci2014
b64d1e23bd Treat html editor as data field in standard filter
HTML Editor field can be treated as normal data field and be filtered with Data fieldtype and condition 'like'
2019-12-23 13:07:42 +05:30
Suraj Shetty
480a192324
Merge branch 'develop' into mandatory-depends-on 2019-12-23 13:03:49 +05:30
mergify[bot]
76a48ff6e0
Merge pull request #9096 from Mangesh-Khairnar/fix-format-currency
fix: allow to format currency for guest users
2019-12-23 07:24:31 +00:00
Suraj Shetty
7107409531
Merge version-12-hotfix to develop (#9095)
* fix: REST API utf-8 decoding on creates/updates

Creating or updating a document via the REST API would generate an error of:

`TypeError: the JSON object must be str, not 'bytes'`

Because get_data() returns bytes which must be explicitly converted to a string before parsing as JSON.

Defect introduced by efe94886a and a71a92341e

* fix(patch): Handle failures in while making Prepared Report attachments private

* case insensitive search for postgres

* convert operator to lowercase while checking

* fix: Pass prepared_report_name as filter if exists

* fix: Add input to multiselect_list control

* fix(reportview): convert to unicode conditionally

fixes TypeError: decoding str is not supported

Traceback (most recent call last):
  File "/home/frappe/frappe-bench/apps/frappe/frappe/app.py", line 57, in application
    response = frappe.handler.handle()
  File "/home/frappe/frappe-bench/apps/frappe/frappe/handler.py", line 22, in handle
    data = execute_cmd(cmd)
  File "/home/frappe/frappe-bench/apps/frappe/frappe/handler.py", line 61, in execute_cmd
    return frappe.call(method, **frappe.form_dict)
  File "/home/frappe/frappe-bench/apps/frappe/frappe/__init__.py", line 1038, in call
    return fn(*args, **newargs)
  File "/home/frappe/frappe-bench/apps/frappe/frappe/__init__.py", line 511, in wrapper_fn
    retval = fn(*args, **get_newargs(fn, kwargs))
  File "/home/frappe/frappe-bench/apps/frappe/frappe/desk/reportview.py", line 177, in export_query
    frappe.response['result'] = text_type(f.read(), 'utf-8')
TypeError: decoding str is not supported

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

* chore: remove useless encode

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

* fix: Allow Rename in Website Route Meta

* fix: Add Visit Web Page button in form

* fix: next schedule date should be on or after current date

* test: next schedule date

* fix: Change modified by

* fix: do not allow bulk update for core, single doctypes and doctypes from inactive domains

* fix: switch to safe_decode

* test: Fix list_view test by removing clear-cache code (#8941)

* test: Fix listview test by waiting for clear-cache

* test: Move wait to list_view.js

* test: Try removing clear-cache

* fix(integration): Social Login Key (#8940)

add missing field

* fix: don't set filter for restrict_to_domain in Bulk Update Tool

* fix: query report chart options

* fix: Default and company address fixes

* fix: revert changes made to get_default_address function

* fix: Remove changes in notifications

* fix: list view group by filter ambiguous column name

* fix: changelog modal ui

* test: list view child table filter with created by filter

* fix: not able to download XML file

* fix(security): invalidate reset_password_key on password reset

currently there is no way to invalidate reset_password_key on updating
password through the user settings. so whenever the user sets a new
password we'll invalidate the reset_password_key, so that existing links
to reset user passwords cannot be used.

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

* fix: Pin faker version to avoid test failures

* perf: optimise globals search

* fix: add index on child table

* fix: do not pop item from list

* fix: dont add index for global search doctype

* fix: rename function to set

* tests: fix results being return

* fix: codacy fixes

* fix: Code cleanup

- Pass values so that db cursor can handle escaping

* fix: Convert list to tuple

* style: added semi-colon

* fix: add default role on sign up via SSO

* fix(autocomplete): parse options (#8999)

* fix(autocomplete): parse options

* fix: add ignore validation flag

* fix: minor change

* fix(email): try to encode email part to utf-8 (#8964)

fixes issues with class objects other than str

Traceback (most recent call last):
  File "/home/frappe/frappe-bench/apps/frappe/frappe/email/doctype/email_account/email_account.py", line 281, in receive
    communication = self.insert_communication(msg, args=args)
  File "/home/frappe/frappe-bench/apps/frappe/frappe/email/doctype/email_account/email_account.py", line 338, in insert_communication
    email = Email(raw)
  File "/home/frappe/frappe-bench/apps/frappe/frappe/email/receive.py", line 372, in __init__
    self.parse()
  File "/home/frappe/frappe-bench/apps/frappe/frappe/email/receive.py", line 393, in parse
    self.process_part(part)
  File "/home/frappe/frappe-bench/apps/frappe/frappe/email/receive.py", line 445, in process_part
    self.text_content += self.get_payload(part)
  File "/home/frappe/frappe-bench/apps/frappe/frappe/email/receive.py", line 489, in get_payload
    charset = self.get_charset(part)
  File "/home/frappe/frappe-bench/apps/frappe/frappe/email/receive.py", line 484, in get_charset
    charset = chardet.detect(frappe.safe_encode(part))['encoding']
  File "/home/frappe/frappe-bench/env/lib/python3.6/site-packages/chardet/__init__.py", line 34, in detect
    '{0}'.format(type(byte_str)))
TypeError: Expected object of type bytes or bytearray, got: <class 'email.message.Message'>

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

* fix: Ambiguous column error when going to next doc (#9005)

fix: Ambiguous column error when going to next doc

Co-authored-by: Prssanna Desai <prssud@gmail.com>

* fix(patch): auto commit on more than 10000 writes

fixes issue where patch fails with:

frappe.exceptions.ValidationError: Too many writes in one request. Please send smaller requests

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

* revert: changes in currency formatting  (#9003)

* fix: reverted currency formatting

* ux: added description for currency's number format
* It doesn't have any effect on how the currency is formatted.

* fix: revert json changes in currency master

* fix(filters): set default id to empty string instead of 0 (#9014)

fixes issue where "undefined" value gets set to 0 in postgres, which causes ProgrammingError since the expected value is of type str and not int

* revert: changes in currency formatting  (#9003)

* fix: reverted currency formatting

* ux: added description for currency's number format
* It doesn't have any effect on how the currency is formatted.

* fix: revert json changes in currency master

* feat: add doc for email linking

* fix: missing commits while reverting currency changes

* fix(file): Public-private issue (#9032)

* fix: Pass file's is_private for doc creation

* fix: File is_private and file_url mismatch

* fix: Check if file_url exists

* fix: Validation check

* fix(postgres): Convert is_private to int

* fix: File path for content_hash

* fix: Show default currency as a fallback for currency fieldtype (#8992)

* fix: Show default currency as a fallback for currency fieldtype

* test: Add a test for currency formatting

* fix: Add a patch to fix all user's home settings (#9040)

* fix: Add a patch to fix all user's home settings

* fix: Remove limit

* fix: Allow field of submitted doc to edit if field has allow_on_submit enabled

* test: Add test to check if field is editable

* fix: Typo

* test: Add assert statement for value

* test: Clear cache after creating doctype

* fix: Codacy

* fix checkbox behavior in rtl view when clicking on label to check (#8898)

* fix checkbox behavior in rtl view when clicking on label to check

* fix: Undo changes in desk.css

* fix: Empty row validation

* style: Fix code formatting

* fix: Terminate regex

* fix: don't validate email for standard filters

* fix: before setting user default value, if fieldtype is Link check if doc exists

* Revert "fix: user default value for Link fields"

* before setting user default value, if fieldtype is Link check if doc exists

* fix: Remove Attachment on remove

* fix: minor changes

* style: fix Codacy issue

There should be no space before ','. (comma-spacing)

* fix: rfc5322 compliance for python3 (#9056)

* start of tests

* rfc compliant emails for frappe.

* fix for deepsource

* fix length of strings.

* fix bug that I'm not sure where it came from?

* codacy and deepsource issues trying to keep them happy

* take a punt in the dark

* fix: use SMTPUTF8 instead of SMTP and other minor fixes

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

* fix: patch home_settings_for_all_users

* style: Fix Codacy

* fix: KeyError: 'hidden_modules'

* fix: TypeError in home_settings patch

Convert set to list

* refactor: override style for changelog modal

* Merge V12-pre-release to version-12-hotfix (#9094)

Merge V12-pre-release to version-12-hotfix

Co-authored-by: null <rohitw1991@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
Co-authored-by: Vishal Dhayagude <vishaldhayagude09@gmail.com>
Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>
Co-authored-by: null <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: null <sahilkhan28297@gmail.com>

* Revert queue.py

Co-authored-by: Ben Knowles <benknowles@users.noreply.github.com>
Co-authored-by: Aditya Hase <aditya@adityahase.com>
Co-authored-by: Shridhar Patil <shridharpatil2792@gmail.com>
Co-authored-by: Faris Ansari <netchampfaris@users.noreply.github.com>
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
Co-authored-by: Revant Nandgaonkar <revant.one@gmail.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>
Co-authored-by: Rohan <Alchez@users.noreply.github.com>
Co-authored-by: Mangesh-Khairnar <mkhairnar10@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Saqib <thefalconx33@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Ammar Hararah <ammarkharara@gmail.com>
Co-authored-by: Vishal Dhayagude <vishdha@users.noreply.github.com>
Co-authored-by: sahil28297 <37302950+sahil28297@users.noreply.github.com>
2019-12-23 12:24:52 +05:30
Suraj Shetty
4b8d84f638
Merge branch 'develop' into tag-fix-develop 2019-12-23 09:56:19 +05:30
Suraj Shetty
ae545a00b2
Merge branch 'develop' into tag-fix-develop 2019-12-23 09:10:33 +05:30
Suraj Shetty
1032e6b245
Merge branch 'develop' into v12-pre-release-fixes-develop 2019-12-23 09:10:20 +05:30
Suraj Shetty
cf481e5f69
fix: Fix tags list sidebar dropdown (#9099)
fix: Fix tags list sidebar dropdown

Co-authored-by: Prssanna Desai <prssud@gmail.com>
2019-12-23 09:06:43 +05:30
mergify[bot]
33a10e0983
Merge pull request #9002 from ruchamahabal/remove_onboarding_images
fix: remove illustrations from onboarding slides
2019-12-23 02:51:19 +00:00
Himanshu Warekar
4e79b7994e fix: miscellaneous fixes 2019-12-23 07:37:50 +05:30
prssanna
28f99551f5 fix: use reload_stats function 2019-12-23 07:31:09 +05:30
prssanna
1c12641587 fix: add padding to 'No Records Tagged' 2019-12-23 07:31:09 +05:30
prssanna
0728529b6e fix: no records tagged getting rendered multiple times 2019-12-23 07:31:09 +05:30
prssanna
8d99e2303c fix: fix tag dropdown search 2019-12-23 07:30:19 +05:30
mergify[bot]
0c042ef35b
Merge pull request #8970 from scmmishra/changelog-ux
fix (ui/ux): change log modal on boot
2019-12-22 04:32:22 +00:00
Shivam Mishra
f8cda37127 refactor: override style for changelog modal 2019-12-20 15:41:35 +05:30