Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Bug fixes

Browse Source
This commit is contained in:
Hillel Coren 2014-03-23 20:19:03 +02:00
parent bb6815ba13
commit a09b898cb1
6 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/lang/en/fields.php
View File

@ -36,7 +36,7 @@ return array(
'po_number' => 'PO Number', 'po_number' => 'PO Number',
'po_number_short' => 'PO #', 'po_number_short' => 'PO #',
'frequency_id' => 'How often', 'frequency_id' => 'How often',
'dicount' => 'Discount', 'discount' => 'Discount',
'taxes' => 'Taxes', 'taxes' => 'Taxes',
'tax' => 'Tax', 'tax' => 'Tax',
'item' => 'Item', 'item' => 'Item',

2
app/lang/fr/fields.php
View File

@ -36,7 +36,7 @@ return array(
'po_number' => 'Numéro du bon de commande', 'po_number' => 'Numéro du bon de commande',
'po_number_short' => 'Bon de commande #', 'po_number_short' => 'Bon de commande #',
'frequency_id' => 'Fréquence', //litteral translation : Combien de fois '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', 'taxes' => 'Taxes',
'tax' => 'Taxe', 'tax' => 'Taxe',
'item' => 'Ligne', //I'm not sure, I need the context : screenshot ? 'item' => 'Ligne', //I'm not sure, I need the context : screenshot ?

25
app/lang/pt_BR/fields.php
View File

@ -25,4 +25,29 @@ return array(
'industry_id' => 'Empresa', 'industry_id' => 'Empresa',
'private_notes' => 'Notas Privadas', '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',
); );

2
app/models/Account.php
View File

@ -178,7 +178,7 @@ class Account extends Eloquent
'due_date', 'due_date',
'invoice_number', 'invoice_number',
'po_number', 'po_number',
'dicount', 'discount',
'taxes', 'taxes',
'tax', 'tax',
'item', 'item',

1
public/js/jspdf.plugin.split_text_to_size.js
View File

@ -39,7 +39,6 @@ cell ocupied by the width of the char in that position.
@returns {Array} @returns {Array}
*/ */
var getCharWidthsArray = API.getCharWidthsArray = function(text, options){ var getCharWidthsArray = API.getCharWidthsArray = function(text, options){
if (!options) { if (!options) {
options = {} options = {}
} }

5
public/js/script.js
View File

@ -1355,9 +1355,10 @@ function concatStrings() {
function displayGrid(doc, invoice, data, x, y, layout, hasheader, rightAlignX, rightAlignTitleX) { function displayGrid(doc, invoice, data, x, y, layout, hasheader, rightAlignX, rightAlignTitleX) {
var numLines = 0; var numLines = 0;
var origY = y; var origY = y;
for (var i=0; i<data.length; i++) { for (var i=0; i<data.length; i++) {
doc.setFontType('normal'); doc.setFontType('normal');
if (invoice.invoice_design_id == 1 && i > 0 && origY === layout.accountTop) { if (invoice.invoice_design_id == 1 && i > 0 && origY === layout.accountTop) {
SetPdfColor('GrayText',doc); SetPdfColor('GrayText',doc);
} }
@ -1398,8 +1399,8 @@ function displayGrid(doc, invoice, data, x, y, layout, hasheader, rightAlignX, r
*/ */
doc.setFontType('normal'); doc.setFontType('normal');
key = invoiceLabels[key]; key = invoiceLabels[key];
if (rightAlignTitleX) { if (rightAlignTitleX) {
marginLeft = rightAlignTitleX - (doc.getStringUnitWidth(key) * doc.internal.getFontSize()); marginLeft = rightAlignTitleX - (doc.getStringUnitWidth(key) * doc.internal.getFontSize());
} else { } else {