verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

Merge pull request '2980 - Invoice in fixes' (#668) from 2980-invoiceIn_fixes into dev
gitea/salix/pipeline/head This commit looks good Details 

Reviewed-on: #668
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
This commit is contained in:
Carlos Jimenez Ruiz 2021-06-18 14:38:14 +00:00
parent 9506a8fd90 8f24c3f39b
commit 194c61bfe3
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/invoiceIn/back/methods/invoice-in/filter.js
View File

@ -109,8 +109,9 @@ module.exports = Self => {
return {'ii.created': {gte: value}}; return {'ii.created': {gte: value}};
case 'to': case 'to':
return {'ii.created': {lte: value}}; return {'ii.created': {lte: value}};
case 'account':
case 'fi': case 'fi':
return {'s.nif': value};
case 'account':
return {[`s.${param}`]: value}; return {[`s.${param}`]: value};
case 'supplierRef': case 'supplierRef':
case 'supplierFk': case 'supplierFk':

7
modules/invoiceIn/front/index/index.html
View File

@ -54,19 +54,22 @@
</vn-icon-button> </vn-icon-button>
</vn-td> </vn-td>
<vn-td shrink> <vn-td shrink>
<vn-icon-button <!-- <vn-icon-button
ng-show="invoiceIn.dmsFk" ng-show="invoiceIn.dmsFk"
vn-click-stop="$ctrl.openPdf(invoiceIn.dmsFk)" vn-click-stop="$ctrl.openPdf(invoiceIn.dmsFk)"
icon="cloud_download" icon="cloud_download"
title="Download PDF" title="Download PDF"
vn-tooltip="Download PDF"> vn-tooltip="Download PDF">
</vn-icon-button> </vn-icon-button> -->
</vn-td> </vn-td>
</a> </a>
</vn-tbody> </vn-tbody>
</vn-table> </vn-table>
</vn-card> </vn-card>
</vn-data-viewer> </vn-data-viewer>
<vn-supplier-descriptor-popover
vn-id="supplierDescriptor">
</vn-supplier-descriptor-popover>
<vn-popup vn-id="summary"> <vn-popup vn-id="summary">
<vn-invoice-in-summary <vn-invoice-in-summary
invoice-in="$ctrl.selectedInvoiceIn"> invoice-in="$ctrl.selectedInvoiceIn">

7
modules/invoiceIn/front/search-panel/index.html
View File

@ -27,11 +27,12 @@
label="Account" label="Account"
ng-model="filter.account"> ng-model="filter.account">
</vn-textfield> </vn-textfield>
<vn-textfield <vn-input-number
vn-one vn-one
label="Amount" label="Amount"
ng-model="filter.amount"> ng-model="filter.amount"
</vn-textfield> step="0.01">
</vn-input-number>
</vn-horizontal> </vn-horizontal>
<vn-horizontal> <vn-horizontal>
<vn-date-picker <vn-date-picker

4
modules/invoiceOut/front/index/index.html
View File

@ -36,7 +36,7 @@
<vn-td expand>{{::invoiceOut.created | date:'dd/MM/yyyy' | dashIfEmpty}}</vn-td> <vn-td expand>{{::invoiceOut.created | date:'dd/MM/yyyy' | dashIfEmpty}}</vn-td>
<vn-td>{{::invoiceOut.companyCode | dashIfEmpty}}</vn-td> <vn-td>{{::invoiceOut.companyCode | dashIfEmpty}}</vn-td>
<vn-td shrink>{{::invoiceOut.dued | date:'dd/MM/yyyy' | dashIfEmpty}}</vn-td> <vn-td shrink>{{::invoiceOut.dued | date:'dd/MM/yyyy' | dashIfEmpty}}</vn-td>
<vn-td> <vn-td shrink>
<vn-icon-button <vn-icon-button
ng-show="invoiceOut.hasPdf" ng-show="invoiceOut.hasPdf"
vn-click-stop="$ctrl.openPdf(invoiceOut.id)" vn-click-stop="$ctrl.openPdf(invoiceOut.id)"
@ -45,7 +45,7 @@
vn-tooltip="Download PDF"> vn-tooltip="Download PDF">
</vn-icon-button> </vn-icon-button>
</vn-td> </vn-td>
<vn-td> <vn-td shrink>
<vn-icon-button <vn-icon-button
vn-click-stop="$ctrl.preview(invoiceOut)" vn-click-stop="$ctrl.preview(invoiceOut)"
vn-tooltip="Preview" vn-tooltip="Preview"