mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2024-09-19 16:01:34 +02:00
Bug fixes
This commit is contained in:
parent
bb6815ba13
commit
a09b898cb1
@ -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',
|
||||
|
@ -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 ?
|
||||
|
@ -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',
|
||||
|
||||
);
|
||||
|
@ -178,7 +178,7 @@ class Account extends Eloquent
|
||||
'due_date',
|
||||
'invoice_number',
|
||||
'po_number',
|
||||
'dicount',
|
||||
'discount',
|
||||
'taxes',
|
||||
'tax',
|
||||
'item',
|
||||
|
@ -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 = {}
|
||||
}
|
||||
|
@ -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<data.length; i++) {
|
||||
doc.setFontType('normal');
|
||||
|
||||
|
||||
if (invoice.invoice_design_id == 1 && 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 {
|
||||
|
Loading…
Reference in New Issue
Block a user