ci2014
a8b53deb75
Fix loop error in utils.py
...
Property Setters got deleted on bench migrate and haven't been readded, because data was passed instead of d. Now it works.
2019-09-21 15:41:54 +02:00
Sahil Khan
61bd8b71ad
Merge branch 'develop' into version-12
2019-09-20 15:14:17 +05:30
Sahil Khan
bcba2e3ee1
bumped to version 12.0.14
2019-09-20 15:34:17 +05:50
Aditya Hase
cd5a80b534
fix(security): Use frappe.render_template instead of Template.r… ( #8467 )
...
fix(security): Use frappe.render_template instead of Template.render
2019-09-20 15:04:21 +05:30
Aditya Hase
d67b995676
fix(security): Use frappe.render_template instead of Template.render
2019-09-20 14:41:28 +05:30
mergify[bot]
db6712e407
Merge pull request #8465 from rohitwaghchaure/flag_to_skip_redirect_on_error_from_quick_entry
...
feat: added flag to skip redirect on error for quick entry
2019-09-20 09:02:57 +00:00
Rohit Waghchaure
79be132e3d
feat: added flag to skip redirect on error for quick entry
2019-09-20 12:22:54 +05:30
Aditya Hase
420c56bca0
fix: retain doc.name ( #8461 )
...
fix: retain doc.name
2019-09-19 17:29:58 +05:30
Suraj Shetty
61f98c6ce9
Merge pull request #8304 from netchampfaris/file-upload-fix
...
fix: Remove NestedSet from File
2019-09-19 17:18:10 +05:30
Shivam Mishra
3e390470ae
fix: retain doc.name
2019-09-19 17:10:04 +05:30
Faris Ansari
ef30490865
style: Unused variable
2019-09-19 16:14:19 +05:30
Faris Ansari
c8a80a2e4d
fix: frappe.db.field_exists
...
- field_exists didn't work correctly
- The call to field_exists itself was wrong
2019-09-19 15:41:17 +05:30
Faris Ansari
814b29923f
Merge branch 'develop' of https://github.com/frappe/frappe into file-upload-fix
2019-09-19 15:21:22 +05:30
mergify[bot]
8e18faa596
Merge pull request #8458 from ruchamahabal/fix_export_report
...
fix(Report View): export report not working for add group
2019-09-19 08:29:36 +00:00
Rucha Mahabal
c120bd3466
fix: merge key validations
2019-09-19 13:39:56 +05:30
Rucha Mahabal
d4ea2b4c1f
fix: merge key validations
...
Co-Authored-By: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2019-09-19 13:34:51 +05:30
Rucha Mahabal
03587849b8
fix: export report not working for add group
2019-09-19 13:09:06 +05:30
gavin
7ef5b20ca4
fix: fixed email count for current month ( #8452 )
2019-09-18 22:55:35 +05:30
gavin
67550fd9a2
fix: fixed email count for current month ( #8454 )
2019-09-18 22:55:19 +05:30
gavin
7d2e664b74
fix: disables 'New' for Prepared Report ( #8448 )
2019-09-18 15:57:04 +05:30
Faris Ansari
44947ee13a
chore: Dont merge if squash label is added ( #8447 )
2019-09-18 13:25:38 +05:30
mergify[bot]
3ba54ae3a7
Merge pull request #8405 from hrwX/not_fix
...
fix(Role): Don't return admin and guest placeholder email
2019-09-18 07:47:49 +00:00
Faris Ansari
66bd2a9f5e
chore: Squash PRs when squash label is added ( #8446 )
2019-09-18 12:29:50 +05:30
mergify[bot]
12f602cc8a
Merge pull request #8444 from ruchamahabal/export_report_fix
...
fix(report-view): show export all checkbox only if total row count ex…
2019-09-18 06:47:13 +00:00
Rucha Mahabal
e6055d406e
fix: codacy
2019-09-18 11:56:16 +05:30
Faris Ansari
2508ae1377
test: Set user Administrator
2019-09-18 11:04:34 +05:30
Rucha Mahabal
3de3ce0230
fix(report-view): show export all checkbox only if total row count exceeds page length
2019-09-17 22:23:24 +05:30
mergify[bot]
2777380fce
Merge pull request #8438 from scmmishra/list-more-fix
...
fix: more button visibility in webforms
2019-09-17 11:49:11 +00:00
Sahil Khan
7d82c1fbcf
Merge branch 'develop' into version-12
2019-09-17 17:09:52 +05:30
Sahil Khan
ff8eefa355
bumped to version 12.0.13
2019-09-17 17:29:52 +05:50
mergify[bot]
54cc0e9ba3
Merge pull request #8441 from surajshetty3416/fix-mapper-permission
...
fix: Move permission check code in get_mapped_doc method
2019-09-17 11:25:13 +00:00
Frappe PR Bot
88e9d81fb9
feat: Updated translation ( #8430 )
2019-09-17 15:58:09 +05:30
Suraj Shetty
757953851b
fix: Move permission check code in get_mapped_doc method
...
- Check target_doc creation permission only after
completely mapping target doc with source_doc
2019-09-17 15:47:49 +05:30
Shivam Mishra
d1c4e6e7dd
fix: more button visibility in webforms
2019-09-17 11:51:00 +05:30
Himanshu
4dcd4d3a21
chore: remove code related to gcalendar ( #8425 )
2019-09-16 21:51:42 +05:30
Shivam Mishra
755721d01b
fix: ignore permission for reopening assignments ( #8432 )
2019-09-16 21:50:40 +05:30
mergify[bot]
341fcd9975
Merge pull request #8429 from scmmishra/asssignment-rule-fix
...
fix: assignments reflect after removing on sidebar
2019-09-16 10:48:25 +00:00
Shivam Mishra
becedb64a3
fix: assignments reflect after removing on sidebar
2019-09-16 15:58:24 +05:30
mergify[bot]
bde6d31dec
Merge pull request #8423 from hrwX/addr_query
...
feat(Contact): Show address related to doctype in child
2019-09-16 09:38:43 +00:00
mergify[bot]
824a3ab33a
Merge pull request #8428 from scmmishra/asssignment-rule-fix
...
fix: added null check for conditions
2019-09-16 08:32:24 +00:00
Shivam Mishra
124a218bbf
fix: added null check for conditions
2019-09-16 13:24:16 +05:30
Nabin Hait
4668cc64e0
fix: reload google contacts
2019-09-16 12:49:03 +05:30
Himanshu
25979febb6
fix: v11 patch breaking as v11 dint have gcontacts ( #8426 )
2019-09-16 12:02:06 +05:30
Himanshu Warekar
7a25c26390
fix: check for read permission
2019-09-16 10:02:43 +05:30
Himanshu Warekar
ccd2c10128
chore: remove log statement
2019-09-15 17:46:53 +05:30
Himanshu Warekar
3dbafe4bd9
feat: show address related to doctype in child
2019-09-15 15:06:02 +05:30
Faris Ansari
f26c8895bd
feat: API to scan and get barcode from camera ( #8415 )
...
* feat: API to scan and get barcode from camera
- frappe.barcode.scan_barcode
* fix: Use cordova barcodeScanner in mobile app
* style: Undefined variable and no console
2019-09-14 15:14:03 +05:30
mergify[bot]
aec9ca891a
Merge pull request #8419 from scmmishra/search-allow-guest
...
refactor: convert link field to autocomplete
2019-09-13 12:27:30 +00:00
Shivam Mishra
582d74c31b
refactor: remove allow guest from search
2019-09-13 17:40:18 +05:30
Shivam Mishra
642896fc9a
feat: convert link to autocomplete
2019-09-13 17:39:33 +05:30
