diff --git a/app/lang/en/fields.php b/app/lang/en/fields.php index 10f5d738c3..6a0bcaa7b2 100644 --- a/app/lang/en/fields.php +++ b/app/lang/en/fields.php @@ -36,7 +36,7 @@ return array( 'po_number' => 'PO Number', 'po_number_short' => 'PO #', 'frequency_id' => 'How often', - 'dicount' => 'Discount', + 'discount' => 'Discount', 'taxes' => 'Taxes', 'tax' => 'Tax', 'item' => 'Item', diff --git a/app/lang/fr/fields.php b/app/lang/fr/fields.php index 4af61a3ceb..37dc8e1df8 100644 --- a/app/lang/fr/fields.php +++ b/app/lang/fr/fields.php @@ -36,7 +36,7 @@ return array( 'po_number' => 'Numéro du bon de commande', 'po_number_short' => 'Bon de commande #', 'frequency_id' => 'Fréquence', //litteral translation : Combien de fois - 'dicount' => 'Remise', //can be "rabais" or "réduction" + 'discount' => 'Remise', //can be "rabais" or "réduction" 'taxes' => 'Taxes', 'tax' => 'Taxe', 'item' => 'Ligne', //I'm not sure, I need the context : screenshot ? diff --git a/app/lang/pt_BR/fields.php b/app/lang/pt_BR/fields.php index 523f0a85b5..a405467cfe 100644 --- a/app/lang/pt_BR/fields.php +++ b/app/lang/pt_BR/fields.php @@ -25,4 +25,29 @@ return array( 'industry_id' => 'Empresa', 'private_notes' => 'Notas Privadas', + // invoice + 'invoice' => 'Invoice', + 'client' => 'Client', + 'invoice_date' => 'Invoice Date', + 'due_date' => 'Due Date', + 'invoice_number' => 'Invoice Number', + 'invoice_number_short' => 'Invoice #', + 'po_number' => 'PO Number', + 'po_number_short' => 'PO #', + 'frequency_id' => 'How often', + 'discount' => 'Discount', + 'taxes' => 'Taxes', + 'tax' => 'Tax', + 'item' => 'Item', + 'description' => 'Description', + 'unit_cost' => 'Unit Cost', + 'quantity' => 'Quantity', + 'line_total' => 'Line Total', + 'subtotal' => 'Subtotal', + 'paid_to_date' => 'Paid to Date', + 'balance_due' => 'Balance Due', + 'invoice_design_id' => 'Design', + 'terms' => 'Terms', + 'your_invoice' => 'Your Invoice', + ); diff --git a/app/models/Account.php b/app/models/Account.php index bc74165573..208ec4541d 100755 --- a/app/models/Account.php +++ b/app/models/Account.php @@ -178,7 +178,7 @@ class Account extends Eloquent 'due_date', 'invoice_number', 'po_number', - 'dicount', + 'discount', 'taxes', 'tax', 'item', diff --git a/public/js/jspdf.plugin.split_text_to_size.js b/public/js/jspdf.plugin.split_text_to_size.js index 93b9a48f4a..9d74d442af 100755 --- a/public/js/jspdf.plugin.split_text_to_size.js +++ b/public/js/jspdf.plugin.split_text_to_size.js @@ -39,7 +39,6 @@ cell ocupied by the width of the char in that position. @returns {Array} */ var getCharWidthsArray = API.getCharWidthsArray = function(text, options){ - if (!options) { options = {} } diff --git a/public/js/script.js b/public/js/script.js index 618670d40b..f0e8dc4027 100644 --- a/public/js/script.js +++ b/public/js/script.js @@ -1355,9 +1355,10 @@ function concatStrings() { function displayGrid(doc, invoice, data, x, y, layout, hasheader, rightAlignX, rightAlignTitleX) { var numLines = 0; var origY = y; + for (var i=0; i 0 && origY === layout.accountTop) { SetPdfColor('GrayText',doc); } @@ -1398,8 +1399,8 @@ function displayGrid(doc, invoice, data, x, y, layout, hasheader, rightAlignX, r */ doc.setFontType('normal'); - key = invoiceLabels[key]; + if (rightAlignTitleX) { marginLeft = rightAlignTitleX - (doc.getStringUnitWidth(key) * doc.internal.getFontSize()); } else {