Merge branch 'dev' into 5652-ItemTrash

CHANGELOG.md

@@ -6,6 +6,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
+## [2340.01] - 2023-10-05
+
+### Added
+### Changed
+
+### Fixed
+
 ## [2338.01] - 2023-09-21
 
 ### Added

back/model-config.json

@@ -15,6 +15,9 @@
     },
     "Bank": {
         "dataSource": "vn"
+    },
+     "Buyer": {
+        "dataSource": "vn"
     },
     "Campaign": {
         "dataSource": "vn"

back/models/buyer.json

@@ -0,0 +1,28 @@
+{
+	"name": "Buyer",
+	"base": "VnModel",
+	"options": {
+		"mysql": {
+			"table": "buyer"
+		}
+	},
+	"properties": {
+		"userFk": {
+			"type": "number",
+			"required": true,
+			"id": true
+		},
+		"nickname": {
+			"type": "string",
+			"required": true
+		}
+	},
+	"acls": [
+        {
+            "accessType": "READ",
+            "principalType": "ROLE",
+            "principalId": "employee",
+            "permission": "ALLOW"
+        }
+    ]
+}

db/changes/233601/00-createClaimReader.sql

@@ -1,4 +1,4 @@
-INSERT INTO `account`.`role` (`id`, `name`, `description`, `hasLogin`)
+INSERT INTO `account`.`role` (`name`, `description`, `hasLogin`)
 	VALUES ('claimViewer','Trabajadores que consulta las reclamaciones ',1);
 
 INSERT INTO `account`.`roleInherit` (`role`,`inheritsFrom`)
@@ -10,7 +10,7 @@ INSERT INTO `account`.`roleInherit` (`role`,`inheritsFrom`)
 			'buyer',
 			'deliveryBoss',
 			'handmadeBoss'
-		)
+		);
 
 DELETE FROM `salix`.`ACL`
 	WHERE `model`= 'claim'
@@ -29,4 +29,3 @@ INSERT INTO `salix`.`ACL` (`model`,`property`,`accessType`,`permission`,`princip
 	VALUES ('Claim','findById','READ','ALLOW','ROLE','claimViewer');
 INSERT INTO `salix`.`ACL` (`model`,`property`,`accessType`,`permission`,`principalType`,`principalid`)
 	VALUES ('Claim','getSummary','READ','ALLOW','ROLE','claimViewer');
-

modules/client/front/summary/index.html

@@ -255,7 +255,7 @@
                 value="{{$ctrl.summary.averageInvoiced.invoiced | currency: 'EUR':2}}">
             </vn-label-value>
             <vn-label-value label="Claims"
-                value="{{$ctrl.claimingRate($ctrl.summary.claimsRatio.claimingRate) | percentage}}">
+                value="{{$ctrl.claimingRate($ctrl.summary.claimsRatio.claimingRate / 100) | percentage}}">
             </vn-label-value>
         </vn-one>
         <vn-one>

package.json

@@ -1,6 +1,6 @@
 {
     "name": "salix-back",
-    "version": "23.38.01",
+    "version": "23.40.01",
     "author": "Verdnatura Levante SL",
     "description": "Salix backend",
     "license": "GPL-3.0",

print/templates/email/printer-setup/locale/es.yml

@@ -8,8 +8,8 @@ description:
     <a href='https://www.youtube.com/watch?v=qhb0kgQF3o8' title='Youtube' target='_blank'
     style='color:#8dba25'>https://www.youtube.com/watch?v=qhb0kgQF3o8</a>. También
     necesitarás el GoLabel, el programa para imprimir las cintas.
-  downloadFrom: Puedes descargarlo desde este enlace <a href='https://godex.s3-accelerate.amazonaws.com/_6f5glRrVhQAEBGhdUsqJA.file?v01'
-    title='Descargar GoLabel' target='_blank' style='color:#8dba25'>https://godex.s3-accelerate.amazonaws.com/_6f5glRrVhQAEBGhdUsqJA.file?v01</a>
+  downloadFrom: Puedes descargarlo desde este enlace <a href='https://cdn.verdnatura.es/public/GoLabel.zip'
+    title='Descargar GoLabel' target='_blank' style='color:#8dba25'>https://cdn.verdnatura.es/public/GoLabel.zip</a>
   downloadDriver: En este enlace puedes descargar el driver de la impresora <a href='https://es.seagullscientific.com/support/downloads/drivers/godex/download/'
     title='Descargar driver' target='_blank' style='color:#8dba25'>https://es.seagullscientific.com/support/downloads/drivers/godex/download/</a>
 sections: