Commit graph

22990 commits

Author SHA1 Message Date
mergify[bot]
c74aa7bcfe
Merge pull request #9157 from sagarvora/fix-jinja-dev
fix: (re)allow custom filters/methods to be used with jinja
2019-12-31 16:14:13 +00:00
mergify[bot]
f393d0d72b
Merge pull request #9145 from hrwX/qe_cf
feat(Customize Form): Ability to add fields to quick entry
2019-12-31 15:22:19 +00:00
mergify[bot]
106c3eb6b9
Merge pull request #9144 from scmmishra/awesome-bar
feat: wider awesomebar
2019-12-31 15:04:58 +00:00
Suraj Shetty
03ca005f68
Merge branch 'develop' into qe_cf 2019-12-31 20:26:58 +05:30
mergify[bot]
ed89e828ef
Merge pull request #9154 from Thunderbottom/bytes-fix
fix(email): handle case where cstr returns text_type of str
2019-12-31 14:35:17 +00:00
Suraj Shetty
32c1ddf97f
Merge branch 'develop' into awesome-bar 2019-12-31 19:36:55 +05:30
Suraj Shetty
ba02670532
Merge branch 'develop' into bytes-fix 2019-12-31 19:36:43 +05:30
mergify[bot]
8144b42e29
Merge pull request #9175 from Thunderbottom/psycopg2-fix
fix(requirements): remove psycopg2 from requirements
2019-12-31 13:53:21 +00:00
mergify[bot]
79728658f4
Merge pull request #9173 from prssanna/depends-on-test
test: fix depends on ui test
2019-12-31 13:52:24 +00:00
Suraj Shetty
e9b801fca8
Merge branch 'develop' into depends-on-test 2019-12-31 19:03:53 +05:30
Suraj Shetty
f6e04d80f2
Merge branch 'develop' into psycopg2-fix 2019-12-31 19:03:31 +05:30
Rucha Mahabal
0778c337ae fix(Auto Repeat): derive next date from start date and offset (#9177) 2019-12-31 18:51:09 +05:30
Chinmay D. Pai
459e550a3f
fix(requirements): remove psycopg2 from requirements
apparently, since version 2.8, psycopg2 does not install the binary
version by default (read source), and hence fails on setup with the
error:

Error: pg_config executable not found

since nobody can really be arsed to compile this binary on their own,
we'll stick to using psycopg2-binary instead.

source: https://www.postgresql.org/message-id/CA%2Bmi_8bd6kJHLTGkuyHSnqcgDrJ1uHgQWvXCKQFD3tPQBUa2Bw%40mail.gmail.com

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2019-12-31 18:19:15 +05:30
prssanna
78ee7c79f6 fix: fix depends on ui test 2019-12-31 16:01:59 +05:30
Suraj Shetty
50e014f853
Merge branch 'develop' into bytes-fix 2019-12-31 15:38:02 +05:30
Suraj Shetty
d779c4fc32
Merge branch 'develop' into awesome-bar 2019-12-31 15:36:46 +05:30
rohitwaghchaure
3ba9c2dfd4
Merge pull request #8775 from rohitwaghchaure/email_not_pull_because_of_contact_error
fix: Name of Contact cannot be Contact error while creating communication for incoming emails
2019-12-31 10:27:17 +05:30
mergify[bot]
2d8a1c6753
Merge pull request #9166 from deepeshgarg007/date_fix
fix: Fallback value for time format
2019-12-30 10:07:27 +00:00
deepeshgarg007
652e97eb71 fix: Fallback value for time format 2019-12-30 15:13:16 +05:30
Sagar Vora
fb02908219 fix: (re)allow custom filters/methods to be used with jinja 2019-12-30 10:57:30 +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]
3789ffd03a
Merge pull request #9135 from Alchez/dev-os-error-message
fix(pdf): error when trying to print PDFs
2019-12-28 11:24:37 +00:00
Suraj Shetty
3c3516a652 fix(email): Do not encode smtp_server value (#9137)
* fix: Do not encode smtp server

Because it breaks in python 3

* fix: use cstr to change text_type to str

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

Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-12-28 11:21:08 +05:30
mergify[bot]
cca4ec77bf
Merge pull request #9149 from sagarvora/fix-req
fix: update version pinning for python 3.8 compatibility
2019-12-28 05:11:02 +00:00
Chinmay D. Pai
4d48a2a032
fix(email): handle case where cstr returns text_type of str
chardet requires input to be bytes or bytesarray, but sometimes
frappe.cstr() returns text_type of str without encoding it to utf-8

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2019-12-27 16:28:09 +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
Sagar Vora
58e1bc5ce1 fix: update version pinning for python 3.8 compatibility 2019-12-27 15:07:17 +05:30
mergify[bot]
f4c4d25174
Merge pull request #9143 from Alchez/dev-filters-default-message
fix: no data fallback on filters
2019-12-27 07:43:28 +00:00
Suraj Shetty
75a3732ed8 fix: File duplicate check (#9136)
* fix: File duplicate check

By passing file name from file url instead of file name.
because file name can be different from actual file
if the same file is uploaded twice with different names.

* refactor: Remove unused code
2019-12-27 13:01:49 +05:30
Himanshu Warekar
76c0d3b561 fix: adding quick entry fields via customize form 2019-12-27 12:51:29 +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
Prssanna Desai
85628e687f
fix: whitelist function
Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com>
2019-12-26 17:56:19 +05:30
Development for People
3d7f422fc1 Fix non translatable text for edit/delete comments in doctypes timeline 2019-12-26 12:44:07 +01:00
Rohan Bansal
67791ff194 fix(pdf): error when trying to print PDFs 2019-12-26 14:44:19 +05:30
deepeshgarg007
7c69ff4646 Merge branch 'develop' of https://github.com/frappe/frappe into mandatory-depends-on 2019-12-26 13:23:11 +05:30
mergify[bot]
0548a9c23a
Merge pull request #9111 from nextchamp-saqib/table-currency-pf
fix: display correct currency in child tables
2019-12-25 09:29:37 +00:00
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
mergify[bot]
753e8d5bac
Merge pull request #9129 from netchampfaris/fix-new-data-import-update-for-child-rows
fix: Child Table Update in New Data Import
2019-12-25 09:23:17 +00:00
Suraj Shetty
849a967119
Merge branch 'develop' into table-currency-pf 2019-12-25 14:45:07 +05:30
Faris Ansari
0d0c327ee7 fix: Child Table Update in New Data Import
- Dont check for mandatory in child rows in update
- Create a new doc for child rows being inserted in update
2019-12-25 14:25:46 +05:30
mergify[bot]
ecf78fe5ee
Merge pull request #9127 from netchampfaris/fix-update-in-new-data-import
fix: Update in New Data Import
2019-12-25 08:21:33 +00:00
Faris Ansari
2f9ced19db fix: Update in New Data Import
- Build a doc from the provided columns in template
- Check if ID column is provided
2019-12-25 13:38:40 +05:30
Himanshu
a89c9671ac fix: use distinct for tag filters (#9126) 2019-12-25 07:49:02 +00:00
mergify[bot]
3f5b2bf49d
Merge pull request #9112 from netchampfaris/whitelist-schemaorg-attributes
fix: Whitelist schema.org attributes
2019-12-25 07:00:45 +00:00
Suraj Shetty
9a2e360ea0
Merge branch 'develop' into whitelist-schemaorg-attributes 2019-12-25 12:19:52 +05:30
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
698764b89b review changes 2019-12-25 09:57:01 +05:30