Merge branch 'master' of ssh://lx-office/~/lx-office-erp

Conflicts:
	doc/changelog

diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl
index 8ba48d6..cf7bc42 100644 (file)
--- a/bin/mozilla/do.pl
+++ b/bin/mozilla/do.pl
@@ -466,7 +466,7 @@ sub orders {
 
   my @hidden_variables = map { "l_${_}" } @columns;
   push @hidden_variables, $form->{vc}, qw(l_closed l_notdelivered open closed delivered notdelivered donumber ordnumber
-                                          transaction_description transdatefrom transdateto type vc employee_id salesman_id);
+                                          transaction_description transdatefrom transdateto type vc employee_id salesman_id project_id);
 
   my $href = build_std_url('action=orders', grep { $form->{$_} } @hidden_variables);
 

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index fd019ee..cd7c1ee 100644 (file)
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -1777,14 +1777,17 @@ sub poso {
 
   map { $form->{$_} = $saved_vars{$_} } keys %saved_vars;
 
-  &prepare_order;
-
   # prepare_order assumes that the discount is in db-notation (0.05) and not user-notation (5)
-  # and therefore multiplies the values by 100 in the case of reading from db or making an order from several quotation, so we convert this back into percent-notation for the user interface by multiplying with 0.01
+  # and therefore multiplies the values by 100 in the case of reading from db or making an order
+  # from several quotation, so we convert this back into percent-notation for the user interface by multiplying with 0.01
+  # ergänzung 03.10.2010 muss vor prepare_order passieren (s.a. Svens Kommentar zu Bug 1017)
+  # das parse_amount wird oben schon ausgeführt, deswegen an dieser stelle raus (wichtig: kommawerte bei discount testen)
   for my $i (1 .. $form->{rowcount}) {
-    $form->{"discount_$i"}  = $form->format_amount(\%myconfig, $form->{"discount_$i"} * 0.01);
+    $form->{"discount_$i"} /=100;
   };
 
+  &prepare_order;
+
   # format amounts
   for my $i (1 .. $form->{rowcount} - 1) {
     map { $form->{"${_}_$i"} =~ s/\"/"/g } qw(partnumber description unit);

diff --git a/doc/changelog b/doc/changelog
index 98ec43a..b86f40e 100644 (file)
--- a/doc/changelog
+++ b/doc/changelog
@@ -161,7 +161,7 @@
   922 940 1024 1025 1028 1030 1031 1034 1035 1037 1040 1043 1044 1046 1051 1055
   1057 1058 1072 1073 1077 1081 1082 1095 1098 1100 1101 1108 1110 1118 1125
   1127 1130 1133 1135 1136 1138 1146 1147 1150 1151 1155 1164 1173 1177 1186
-  1190 1191 1199 1201
+  1188 1190 1191 1195 1199 1201
 
 
 2009-06-02 - Version 2.6.0

diff --git a/locale/de/all b/locale/de/all
index d169fe5..12b937f 100644 (file)
--- a/locale/de/all
+++ b/locale/de/all
@@ -972,7 +972,7 @@ $self->{texts} = {
   'Margins'                     => 'Seitenränder',
   'Mark as closed'              => 'Abschließen',
   'Mark as paid?'               => 'Als bezahlt markieren?',
-  'Mark closed'                 => 'Schließen',
+  'Mark closed'                 => 'Als geschlossen markieren',
   'Marked as paid'              => 'Als bezahlt markiert',
   'Marked entries printed!'     => 'Markierte Einträge wurden gedruckt!',
   'Master Data'                 => 'Stammdaten',
@@ -1771,7 +1771,7 @@ $self->{texts} = {
   'Vendor Invoice'              => 'Einkaufsrechnung',
   'Vendor Invoices'             => 'Einkaufsrechnungen',
   'Vendor Number'               => 'Lieferantennummer',
-  'Vendor Ordner Number'        => 'Bestellnummer beim Lieferanten',
+  'Vendor Order Number'         => 'Bestellnummer beim Lieferanten',
   'Vendor deleted!'             => 'Lieferant gelöscht!',
   'Vendor details'              => 'Lieferantendetails',
   'Vendor missing!'             => 'Lieferant fehlt!',

diff --git a/locale/de/do b/locale/de/do
index 0b21248..528697c 100644 (file)
--- a/locale/de/do
+++ b/locale/de/do
@@ -430,7 +430,7 @@ $self->{subs} = {
   'als_csv_exportieren'         => 'export_as_csv',
   'als_pdf_exportieren'         => 'export_as_pdf',
   'rechnung'                    => 'invoice',
-  'schließen'                   => 'mark_closed',
+  'als_geschlossen_markieren'   => 'mark_closed',
   'neue_ware'                   => 'new_part',
   'nein'                        => 'no',
   'drucken'                     => 'print',

diff --git a/locale/de/login b/locale/de/login
index 739e355..782d0a8 100644 (file)
--- a/locale/de/login
+++ b/locale/de/login
@@ -550,7 +550,7 @@ $self->{subs} = {
   'abschließen'           => 'finish',
   'rechnung'                    => 'invoice',
   'anmeldung'                   => 'login',
-  'schließen'                   => 'mark_closed',
+  'als_geschlossen_markieren'   => 'mark_closed',
   'neue_ware'                   => 'new_part',
   'nein'                        => 'no',
   'drucken'                     => 'print',

diff --git a/locale/de/oe b/locale/de/oe
index 084476f..003ffe0 100644 (file)
--- a/locale/de/oe
+++ b/locale/de/oe
@@ -500,7 +500,7 @@ $self->{subs} = {
   'als_csv_exportieren'         => 'export_as_csv',
   'als_pdf_exportieren'         => 'export_as_pdf',
   'rechnung'                    => 'invoice',
-  'schließen'                   => 'mark_closed',
+  'als_geschlossen_markieren'   => 'mark_closed',
   'neue_ware'                   => 'new_part',
   'nein'                        => 'no',
   'drucken'                     => 'print',

diff --git a/locale/de/todo b/locale/de/todo
index b86fb0f..dc1299e 100644 (file)
--- a/locale/de/todo
+++ b/locale/de/todo
@@ -537,7 +537,7 @@ $self->{subs} = {
   'als_pdf_exportieren'         => 'export_as_pdf',
   'abschließen'           => 'finish',
   'rechnung'                    => 'invoice',
-  'schließen'                   => 'mark_closed',
+  'als_geschlossen_markieren'   => 'mark_closed',
   'neue_ware'                   => 'new_part',
   'nein'                        => 'no',
   'drucken'                     => 'print',

diff --git a/lxo-import/addressB.php b/lxo-import/addressB.php
old mode 100644 (file)
new mode 100755 (executable)
index 2341fdd..5fec8b1
--- a/lxo-import/addressB.php
+++ b/lxo-import/addressB.php
@@ -109,7 +109,16 @@ if ($ok) while (!feof($f)){
             continue;
         };
         $data=trim($data);
-        $data=mb_convert_encoding($data,"ISO-8859-15","auto");
+        // seit 2.6 ist die DB-Kodierung UTF-8 @holger Ansonsten einmal vorher die DB-Encoding auslesen
+        // Falls die Daten ISO-kodiert kommen entsprechend wandeln
+        // UTF-8 MUSS als erstes stehen, da ansonsten die Prüfung bei ISO-8859-1 aufhört ...
+        // TODO Umlaute am Anfang wurden bei meinem Test nicht übernommen (Österreich). S.a.:
+        // http://forum.de.selfhtml.org/archiv/2007/1/t143904/
+
+        $encoding = mb_detect_encoding($data,"UTF-8,ISO-8859-1,ISO-8859-15");
+        if ($encoding != "UTF-8"){
+          $data=mb_convert_encoding($data, "UTF-8","$encoding");
+        }
         //$data=htmlentities($data);
         $data=addslashes($data);
         if ($in_fld[$i]==$file."number") {  // customernumber || vendornumber

diff --git a/templates/webpages/do/form_footer_de.html b/templates/webpages/do/form_footer_de.html
index b9f8ddf..693d032 100644 (file)
--- a/templates/webpages/do/form_footer_de.html
+++ b/templates/webpages/do/form_footer_de.html
@@ -74,7 +74,7 @@
    [%- END %]
    [%- IF id %]
    [%- UNLESS closed %]
-   <input class="submit" type="submit" name="action_mark_closed" value="Schließen">
+   <input class="submit" type="submit" name="action_mark_closed" value="Als geschlossen markieren">
    [%- END %]
    <input type="button" class="submit" onclick="set_history_window([% id %]);" name="history" id="history" value="Historie">
    [%- END %]

diff --git a/templates/webpages/do/form_header_master.html b/templates/webpages/do/form_header_master.html
index 3e7c02d..44dd902 100644 (file)
--- a/templates/webpages/do/form_header_master.html
+++ b/templates/webpages/do/form_header_master.html
@@ -318,7 +318,7 @@
        </tr>
 
        <tr>
-        <th width="70%" align="right" nowrap>[% IF is_customer %]<translate>Customer Order Number</translate>[% ELSE %]<translate>Vendor Ordner Number</translate>[% END %]</th>
+        <th width="70%" align="right" nowrap>[% IF is_customer %]<translate>Customer Order Number</translate>[% ELSE %]<translate>Vendor Order Number</translate>[% END %]</th>
         <td><input name="cusordnumber" size="11" value="[% HTML.escape(cusordnumber) %]"[% RO %]></td>
        </tr>