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

7489-testToMaster #2515

Merged
alexm merged 329 commits from 7489-testToMaster into master 2024-05-28 05:30:19 +00:00
Conversation 0 Commits 329 Files Changed 212 +6 -4
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 58aedf160b - Show all commits

2
modules/invoiceOut/front/descriptor-menu/index.html
View File

@ -240,7 +240,7 @@
<vn-check <vn-check
ng-model="$ctrl.isChecked" ng-model="$ctrl.isChecked"
label="destinationClient" label="destinationClient"
info="checkinfo" info="transferInvoiceInfo"
/> />
</vn-check> </vn-check>
</vn-horizontal> </vn-horizontal>

2
modules/invoiceOut/front/descriptor-menu/index.js
View File

@ -166,7 +166,7 @@ class Controller extends Section {
const hasToInvoiceByAddress = clientData.hasToInvoiceByAddress; const hasToInvoiceByAddress = clientData.hasToInvoiceByAddress;
if (this.checked && hasToInvoiceByAddress) { if (this.checked && hasToInvoiceByAddress) {
if (!window.confirm('El cliente destino tiene marcado facturar por consignatario, ¿desea continuar?')) if (!window.confirm(this.$t('confirmTransferInvoice')))
return; return;
} }

3
modules/invoiceOut/front/descriptor-menu/locale/en.yml
View File

@ -3,4 +3,5 @@ Transfer invoice to...: Transfer invoice to...
Cplus Type: Cplus Type Cplus Type: Cplus Type
transferInvoice: Transfer Invoice transferInvoice: Transfer Invoice
destinationClient: Bill destination client destinationClient: Bill destination client
checkinfo: New tickets from the destination customer will be generated in the consignee by default. transferInvoiceInfo: New tickets from the destination customer will be generated in the default consignee.
confirmTransferInvoice: Destination customer has marked to bill by consignee, do you want to continue?

3
modules/invoiceOut/front/descriptor-menu/locale/es.yml
View File

@ -26,4 +26,5 @@ Rectificative type: Tipo rectificativa
Transferred invoice: Factura transferida Transferred invoice: Factura transferida
transferInvoice: Transferir factura transferInvoice: Transferir factura
destinationClient: Facturar cliente destino destinationClient: Facturar cliente destino
checkinfo: Los nuevos tickets del cliente destino, serán generados en el consignatario por defecto. transferInvoiceInfo: Los nuevos tickets del cliente destino serán generados en el consignatario por defecto.
confirmTransferInvoice: El cliente destino tiene marcado facturar por consignatario, ¿desea continuar?