X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/9c51e3d477a2ee0e967328ce5f7932a7fee2b49b..92daa1a66a9ff737c92df86da3c28d663c421032:/SL/IS.pm diff --git a/SL/IS.pm b/SL/IS.pm index 8e8b4781f..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) @@ -1902,7 +1902,7 @@ 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 + 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)