Commit graph

23328 commits

Author SHA1 Message Date
mergify[bot]
3f2b8d835a
Merge pull request #9369 from surajshetty3416/fix-incorrect-translations
fix(translations): Incorrect syntax
2020-01-30 07:23:40 +00:00
Faris Ansari
41b0cf87e5
fix: Move .format out of translation method 2020-01-30 12:31:04 +05:30
Faris Ansari
47de77b2b1
fix: Undo print statement 2020-01-30 12:23:14 +05:30
Suraj Shetty
51bae0df50 fix(translations): Incorrect syntax 2020-01-29 15:35:28 +05:30
Suraj Shetty
dee4a7336c fix(translations): Incorrect syntax 2020-01-29 15:22:35 +05:30
mergify[bot]
9830225bea
Merge pull request #9367 from prssanna/auto-email-report
fix: auto email report naming
2020-01-28 11:37:08 +00:00
Marica
b1db148dc8 fix: More informational error message in Address. (#9352)
* fix: More informational error message in Address.

* fix: Changed message, added title.

* fix: Changes compatible with translations.

* fix: Translation fixes.

* style: Fix formatting

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-01-28 10:43:18 +00:00
Faris Ansari
2e2c038f35 fix: Skip Email Queue doctype in delete_doc (#9364) 2020-01-27 21:33:47 +05:30
Rohan
b427c934b0 fix: py3 compatibility for error snapshot creation (develop) (#9336)
* fix: py3 compatibility for error snapshot creation

* fix: remove invalid checks

* Revert "fix: remove invalid checks"

This reverts commit f636c122146e38a5e0cd964686a6c7187ccb53b4.

* fix: use six to maintain py2 and py3 compatibility
2020-01-27 21:32:23 +05:30
prssanna
e032e817db fix: auto email report naming 2020-01-27 20:35:46 +05:30
mergify[bot]
f11b8fc476
Merge pull request #8567 from ruchamahabal/offline-erpnext
feat: Events Streaming
2020-01-27 11:58:15 +00:00
Rucha Mahabal
fff17ef87a feat: add event streaming to automation module page 2020-01-27 16:31:05 +05:30
Rucha Mahabal
8147fa45dd fix: anti-pattern code 2020-01-27 14:07:13 +05:30
Rucha Mahabal
38b99f7aa0 fix: trim extra / from producer url to overcome url mismatch 2020-01-27 13:51:58 +05:30
Rucha Mahabal
c0b22871fb fix: set parent in child table row dependency 2020-01-27 13:38:50 +05:30
Rucha Mahabal
19c69e5316 fix: anti-pattern code 2020-01-27 12:26:12 +05:30
mergify[bot]
94d796ea1c
Merge pull request #9362 from marination/map_current_doc_fixes
fix: Removed annotations due to py>=3.7 compatibility.
2020-01-27 06:46:00 +00:00
marination
e65486f0c7 fix: Removed annotations due to py>=3.7 compatibility. 2020-01-27 11:59:40 +05:30
mergify[bot]
308971928e
Merge pull request #9334 from marination/map_current_doc
fix: Allow map_docs to accommodate 'args' sent from client call
2020-01-27 04:13:48 +00:00
Rucha Mahabal
d2445a6a40 fix: second level nested link dependency not syncing 2020-01-26 23:19:58 +05:30
mergify[bot]
85e1555c39
Merge pull request #9357 from sumitbhanushali/fix-calendar-view
fix(calendar):  UI fix
2020-01-26 06:43:38 +00:00
mergify[bot]
66a5bf3320
Merge pull request #9347 from frappe/breadcrumb-schema-org
fix: Update breadcrumb itemtype to schema.org
2020-01-24 12:57:43 +00:00
mergify[bot]
86746c31f8
Merge pull request #9343 from Alchez/dev-api-updates-on-child-table
fix: save parent document if child document is updated (develop)
2020-01-24 10:21:34 +00:00
sumit
124e9bc968 fix(calendar): strip html out of title 2020-01-24 14:30:14 +05:30
sumit
31a330985c fix: added isArray check 2020-01-24 14:26:56 +05:30
marination
f61ae3fd1a fix: Comment to docstring and minor changes
- added description for args with example
- 'yield' might not be the best idea, barely any improvement, so changed back to 'return'
2020-01-24 12:02:46 +05:30
mergify[bot]
e4f1777ead
Merge pull request #9339 from racitup/develop
fix: corrected status option from Success to Complete in scheduled job log
2020-01-24 03:55:59 +00:00
Suraj Shetty
a25f5d207a
Merge branch 'develop' into offline-erpnext 2020-01-24 09:23:15 +05:30
sumit
7f350e0f31 added length check as [] is truthy 2020-01-23 18:20:37 +05:30
mergify[bot]
7c39f964db
Merge pull request #9345 from rohitwaghchaure/auto_email_report_not_working_for_the_prepared_report_develop
fix: auto email report not working for the prepared report
2020-01-23 11:38:27 +00:00
Faris Ansari
b7b01bfa4c
fix: Update breadcrumb itemtype to schema.org 2020-01-23 13:10:11 +05:30
mergify[bot]
69b76bfbbf
Merge pull request #9340 from jigartarpara/patch-1
fix: Create User Email feature in User doctype
2020-01-23 05:36:12 +00:00
Rohit Waghchaure
54a54dd3c8 fix: auto email report not working for the prepared report 2020-01-22 19:47:25 +05:30
Jigar Tarpara
b1169c0b31
Update frappe/core/doctype/user/user.js
Co-Authored-By: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-01-22 19:40:24 +05:30
mergify[bot]
53ac59ddc2
Merge pull request #9305 from rohitwaghchaure/fixed_barcode_not_working_with_special_characters_new
fix: barcode issue
2020-01-22 12:32:38 +00:00
Rohan Bansal
90cf15cfc0 test: remove explicit commit 2020-01-22 17:56:55 +05:30
Rohan Bansal
c51a3a8f44 test: add tests for child document updates 2020-01-22 17:56:51 +05:30
Rohan Bansal
334bb2fe7a fix: save parent document if child document is updated 2020-01-22 16:20:31 +05:30
Suraj Shetty
2eb517ac81
fix(get_permlevel_access): Lazy load handle different permissio… (#9341)
fix(get_permlevel_access): Lazy load handle different permission types
2020-01-22 14:04:47 +05:30
Suraj Shetty
5eaaaf03db test: Fix user permission test 2020-01-22 12:51:47 +05:30
Suraj Shetty
02453fa7e0 style: Fix codacy 2020-01-22 12:51:47 +05:30
Suraj Shetty
5cbe2170e8 test: Reset Blog Post doc perms 2020-01-22 12:51:47 +05:30
Suraj Shetty
c9adf965eb test: Fix fieldlevel permission test 2020-01-22 12:51:47 +05:30
Saif Ur Rehman
dd72d5e022 chore: No need for frappe._dict() 2020-01-22 12:51:47 +05:30
Saif Ur Rehman
69d7649969 fix(get_permlevel_access): Lazy load handle different permission types 2020-01-22 12:51:47 +05:30
mergify[bot]
8ba6d2ad3d
Merge pull request #9333 from prssanna/filter-options-fix
fix(Filters): Options don't change when changing filter condition
2020-01-22 06:54:25 +00:00
Jigar Tarpara
87248a1a11
Fix: Create User Email> Email Account (In User Doctype)
Create User Email not working properly becuase of response empty
2020-01-22 11:37:03 +05:30
racitup
888f9eb611 fix: corrected status option from Success to Complete in scheduled job log 2020-01-22 05:03:09 +00:00
marination
d110b744d9 fix: Modified map_docs to accomodate 'args' sent from client call 2020-01-21 15:13:30 +05:30
mergify[bot]
4a8208c729
Merge pull request #9331 from lijiming/develop
fix: add translation for Leaderboard Title
2020-01-21 04:33:11 +00:00