Merge branch 'master' into Dev_PHP-Payments

Merged changes from master.

app/lang/de/fields.php

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

app/views/accounts/notifications.blade.php

@@ -30,7 +30,8 @@
 			}(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;
-	  	<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>
 
   </div></div>

public/js/script.js

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