X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FIS.pm;h=67a1fe5e21b02aa9674ad69c8aef54f99e5f6cc0;hb=da1893cd430d3833fb9ba28517f3bea8ceb103d9;hp=66564344cb02fb4b5232519b3287ad4cc5a27fbd;hpb=604959deb2d2d058a4c421468027e0d55066cffd;p=kivitendo-erp.git

diff --git a/SL/IS.pm b/SL/IS.pm
index 66564344c..67a1fe5e2 100644
--- a/SL/IS.pm
+++ b/SL/IS.pm
@@ -1550,7 +1550,7 @@ sub retrieve_invoice {
 		i.project_id, pr.projectnumber, i.serialnumber,
 		p.partnumber, p.assembly, p.bin, p.notes AS partnotes, p.inventory_accno_id AS part_inventory_accno_id, i.id AS invoice_pos,
 		pg.partsgroup, i.pricegroup_id, (SELECT pricegroup FROM pricegroup WHERE id=i.pricegroup_id) as pricegroup,
-		i.ordnumber, i.transdate, i.cusordnumber, p.alu, p.formel, i.subtotal
+		i.ordnumber, i.transdate, i.cusordnumber, p.formel, i.subtotal
 		FROM invoice i
 	        JOIN parts p ON (i.parts_id = p.id)
 	        LEFT JOIN project pr ON (i.project_id = pr.id)
@@ -1806,7 +1806,7 @@ sub get_customer {
   $sth->finish;
 
   # get shipping addresses
-  $query = qq|SELECT s.id,s.shiptoname
+  $query = qq|SELECT s.shipto_id,s.shiptoname,s.shiptodepartment_1
               FROM shipto s
 	      WHERE s.trans_id = $form->{customer_id}|;
   $sth = $dbh->prepare($query);
@@ -1902,13 +1902,12 @@ sub retrieve_item {
 			c2.accno AS income_accno, c2.new_chart_id AS income_new_chart, date($transdate)  - c2.valid_from as income_valid,
 			c3.accno AS expense_accno, c3.new_chart_id AS expense_new_chart, date($transdate) - c3.valid_from as expense_valid,
 		 p.unit, p.assembly, p.bin, p.onhand, p.notes AS partnotes, p.notes AS longdescription, p.not_discountable,
-		 pg.partsgroup, p.formel, p.alu, p.payment_id AS part_payment_id, adr.adr_description
+		 pg.partsgroup, p.formel, p.payment_id AS part_payment_id
                  FROM parts p
 		 LEFT JOIN chart c1 ON ((select inventory_accno_id from buchungsgruppen where id=p.buchungsgruppen_id) = c1.id)
 		 LEFT JOIN chart c2 ON ((select income_accno_id_$form->{taxzone_id} from buchungsgruppen where id=p.buchungsgruppen_id) = c2.id)
 		 LEFT JOIN chart c3 ON ((select expense_accno_id_$form->{taxzone_id} from buchungsgruppen where id=p.buchungsgruppen_id) = c3.id)
 		 LEFT JOIN partsgroup pg ON (pg.id = p.partsgroup_id)
-                 LEFT JOIN adr adr ON (adr.id = p.adr_id)
 	         WHERE $where|;
   my $sth = $dbh->prepare($query);
   $sth->execute || $form->dberror($query);