From: Sven Schöling <s.schoeling@linet-services.de>
Date: Wed, 7 Nov 2012 16:48:27 +0000 (+0100)
Subject: Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
X-Git-Tag: release-3.0.0beta1~19^2~2
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/5d376151ff31e1d55fd985c64db97d609daf273b?hp=09306b9f2258b2414d89cc19567c2d7d0af29bfb

Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
---

diff --git a/SL/Template/OpenDocument.pm b/SL/Template/OpenDocument.pm
index 12a7bc8c5..b4ea1f2a5 100644
--- a/SL/Template/OpenDocument.pm
+++ b/SL/Template/OpenDocument.pm
@@ -270,14 +270,14 @@ sub parse {
 
   $zip->contents("content.xml", Encode::encode('utf-8-strict', $new_contents));
 
-  my $styles = $zip->contents("styles.xml");
+  my $styles = Encode::decode('utf-8-strict', $zip->contents("styles.xml"));
   if ($contents) {
     my $new_styles = $self->parse_block($styles);
     if (!defined($new_contents)) {
       $main::lxdebug->leave_sub();
       return 0;
     }
-    $zip->contents("styles.xml", $new_styles);
+    $zip->contents("styles.xml", Encode::encode('utf-8-strict', $new_styles));
   }
 
   $zip->writeToFileNamed($form->{"tmpfile"}, 1);
diff --git a/bin/mozilla/wh.pl b/bin/mozilla/wh.pl
index 0315bb9dc..92cfcb69b 100644
--- a/bin/mozilla/wh.pl
+++ b/bin/mozilla/wh.pl
@@ -44,6 +44,8 @@ use SL::WH;
 use SL::OE;
 use SL::ReportGenerator;
 
+use SL::DB::Part;
+
 use Data::Dumper;
 
 require "bin/mozilla/common.pl";
@@ -85,8 +87,16 @@ sub transfer_warehouse_selection {
   show_no_warehouses_error() if (!scalar @{ $form->{WAREHOUSES} });
 
   my $units      = AM->retrieve_units(\%myconfig, $form);
+
+  my $part = 0;
+  if ( $form->{parts_id} ) {
+    $part = SL::DB::Part->new();
+    $part->id($form->{parts_id});
+    $part->load();
+  }
+
   # der zweite Parameter von unit_select_data gibt den default-Namen (selected) vor
-  $form->{UNITS} = AM->unit_select_data($units, $form->{unit}, 0, $form->{unit});
+  $form->{UNITS} = AM->unit_select_data($units, $form->{unit}, 0, $part ? $part->unit : 0);
 
   if (scalar @{ $form->{WAREHOUSES} }) {
     $form->{warehouse_id} ||= $form->{WAREHOUSES}->[0]->{id};
diff --git a/locale/de/all b/locale/de/all
index e567fdbd6..604ae2eb8 100644
--- a/locale/de/all
+++ b/locale/de/all
@@ -87,7 +87,6 @@ $self->{texts} = {
   'Account Link IC_taxpart'     => 'Warenliste Steuer',
   'Account Link IC_taxservice'  => 'Dienstleistungen Steuer',
   'Account Number'              => 'Kontonummer',
-  'Account Number already used!' => 'Kontonummer ist bereits in Benutzung!',
   'Account Number missing!'     => 'Kontonummer fehlt!',
   'Account Nummer'              => 'Kontonummer',
   'Account Type'                => 'Kontoart',
@@ -1041,6 +1040,7 @@ $self->{texts} = {
   'Invoice total less discount' => 'Rechnungssumme abzüglich Skonto',
   'Invoice with Storno (abbreviation)' => 'R(S)',
   'Invoices'                    => 'Rechnungen',
+  'Invoices, Credit Notes & AR Transactions' => 'Rechnungen, Gutschriften & Debitorenbuchungen',
   'Is Searchable'               => 'Durchsuchbar',
   'Is this a summary account to record' => 'Sammelkonto für',
   'It is possible that even after such a correction there is something wrong with this transaction (e.g. taxes that don\'t match the selected taxkey). Therefore you should re-run the general ledger analysis.' => 'Auch nach einer Korrektur kann es mit dieser Buchung noch weitere Probleme geben (z.B. nicht zum Steuerschlüssel passende Steuern), weshalb ein erneutes Ausführen der Hauptbuchanalyse empfohlen wird.',
@@ -2176,7 +2176,7 @@ $self->{texts} = {
   'Vendor'                      => 'Lieferant',
   'Vendor (name)'               => 'Lieferant (Name)',
   'Vendor Invoice'              => 'Einkaufsrechnung',
-  'Vendor Invoices'             => 'Einkaufsrechnungen',
+  'Vendor Invoices & AP Transactions' => 'Einkaufsrechnungen & Kreditorenbuchungen',
   'Vendor Name'                 => 'Lieferantenname',
   'Vendor Number'               => 'Lieferantennummer',
   'Vendor Order Number'         => 'Bestellnummer beim Lieferanten',
diff --git a/menu.ini b/menu.ini
index cb0700309..fa99ded7a 100644
--- a/menu.ini
+++ b/menu.ini
@@ -149,7 +149,7 @@ module=do.pl
 action=search
 type=sales_delivery_order
 
-[AR--Reports--Invoices]
+[AR--Reports--Invoices, Credit Notes & AR Transactions]
 ACCESS=invoice_edit
 module=ar.pl
 action=search
@@ -222,7 +222,7 @@ module=do.pl
 action=search
 type=purchase_delivery_order
 
-[AP--Reports--Vendor Invoices]
+[AP--Reports--Vendor Invoices & AP Transactions]
 ACCESS=vendor_invoice_edit
 module=ap.pl
 action=search
diff --git a/templates/webpages/menu/menunew.html b/templates/webpages/menu/menunew.html
index 7285d867f..4c51b6637 100644
--- a/templates/webpages/menu/menunew.html
+++ b/templates/webpages/menu/menunew.html
@@ -42,7 +42,7 @@ $(clockon);
     [%- HTML.escape(mainitem.title) %]
    </a>
    [%- IF mainitem.subitems %]
-    <ul[%- IF force_ul_width %] width="[% mainitem.max_width * 12 %]"[% END %]>
+    <ul[%- IF force_ul_width %] width="[% mainitem.max_width * 10 %]"[% END %]>
      [%- SET sub1_id = main_id * 100 %]
      [%- FOREACH sub1item = mainitem.subitems %]
       [%- SET sub1_id = sub1_id + 1 %]
@@ -51,7 +51,7 @@ $(clockon);
         [%- HTML.escape(sub1item.title) %]
        </a>
        [%- IF sub1item.subitems %]
-        <ul[%- IF force_ul_width %] width="[% sub1item.max_width * 12 %]"[% END %]>
+        <ul[%- IF force_ul_width %] width="[% sub1item.max_width * 10 %]"[% END %]>
          [%- SET sub2_id = sub1_id * 100 %]
          [%- FOREACH sub2item = sub1item.subitems %]
           [%- SET sub2_id = sub2_id + 1 %]