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

Conflicts:
	doc/changelog

diff --git a/SL/IR.pm b/SL/IR.pm
index a64869d455e2942d25bb7f7facb88b1793b9ffc0..7fefd41177872685599400873cdd6cab4fcb39de 100644 (file)
--- a/SL/IR.pm
+++ b/SL/IR.pm
@@ -318,12 +318,12 @@ sub post_invoice {
     my ($invoice_id) = selectfirst_array_query($form, $dbh, qq|SELECT nextval('invoiceid')|);
 
     $query =
-      qq|INSERT INTO invoice (id, trans_id, parts_id, description, qty, base_qty,
+      qq|INSERT INTO invoice (id, trans_id, parts_id, description, longdescription, qty, base_qty,
                               sellprice, fxsellprice, discount, allocated, unit, deliverydate,
                               project_id, serialnumber, price_factor_id, price_factor, marge_price_factor)
-         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, (SELECT factor FROM price_factors WHERE id = ?), ?)|;
+         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, (SELECT factor FROM price_factors WHERE id = ?), ?)|;
     @values = ($invoice_id, conv_i($form->{id}), conv_i($form->{"id_$i"}),
-               $form->{"description_$i"}, $form->{"qty_$i"} * -1,
+               $form->{"description_$i"}, $form->{"longdescription_$i"}, $form->{"qty_$i"} * -1,
                $baseqty * -1, $form->{"sellprice_$i"}, $fxsellprice, $form->{"discount_$i"}, $allocated,
                $form->{"unit_$i"}, conv_date($form->{deliverydate}),
                conv_i($form->{"project_id_$i"}), $form->{"serialnumber_$i"},
@@ -799,7 +799,7 @@ sub retrieve_invoice {
         c3.accno AS expense_accno,   c3.new_chart_id AS expense_new_chart,   date($transdate) - c3.valid_from AS expense_valid,
 
         i.id AS invoice_id,
-        i.description, i.qty, i.fxsellprice AS sellprice, i.parts_id AS id, i.unit, i.deliverydate, i.project_id, i.serialnumber,
+        i.description, i.longdescription, i.qty, i.fxsellprice AS sellprice, i.parts_id AS id, i.unit, i.deliverydate, i.project_id, i.serialnumber,
         i.price_factor_id, i.price_factor, i.marge_price_factor, i.discount,
         p.partnumber, p.inventory_accno_id AS part_inventory_accno_id, p.bin, pr.projectnumber, pg.partsgroup
 

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index b90209f948f79bd4edf3281eae992348b7b9fab4..6446cc787f75eb4be0c07bb1f60fa2acd5821c2c 100644 (file)
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -898,6 +898,16 @@ sub credit_note {
 
   $form->{creditremaining} -= ($form->{oldinvtotal} - $form->{ordtotal});
 
+  # bei Gutschriften werden Zahlungseingänge aus Rechnung nicht übernommen
+  for my $i (1 .. $form->{paidaccounts}) {
+    delete $form->{"paid_$i"};
+    delete $form->{"source_$i"};
+    delete $form->{"memo_$i"};
+    delete $form->{"datepaid_$i"};
+    delete $form->{"AR_paid_$i"};
+  };
+  $form->{paidaccounts} = 1;
+
   &prepare_invoice;
 
 

diff --git a/doc/changelog b/doc/changelog
index bf2a4667ddc663717b96534ae0d9b0da4a4eaf16..00a0b9822ac1f81e97083cae0ed6396ef6ad8b8b 100644 (file)
--- a/doc/changelog
+++ b/doc/changelog
@@ -159,8 +159,9 @@
   Liste gefixter Bugs aus dem Bugtracker:
 
   922 940 1024 1025 1028 1030 1031 1034 1035 1037 1040 1043 1044 1046 1051 1055
-  1057 1058 1073 1077 1081 1082 1098 1100 1101 1108 1110 1118 1125 1127 1130
-  1133 1135 1136 1138 1146 1147 1150 1151 1155 1164 1186 1190 1191 1199 1201
+  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 1177 1186 1190
+  1191 1199 1201
 
 
 2009-06-02 - Version 2.6.0

diff --git a/doc/dokumentenvorlagen-und-variablen.html b/doc/dokumentenvorlagen-und-variablen.html
index b2b90cdcbcacbcdb42192d2bed49ea83a4f2c993..5120d5b4b411e631adf5fcb77761ec2a8294a043 100644 (file)
--- a/doc/dokumentenvorlagen-und-variablen.html
+++ b/doc/dokumentenvorlagen-und-variablen.html
@@ -1179,6 +1179,10 @@ td {
  <p>
   <table border="1">
    <tr><th>Variablenname</th><th>Bedeutung</th></tr>
+   <tr>
+    <td><code>cusordnumber</code></td>
+    <td>Bestellnummer des Kunden (im Verkauf) bzw. Bestellnummer des Lieferanten (im Einkauf)</td>
+   </tr>
    <tr>
     <td><code>donumber</code></td>
     <td>Lieferscheinnummer</td>

diff --git a/locale/de/all b/locale/de/all
index a3ad75493fb576d2afab4a8929c93f6e270971dd..d169fe5cb5e87e0dae29ef0408481c3f92fd95f1 100644 (file)
--- a/locale/de/all
+++ b/locale/de/all
@@ -1771,6 +1771,7 @@ $self->{texts} = {
   'Vendor Invoice'              => 'Einkaufsrechnung',
   'Vendor Invoices'             => 'Einkaufsrechnungen',
   'Vendor Number'               => 'Lieferantennummer',
+  'Vendor Ordner Number'        => 'Bestellnummer beim Lieferanten',
   'Vendor deleted!'             => 'Lieferant gelöscht!',
   'Vendor details'              => 'Lieferantendetails',
   'Vendor missing!'             => 'Lieferant fehlt!',

diff --git a/templates/webpages/do/form_header_de.html b/templates/webpages/do/form_header_de.html
index a29e0e969420eea70980c5ffc53d101c39bb8fa1..372227855b69602a016c0a23c32bc03aeedbee4b 100644 (file)
--- a/templates/webpages/do/form_header_de.html
+++ b/templates/webpages/do/form_header_de.html
@@ -318,7 +318,7 @@
        </tr>
 
        <tr>
-        <th width="70%" align="right" nowrap>Bestellnummer des Kunden</th>
+        <th width="70%" align="right" nowrap>[% IF is_customer %]Bestellnummer des Kunden[% ELSE %]Bestellnummer beim Lieferanten[% END %]</th>
         <td><input name="cusordnumber" size="11" value="[% HTML.escape(cusordnumber) %]"[% RO %]></td>
        </tr>
 

diff --git a/templates/webpages/do/form_header_master.html b/templates/webpages/do/form_header_master.html
index ce7f57a303d187008bcb890a3f591c57c0a5e5d8..3e7c02dd52fdd4fce703aca3609ae7f121409f87 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><translate>Customer Order Number</translate></th>
+        <th width="70%" align="right" nowrap>[% IF is_customer %]<translate>Customer Order Number</translate>[% ELSE %]<translate>Vendor Ordner Number</translate>[% END %]</th>
         <td><input name="cusordnumber" size="11" value="[% HTML.escape(cusordnumber) %]"[% RO %]></td>
        </tr>