From 8fd133c5e8a10edb4b35b3796887be898d6ff442 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 27 Nov 2024 12:51:09 +0100
Subject: [PATCH 1/2] feat: refs #6818 define prefix model

---
 back/model-config.json                        |  3 +++
 back/models/prefix.json                       | 27 +++++++++++++++++++
 modules/client/back/methods/client/summary.js |  2 +-
 3 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 back/models/prefix.json

diff --git a/back/model-config.json b/back/model-config.json
index b543071c9b..e0bc922002 100644
--- a/back/model-config.json
+++ b/back/model-config.json
@@ -133,6 +133,9 @@
     "Postcode": {
         "dataSource": "vn"
     },
+    "Prefix": {
+        "dataSource": "vn"
+    },
     "ReferenceRate": {
         "dataSource": "vn"
     },
diff --git a/back/models/prefix.json b/back/models/prefix.json
new file mode 100644
index 0000000000..762354caa2
--- /dev/null
+++ b/back/models/prefix.json
@@ -0,0 +1,27 @@
+{
+    "name": "Prefix",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "pbx.prefix"
+        }
+    },
+    "properties": {
+        "country": {
+            "type": "string",
+            "id": true
+        },
+        "prefix": {
+            "type": "string"
+        }
+    },
+    "acls": [
+        {
+            "property": "*",
+            "accessType": "READ",
+            "principalType": "ROLE",
+            "principalId": "employee",
+            "permission": "ALLOW"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/modules/client/back/methods/client/summary.js b/modules/client/back/methods/client/summary.js
index 9242fbd442..9c1420b611 100644
--- a/modules/client/back/methods/client/summary.js
+++ b/modules/client/back/methods/client/summary.js
@@ -54,7 +54,7 @@ module.exports = Self => {
                 {
                     relation: 'country',
                     scope: {
-                        fields: ['id', 'name'],
+                        fields: ['id', 'name', 'code'],
                         include: {
                             relation: 'saySimpleCountry',
                         }

From 51d96a89c590ecd93ee41f3f589ca67a8f10b902 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Thu, 28 Nov 2024 11:15:58 +0100
Subject: [PATCH 2/2] fix: refs #7266 Increased size item id buy-label

---
 .../templates/reports/buy-label-barcode/assets/css/style.css  | 4 +++-
 .../reports/buy-label-barcode/buy-label-barcode.html          | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/print/templates/reports/buy-label-barcode/assets/css/style.css b/print/templates/reports/buy-label-barcode/assets/css/style.css
index eece20acb0..ce1924878c 100644
--- a/print/templates/reports/buy-label-barcode/assets/css/style.css
+++ b/print/templates/reports/buy-label-barcode/assets/css/style.css
@@ -33,7 +33,9 @@ td {
     font-size: 26px;
 }
 .lg-txt {
-    font-size: 32px;
+    font-size: 40px;
+    padding: 0px;
+    line-height: 1;
 }
 .xl-txt {
     font-size: 50px;
diff --git a/print/templates/reports/buy-label-barcode/buy-label-barcode.html b/print/templates/reports/buy-label-barcode/buy-label-barcode.html
index c1725f5c06..ebddb60ecb 100644
--- a/print/templates/reports/buy-label-barcode/buy-label-barcode.html
+++ b/print/templates/reports/buy-label-barcode/buy-label-barcode.html
@@ -36,12 +36,12 @@
 				</td>
 			</tr>
 			<tr>
-				<td class="lg-txt xl-width bold center">
+				<td class="bold center lg-txt xl-width">
 					<div class="overflow-line">
 						{{formatNumber(buy.itemFk)}}
 					</div>
 				</td>
-				<td colspan="2" class="md-txt md-width center">
+				<td colspan="2" class="center md-txt md-width">
 					<div class="overflow-line">
 						{{`${(packing || buy.packing)} x ${buy.stems || ''}`}}
 					</div>