Revision b989d7cf
Von Kivitendo Admin vor mehr als 10 Jahren hinzugefügt
| SL/IS.pm | ||
|---|---|---|
| 1392 | 1392 |
c3.accno AS expense_accno, c3.new_chart_id AS expense_new_chart, date($transdate) - c3.valid_from AS expense_valid |
| 1393 | 1393 |
FROM invoice i, parts p |
| 1394 | 1394 |
LEFT JOIN chart c1 ON ((SELECT inventory_accno_id FROM buchungsgruppen WHERE id = p.buchungsgruppen_id) = c1.id) |
| 1395 |
LEFT JOIN chart c2 ON ((SELECT income_accno_id_${taxzone_id} FROM buchungsgruppen WHERE id = p.buchungsgruppen_id) = c2.id)
|
|
| 1396 |
LEFT JOIN chart c3 ON ((select expense_accno_id_${taxzone_id} FROM buchungsgruppen WHERE id = p.buchungsgruppen_id) = c3.id)
|
|
| 1395 |
LEFT JOIN chart c2 ON ((SELECT tc.income_accno_id FROM taxzone_charts tc WHERE tc.taxzone_id = '$taxzone_id' and tc.buchungsgruppen_id = p.buchungsgruppen_id) = c2.id)
|
|
| 1396 |
LEFT JOIN chart c3 ON ((SELECT tc.expense_accno_id FROM taxzone_charts tc WHERE tc.taxzone_id = '$taxzone_id' and tc.buchungsgruppen_id = p.buchungsgruppen_id) = c3.id)
|
|
| 1397 | 1397 |
WHERE (i.parts_id = p.id) |
| 1398 | 1398 |
AND (i.parts_id = ?) |
| 1399 | 1399 |
AND ((i.base_qty + i.allocated) < 0) |
| ... | ... | |
| 1661 | 1661 |
LEFT JOIN pricegroup prg ON (i.pricegroup_id = prg.id) |
| 1662 | 1662 |
|
| 1663 | 1663 |
LEFT JOIN chart c1 ON ((SELECT inventory_accno_id FROM buchungsgruppen WHERE id = p.buchungsgruppen_id) = c1.id) |
| 1664 |
LEFT JOIN chart c2 ON ((SELECT income_accno_id_${taxzone_id} FROM buchungsgruppen WHERE id = p.buchungsgruppen_id) = c2.id)
|
|
| 1665 |
LEFT JOIN chart c3 ON ((SELECT expense_accno_id_${taxzone_id} FROM buchungsgruppen WHERE id = p.buchungsgruppen_id) = c3.id)
|
|
| 1664 |
LEFT JOIN chart c2 ON ((SELECT tc.income_accno_id FROM taxzone_charts tc WHERE tc.taxzone_id = '$taxzone_id' and tc.buchungsgruppen_id = p.buchungsgruppen_id) = c2.id)
|
|
| 1665 |
LEFT JOIN chart c3 ON ((SELECT tc.expense_accno_id FROM taxzone_charts tc WHERE tc.taxzone_id = '$taxzone_id' and tc.buchungsgruppen_id = p.buchungsgruppen_id) = c3.id)
|
|
| 1666 | 1666 |
|
| 1667 | 1667 |
WHERE (i.trans_id = ?) AND NOT (i.assemblyitem = '1') ORDER BY i.id|; |
| 1668 | 1668 |
|
| ... | ... | |
| 1959 | 1959 |
FROM buchungsgruppen |
| 1960 | 1960 |
WHERE id = p.buchungsgruppen_id) = c1.id) |
| 1961 | 1961 |
LEFT JOIN chart c2 ON |
| 1962 |
((SELECT income_accno_id_${taxzone_id}
|
|
| 1963 |
FROM buchungsgruppen
|
|
| 1964 |
WHERE id = p.buchungsgruppen_id) = c2.id)
|
|
| 1962 |
((SELECT tc.income_accno_id
|
|
| 1963 |
FROM taxzone_charts tc
|
|
| 1964 |
WHERE tc.buchungsgruppen_id = p.buchungsgruppen_id and tc.taxzone_id = ${taxzone_id}) = c2.id)
|
|
| 1965 | 1965 |
LEFT JOIN chart c3 ON |
| 1966 |
((SELECT expense_accno_id_${taxzone_id}
|
|
| 1967 |
FROM buchungsgruppen
|
|
| 1968 |
WHERE id = p.buchungsgruppen_id) = c3.id)
|
|
| 1966 |
((SELECT tc.expense_accno_id
|
|
| 1967 |
FROM taxzone_charts tc
|
|
| 1968 |
WHERE tc.buchungsgruppen_id = p.buchungsgruppen_id and tc.taxzone_id = ${taxzone_id}) = c3.id)
|
|
| 1969 | 1969 |
LEFT JOIN partsgroup pg ON (pg.id = p.partsgroup_id) |
| 1970 | 1970 |
LEFT JOIN price_factors pfac ON (pfac.id = p.price_factor_id) |
| 1971 | 1971 |
WHERE $where|; |
Auch abrufbar als: Unified diff
Auf Datenbankebene Steuerzonen konfigurierbar gemacht
Damit können jetzt mehr als die 4 Standardsteuerzonen eingerichtet
werden. Die bisherigen Steuerzonen wurden aus der Tabelle
buchungsgruppen in die neue Tabelle taxzone_charts ausgelagert.
Konzeption siehe Ticket #2295
Es wurden noch keinerlei Veränderungen an der Kivitendo
Benutzeroberfläche durchgeführt, durch dieses Upgrade können die
Buchungsgruppen also nicht mehr konfiguriert werden, dies muß auf
Datenbankebene passieren.
Rose schon angepasst.
Conflicts: