refs #4547 formateo arreglado
gitea/salix/pipeline/head There was a failure building this commit
Details
gitea/salix/pipeline/head There was a failure building this commit
Details
This commit is contained in:
parent
1246a65f32
commit
8d8d217fe7
|
|
@ -1,17 +1,40 @@
|
||||||
<vn-crud-model vn-id="model" url="Receipts/filter" limit="20" data="$ctrl.balances">
|
<vn-crud-model
|
||||||
|
vn-id="model"
|
||||||
|
url="Receipts/filter"
|
||||||
|
limit="20"
|
||||||
|
data="$ctrl.balances">
|
||||||
</vn-crud-model>
|
</vn-crud-model>
|
||||||
<vn-crud-model vn-id="riskModel" url="ClientRisks" filter="$ctrl.filter" data="$ctrl.clientRisks">
|
<vn-crud-model
|
||||||
|
vn-id="riskModel"
|
||||||
|
url="ClientRisks"
|
||||||
|
filter="$ctrl.filter"
|
||||||
|
data="$ctrl.clientRisks">
|
||||||
</vn-crud-model>
|
</vn-crud-model>
|
||||||
<vn-crud-model auto-load="true" url="Companies" data="companies" order="code">
|
<vn-crud-model
|
||||||
|
auto-load="true"
|
||||||
|
url="Companies"
|
||||||
|
data="companies"
|
||||||
|
order="code">
|
||||||
</vn-crud-model>
|
</vn-crud-model>
|
||||||
<vn-side-menu side="right">
|
<vn-side-menu side="right">
|
||||||
<div class="vn-pa-md">
|
<div class="vn-pa-md">
|
||||||
<vn-autocomplete vn-one vn-id="company" ng-model="$ctrl.companyId" data="companies" show-field="code"
|
<vn-autocomplete
|
||||||
value-field="id" label="Company">
|
vn-one
|
||||||
|
vn-id="company"
|
||||||
|
ng-model="$ctrl.companyId"
|
||||||
|
data="companies"
|
||||||
|
show-field="code"
|
||||||
|
value-field="id"
|
||||||
|
label="Company">
|
||||||
</vn-autocomplete>
|
</vn-autocomplete>
|
||||||
<div class="totalBox" style="text-align: center;" ng-if="$ctrl.clientRisks.length">
|
<div
|
||||||
|
class="totalBox"
|
||||||
|
style="text-align: center;"
|
||||||
|
ng-if="$ctrl.clientRisks.length">
|
||||||
<h6 translate>Total by company</h6>
|
<h6 translate>Total by company</h6>
|
||||||
<vn-label-value ng-repeat="riskByCompany in $ctrl.clientRisks" label="{{riskByCompany.company.code}}"
|
<vn-label-value
|
||||||
|
ng-repeat="riskByCompany in $ctrl.clientRisks"
|
||||||
|
label="{{riskByCompany.company.code}}"
|
||||||
value="{{riskByCompany.amount | currency: 'EUR':2}}">
|
value="{{riskByCompany.amount | currency: 'EUR':2}}">
|
||||||
</vn-label-value>
|
</vn-label-value>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -20,78 +43,94 @@
|
||||||
<div class="vn-w-lg">
|
<div class="vn-w-lg">
|
||||||
<vn-data-viewer model="model">
|
<vn-data-viewer model="model">
|
||||||
<vn-card>
|
<vn-card>
|
||||||
<vn-table model="model">
|
<vn-table model="model">
|
||||||
<vn-thead>
|
<vn-thead>
|
||||||
<vn-tr>
|
<vn-tr>
|
||||||
<vn-th expand>Date</vn-th>
|
<vn-th expand>Date</vn-th>
|
||||||
<vn-th>Creation date</vn-th>
|
<vn-th>Creation date</vn-th>
|
||||||
<vn-th>Employee</vn-th>
|
<vn-th>Employee</vn-th>
|
||||||
<vn-th>Reference</vn-th>
|
<vn-th>Reference</vn-th>
|
||||||
<vn-th number>Bank</vn-th>
|
<vn-th number>Bank</vn-th>
|
||||||
<vn-th number>Debit</vn-th>
|
<vn-th number>Debit</vn-th>
|
||||||
<vn-th number>Havings</vn-th>
|
<vn-th number>Havings</vn-th>
|
||||||
<vn-th number>Balance</vn-th>
|
<vn-th number>Balance</vn-th>
|
||||||
<vn-th center>Conciliated</vn-th>
|
<vn-th center>Conciliated</vn-th>
|
||||||
<vn-th></vn-th>
|
<vn-th></vn-th>
|
||||||
</vn-tr>
|
</vn-tr>
|
||||||
</vn-thead>
|
</vn-thead>
|
||||||
<vn-tbody>
|
<vn-tbody>
|
||||||
<vn-tr ng-repeat="balance in $ctrl.balances">
|
<vn-tr ng-repeat="balance in $ctrl.balances">
|
||||||
<vn-td expand>
|
<vn-td expand>
|
||||||
<span title="{{::balance.payed | date:'dd/MM/yyyy'}}">
|
<span title="{{::balance.payed | date:'dd/MM/yyyy'}}">
|
||||||
{{::balance.payed | date:'dd/MM/yyyy'}}
|
{{::balance.payed | date:'dd/MM/yyyy'}}
|
||||||
</span>
|
</span>
|
||||||
</vn-td>
|
</vn-td>
|
||||||
<vn-td shrink-datetime>
|
<vn-td shrink-datetime>
|
||||||
<span title="{{::balance.created | date:'dd/MM/yyyy HH:mm'}}">
|
<span title="{{::balance.created | date:'dd/MM/yyyy HH:mm'}}">
|
||||||
{{::balance.created | date:'dd/MM/yyyy HH:mm'}}
|
{{::balance.created | date:'dd/MM/yyyy HH:mm'}}
|
||||||
</span>
|
</span>
|
||||||
</vn-td>
|
</vn-td>
|
||||||
<vn-td>
|
<vn-td>
|
||||||
<span vn-click-stop="workerDescriptor.show($event, balance.workerFk)" class="link">
|
<span
|
||||||
{{::balance.userName}}
|
vn-click-stop="workerDescriptor.show($event, balance.workerFk)"
|
||||||
</span>
|
class="link">
|
||||||
</vn-td>
|
{{::balance.userName}}
|
||||||
<vn-td-editable disabled="balance.isInvoice || !$ctrl.isAdministrative" expand>
|
</span>
|
||||||
<text>
|
</vn-td>
|
||||||
<div ng-show="::balance.description">
|
<vn-td-editable disabled="balance.isInvoice || !$ctrl.isAdministrative" expand>
|
||||||
<span ng-if="balance.isInvoice"
|
<text>
|
||||||
title="{{'BILL' | translate: {ref: balance.description} }}"
|
<div ng-show="::balance.description">
|
||||||
vn-click-stop="$ctrl.showInvoiceOutDescriptor($event, balance)" class="link">
|
<span
|
||||||
{{'BILL' | translate: {ref: balance.description} }}
|
ng-if="balance.isInvoice"
|
||||||
</span>
|
title="{{'BILL' | translate: {ref: balance.description} }}"
|
||||||
<span ng-if="!balance.isInvoice" title="{{::balance.description}}">
|
vn-click-stop="$ctrl.showInvoiceOutDescriptor($event, balance)"
|
||||||
{{balance.description}}
|
class="link">
|
||||||
</span>
|
{{'BILL' | translate: {ref: balance.description} }}
|
||||||
</div>
|
</span>
|
||||||
</text>
|
<span
|
||||||
<field>
|
ng-if="!balance.isInvoice"
|
||||||
<vn-textfield vn-acl="administrative" class="dense" vn-focus
|
title="{{::balance.description}}">
|
||||||
ng-model="balance.description" on-change="$ctrl.changeDescription(balance)">
|
{{balance.description}}
|
||||||
</vn-textfield>
|
</span>
|
||||||
</field>
|
</div>
|
||||||
</vn-td-editable>
|
</text>
|
||||||
<vn-td number>{{::balance.bankFk}}</vn-td>
|
<field>
|
||||||
<vn-td number expand>{{::balance.debit | currency: 'EUR':2}}</vn-td>
|
<vn-textfield vn-acl="administrative" class="dense" vn-focus
|
||||||
<vn-td number expand>{{::balance.credit | currency: 'EUR':2}}</vn-td>
|
ng-model="balance.description"
|
||||||
<vn-td number expand>{{balance.balance | currency: 'EUR':2}}</vn-td>
|
on-change="$ctrl.changeDescription(balance)">
|
||||||
<vn-td center shrink>
|
</vn-textfield>
|
||||||
<vn-check ng-model="balance.isConciliate" disabled="true">
|
</field>
|
||||||
</vn-check>
|
</vn-td-editable>
|
||||||
</vn-td>
|
<vn-td number>{{::balance.bankFk}}</vn-td>
|
||||||
<vn-td center shrink>
|
<vn-td number expand>{{::balance.debit | currency: 'EUR':2}}</vn-td>
|
||||||
<a ng-show="balance.hasPdf" target="_blank"
|
<vn-td number expand>{{::balance.credit | currency: 'EUR':2}}</vn-td>
|
||||||
href="api/InvoiceOuts/{{::balance.id}}/download?access_token={{::$ctrl.vnToken.token}}">
|
<vn-td number expand>{{balance.balance | currency: 'EUR':2}}</vn-td>
|
||||||
<vn-icon-button icon="cloud_download" title="{{'Download PDF' | translate}}">
|
<vn-td center shrink>
|
||||||
</vn-icon-button>
|
<vn-check
|
||||||
</a>
|
ng-model="balance.isConciliate"
|
||||||
</vn-td>
|
disabled="true">
|
||||||
|
</vn-check>
|
||||||
|
</vn-td>
|
||||||
|
<vn-td center shrink>
|
||||||
|
<a ng-show="balance.hasPdf"
|
||||||
|
target="_blank"
|
||||||
|
href="api/InvoiceOuts/{{::balance.id}}/download?access_token={{::$ctrl.vnToken.token}}">
|
||||||
|
<vn-icon-button
|
||||||
|
icon="cloud_download"
|
||||||
|
title="{{'Download PDF' | translate}}">
|
||||||
|
</vn-icon-button>
|
||||||
|
</a>
|
||||||
|
</vn-td>
|
||||||
<vn-td center shrink ng-if="!balance.isInvoice">
|
<vn-td center shrink ng-if="!balance.isInvoice">
|
||||||
<vn-icon-button vn-dialog="send_compensation" icon="outgoing_mail"
|
<vn-icon-button
|
||||||
|
vn-dialog="send_compensation"
|
||||||
|
icon="outgoing_mail"
|
||||||
title="{{'Send compensation' | translate}}">
|
title="{{'Send compensation' | translate}}">
|
||||||
</vn-icon-button>
|
</vn-icon-button>
|
||||||
</vn-td>
|
</vn-td>
|
||||||
<vn-confirm vn-id="send_compensation" on-accept="$ctrl.sendEmail(balance)"
|
<vn-confirm
|
||||||
|
vn-id="send_compensation"
|
||||||
|
on-accept="$ctrl.sendEmail(balance)"
|
||||||
question="¿Desea informar de la compensacion al cliente por correo?"
|
question="¿Desea informar de la compensacion al cliente por correo?"
|
||||||
message="Send compensation">
|
message="Send compensation">
|
||||||
</vn-confirm>
|
</vn-confirm>
|
||||||
|
|
@ -101,13 +140,24 @@
|
||||||
</vn-card>
|
</vn-card>
|
||||||
</vn-data-viewer>
|
</vn-data-viewer>
|
||||||
</div>
|
</div>
|
||||||
<vn-float-button vn-acl="salesAssistant" vn-acl-action="remove" icon="add" vn-tooltip="New payment" vn-bind="+"
|
<vn-float-button
|
||||||
fixed-bottom-right ng-click="balanceCreate.show()">
|
vn-acl="salesAssistant"
|
||||||
|
vn-acl-action="remove"
|
||||||
|
icon="add"
|
||||||
|
vn-tooltip="New payment"
|
||||||
|
vn-bind="+"
|
||||||
|
fixed-bottom-right
|
||||||
|
ng-click="balanceCreate.show()">
|
||||||
</vn-float-button>
|
</vn-float-button>
|
||||||
<vn-client-balance-create vn-id="balance-create" on-accept="$ctrl.getData()" company-fk="$ctrl.companyId"
|
<vn-client-balance-create
|
||||||
|
vn-id="balance-create"
|
||||||
|
on-accept="$ctrl.getData()"
|
||||||
|
company-fk="$ctrl.companyId"
|
||||||
client-fk="$ctrl.$params.id">
|
client-fk="$ctrl.$params.id">
|
||||||
</vn-client-balance-create>
|
</vn-client-balance-create>
|
||||||
<vn-worker-descriptor-popover vn-id="workerDescriptor">
|
<vn-worker-descriptor-popover
|
||||||
|
vn-id="workerDescriptor">
|
||||||
</vn-worker-descriptor-popover>
|
</vn-worker-descriptor-popover>
|
||||||
<vn-invoice-out-descriptor-popover vn-id="invoiceOutDescriptor">
|
<vn-invoice-out-descriptor-popover
|
||||||
|
vn-id="invoiceOutDescriptor">
|
||||||
</vn-invoice-out-descriptor-popover>
|
</vn-invoice-out-descriptor-popover>
|
||||||
|
|
@ -45,7 +45,6 @@ class Controller extends Section {
|
||||||
return this.aclService.hasAny(['administrative']);
|
return this.aclService.hasAny(['administrative']);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
getData() {
|
getData() {
|
||||||
return this.$.model.applyFilter(null, {
|
return this.$.model.applyFilter(null, {
|
||||||
clientId: this.$params.id,
|
clientId: this.$params.id,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue