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

22970 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
Himanshu
6c39d3c3d3
Update frappe/desk/reportview.py 
Co-Authored-By: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2019-12-25 09:48:04 +05:30
Himanshu
ddaae94282
Update frappe/desk/reportview.py 
Co-Authored-By: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2019-12-25 09:47:10 +05:30
Himanshu
90850a5123
Update frappe/desk/reportview.py 
Co-Authored-By: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2019-12-25 09:47:04 +05:30
Himanshu
2392720222
Update frappe/desk/reportview.py 
Co-Authored-By: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2019-12-25 09:46:44 +05:30
Himanshu
638f978f11
Update frappe/desk/reportview.py 
Co-Authored-By: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2019-12-25 09:46:26 +05:30
Himanshu
15e689c369
Update frappe/desk/reportview.py 
Co-Authored-By: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2019-12-25 09:45:29 +05:30
Rushabh Mehta
a4ccde3e4a
Merge pull request #9105 from rmehta/safe-exec-allow-iter 
feat(safe_exec): allow iterators and comprehension
 2019-12-24 22:35:57 +05:30
Rushabh Mehta
5caa88967e fix(minor): remove print from safe_exec 2019-12-24 22:21:21 +05:30
Rushabh Mehta
711e34c059 feat(safe_exec): allow frappe.db.set_value 2019-12-24 22:21:21 +05:30
Rushabh Mehta
c4c35be68d fix(safe_exec): allow sorted 2019-12-24 22:21:21 +05:30
Rushabh Mehta
c9afc965c1 fix(safe_exec): allow frappe.utils.[function] 2019-12-24 22:21:21 +05:30
Rushabh Mehta
2394586d11 feat(safe_exec): allow iterators and comprehension 2019-12-24 22:21:21 +05:30
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
mergify[bot]
109d819437
Merge pull request #9121 from netchampfaris/web-form-custom-css 
feat: Custom CSS support in Web Form
 2019-12-24 13:21:26 +00:00
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
Suraj Shetty
6bad84ee8a
Merge branch 'develop' into tag_total_develop 2019-12-24 16:37:41 +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
Faris Ansari
3be13b897a feat: Custom CSS support in Web Form 2019-12-24 14:16:26 +05:30
Suraj Shetty
5b1216694c
Merge branch 'develop' into tag_total_develop 2019-12-24 13:25:48 +05:30