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

Conflicts:
	doc/changelog

diff --git a/SL/AM.pm b/SL/AM.pm
index 11b32ca..1dbf9d8 100644 (file)
--- a/SL/AM.pm
+++ b/SL/AM.pm
@@ -647,7 +647,7 @@ sub business {
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 
-  my $query = qq|SELECT id, description, discount, customernumberinit
+  my $query = qq|SELECT id, description, discount, customernumberinit, salesman
                  FROM business
                  ORDER BY 2|;
 
@@ -673,7 +673,7 @@ sub get_business {
   my $dbh = $form->dbconnect($myconfig);
 
   my $query =
-    qq|SELECT b.description, b.discount, b.customernumberinit
+    qq|SELECT b.description, b.discount, b.customernumberinit, b.salesman
        FROM business b
        WHERE b.id = ?|;
   my $sth = $dbh->prepare($query);
@@ -699,20 +699,20 @@ sub save_business {
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 
-  my @values = ($form->{description}, $form->{discount},
-                $form->{customernumberinit});
+  my @values = ($form->{description}, $form->{discount}, $form->{customernumberinit}, $form->{salesman} ? 't' : 'f');
   # id is the old record
   if ($form->{id}) {
     $query = qq|UPDATE business SET
                 description = ?,
                 discount = ?,
-                customernumberinit = ?
+                customernumberinit = ?,
+                salesman = ?
                 WHERE id = ?|;
     push(@values, $form->{id});
   } else {
     $query = qq|INSERT INTO business
-                (description, discount, customernumberinit)
-                VALUES (?, ?, ?)|;
+                (description, discount, customernumberinit, salesman)
+                VALUES (?, ?, ?, ?)|;
   }
   do_query($form, $dbh, $query, @values);
 

diff --git a/SL/IS.pm b/SL/IS.pm
index a176b4d..6bf6aaf 100644 (file)
--- a/SL/IS.pm
+++ b/SL/IS.pm
@@ -1017,13 +1017,6 @@ sub post_invoice {
                 conv_i($form->{"id"}));
   do_query($form, $dbh, $query, @values);
 
-  if($form->{"formname"} eq "credit_note") {
-    for my $i (1 .. $form->{rowcount}) {
-      $query = qq|UPDATE parts SET onhand = onhand - ? WHERE id = ?|;
-      @values = (conv_i($form->{"qty_$i"}), conv_i($form->{"id_$i"}));
-      do_query($form, $dbh, $query, @values);
-    }
-  }
 
   if ($form->{storno}) {
     $query =

diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index 3cb5ac3..fe9199e 100644 (file)
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -1107,6 +1107,7 @@ sub list_business {
   $form->{title} = $locale->text('Type of Business');
 
   my @column_index = qw(description discount customernumberinit);
+  push @column_index, 'salesman' if $::vertreter;
   my %column_header;
   $column_header{description} =
       qq|<th class=listheading width=60%>|
@@ -1120,6 +1121,10 @@ sub list_business {
       qq|<th class=listheading>|
     . $locale->text('Customernumberinit')
     . qq|</th>|;
+  $column_header{salesman} =
+      qq|<th class=listheading>|
+    . $locale->text('Representative')
+    . qq|</th>|;
 
   $form->header;
 
@@ -1159,6 +1164,7 @@ sub list_business {
     $column_data{discount}           = qq|<td align=right>$discount</td>|;
     $column_data{customernumberinit} =
       qq|<td align=right>$ref->{customernumberinit}</td>|;
+    $column_data{salesman} = '<td>' . ($ref->{salesman} ? $::locale->text('Yes') : $::locale->text('No')) . '</td>';
 
     map { print "$column_data{$_}\n" } @column_index;
 
@@ -1213,6 +1219,18 @@ sub business_header {
   $form->{discount} =
     $form->format_amount(\%myconfig, $form->{discount} * 100);
 
+  my $salesman_code;
+  if ($::vertreter) {
+    $salesman_code = qq|
+  <tr>
+    <th align="right">| . $locale->text('Representative') . qq|</th>
+    <td>| . $::cgi->checkbox(-name => "salesman", -value => 1, -label => '', 'checked' => $form->{salesman} ? 1 : 0) . qq|</td>
+  </tr>
+|;
+  } else {
+    $salesman_code = $::cgi->hidden(-name => 'salesman', -value => $form->{salesman} ? 1 : 0);
+  }
+
   $form->header;
 
   print qq|
@@ -1240,6 +1258,7 @@ sub business_header {
     <th align=right>| . $locale->text('Customernumberinit') . qq|</th>
     <td><input name=customernumberinit size=10 value=$form->{customernumberinit}></td>
   </tr>
+$salesman_code
   <td colspan=2><hr size=3 noshade></td>
   </tr>
 </table>

diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl
index 0130a46..c2d3b90 100644 (file)
--- a/bin/mozilla/ct.pl
+++ b/bin/mozilla/ct.pl
@@ -156,7 +156,7 @@ sub list_names {
   my %column_defs = (
     'id'                => { 'text' => $locale->text('ID'), },
     "$form->{db}number" => { 'text' => $locale->text('Number'), },
-    'name'              => { 'text' => $locale->text('Name'), },
+    'name'              => { 'text' => $form->{IS_CUSTOMER} ? $::locale->text('Customer Name') : $::locale->text('Vendor Name'), },
     'contact'           => { 'text' => $locale->text('Contact'), },
     'phone'             => { 'text' => $locale->text('Phone'), },
     'fax'               => { 'text' => $locale->text('Fax'), },

diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl
index 1c546e4..fa3be49 100644 (file)
--- a/bin/mozilla/do.pl
+++ b/bin/mozilla/do.pl
@@ -359,7 +359,7 @@ sub update_delivery_order {
     my $rows = scalar @{ $form->{item_list} };
 
     if ($rows) {
-      $form->{"qty_$i"} = 1 unless ($form->{"qty_$i"});
+      $form->{"qty_$i"} = 1 unless $form->parse_amount(\%myconfig, $form->{"qty_$i"});
 
       if ($rows > 1) {
 

diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl
index 09ef524..042fd4b 100644 (file)
--- a/bin/mozilla/ir.pl
+++ b/bin/mozilla/ir.pl
@@ -463,7 +463,7 @@ sub update {
     my $rows = scalar @{ $form->{item_list} };
 
     if ($rows) {
-      $form->{"qty_$i"} = 1 unless ($form->{"qty_$i"});
+      $form->{"qty_$i"} = 1 unless $form->parse_amount(\%myconfig, $form->{"qty_$i"});
 
       if ($rows > 1) {
 

diff --git a/doc/changelog b/doc/changelog
index 51010e5..a7abfe4 100644 (file)
--- a/doc/changelog
+++ b/doc/changelog
@@ -153,6 +153,7 @@
     formatiert.
   - Bei Einkaufsrechnungen gab es Probleme mit der Rabattberechnung.
   - Lieferanten in Einkaufsrechnungen wurden nicht richtig formatiert.
+  - Gutschriften lösten Lagerbewegung in Warenübersicht (Auswahlmaske für bspw. Rechnungen) aus
 
 
 
@@ -162,7 +163,7 @@
   1044 1046 1051 1055 1057 1058 1072 1073 1077 1079 1081 1082 1095 1098
   1100 1101 1108 1110 1118 1125 1127 1130 1133 1135 1136 1138 1144
   1146 1147 1150 1151 1155 1164 1173 1177 1186 1188 1190 1191 1195
-  1197 1199 1200 1201 1209
+  1197 1198 1199 1200 1201 1209 1250 1289
 
 
 2009-06-02 - Version 2.6.0

diff --git a/locale/de/all b/locale/de/all
index 6e59564..78cd726 100644 (file)
--- a/locale/de/all
+++ b/locale/de/all
@@ -442,6 +442,7 @@ $self->{texts} = {
   'Custom Variables'            => 'Benutzerdefinierte Variablen',
   'Custom variables for module' => 'Benutzerdefinierte Variablen für Modul',
   'Customer'                    => 'Kunde',
+  'Customer Name'               => 'Kundenname',
   'Customer Number'             => 'Kundennummer',
   'Customer Order Number'       => 'Bestellnummer des Kunden',
   'Customer deleted!'           => 'Kunde gelöscht!',
@@ -1774,6 +1775,7 @@ $self->{texts} = {
   'Vendor'                      => 'Lieferant',
   'Vendor Invoice'              => 'Einkaufsrechnung',
   'Vendor Invoices'             => 'Einkaufsrechnungen',
+  'Vendor Name'                 => 'Lieferantenname',
   'Vendor Number'               => 'Lieferantennummer',
   'Vendor Order Number'         => 'Bestellnummer beim Lieferanten',
   'Vendor deleted!'             => 'Lieferant gelöscht!',

diff --git a/locale/de/am b/locale/de/am
index 179517e..b395a0c 100644 (file)
--- a/locale/de/am
+++ b/locale/de/am
@@ -250,6 +250,7 @@ $self->{texts} = {
   'Ranges of numbers and default accounts' => 'Nummernkreise und Standardkonten',
   'Receipt, payment, reconciliation' => 'Zahlungseingang, Zahlungsausgang, Kontenabgleich',
   'Reports'                     => 'Berichte',
+  'Representative'              => 'Vertreter',
   'Revenue'                     => 'Erlöskonto',
   'Revenues EU with UStId'      => 'Erlöse EU m. UStId',
   'Revenues EU without UStId'   => 'Erlöse EU o. UStId',

diff --git a/locale/de/ct b/locale/de/ct
index 5e99767..31ba2cf 100644 (file)
--- a/locale/de/ct
+++ b/locale/de/ct
@@ -60,6 +60,7 @@ $self->{texts} = {
   'Create and edit vendor invoices' => 'Eingangsrechnungen erfassen und bearbeiten',
   'Credit Note'                 => 'Gutschrift',
   'Customer'                    => 'Kunde',
+  'Customer Name'               => 'Kundenname',
   'Customer Number'             => 'Kundennummer',
   'Customer deleted!'           => 'Kunde gelöscht!',
   'Customer details'            => 'Kundendetails',
@@ -171,6 +172,7 @@ $self->{texts} = {
   'Variable'                    => 'Variable',
   'Vendor'                      => 'Lieferant',
   'Vendor Invoice'              => 'Einkaufsrechnung',
+  'Vendor Name'                 => 'Lieferantenname',
   'Vendor deleted!'             => 'Lieferant gelöscht!',
   'Vendor details'              => 'Lieferantendetails',
   'Vendor saved!'               => 'Lieferant gespeichert!',

diff --git a/sql/Pg-upgrade2/warehouse3.sql b/sql/Pg-upgrade2/warehouse3.sql
new file mode 100644 (file)
index 0000000..73c88c5
--- /dev/null
+++ b/sql/Pg-upgrade2/warehouse3.sql
@@ -0,0 +1,5 @@
+-- @tag: warehouse3
+-- @description: Defaultwert für onhand nochmal erneut setzen nach Bugfix für 1289 Gutschriften auf Rechnungen lösen Lagerbewegung aus
+-- @depends: warehouse2 release_2_6_0
+-- @charset: UTF-8
+UPDATE parts SET onhand = COALESCE((SELECT SUM(qty) FROM inventory WHERE inventory.parts_id = parts.id), 0);

diff --git a/templates/webpages/ct/form_header_de.html b/templates/webpages/ct/form_header_de.html
index 7ba3332..4113f0d 100644 (file)
--- a/templates/webpages/ct/form_header_de.html
+++ b/templates/webpages/ct/form_header_de.html
@@ -73,7 +73,7 @@
      </tr>
 
      <tr>
-      <th align="right" nowrap>Firmenname</th>
+      <th align="right" nowrap>[% IF is_customer %]Kundenname[%- ELSE %]Lieferantenname[%- END %]</th>
       <td><input name="name" size="35" maxlength="75" value="[% HTML.escape(name) %]"></td>
      </tr>
 

diff --git a/templates/webpages/ct/form_header_master.html b/templates/webpages/ct/form_header_master.html
index ffe9c69..33ecfef 100644 (file)
--- a/templates/webpages/ct/form_header_master.html
+++ b/templates/webpages/ct/form_header_master.html
@@ -73,7 +73,7 @@
      </tr>
 
      <tr>
-      <th align="right" nowrap><translate>Company Name</translate></th>
+      <th align="right" nowrap>[% IF is_customer %]<translate>Customer Name</translate>[%- ELSE %]<translate>Vendor Name</translate>[%- END %]</th>
       <td><input name="name" size="35" maxlength="75" value="[% HTML.escape(name) %]"></td>
      </tr>
 

diff --git a/templates/webpages/ct/search_de.html b/templates/webpages/ct/search_de.html
index ea5222e..0773478 100644 (file)
--- a/templates/webpages/ct/search_de.html
+++ b/templates/webpages/ct/search_de.html
@@ -13,7 +13,7 @@
    </tr>
 
    <tr>
-    <th align="right" nowrap>Firmenname</th>
+    <th align="right" nowrap>[% IF IS_CUSTOMER %]Kundenname[%- ELSE %]Lieferantenname[%- END %]</th>
     <td><input name="name" size="35"></td>
    </tr>
 
@@ -86,7 +86,7 @@
        </td>
        <td>
         <input name="l_name" id="l_name" type="checkbox" class="checkbox" value="Y" checked>
-        <label for="l_name">Firmenname</label>
+        <label for="l_name">[% IF IS_CUSTOMER %]Kundenname[%- ELSE %]Lieferantenname[%- END %]</label>
        </td>
        <td>
         <input name="l_street" id="l_street" type="checkbox" class="checkbox" value="Y" checked>

diff --git a/templates/webpages/ct/search_master.html b/templates/webpages/ct/search_master.html
index 6d0e6da..b54a864 100644 (file)
--- a/templates/webpages/ct/search_master.html
+++ b/templates/webpages/ct/search_master.html
@@ -13,7 +13,7 @@
    </tr>
 
    <tr>
-    <th align="right" nowrap><translate>Company Name</translate></th>
+    <th align="right" nowrap>[% IF IS_CUSTOMER %]<translate>Customer Name</translate>[%- ELSE %]<translate>Vendor Name</translate>[%- END %]</th>
     <td><input name="name" size="35"></td>
    </tr>
 
@@ -86,7 +86,7 @@
        </td>
        <td>
         <input name="l_name" id="l_name" type="checkbox" class="checkbox" value="Y" checked>
-        <label for="l_name"><translate>Company Name</translate></label>
+        <label for="l_name">[% IF IS_CUSTOMER %]<translate>Customer Name</translate>[%- ELSE %]<translate>Vendor Name</translate>[%- END %]</label>
        </td>
        <td>
         <input name="l_street" id="l_street" type="checkbox" class="checkbox" value="Y" checked>