From: Niclas Zimmermann <niclas@kivitendo-premium.de>
Date: Mon, 3 Jun 2013 11:50:52 +0000 (+0200)
Subject: Merge branch 'master' of github.com:kivitendo/kivitendo-erp
X-Git-Tag: release-3.1.0beta1~387
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/7635f647ec7dcdef51684b21601ee0930ea2bc5b?ds=inline;hp=-c

Merge branch 'master' of github.com:kivitendo/kivitendo-erp
---

7635f647ec7dcdef51684b21601ee0930ea2bc5b
diff --combined locale/de/all
index 5136a93f7,2d3c55dc2..5a5009ca3
--- a/locale/de/all
+++ b/locale/de/all
@@@ -619,7 -619,6 +619,6 @@@ $self->{texts} = 
    'Default Bin'                 => 'Standard-Lagerplatz',
    'Default Customer/Vendor Language' => 'Standard-Kunden-/Lieferantensprache',
    'Default Warehouse'           => 'Standard-Lager',
-   'Default Customer/Vendor Language' => 'Standard-Kunden-/Lieferantensprache',
    'Default buchungsgruppe'      => 'Standardbuchungsgruppe',
    'Default currency'            => 'Standardwährung',
    'Default currency missing!'   => 'Standardwährung fehlt!',
@@@ -1822,8 -1821,6 +1821,8 @@@
    'Show old dunnings'           => 'Alte Mahnungen anzeigen',
    'Show overdue sales quotations and requests for quotations...' => 'Überfällige Angebote und Preisanfragen anzeigen...',
    'Show settings'               => 'Einstellungen anzeigen',
 +  'Show the weights of articles and the total weight in orders, invoices and delivery notes?' => 'Sollen Warengewichte und Gesamtgewicht in Aufträgen, Rechnungen und Lieferscheinen angezeigt werden?',
 +  'Show weights'                => 'Gewichte anzeigen',
    'Show your TODO list after loggin in' => 'Aufgabenliste nach dem Anmelden anzeigen',
    'Signature'                   => 'Unterschrift',
    'Since bin is not enforced in the parts data, please specify a bin where goods without a specified bin will be put.' => 'Da Lagerpl&auml;tze kein Pflichtfeld sind, geben Sie bitte einen Lagerplatz an, in dem Waren ohne spezifizierten Lagerplatz eingelagert werden sollen.',
@@@ -2204,7 -2201,6 +2203,7 @@@
    'Total Fees'                  => 'Kumulierte Gebühren',
    'Total stock value'           => 'Gesamter Bestandswert',
    'Total sum'                   => 'Gesamtsumme',
 +  'Total weight'                => 'Gesamtgewicht',
    'Totals'                      => 'Summen',
    'Trade Discount'              => 'Rabatt',
    'Trans Id'                    => 'Trans-ID',
diff --combined templates/webpages/client_config/form.html
index bcbf845be,737db1af5..0d2d64eeb
--- a/templates/webpages/client_config/form.html
+++ b/templates/webpages/client_config/form.html
@@@ -1,4 -1,4 +1,4 @@@
- [%- USE T8 %][%- USE L %][% USE LxERP %]
+ [%- USE T8 %][%- USE L %][% USE LxERP %][%- USE HTML -%]
  
  [% PROCESS 'common/select_warehouse_bin.html'  WAREHOUSES=SELF.WAREHOUSES warehouse_id=SELF.warehouse_id bin_id=SELF.bin_id %]
  <h1>[% title | html %]</h1>
@@@ -198,18 -198,6 +198,18 @@@
   </tr>
  
  
 + <tr class='listheading'>
 +   <th colspan="3">[% 'Weight' | $T8 %]</th>
 + </tr>
 + <tr>
 +   <td align="right">[% 'Show weights' | $T8 %]</td>
 +   <td>
 +     [% L.yes_no_tag('show_weight', SELF.show_weight) %]
 +   </td>
 +   <td>
 +     [% 'Show the weights of articles and the total weight in orders, invoices and delivery notes?' | $T8 %]<br>
 +   </td>
 + </tr>
  </table>
  
  <br>