From b1dd1f01850a58113259bf1ea4140e25c5c04309 Mon Sep 17 00:00:00 2001 From: Felipe Orellana <1656249+DeveloperMetal@users.noreply.github.com> Date: Thu, 27 Oct 2022 18:06:35 -0400 Subject: [PATCH 1/2] chore: aligning pre-release with production (#763) * bumped to version 2.2.2 * Bump to version 2.2.2 * bumped to version 2.2.3 * bumped to version 2.2.4 * bumped to version 2.3.0 * bumped to version 2.3.1 * bumped to version 2.3.2 * fix: sites with white text bleed into print-format font color (#759) Changes: - Enforces black text on .print-format classes to ensure text is readable on sites with white text (JHA) Co-authored-by: sahil28297 <37302950+sahil28297@users.noreply.github.com> Co-authored-by: Sahil Khan --- bloomstack_core/__init__.py | 2 +- bloomstack_core/public/css/authorize_document.css | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/bloomstack_core/__init__.py b/bloomstack_core/__init__.py index d35d99f00..fc07715ef 100644 --- a/bloomstack_core/__init__.py +++ b/bloomstack_core/__init__.py @@ -1,4 +1,4 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -__version__ = '2.2.1' +__version__ = '2.3.2' diff --git a/bloomstack_core/public/css/authorize_document.css b/bloomstack_core/public/css/authorize_document.css index 913b42196..f203fe645 100644 --- a/bloomstack_core/public/css/authorize_document.css +++ b/bloomstack_core/public/css/authorize_document.css @@ -99,6 +99,18 @@ -webkit-print-color-adjust: exact; } +.print-format, .print-format h1, .print-format h2, .print-format h3, .print-format p, .print-format td, .print-format th { + color: black; +} + +.print-format .bill-ship-section { + display: flex; +} + +.print-format .bill-ship-section > * { + flex: 1 1 auto; +} + .page-break { page-break-after: always; } @@ -317,4 +329,4 @@ ul.actions li a.approveBtn { #signeeName { text-align: center; margin-bottom: 15px; -} \ No newline at end of file +} From b20ad86948791daa3ccb81131bf06d8273b4f7d6 Mon Sep 17 00:00:00 2001 From: Felipe Orellana <1656249+DeveloperMetal@users.noreply.github.com> Date: Thu, 27 Oct 2022 23:00:36 -0400 Subject: [PATCH 2/2] feat: disable autoname (#764) * bumped to version 2.2.2 * Bump to version 2.2.2 * bumped to version 2.2.3 * bumped to version 2.2.4 * bumped to version 2.3.0 * bumped to version 2.3.1 * bumped to version 2.3.2 * fix: sites with white text bleed into print-format font color (#759) Changes: - Enforces black text on .print-format classes to ensure text is readable on sites with white text (JHA) * feat: adds option to disable auto naming on items Co-authored-by: sahil28297 <37302950+sahil28297@users.noreply.github.com> Co-authored-by: Sahil Khan --- bloomstack_core/hook_events/item.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/bloomstack_core/hook_events/item.py b/bloomstack_core/hook_events/item.py index 1a977b79a..d3458fa8a 100644 --- a/bloomstack_core/hook_events/item.py +++ b/bloomstack_core/hook_events/item.py @@ -17,9 +17,14 @@ def create_integration_request(doc, method): @frappe.whitelist() def autoname_item(item): - item = frappe._dict(json.loads(item)) - item_code = autoname(item) - return item_code + config = frappe.get_site_config() or frappe._dict() + + if config.enforce_item_code_naming == True or config.enforce_item_code_naming == None: + item = frappe._dict(json.loads(item)) + item_code = autoname(item) + return item_code + + return item.item_code def autoname(item, method=None):