X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FIC.pm;h=f6ceaceb105b6f545116af8d969b5ec7ba538608;hb=fee5532a132c44dcfc1743393cba00c8e3397176;hp=810e226fac194758e20ea143ffa27388f8261ae4;hpb=b989d7cfb4bd8de5c3e290b8df0519ad34d5dd0c;p=kivitendo-erp.git diff --git a/SL/IC.pm b/SL/IC.pm index 810e226fa..f6ceaceb1 100644 --- a/SL/IC.pm +++ b/SL/IC.pm @@ -243,7 +243,7 @@ sub save { map { $form->{$_} = $form->parse_amount($myconfig, $form->{$_}) } qw(rop weight listprice sellprice gv lastcost); - my $makemodel = (($form->{make_1}) || ($form->{model_1})) ? 1 : 0; + my $makemodel = ($form->{make_1} || $form->{model_1} || ($form->{makemodel_rows} > 1)) ? 1 : 0; $form->{assembly} = ($form->{item} eq 'assembly') ? 1 : 0; @@ -1552,9 +1552,9 @@ sub retrieve_accounts { LEFT JOIN chart c1 ON bg.inventory_accno_id = c1.id LEFT JOIN chart c2 ON tc.income_accno_id = c2.id LEFT JOIN chart c3 ON tc.expense_accno_id = c3.id - WHERE - tc.taxzone_id = '$form->{taxzone_id}' - and + WHERE + tc.taxzone_id = '$form->{taxzone_id}' + and p.id IN ($in) SQL