verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 66 Releases Wiki Activity

Merge pull request '5395-travel.extra-community' (!1400) from 5395-travel.extra-community into dev
gitea/salix/pipeline/head This commit looks good Details 

Reviewed-on: #1400
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
This commit is contained in:
Vicent Llopis 2023-03-24 11:14:08 +00:00
parent 9311a59a54 a32dea0acd
commit 4bc24b02f6
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -11,7 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- (Monitor tickets) Muestra un icono al lado de la zona, si el ticket es frágil y se envía por agencia - (Monitor tickets) Muestra un icono al lado de la zona, si el ticket es frágil y se envía por agencia
### Changed ### Changed
- - (Envíos -> Extra comunitarios) Se agrupan las entradas del mismo travel. Añadidos campos Referencia y Importe.
### Fixed ### Fixed
- -

2
modules/travel/back/methods/travel/extraCommunityFilter.js
View File

@ -130,6 +130,7 @@ module.exports = Self => {
SUM(b.stickers) AS stickers, SUM(b.stickers) AS stickers,
s.id AS cargoSupplierFk, s.id AS cargoSupplierFk,
s.nickname AS cargoSupplierNickname, s.nickname AS cargoSupplierNickname,
s.name AS supplierName,
CAST(SUM(b.weight * b.stickers) as DECIMAL(10,0)) as loadedKg, CAST(SUM(b.weight * b.stickers) as DECIMAL(10,0)) as loadedKg,
CAST(SUM(vc.aerealVolumetricDensity * b.stickers * IF(pkg.volume, pkg.volume, pkg.width * pkg.depth * pkg.height) / 1000000) as DECIMAL(10,0)) as volumeKg CAST(SUM(vc.aerealVolumetricDensity * b.stickers * IF(pkg.volume, pkg.volume, pkg.width * pkg.depth * pkg.height) / 1000000) as DECIMAL(10,0)) as volumeKg
FROM travel t FROM travel t
@ -167,6 +168,7 @@ module.exports = Self => {
SUM(b.stickers) AS stickers, SUM(b.stickers) AS stickers,
e.evaNotes, e.evaNotes,
e.notes, e.notes,
e.invoiceAmount,
CAST(SUM(b.weight * b.stickers) AS DECIMAL(10,0)) as loadedkg, CAST(SUM(b.weight * b.stickers) AS DECIMAL(10,0)) as loadedkg,
CAST(SUM(vc.aerealVolumetricDensity * b.stickers * IF(pkg.volume, pkg.volume, pkg.width * pkg.depth * pkg.height) / 1000000) AS DECIMAL(10,0)) as volumeKg CAST(SUM(vc.aerealVolumetricDensity * b.stickers * IF(pkg.volume, pkg.volume, pkg.width * pkg.depth * pkg.height) / 1000000) AS DECIMAL(10,0)) as volumeKg
FROM tmp.travel tr FROM tmp.travel tr

21
modules/travel/front/extra-community/index.html
View File

@ -3,7 +3,7 @@
url="Travels/extraCommunityFilter" url="Travels/extraCommunityFilter"
user-params="::$ctrl.defaultFilter" user-params="::$ctrl.defaultFilter"
data="travels" data="travels"
order="shipped ASC, landed ASC, travelFk, loadPriority, agencyModeFk, evaNotes" order="landed ASC, shipped ASC, travelFk, loadPriority, agencyModeFk, supplierName, evaNotes"
limit="20" limit="20"
auto-load="true"> auto-load="true">
</vn-crud-model> </vn-crud-model>
@ -48,6 +48,9 @@
<th field="agencyModeFk"> <th field="agencyModeFk">
<span translate>Agency</span> <span translate>Agency</span>
</th> </th>
<th field="invoiceAmount">
<span translate>Amount</span>
</th>
<th field="ref"> <th field="ref">
<span translate>Reference</span> <span translate>Reference</span>
</th> </th>
@ -107,6 +110,7 @@
{{::travel.cargoSupplierNickname}} {{::travel.cargoSupplierNickname}}
</span> </span>
</td> </td>
<td></td>
<td>{{::travel.agencyModeName}}</td> <td>{{::travel.agencyModeName}}</td>
<td vn-click-stop> <td vn-click-stop>
<vn-td-editable name="reference" expand> <vn-td-editable name="reference" expand>
@ -157,22 +161,15 @@
{{::entry.supplierName}} {{::entry.supplierName}}
</span> </span>
</td> </td>
<td number>{{::entry.invoiceAmount | currency: 'EUR': 2}}</td>
<td></td> <td></td>
<td class="td-editable">{{::entry.ref}}</td> <td class="td-editable">{{::entry.invoiceNumber}}</td>
<td number>{{::entry.stickers}}</td> <td number>{{::entry.stickers}}</td>
<td number></td> <td number></td>
<td number>{{::entry.loadedkg}}</td> <td number>{{::entry.loadedkg}}</td>
<td number>{{::entry.volumeKg}}</td> <td number>{{::entry.volumeKg}}</td>
<td> <td></td>
<span ng-if="::entry.notes" vn-tooltip="{{::entry.notes}}"> <td></td>
{{::entry.notes}}
</span>
</td>
<td>
<span ng-if="::entry.evaNotes" vn-tooltip="{{::entry.evaNotes}}">
{{::entry.evaNotes}}
</span>
</td>
<td></td> <td></td>
<td></td> <td></td>
</tr> </tr>