From 444d2ae4c4b518b2d306d49b74190553de903b69 Mon Sep 17 00:00:00 2001
From: alexandre <alexandre@verdnatura.es>
Date: Mon, 30 Jan 2023 15:28:47 +0100
Subject: [PATCH 1/3] refs #5104 grouping/packing unified

---
 modules/entry/front/latest-buys/locale/es.yml |  4 +-
 modules/entry/front/summary/index.html        | 14 +++--
 modules/item/front/last-entries/index.html    | 52 +++++++++----------
 3 files changed, 34 insertions(+), 36 deletions(-)

diff --git a/modules/entry/front/latest-buys/locale/es.yml b/modules/entry/front/latest-buys/locale/es.yml
index 8d70844fa..795e3f5f4 100644
--- a/modules/entry/front/latest-buys/locale/es.yml
+++ b/modules/entry/front/latest-buys/locale/es.yml
@@ -1,5 +1,5 @@
 Edit buy(s): Editar compra(s)
-Buying value: Precio
+Buying value: Coste
 Freight value: Porte
 Commission value: Comisión
 Package value: Embalaje
@@ -16,4 +16,4 @@ Field to edit: Campo a editar
 PackageName: Cubo
 Edit: Editar
 buy(s): compra(s)
-Package out: Embalaje envíos
\ No newline at end of file
+Package out: Embalaje envíos
diff --git a/modules/entry/front/summary/index.html b/modules/entry/front/summary/index.html
index 04844ab99..8f1cd924d 100644
--- a/modules/entry/front/summary/index.html
+++ b/modules/entry/front/summary/index.html
@@ -38,7 +38,7 @@
         </vn-one>
         <vn-one>
             <vn-label-value label="Reference">
-                <span 
+                <span
                     ng-click="travelDescriptor.show($event, $ctrl.entryData.travel.id)"
                     class="link">
                     {{$ctrl.entryData.travel.ref}}
@@ -114,8 +114,7 @@
                         <th translate center field="grouping">Grouping</th>
                         <th translate center field="buyingValue">Buying value</th>
                         <th translate center field="price3">Import</th>
-                        <th translate center expand field="price2">Grouping price</th>
-                        <th translate center expand field="price3">Packing price</th>
+                        <th translate center expand field="price">PVP</th>
                     </tr>
                 </thead>
                 <tbody ng-repeat="line in buys">
@@ -125,19 +124,18 @@
                         <td center title="{{::line.packageFk | dashIfEmpty}}">{{::line.packageFk | dashIfEmpty}}</td>
                         <td center title="{{::line.weight}}">{{::line.weight}}</td>
                         <td center>
-                            <vn-chip class="transparent" translate-attr="line.groupingMode == 2 ? {title: 'Minimun amount'} : {title: 'Packing'}" ng-class="{'message': line.groupingMode == 2}"> 
+                            <vn-chip class="transparent" translate-attr="line.groupingMode == 2 ? {title: 'Minimun amount'} : {title: 'Packing'}" ng-class="{'message': line.groupingMode == 2}">
                                 <span>{{::line.packing | dashIfEmpty}}</span>
                             </vn-chip>
                         </td>
                         <td center>
-                            <vn-chip class="transparent" translate-attr="line.groupingMode == 1 ? {title: 'Minimun amount'} : {title: 'Grouping'}" ng-class="{'message': line.groupingMode == 1}"> 
+                            <vn-chip class="transparent" translate-attr="line.groupingMode == 1 ? {title: 'Minimun amount'} : {title: 'Grouping'}" ng-class="{'message': line.groupingMode == 1}">
                                 <span>{{::line.grouping | dashIfEmpty}}</span>
                             </vn-chip>
                         </vn-td>
                         <td center title="{{::line.buyingValue | currency: 'EUR':2}}">{{::line.buyingValue | currency: 'EUR':2}}</td>
                         <td center title="{{::line.quantity * line.buyingValue | currency: 'EUR':2}}">{{::line.quantity * line.buyingValue | currency: 'EUR':2}}</td>
-                        <td center title="{{::line.price2 | currency: 'EUR':2}}">{{::line.price2 | currency: 'EUR':2}}</td>
-                        <td center title="{{::line.price3 | currency: 'EUR':2}}">{{::line.price3 | currency: 'EUR':2}}</td>
+                        <td center title="Grouping / Packing">{{::line.price2 | currency: 'EUR':2 | dashIfEmpty}} / {{::line.price3 | currency: 'EUR':2 | dashIfEmpty}}</td>
                     </tr>
                     <tr class="dark-row">
                         <td shrink>
@@ -195,7 +193,7 @@
     vn-id="item-descriptor"
     warehouse-fk="$ctrl.vnConfig.warehouseFk">
 </vn-item-descriptor-popover>
-<vn-travel-descriptor-popover 
+<vn-travel-descriptor-popover
     vn-id="travelDescriptor">
 </vn-travel-descriptor-popover>
 
diff --git a/modules/item/front/last-entries/index.html b/modules/item/front/last-entries/index.html
index 0348d4f66..1c2db10a5 100644
--- a/modules/item/front/last-entries/index.html
+++ b/modules/item/front/last-entries/index.html
@@ -9,15 +9,15 @@
 </vn-crud-model>
 
 <vn-card class="vn-w-md vn-pa-md">
-    <vn-horizontal> 
+    <vn-horizontal>
         <vn-date-picker class="vn-pa-xs"
-            vn-one 
-            label="Since" 
+            vn-one
+            label="Since"
             ng-model="$ctrl.dateFrom">
         </vn-date-picker>
         <vn-date-picker class="vn-pa-xs"
-            vn-one 
-            label="To" 
+            vn-one
+            label="To"
             ng-model="$ctrl.dateTo">
         </vn-date-picker>
     </vn-horizontal>
@@ -35,8 +35,7 @@
                         <vn-th field="warehouseFk">Warehouse</vn-th>
                         <vn-th field="landed">Landed</vn-th>
                         <vn-th number>Entry</vn-th>
-                        <vn-th number vn-tooltip="Price Per Unit">P.P.U</vn-th>
-                        <vn-th number vn-tooltip="Price Per Package">P.P.P</vn-th>
+                        <vn-th vn-tooltip="Grouping / Packing">PVP</vn-th>
                         <vn-th number class="expendable">Label</vn-th>
                         <vn-th number>Packing</vn-th>
                         <vn-th number>Grouping</vn-th>
@@ -51,7 +50,7 @@
                 <vn-tbody>
                     <vn-tr ng-repeat="entry in entries">
                         <vn-td center>
-                            <vn-check 
+                            <vn-check
                                 ng-model="entry.isIgnored"
                                 disabled="true">
                             </vn-check>
@@ -65,30 +64,31 @@
                                 {{::entry.entryFk | dashIfEmpty}}
                             </span>
                         </vn-td>
-                        <vn-td number>{{::entry.price2 | dashIfEmpty}}</vn-td>
-                        <vn-td number>{{::entry.price3 | dashIfEmpty}}</vn-td>
+                        <vn-td title="{{::entry.price2 | currency: 'EUR':2 | dashIfEmpty}} / {{::entry.price3 | currency: 'EUR':2 | dashIfEmpty}}">
+                            {{::entry.price2 | currency: 'EUR':2 | dashIfEmpty}} / {{::entry.price3 | currency: 'EUR':2 | dashIfEmpty}}
+                        </vn-td>
                         <vn-td number class="expendable">{{entry.stickers | dashIfEmpty}}</vn-td>
                         <vn-td number>
-                            <vn-chip translate-attr="{title: 'Packing'}" ng-class="{'message': entry.groupingMode == 2}"> 
+                            <vn-chip translate-attr="{title: 'Packing'}" ng-class="{'message': entry.groupingMode == 2}">
                                 <span>{{::entry.packing | dashIfEmpty}}</span>
                             </vn-chip>
                         </vn-td>
                         <vn-td number>
-                            <vn-chip translate-attr="{title: 'Grouping'}" ng-class="{'message': entry.groupingMode == 1}"> 
+                            <vn-chip translate-attr="{title: 'Grouping'}" ng-class="{'message': entry.groupingMode == 1}">
                                 <span>{{::entry.grouping | dashIfEmpty}}</span>
                             </vn-chip>
                         </vn-td>
                         <vn-td number class="expendable">{{::entry.stems | dashIfEmpty}}</vn-td>
                         <vn-td number>{{::entry.quantity}}</vn-td>
-                        <vn-td number 
+                        <vn-td number
                             class="expendable">
                                 <span
                                     vn-tooltip="
-                                    {{::$ctrl.$t('Cost')}}: {{::entry.buyingValue| dashIfEmpty}}<br> 
-                                    {{::$ctrl.$t('Package')}}: {{::entry.packageValue| dashIfEmpty}}<br>
-                                    {{::$ctrl.$t('Freight')}}: {{::entry.freightValue| dashIfEmpty}}<br>
-                                    {{::$ctrl.$t('Comission')}}: {{::entry.comissionValue| dashIfEmpty}}">
-                                    {{::entry.cost | dashIfEmpty}}
+                                    {{::$ctrl.$t('Cost')}}: {{::entry.buyingValue | currency: 'EUR':2 | dashIfEmpty}}<br>
+                                    {{::$ctrl.$t('Package')}}: {{::entry.packageValue | currency: 'EUR':2 | dashIfEmpty}}<br>
+                                    {{::$ctrl.$t('Freight')}}: {{::entry.freightValue | currency: 'EUR':2 | dashIfEmpty}}<br>
+                                    {{::$ctrl.$t('Comission')}}: {{::entry.comissionValue | currency: 'EUR':2 | dashIfEmpty}}">
+                                    {{::entry.cost | currency: 'EUR':2 | dashIfEmpty}}
                                 </span>
                         </vn-td>
                         <vn-td number>{{::entry.weight | dashIfEmpty}}</vn-td>
@@ -113,24 +113,24 @@
             ng-click="contextmenu.filterBySelection()">
             Filter by selection
         </vn-item>
-        <vn-item translate 
-            ng-if="contextmenu.isFilterAllowed()" 
+        <vn-item translate
+            ng-if="contextmenu.isFilterAllowed()"
             ng-click="contextmenu.excludeSelection()">
             Exclude selection
         </vn-item>
-        <vn-item translate 
-            ng-if="contextmenu.isFilterAllowed()" 
+        <vn-item translate
+            ng-if="contextmenu.isFilterAllowed()"
             ng-click="contextmenu.removeFilter()">
             Remove filter
         </vn-item>
-        <vn-item translate 
+        <vn-item translate
             ng-click="contextmenu.removeAllFilters()">
             Remove all filters
         </vn-item>
-        <vn-item translate 
-            ng-if="contextmenu.isActionAllowed()" 
+        <vn-item translate
+            ng-if="contextmenu.isActionAllowed()"
             ng-click="contextmenu.copyValue()">
             Copy value
         </vn-item>
     </slot-menu>
-</vn-contextmenu>
\ No newline at end of file
+</vn-contextmenu>

From 2bbd7cb2170eb9fd5b9a0bb943e36ea60c015853 Mon Sep 17 00:00:00 2001
From: alexandre <alexandre@verdnatura.es>
Date: Mon, 30 Jan 2023 15:40:08 +0100
Subject: [PATCH 2/3] refs #5104 changelog

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d00cafc2b..3f2faeb13 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 -  (Trabajadores -> Nuevo trabajador)  Nueva sección
 
 ### Changed
--
+- (Entradas -> Compras) Cambiados los campos "Precio Grouping/Packing" por "PVP" y "Precio" por "Coste"
+- (Artículos -> Últimas compras) Cambiados los campos "P.P.U." y "P.P.P." por "PVP"
 
 ### Fixed
 - (Artículos -> Etiquetas) Permite intercambiar la relevancia entre dos etiquetas.

From 53349fcea74961767c63de4e38c7b6c359f0c891 Mon Sep 17 00:00:00 2001
From: alexandre <alexandre@verdnatura.es>
Date: Mon, 30 Jan 2023 15:41:04 +0100
Subject: [PATCH 3/3] refs #5104 changelog modified

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3f2faeb13..e65983d33 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,7 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 - (Entradas -> Compras) Cambiados los campos "Precio Grouping/Packing" por "PVP" y "Precio" por "Coste"
-- (Artículos -> Últimas compras) Cambiados los campos "P.P.U." y "P.P.P." por "PVP"
+- (Artículos -> Últimas entradas) Cambiados los campos "P.P.U." y "P.P.P." por "PVP"
 
 ### Fixed
 - (Artículos -> Etiquetas) Permite intercambiar la relevancia entre dos etiquetas.