Commit graph

20869 commits

Author SHA1 Message Date
mergify[bot]
db94f19f47
Merge pull request #8154 from rohitwaghchaure/not_able_to_create_customer_from_pos
fix: not able to create customer from pos
2019-08-10 15:26:07 +00:00
mergify[bot]
2dde426fe3
Merge pull request #8158 from adityahase/fix-stupidity
fix(print): Use double quotes inside templates
2019-08-10 14:56:05 +00:00
Aditya Hase
2728bd8d2f fix(print): Use double quotes inside templates
Wow, so many levels of stupidity. What were we thinking?
2019-08-10 19:17:46 +05:30
Rohit Waghchaure
11068649d2 fix: not able to create customer from pos 2019-08-09 17:48:48 +05:30
Aditya Hase
f1b3f58806
Revert "feat: Allow utils inside Energy Point Rule condition" (#8151)
Revert "feat: Allow utils inside Energy Point Rule condition"
2019-08-09 15:06:18 +05:30
Aditya Hase
038723d1ae
Revert "feat: Allow utils inside Energy Point Rule condition" 2019-08-09 13:26:30 +05:30
Faris Ansari
c9b35d35a5
Merge pull request #8024 from hrwX/google_calender
refactor(Google Calender): Make Google Calendar Work Again!
2019-08-09 11:28:43 +05:30
mergify[bot]
ffe01845e7
Merge pull request #8141 from netchampfaris/print-table-column-overflow
fix(Print): Show warning for column overflow
2019-08-09 05:16:56 +00:00
mergify[bot]
8299602370
Merge pull request #8143 from netchampfaris/multi-pdf-letterhead
fix: Pass no_letterhead to download_multi_pdf
2019-08-08 17:10:28 +00:00
Faris Ansari
e960255b7b fix: Pass no_letterhead to download_multi_pdf 2019-08-08 22:27:58 +05:30
Faris Ansari
404805c9dd fix(Print): Show warning for column overflow 2019-08-08 22:14:10 +05:30
mergify[bot]
684311190c
Merge pull request #8140 from surajshetty3416/enhance-eps-p
feat: Allow utils inside Energy Point Rule condition
2019-08-08 16:29:34 +00:00
Suraj Shetty
18225765ae style: fix quotes 2019-08-08 21:35:42 +05:30
Suraj Shetty
6a1b500354 fix: Add complete utils instead 2019-08-08 21:35:42 +05:30
Suraj Shetty
f5ab40398e fix: Pass correct getdate method 2019-08-08 21:35:42 +05:30
Suraj Shetty
cbd9b46321 feat: Allow getdate for Energy Point Rule condition 2019-08-08 21:35:42 +05:30
mergify[bot]
644a12cfb8
Merge pull request #8127 from zerodhatech/zero_psql_conn
fix(postgres): DB Connection
2019-08-08 15:38:37 +00:00
Suraj Shetty
e288ffd820
fix: Button should be visible even with only Read perm (#8139) 2019-08-08 20:57:36 +05:30
Himanshu Warekar
b9ab3d7b06 test: fix test case for data import 2019-08-08 18:55:30 +05:30
Faris Ansari
c411ac773a
fix: Translated message variants 2019-08-08 17:07:39 +05:30
Himanshu Warekar
b217ff86ed fix: translation 2019-08-08 16:59:53 +05:30
Himanshu Warekar
27a684c483 fix: spacing in comment 2019-08-08 16:47:12 +05:30
Himanshu Warekar
f7736c6f7c fix: msgprint 2019-08-08 16:40:15 +05:30
Himanshu Warekar
72b5d02987 fix: message print 2019-08-08 16:36:27 +05:30
Himanshu Warekar
cf56231852 fix: do not frappe.throw when deleting 2019-08-08 16:26:26 +05:30
Himanshu Warekar
0daf6d9683 fix: miscellaneous fixes 2019-08-08 16:20:56 +05:30
mergify[bot]
1abdbbaa89
Merge pull request #8125 from hrwX/comm_fix
fix: Comment file url
2019-08-08 10:43:13 +00:00
kratos
4c5a8d41af bug fix - Postgres db connection
Missing quotes in connection string.
2019-08-08 13:22:15 +05:30
Himanshu Warekar
ad73ee4d08 fix: comment file url 2019-08-08 12:22:51 +05:30
mergify[bot]
54b1a1b860
Merge pull request #8120 from surajshetty3416/fix-video-links-p
fix: Video links in learn section
2019-08-07 15:33:07 +00:00
mergify[bot]
3a9120aad0
Merge pull request #8114 from deepeshgarg007/print_format_v12
fix: Headings and line breaks not seen in print formats
2019-08-07 13:09:18 +00:00
deepeshgarg007
bf39e34958 fix: Add prefix print in attribute names 2019-08-07 18:08:43 +05:30
Deepesh Garg
6e7e8f4057
Merge pull request #8117 from surajshetty3416/fix-label-p
fix: Label Reference Doctype -> Reference Document Type
2019-08-07 17:38:32 +05:30
Suraj Shetty
303e7a4e70 fix: Video Links in learn section 2019-08-07 16:55:35 +05:30
Sahil Khan
b1322ba5ee Merge branch 'version-12-hotfix' into version-12 2019-08-07 16:19:54 +05:30
Sahil Khan
99cacb76f7 bumped to version 12.0.5 2019-08-07 16:39:54 +05:50
Suraj Shetty
ff2e21ab56 fix: Label Reference Doctype -> Reference Document Type 2019-08-07 15:55:52 +05:30
Aditya Hase
c78f7b7613
Merge pull request #8115 from frappe/revert-8111-fix-comments
Revert " fix(comments): Remove size restriction on _comments column"
2019-08-07 15:47:46 +05:30
Aditya Hase
a4317fff54
Revert " fix(comments): Remove size restriction on _comments column" 2019-08-07 15:47:05 +05:30
mergify[bot]
6a9b21c2d4
Merge pull request #8111 from adityahase/fix-comments
fix(comments): Remove size restriction on _comments column
2019-08-07 09:41:07 +00:00
deepeshgarg007
020dd9ef58 fix: Headings and line breaks not seen in print formats 2019-08-07 15:10:58 +05:30
Aditya Hase
f93fbadd47 fix(comments): Remove size restriction on _comments column
Use LONGTEXT (2^32 - 1 bytes) instead of TEXT (2^16 - 1 bytes) data type
2019-08-07 14:33:45 +05:30
Himanshu Warekar
bd4b809a18 fix: encode url while redirect 2019-08-06 22:51:36 +05:30
Himanshu Warekar
6e4000559a chore: code cleanup 2019-08-06 22:38:31 +05:30
mergify[bot]
ba2bc14097
Merge pull request #8102 from surajshetty3416/fix-timeline-css-p
fix: Use text-light instead of text-color for timeline text
2019-08-05 13:30:38 +00:00
Suraj Shetty
b7edf70585 fix: Use text-light instead of text-color for timeline text
Since timeline text is not the primary content on the form,
use lighter color for texts in timeline
2019-08-05 17:08:18 +05:30
mergify[bot]
f8fd4fc95b
Merge pull request #8088 from saurabh6790/version-12-hotfix
fix: import error
2019-08-05 10:18:50 +00:00
mergify[bot]
63e5133487
Merge pull request #8061 from ashish-greycube/patch-5
fix(email): Fixed py3 chardet error - Expected object of type bytes or bytearray, got: <class 'str'>
2019-08-05 07:46:20 +00:00
Faris Ansari
02636f78e9
Merge pull request #8049 from scmmishra/email-patch-1-12
fix: added null check for contact attributes
2019-08-05 13:11:08 +05:30
Ernesto Ruiz
53def1a7c3 Fix: Add translation function to strings (#8023) 2019-08-05 13:06:48 +05:30