Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-23 20:00:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into Dev_PHP-Payments

Browse Source 
Merged changes from master.
This commit is contained in:
blkmutt 2014-03-23 11:41:21 -04:00
commit af7ba0b7b1
3 changed files with 46 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
app/lang/de/fields.php
View File

@ -3,52 +3,52 @@
return array( return array(
// client // client
'organization' => 'Organization', 'organization' => 'Organisation',
'name' => 'Name', 'name' => 'Name',
'website' => 'Website', 'website' => 'Webseite',
'work_phone' => 'Phone', 'work_phone' => 'Telefon',
'address' => 'Address', 'address' => 'Adresse',
'address1' => 'Street', 'address1' => 'Straße',
'address2' => 'Apt/Suite', 'address2' => 'Adresszusatz',
'city' => 'City', 'city' => 'Stadt',
'state' => 'State/Province', 'state' => 'Bundesland',
'postal_code' => 'Postal Code', 'postal_code' => 'Postleitzahl',
'country_id' => 'Country', 'country_id' => 'Land',
'contacts' => 'Contacts', 'contacts' => 'Kontakte',
'first_name' => 'First Name', 'first_name' => 'Vorname',
'last_name' => 'Last Name', 'last_name' => 'Nachname',
'phone' => 'Phone', 'phone' => 'Telefon',
'email' => 'Email', 'email' => 'Email',
'additional_info' => 'Additional Info', 'additional_info' => 'Zusätzliche Info',
'payment_terms' => 'Payment Terms', 'payment_terms' => 'Payment Terms',
'currency_id' => 'Currency', 'currency_id' => 'Währung',
'size_id' => 'Size', 'size_id' => 'Größe',
'industry_id' => 'Industry', 'industry_id' => 'Kategorie',
'private_notes' => 'Private Notes', 'private_notes' => 'Notizen',
// invoice // invoice
'invoice' => 'Invoice', 'invoice' => 'Rechnung',
'client' => 'Client', 'client' => 'Kunde',
'invoice_date' => 'Invoice Date', 'invoice_date' => 'Rechnungsdatum',
'due_date' => 'Due Date', 'due_date' => 'Fällig am',
'invoice_number' => 'Invoice Number', 'invoice_number' => 'Rechungsnummer',
'invoice_number_short' => 'Invoice #', 'invoice_number_short' => 'Rechnung #',
'po_number' => 'PO Number', 'po_number' => 'Bestell Nummer',
'po_number_short' => 'PO #', 'po_number_short' => 'BN #',
'frequency_id' => 'How often', 'frequency_id' => 'Wie oft',
'dicount' => 'Discount', 'dicount' => 'Rabatt',
'taxes' => 'Taxes', 'taxes' => 'Steuern',
'tax' => 'Tax', 'tax' => 'Steuer',
'item' => 'Item', 'item' => 'Artikel',
'description' => 'Description', 'description' => 'Beschreibung',
'unit_cost' => 'Unit Cost', 'unit_cost' => 'Kosten pro Einheit',
'quantity' => 'Quantity', 'quantity' => 'Menge',
'line_total' => 'Line Total', 'line_total' => 'Summe',
'subtotal' => 'Subtotal', 'subtotal' => 'Zwischensumme',
'paid_to_date' => 'Paid to Date', 'paid_to_date' => 'Zahlungsdatum',
'balance_due' => 'Balance Due', 'balance_due' => 'Rechnungsbetrag',
'invoice_design_id' => 'Design', 'invoice_design_id' => 'Design',
'terms' => 'Terms', 'terms' => 'Bedingungen',
'your_invoice' => 'Your Invoice', 'your_invoice' => 'Ihre Rechnung',
); );

3
app/views/accounts/notifications.blade.php
View File

@ -30,7 +30,8 @@
}(document, 'script', 'facebook-jssdk'));</script> }(document, 'script', 'facebook-jssdk'));</script>
<div class="fb-follow" data-href="https://www.facebook.com/invoiceninja" data-colorscheme="light" data-layout="button" data-show-faces="false"></div>&nbsp;&nbsp; <div class="fb-follow" data-href="https://www.facebook.com/invoiceninja" data-colorscheme="light" data-layout="button" data-show-faces="false"></div>&nbsp;&nbsp;
<a href="https://twitter.com/invoiceninja" class="twitter-follow-button" data-show-count="false" data-size="medium">Follow @invoiceninja</a>
<a href="https://twitter.com/invoiceninja" class="twitter-follow-button" data-show-count="false" data-related="hillelcoren" data-size="medium">Follow @invoiceninja</a>
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script> <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>
</div></div> </div></div>

3
public/js/script.js
View File

@ -69,6 +69,7 @@ function GetReportTemplate4(doc, invoice, layout, checkMath) {
y += displaySubtotals(doc, layout, invoice, y+20, 480) + 20; y += displaySubtotals(doc, layout, invoice, y+20, 480) + 20;
/*
if (checkMath && NINJA.parseFloat(total).toFixed(4) != NINJA.parseFloat(invoice.amount).toFixed(4)) if (checkMath && NINJA.parseFloat(total).toFixed(4) != NINJA.parseFloat(invoice.amount).toFixed(4))
{ {
var doc = new jsPDF('p', 'pt'); var doc = new jsPDF('p', 'pt');
@ -78,7 +79,7 @@ function GetReportTemplate4(doc, invoice, layout, checkMath) {
onerror('Failed to generate PDF ' + total + ', ' + invoice.amount ); onerror('Failed to generate PDF ' + total + ', ' + invoice.amount );
return doc; return doc;
} }
*/
doc.setDrawColor(200,200,200); doc.setDrawColor(200,200,200);
doc.setFillColor(230,230,230); doc.setFillColor(230,230,230);