From: Jan Büren <jan@kivitendo-premium.de>
Date: Thu, 28 Aug 2014 12:18:33 +0000 (+0200)
Subject: Merge branch 'master' of github.com:kivitendo/kivitendo-erp
X-Git-Tag: release-3.2.0beta~325^2~4
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/89360aadb2c3e0854a2815e5d0ed8a9efd1c5889?hp=9e561023f96c1b6fa8a3f5148522a53a874aabd6

Merge branch 'master' of github.com:kivitendo/kivitendo-erp
---

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