2983 - Invoice tickets from ticket index #685

Merged
carlosjr merged 7 commits from 2983-ticket_invoice into dev 2021-07-01 12:57:59 +00:00
2 changed files with 3 additions and 19 deletions
Showing only changes of commit 92b6318c79 - Show all commits

View File

@ -183,5 +183,6 @@
"None": "Ninguno", "None": "Ninguno",
"The contract was not active during the selected date": "El contrato no estaba activo durante la fecha seleccionada", "The contract was not active during the selected date": "El contrato no estaba activo durante la fecha seleccionada",
"This document already exists on this ticket": "Este documento ya existe en el ticket", "This document already exists on this ticket": "Este documento ya existe en el ticket",
"Some of the selected tickets are not billable": "Algunos de los tickets seleccionados no son facturables" "Some of the selected tickets are not billable": "Algunos de los tickets seleccionados no son facturables",
"You can't invoice tickets from multiple clients": "No puedes facturar tickets de multiples clientes"
} }

View File

@ -168,7 +168,7 @@
</vn-button> </vn-button>
<vn-button class="round sm vn-mb-sm" <vn-button class="round sm vn-mb-sm"
icon="icon-invoices" icon="icon-invoices"
ng-click="invoiceOptions.show($event)" ng-click="makeInvoiceConfirmation.show()"
ng-show="$ctrl.totalChecked > 0" ng-show="$ctrl.totalChecked > 0"
vn-tooltip="Make invoice..." vn-tooltip="Make invoice..."
tooltip-position="left" tooltip-position="left"
@ -182,23 +182,6 @@
tooltip-position="left"> tooltip-position="left">
</vn-button> </vn-button>
</a> </a>
<vn-menu vn-id="invoiceOptions">
<vn-item
name="makeQuickInvoice"
ng-click="makeInvoiceConfirmation.show()"
ng-show="$ctrl.totalChecked === 1"
translate>
Quick invoice
</vn-item>
<vn-item
ng-click="makeInvoiceConfirmation.show()"
ng-show="$ctrl.totalChecked > 1"
name="makeInvoice"
translate>
Multiple invoice
</vn-item>
</vn-menu>
</vn-vertical> </vn-vertical>
</div> </div>
<vn-popup vn-id="summary"> <vn-popup vn-id="summary">