Skip to content

Commit

Permalink
- Fixed bug with token on business documents.
Browse files Browse the repository at this point in the history
- Updated translations.
  • Loading branch information
Carlos García Gómez committed Sep 19, 2021
1 parent 060d06c commit c1ff4ff
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 22 deletions.
3 changes: 2 additions & 1 deletion Core/Assets/JS/BusinessDocumentView.js
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,8 @@ function businessDocViewSave() {
$("#" + businessDocViewFormName).attr('action', results.substring(3)).submit();
} else {
alert(results);
$("#" + businessDocViewFormName + " :input[name=\"multireqtoken\"]").val(randomString(20));
let token = $("#" + businessDocViewFormName + " :input[name=\"multireqtoken\"]").val() + randomString(1);
$("#" + businessDocViewFormName + " :input[name=\"multireqtoken\"]").val(token);
}
},
error: function (msg) {
Expand Down
2 changes: 1 addition & 1 deletion Core/Base/PluginManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ final class PluginManager
/**
* FacturaScripts core version.
*/
const CORE_VERSION = 2021.39;
const CORE_VERSION = 2021.40;

/**
* Path to list plugins on file.
Expand Down
2 changes: 1 addition & 1 deletion Core/Lib/ExtendedController/BusinessDocumentView.php
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ protected function assets()
{
AssetManager::add('css', FS_ROUTE . '/node_modules/handsontable/dist/handsontable.full.min.css');
AssetManager::add('js', FS_ROUTE . '/node_modules/handsontable/dist/handsontable.full.min.js');
AssetManager::add('js', FS_ROUTE . '/Dinamic/Assets/JS/BusinessDocumentView.js?v=2');
AssetManager::add('js', FS_ROUTE . '/Dinamic/Assets/JS/BusinessDocumentView.js?v=3');
}

/**
Expand Down
2 changes: 1 addition & 1 deletion Core/Translation/ca_ES.json
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@
"codbarras": "Codi de barres",
"code": "Codi",
"codiso": "Codi ISO",
"color": "color",
"color": "Color",
"colors": "Colors",
"columns": "Columnes",
"combination-code": "Codi de combinació",
Expand Down
16 changes: 8 additions & 8 deletions Core/Translation/en_EN.json
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@
"codbarras": "Barcode",
"code": "Code",
"codiso": "ISO code",
"color": "color",
"color": "Color",
"colors": "Colors",
"columns": "Columns",
"combination-code": "Combination code",
Expand Down Expand Up @@ -315,7 +315,7 @@
"default": "Default",
"default-customer": "Default customer",
"default-retention": "Default retention",
"default-role": "Default role",
"default-role": "Default user group",
"default-tax": "Default tax",
"default-warehouse": "Default warehouse",
"delete": "Remove",
Expand Down Expand Up @@ -591,7 +591,7 @@
"invalid-date-there-are-invoices-before": "Invalid date. The date %date% is later than that of the following invoice.",
"invalid-iban": "Invalid IBAN: %iban%",
"invalid-number": "Invalid number: %number%",
"invalid-request": "Petición no válida",
"invalid-request": "Invalid request",
"invoice": "Invoice",
"invoice-email-subject": "Your invoice %code%",
"invoice-email-text": "Hello, I am attaching your invoice %code%",
Expand All @@ -604,7 +604,7 @@
"invoices": "Invoices",
"ip": "IP",
"ip-banned": "For security reasons access from your IP has been temporarily blocked.",
"irpf": "IRPF",
"irpf": "PIT",
"irpf-subaccount-not-found": "Income tax subaccount not found",
"is-admin": "Is administrator",
"is-creditor": "Is creditor",
Expand Down Expand Up @@ -920,7 +920,7 @@
"rates": "Rates",
"re": "RE",
"re-open": "Reopen",
"read-more": "Leer más",
"read-more": "Read more",
"readonly": "Read only",
"rebuild": "Rebuild",
"rebuild-completed": "Rebuild completed",
Expand Down Expand Up @@ -1052,7 +1052,7 @@
"subaccount": "Subaccount",
"subaccount-belongs-other-year": "Sub-account %subAccountCode% belongs to another financial year.",
"subaccount-irpf": "Account for deductions",
"subaccount-irpf-creditor": "Account of IRPF creditor",
"subaccount-irpf-creditor": "Account of PIT creditor",
"subaccount-not-found": "Subaccount %subAccountCode% not found.",
"subaccount-purchases": "Account for purchases",
"subaccount-pyg-not-found": "Profit and loss subaccount not found",
Expand Down Expand Up @@ -1130,7 +1130,7 @@
"total": "Total",
"total-amount": "Total amount",
"total-value-error": "Total amount of %docType% %docCode% incorrect (%docTotal%). Correct amount: %calcTotal%",
"totalirpf-value-error": "Total IRPF amount of %docType% %docCode% incorrect (%docTotalIRPF%). Correct amount: %calcTotalIRPF%",
"totalirpf-value-error": "Total PIT amount of %docType% %docCode% incorrect (%docTotalIRPF%). Correct amount: %calcTotalIRPF%",
"totaliva-value-error": "Total tax amount of %docType% %docCode% incorrect (%docTotalTax%). Correct amount: %calcTotalTax%",
"totallinea-value-error": "Error in the totallinea value of the VAT line of the tax %taxCode% of the invoice. Correct value: %totalLine%",
"town": "Town",
Expand Down Expand Up @@ -1177,7 +1177,7 @@
"using-filecache": "Using Filecache",
"using-memcache": "Using Memcache",
"validate": "Validate",
"validate-iban": "Validar IBAN",
"validate-iban": "Validate IBAN",
"valuation-type": "Valuation type",
"value": "Value",
"value-x": "Value X",
Expand Down
20 changes: 10 additions & 10 deletions Core/Translation/va_ES.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"account": "Conte",
"account-balance": "Saldo del conte",
"account-code": "Còdic del conte",
"account-code-lower-than-parent": "account-code-lower-than-parent",
"account-code-lower-than-parent": "El codi de compte %code% és més curt que el del pare",
"account-data-missing": "Falten senyes en el conte",
"account-dot-code": "Punt per a autocompletar zeros. Example: 11.1 = 1100000001",
"account-length": "Llongitut del conte",
Expand Down Expand Up @@ -78,7 +78,7 @@
"allow-post-data": "Permetre les MODIFICACIONS",
"allow-put-data": "Permetre els AFEGITS",
"allow-sale-without-stock": "Permetre la venda sense estoc",
"allow-sale-without-stock-n": "allow-sale-without-stock-n",
"allow-sale-without-stock-n": "Permetre la venda sense estoc en nous productes",
"allow-update": "Permetre l'actualització",
"amount": "Import",
"amount-without-discount": "Preu sense desconte",
Expand Down Expand Up @@ -109,7 +109,7 @@
"attribute-value-4": "Atribut 4",
"attribute-values": "Valors de l'atribut",
"attributes": "Atributs",
"authentication": "authentication",
"authentication": "Autenticació",
"auto": "Auto",
"auto-apply-to": "Aplica automàticament a",
"available": "Disponible",
Expand Down Expand Up @@ -204,7 +204,7 @@
"codbarras": "Còdic de barres",
"code": "Codi",
"codiso": "Còdic ISO",
"color": "color",
"color": "Color",
"colors": "Colors",
"columns": "Columnes",
"combination-code": "Còdic de combinació",
Expand Down Expand Up @@ -232,7 +232,7 @@
"contact": "Contacte",
"contact-data": "Senyes del contacte",
"contact-info": "Informació de contacte",
"contact-information": "contact-information",
"contact-information": "Informació de contacte",
"contact-person": "Persona de contacte",
"contacts": "Contactes",
"continue": "Continuar",
Expand All @@ -245,7 +245,7 @@
"convert-into-customer": "Convertir en client",
"convert-into-supplier": "Convertir en proveïdor",
"copy": "Copia",
"copy-p": "copy-p",
"copy-p": "Empleni el formulari per a fer una còpia d'aquest model",
"copy-subaccounts": "Copiar pla de comptes",
"core-update": "Actualització del nucli a la versió %version%",
"cost-price": "Preu de cost",
Expand All @@ -267,7 +267,7 @@
"customer": "Client",
"customer-account-not-found": "El subconte del cliente no s'ha trobat",
"customer-banking-accounts": "Contes bancaris",
"customer-code": "customer-code",
"customer-code": "Cod. Client",
"customer-commission-info": "Només s'aplicarà quan la venda siga al client seleccionat",
"customer-delivery-note": "Albarà al client",
"customer-delivery-notes": "Albarans dels clients",
Expand All @@ -283,12 +283,12 @@
"customer-orders": "Encomandes del client",
"customer-payment-concept": "Cobrament del rebut %document%",
"customer-reached-maximum-risk": "El client ha superat el seu risc màxim",
"customer-subaccount-p": "customer-subaccount-p",
"customer-subaccount-p": "Indique un subcompte a usar o deixe el camp en blanc per a assignar una automàticament",
"customers": "Clients",
"customize": "Personalitzar",
"daily": "A diari",
"dashboard": "Tauler",
"dashboard-for": "dashboard-for",
"dashboard-for": "Tauler de %company%",
"data-source": "Senyes d'orige",
"database": "base de dades",
"database-name-must-be-lowercase": "El nom de la base de senyes deu estar en minúscules",
Expand Down Expand Up @@ -591,7 +591,7 @@
"invalid-date-there-are-invoices-before": "Data no vàlida. La data %date% és posterior a la data de la factura següent.",
"invalid-iban": "IBAN no vàlid: %iban%",
"invalid-number": "invalid-number",
"invalid-request": "Petición no válida",
"invalid-request": "Petició no vàlida",
"invoice": "Factura",
"invoice-email-subject": "invoice-email-subject",
"invoice-email-text": "invoice-email-text",
Expand Down

0 comments on commit c1ff4ff

Please sign in to comment.