X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FForm.pm;h=2d1dce5c032789e5cf9fc44fd613da70d9b5c012;hb=a4c3e9de7b3169ac6a0ad270022da9aeed91f9ff;hp=b18bc67b5fcf5902646c04482554ee9e366c5a16;hpb=83fb0fe04ed0f7855c4d54f91a5fc508c47e058e;p=kivitendo-erp.git diff --git a/SL/Form.pm b/SL/Form.pm index b18bc67b5..2d1dce5c0 100644 --- a/SL/Form.pm +++ b/SL/Form.pm @@ -465,7 +465,7 @@ sub header { # this should gradually move to the layouts that need it $layout->use_stylesheet("$_.css") for qw( main menu list_accounts jquery.autocomplete - jquery.multiselect2side frame_header/header + jquery.multiselect2side ui-lightness/jquery-ui jquery-ui.custom jqModal ); @@ -2762,14 +2762,7 @@ sub create_links { FROM acc_trans a LEFT JOIN chart c ON (c.id = a.chart_id) LEFT JOIN project p ON (p.id = a.project_id) - LEFT JOIN tax t ON (t.id= (SELECT tk.tax_id FROM taxkeys tk - WHERE (tk.taxkey_id=a.taxkey) AND - ((CASE WHEN a.chart_id IN (SELECT chart_id FROM taxkeys WHERE taxkey_id = a.taxkey) - THEN tk.chart_id = a.chart_id - ELSE 1 = 1 - END) - OR (c.link='%tax%')) AND - (startdate <= a.transdate) ORDER BY startdate DESC LIMIT 1)) + LEFT JOIN tax t ON (t.id= a.tax_id) WHERE a.trans_id = ? AND a.fx_transaction = '0' ORDER BY a.acc_trans_id, a.transdate|;