# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1335, USA.
#======================================================================
#
# Inventory Control backend
use Data::Dumper;
use List::MoreUtils qw(all any uniq);
-use YAML;
use SL::CVar;
use SL::DBUtils;
use SL::HTML::Restrict;
use SL::TransNumber;
+use SL::Util qw(trim);
+use SL::DB;
+use SL::Presenter::Part qw(type_abbreviation classification_abbreviation separate_abbreviation);
+use Carp;
use strict;
-sub get_part {
- $main::lxdebug->enter_sub();
-
- my ($self, $myconfig, $form) = @_;
-
- # connect to db
- my $dbh = $form->get_standard_dbh;
-
- my $sth;
-
- my $query =
- qq|SELECT p.*,
- c1.accno AS inventory_accno,
- c2.accno AS income_accno,
- c3.accno AS expense_accno,
- pg.partsgroup
- FROM parts p
- LEFT JOIN chart c1 ON (p.inventory_accno_id = c1.id)
- LEFT JOIN chart c2 ON (p.income_accno_id = c2.id)
- LEFT JOIN chart c3 ON (p.expense_accno_id = c3.id)
- LEFT JOIN partsgroup pg ON (p.partsgroup_id = pg.id)
- WHERE p.id = ? |;
- my $ref = selectfirst_hashref_query($form, $dbh, $query, conv_i($form->{id}));
-
- # copy to $form variables
- map { $form->{$_} = $ref->{$_} } (keys %{$ref});
-
- $form->{mtime} = $form->{itime} if !$form->{mtime};
- $form->{lastmtime} = $form->{mtime};
- $form->{onhand} *= 1;
-
- # part or service item
- $form->{item} = ($form->{inventory_accno}) ? 'part' : 'service';
- if ($form->{assembly}) {
- $form->{item} = 'assembly';
-
- # retrieve assembly items
- $query =
- qq|SELECT p.id, p.partnumber, p.description,
- p.sellprice, p.lastcost, p.weight, a.qty, a.bom, p.unit,
- pg.partsgroup, p.price_factor_id, pfac.factor AS price_factor
- FROM parts p
- JOIN assembly a ON (a.parts_id = p.id)
- LEFT JOIN partsgroup pg ON (p.partsgroup_id = pg.id)
- LEFT JOIN price_factors pfac ON pfac.id = p.price_factor_id
- WHERE (a.id = ?)
- ORDER BY a.oid|;
- $sth = prepare_execute_query($form, $dbh, $query, conv_i($form->{id}));
-
- $form->{assembly_rows} = 0;
- while (my $ref = $sth->fetchrow_hashref("NAME_lc")) {
- $form->{assembly_rows}++;
- foreach my $key (keys %{$ref}) {
- $form->{"${key}_$form->{assembly_rows}"} = $ref->{$key};
- }
- }
- $sth->finish;
-
- }
-
- # setup accno hash for <option checked> {amount} is used in create_links
- $form->{amount}{IC} = $form->{inventory_accno};
- $form->{amount}{IC_income} = $form->{income_accno};
- $form->{amount}{IC_sale} = $form->{income_accno};
- $form->{amount}{IC_expense} = $form->{expense_accno};
- $form->{amount}{IC_cogs} = $form->{expense_accno};
-
- # get prices
- $query = <<SQL;
- SELECT pg.pricegroup, pg.id AS pricegroup_id, COALESCE(pr.price, 0) AS price
- FROM pricegroup pg
- LEFT JOIN prices pr ON (pr.pricegroup_id = pg.id) AND (pr.parts_id = ?)
- ORDER BY lower(pg.pricegroup)
-SQL
-
- my $row = 1;
- foreach $ref (selectall_hashref_query($form, $dbh, $query, conv_i($form->{id}))) {
- $form->{"${_}_${row}"} = $ref->{$_} for qw(pricegroup_id pricegroup price);
- $row++;
- }
- $form->{price_rows} = $row - 1;
-
- # get makes
- if ($form->{makemodel}) {
- #hli
- $query = qq|SELECT m.make, m.model,m.lastcost,m.lastcost,m.lastupdate,m.sortorder FROM makemodel m | .
- qq|WHERE m.parts_id = ? order by m.sortorder asc|;
- my @values = ($form->{id});
- $sth = $dbh->prepare($query);
- $sth->execute(@values) || $form->dberror("$query (" . join(', ', @values) . ")");
-
- my $i = 1;
-
- while (($form->{"make_$i"}, $form->{"model_$i"}, $form->{"old_lastcost_$i"},
- $form->{"lastcost_$i"}, $form->{"lastupdate_$i"}, $form->{"sortorder_$i"}) = $sth->fetchrow_array)
- {
- $i++;
- }
- $sth->finish;
- $form->{makemodel_rows} = $i - 1;
-
- }
-
- # get translations
- $query = qq|SELECT language_id, translation, longdescription
- FROM translation
- WHERE parts_id = ?|;
- $form->{translations} = selectall_hashref_query($form, $dbh, $query, conv_i($form->{id}));
-
- # is it an orphan
- my @referencing_tables = qw(invoice orderitems inventory);
- my %column_map = ( );
- my $parts_id = conv_i($form->{id});
-
- $form->{orphaned} = 1;
-
- foreach my $table (@referencing_tables) {
- my $column = $column_map{$table} || 'parts_id';
- $query = qq|SELECT $column FROM $table WHERE $column = ? LIMIT 1|;
- my ($found) = selectrow_query($form, $dbh, $query, $parts_id);
-
- if ($found) {
- $form->{orphaned} = 0;
- last;
- }
- }
-
- $form->{"unit_changeable"} = $form->{orphaned};
-
- Common::webdav_folder($form) if $::lx_office_conf{features}{webdav};
-
- $main::lxdebug->leave_sub();
-}
-
-sub get_pricegroups {
- $main::lxdebug->enter_sub();
-
- my ($self, $myconfig, $form) = @_;
-
- my $dbh = $form->get_standard_dbh;
-
- # get pricegroups
- my $query = qq|SELECT id, pricegroup FROM pricegroup ORDER BY lower(pricegroup)|;
- my $pricegroups = selectall_hashref_query($form, $dbh, $query);
-
- my $i = 1;
- foreach my $pg (@{ $pricegroups }) {
- $form->{"klass_$i"} = "$pg->{id}";
- $form->{"price_$i"} = $form->format_amount($myconfig, $form->{"price_$i"}, -2);
- $form->{"pricegroup_id_$i"} = "$pg->{id}";
- $form->{"pricegroup_$i"} = "$pg->{pricegroup}";
- $i++;
- }
-
- #correct rows
- $form->{price_rows} = $i - 1;
-
- $main::lxdebug->leave_sub();
-
- return $pricegroups;
-}
-
sub retrieve_buchungsgruppen {
$main::lxdebug->enter_sub();
$main::lxdebug->leave_sub();
}
-sub save {
- $main::lxdebug->enter_sub();
-
- my ($self, $myconfig, $form) = @_;
- my @values;
- # connect to database, turn off AutoCommit
- my $dbh = $form->get_standard_dbh;
- my $restricter = SL::HTML::Restrict->create;
-
- # save the part
- # make up a unique handle and store in partnumber field
- # then retrieve the record based on the unique handle to get the id
- # replace the partnumber field with the actual variable
- # add records for makemodel
-
- # if there is a $form->{id} then replace the old entry
- # delete all makemodel entries and add the new ones
-
- # undo amount formatting
- map { $form->{$_} = $form->parse_amount($myconfig, $form->{$_}) }
- qw(rop weight listprice sellprice gv lastcost);
-
- my $makemodel = ($form->{make_1} || $form->{model_1} || ($form->{makemodel_rows} > 1)) ? 1 : 0;
-
- $form->{assembly} = ($form->{item} eq 'assembly') ? 1 : 0;
-
- my ($query, $sth);
-
- my $priceupdate = ', priceupdate = current_date';
-
- if ($form->{id}) {
- my $trans_number = SL::TransNumber->new(type => $form->{item}, dbh => $dbh, number => $form->{partnumber}, id => $form->{id});
- if (!$trans_number->is_unique) {
- $::lxdebug->leave_sub;
- return 3;
- }
-
- # get old price
- $query = qq|SELECT sellprice, weight FROM parts WHERE id = ?|;
- my ($sellprice, $weight) = selectrow_query($form, $dbh, $query, conv_i($form->{id}));
-
- # if item is part of an assembly adjust all assemblies
- $query = qq|SELECT id, qty FROM assembly WHERE parts_id = ?|;
- $sth = prepare_execute_query($form, $dbh, $query, conv_i($form->{id}));
- while (my ($id, $qty) = $sth->fetchrow_array) {
- &update_assembly($dbh, $form, $id, $qty, $sellprice * 1, $weight * 1);
- }
- $sth->finish;
-
- # delete makemodel records
- do_query($form, $dbh, qq|DELETE FROM makemodel WHERE parts_id = ?|, conv_i($form->{id}));
-
- if ($form->{item} eq 'assembly') {
- # delete assembly records
- do_query($form, $dbh, qq|DELETE FROM assembly WHERE id = ?|, conv_i($form->{id}));
- }
-
- # delete translations
- do_query($form, $dbh, qq|DELETE FROM translation WHERE parts_id = ?|, conv_i($form->{id}));
-
- # Check whether or not the prices have changed. If they haven't
- # then 'priceupdate' should not be updated.
- my $previous_values = selectfirst_hashref_query($form, $dbh, qq|SELECT * FROM parts WHERE id = ?|, conv_i($form->{id})) || {};
- $priceupdate = '' if (all { $previous_values->{$_} == $form->{$_} } qw(sellprice lastcost listprice));
-
- } else {
- my $trans_number = SL::TransNumber->new(type => $form->{item}, dbh => $dbh, number => $form->{partnumber}, save => 1);
-
- if ($form->{partnumber} && !$trans_number->is_unique) {
- $::lxdebug->leave_sub;
- return 3;
- }
-
- $form->{partnumber} ||= $trans_number->create_unique;
-
- ($form->{id}) = selectrow_query($form, $dbh, qq|SELECT nextval('id')|);
- do_query($form, $dbh, qq|INSERT INTO parts (id, partnumber, unit) VALUES (?, ?, ?)|, $form->{id}, $form->{partnumber}, $form->{unit});
-
- $form->{orphaned} = 1;
- }
- my $partsgroup_id = undef;
-
- if ($form->{partsgroup}) {
- (my $partsgroup, $partsgroup_id) = split(/--/, $form->{partsgroup});
- }
-
- my ($subq_inventory, $subq_expense, $subq_income);
- if ($form->{"item"} eq "part") {
- $subq_inventory =
- qq|(SELECT bg.inventory_accno_id
- FROM buchungsgruppen bg
- WHERE bg.id = | . conv_i($form->{"buchungsgruppen_id"}, 'NULL') . qq|)|;
- } else {
- $subq_inventory = "NULL";
- }
-
- if ($form->{"item"} ne "assembly") {
- $subq_expense =
- qq|(SELECT tc.expense_accno_id
- FROM taxzone_charts tc
- WHERE tc.buchungsgruppen_id = | . conv_i($form->{"buchungsgruppen_id"}, 'NULL') . qq| and tc.taxzone_id = 0)|;
- } else {
- $subq_expense = "NULL";
- }
-
- normalize_text_blocks();
-
- $query =
- qq|UPDATE parts SET
- partnumber = ?,
- description = ?,
- makemodel = ?,
- alternate = 'f',
- assembly = ?,
- listprice = ?,
- sellprice = ?,
- lastcost = ?,
- weight = ?,
- unit = ?,
- notes = ?,
- formel = ?,
- rop = ?,
- warehouse_id = ?,
- bin_id = ?,
- buchungsgruppen_id = ?,
- payment_id = ?,
- inventory_accno_id = $subq_inventory,
- income_accno_id = (SELECT tc.income_accno_id FROM taxzone_charts tc WHERE tc.taxzone_id = 0 and tc.buchungsgruppen_id = ?),
- expense_accno_id = $subq_expense,
- obsolete = ?,
- image = ?,
- drawing = ?,
- shop = ?,
- ve = ?,
- gv = ?,
- ean = ?,
- has_sernumber = ?,
- not_discountable = ?,
- microfiche = ?,
- partsgroup_id = ?,
- price_factor_id = ?
- $priceupdate
- WHERE id = ?|;
- @values = ($form->{partnumber},
- $form->{description},
- $makemodel ? 't' : 'f',
- $form->{assembly} ? 't' : 'f',
- $form->{listprice},
- $form->{sellprice},
- $form->{lastcost},
- $form->{weight},
- $form->{unit},
- $restricter->process($form->{notes}),
- $form->{formel},
- $form->{rop},
- conv_i($form->{warehouse_id}),
- conv_i($form->{bin_id}),
- conv_i($form->{buchungsgruppen_id}),
- conv_i($form->{payment_id}),
- conv_i($form->{buchungsgruppen_id}),
- $form->{obsolete} ? 't' : 'f',
- $form->{image},
- $form->{drawing},
- $form->{shop} ? 't' : 'f',
- conv_i($form->{ve}),
- conv_i($form->{gv}),
- $form->{ean},
- $form->{has_sernumber} ? 't' : 'f',
- $form->{not_discountable} ? 't' : 'f',
- $form->{microfiche},
- conv_i($partsgroup_id),
- conv_i($form->{price_factor_id}),
- conv_i($form->{id})
- );
- do_query($form, $dbh, $query, @values);
-
- # delete translation records
- do_query($form, $dbh, qq|DELETE FROM translation WHERE parts_id = ?|, conv_i($form->{id}));
-
- my @translations = grep { $_->{language_id} && $_->{translation} } @{ $form->{translations} || [] };
- if (@translations) {
- $query = qq|INSERT into translation (parts_id, language_id, translation, longdescription)
- VALUES ( ?, ?, ?, ? )|;
- $sth = $dbh->prepare($query);
-
- foreach my $translation (@translations) {
- do_statement($form, $sth, $query, conv_i($form->{id}), conv_i($translation->{language_id}), $translation->{translation}, $restricter->process($translation->{longdescription}));
- }
-
- $sth->finish();
- }
-
- # delete price records
- do_query($form, $dbh, qq|DELETE FROM prices WHERE parts_id = ?|, conv_i($form->{id}));
-
- $query = qq|INSERT INTO prices (parts_id, pricegroup_id, price) VALUES(?, ?, ?)|;
- $sth = prepare_query($form, $dbh, $query);
-
- for my $i (1 .. $form->{price_rows}) {
- my $price = $form->parse_amount($myconfig, $form->{"price_$i"});
- next unless $price;
-
- @values = (conv_i($form->{id}), conv_i($form->{"pricegroup_id_$i"}), $price);
- do_statement($form, $sth, $query, @values);
- }
-
- $sth->finish;
-
- # insert makemodel records
- my $lastupdate = '';
- my $value = 0;
- for my $i (1 .. $form->{makemodel_rows}) {
- if (($form->{"make_$i"}) || ($form->{"model_$i"})) {
- #hli
- $value = $form->parse_amount($myconfig, $form->{"lastcost_$i"});
- if ($value == $form->parse_amount($myconfig, $form->{"old_lastcost_$i"}))
- {
- if ($form->{"lastupdate_$i"} eq "") {
- $lastupdate = 'now()';
- } else {
- $lastupdate = $dbh->quote($form->{"lastupdate_$i"});
- }
- } else {
- $lastupdate = 'now()';
- }
- $query = qq|INSERT INTO makemodel (parts_id, make, model, lastcost, lastupdate, sortorder) | .
- qq|VALUES (?, ?, ?, ?, ?, ?)|;
- @values = (conv_i($form->{id}), conv_i($form->{"make_$i"}), $form->{"model_$i"}, $value, $lastupdate, conv_i($form->{"sortorder_$i"}) );
-
- do_query($form, $dbh, $query, @values);
- }
- }
-
- # add assembly records
- if ($form->{item} eq 'assembly') {
- # check additional assembly row
- my $i = $form->{assembly_rows};
- # if last row is not empty add them
- if ($form->{"partnumber_$i"} ne "") {
- $query = qq|SELECT id FROM parts WHERE partnumber = ?|;
- my ($partid) = selectrow_query($form, $dbh, $query,$form->{"partnumber_$i"} );
- if ( $partid ) {
- $form->{"qty_$i"} = 1 unless ($form->{"qty_$i"});
- $form->{"id_$i"} = $partid;
- $form->{"bom_$i"} = 0;
- $form->{assembly_rows}++;
- }
- else {
- $::form->error($::locale->text("uncorrect partnumber ").$form->{"partnumber_$i"});
- }
- }
-
- for my $i (1 .. $form->{assembly_rows}) {
- $form->{"qty_$i"} = $form->parse_amount($myconfig, $form->{"qty_$i"});
-
- if ($form->{"qty_$i"} != 0) {
- $form->{"bom_$i"} *= 1;
- $query = qq|INSERT INTO assembly (id, parts_id, qty, bom) | .
- qq|VALUES (?, ?, ?, ?)|;
- @values = (conv_i($form->{id}), conv_i($form->{"id_$i"}), conv_i($form->{"qty_$i"}), $form->{"bom_$i"} ? 't' : 'f');
- do_query($form, $dbh, $query, @values);
- }
- }
- my @a = localtime;
- $a[5] += 1900;
- $a[4]++;
- my $shippingdate = "$a[5]-$a[4]-$a[3]";
-
- $form->get_employee($dbh);
-
- }
-
- #set expense_accno=inventory_accno if they are different => bilanz
- my $vendor_accno =
- ($form->{expense_accno} != $form->{inventory_accno})
- ? $form->{inventory_accno}
- : $form->{expense_accno};
-
- # get tax rates and description
- my $accno_id =
- ($form->{vc} eq "customer") ? $form->{income_accno} : $vendor_accno;
- $query =
- qq|SELECT c.accno, c.description, t.rate, t.taxnumber
- FROM chart c, tax t
- WHERE (c.id = t.chart_id) AND (t.taxkey IN (SELECT taxkey_id FROM chart where accno = ?))
- ORDER BY c.accno|;
- my $stw = prepare_execute_query($form, $dbh, $query, $accno_id);
-
- $form->{taxaccount} = "";
- while (my $ptr = $stw->fetchrow_hashref("NAME_lc")) {
- $form->{taxaccount} .= "$ptr->{accno} ";
- if (!($form->{taxaccount2} =~ /\Q$ptr->{accno}\E/)) {
- $form->{"$ptr->{accno}_rate"} = $ptr->{rate};
- $form->{"$ptr->{accno}_description"} = $ptr->{description};
- $form->{"$ptr->{accno}_taxnumber"} = $ptr->{taxnumber};
- $form->{taxaccount2} .= " $ptr->{accno} ";
- }
- }
-
- CVar->save_custom_variables(dbh => $dbh,
- module => 'IC',
- trans_id => $form->{id},
- variables => $form,
- save_validity => 1);
-
- # Delete saved custom variable values for configs that have been
- # marked invalid for this part.
- $query = <<SQL;
- DELETE FROM custom_variables
- WHERE (config_id IN (
- SELECT val.config_id
- FROM custom_variables_validity val
- LEFT JOIN custom_variable_configs val_cfg ON (val.config_id = val_cfg.id)
- WHERE (val_cfg.module = 'IC')
- AND (val.trans_id = ?)))
- AND (trans_id = ?)
-SQL
- do_query($form, $dbh, $query, ($form->{id}) x 2);
-
- # commit
- my $rc = $dbh->commit;
-
- $main::lxdebug->leave_sub();
-
- return $rc;
-}
-
-sub update_assembly {
- $main::lxdebug->enter_sub();
-
- my ($dbh, $form, $id, $qty, $sellprice, $weight) = @_;
-
- my $query = qq|SELECT id, qty FROM assembly WHERE parts_id = ?|;
- my $sth = prepare_execute_query($form, $dbh, $query, conv_i($id));
-
- while (my ($pid, $aqty) = $sth->fetchrow_array) {
- &update_assembly($dbh, $form, $pid, $aqty * $qty, $sellprice, $weight);
- }
- $sth->finish;
-
- $query =
- qq|UPDATE parts SET sellprice = sellprice + ?, weight = weight + ?
- WHERE id = ?|;
- my @values = ($qty * ($form->{sellprice} - $sellprice),
- $qty * ($form->{weight} - $weight), conv_i($id));
- do_query($form, $dbh, $query, @values);
-
- $main::lxdebug->leave_sub();
-}
-
-sub retrieve_assemblies {
- $main::lxdebug->enter_sub();
-
- my ($self, $myconfig, $form) = @_;
-
- # connect to database
- my $dbh = $form->get_standard_dbh;
-
- my $where = qq|NOT p.obsolete|;
- my @values;
-
- if ($form->{partnumber}) {
- $where .= qq| AND (p.partnumber ILIKE ?)|;
- push(@values, '%' . $form->{partnumber} . '%');
- }
-
- if ($form->{description}) {
- $where .= qq| AND (p.description ILIKE ?)|;
- push(@values, '%' . $form->{description} . '%');
- }
-
- # retrieve assembly items
- my $query =
- qq|SELECT p.id, p.partnumber, p.description,
- p.onhand, p.rop,
- (SELECT sum(p2.inventory_accno_id)
- FROM parts p2, assembly a
- WHERE (p2.id = a.parts_id) AND (a.id = p.id)) AS inventory
- FROM parts p
- WHERE NOT p.obsolete AND p.assembly $where|;
-
- $form->{assembly_items} = selectall_hashref_query($form, $dbh, $query, @values);
-
- $main::lxdebug->leave_sub();
-}
-
-sub delete {
- $main::lxdebug->enter_sub();
-
- my ($self, $myconfig, $form) = @_;
- my @values = (conv_i($form->{id}));
- # connect to database, turn off AutoCommit
- my $dbh = $form->get_standard_dbh;
-
- my %columns = ( "assembly" => "id", "parts" => "id" );
-
- for my $table (qw(prices makemodel inventory assembly translation parts)) {
- my $column = defined($columns{$table}) ? $columns{$table} : "parts_id";
- do_query($form, $dbh, qq|DELETE FROM $table WHERE $column = ?|, @values);
- }
-
- # commit
- my $rc = $dbh->commit;
-
- $main::lxdebug->leave_sub();
-
- return $rc;
-}
-
sub assembly_item {
$main::lxdebug->enter_sub();
while (my ($column, $table) = each(%columns)) {
next unless ($form->{"${column}_$i"});
$where .= qq| AND ${table}.${column} ILIKE ?|;
- push(@values, '%' . $form->{"${column}_$i"} . '%');
+ push(@values, like($form->{"${column}_$i"}));
}
if ($form->{id}) {
$where .= qq| ORDER BY p.description|;
}
- # connect to database
- my $dbh = $form->get_standard_dbh;
-
my $query =
qq|SELECT p.id, p.partnumber, p.description, p.sellprice,
+ p.classification_id,
p.weight, p.onhand, p.unit, pg.partsgroup, p.lastcost,
- p.price_factor_id, pfac.factor AS price_factor
+ p.price_factor_id, pfac.factor AS price_factor, p.notes as longdescription
FROM parts p
LEFT JOIN partsgroup pg ON (p.partsgroup_id = pg.id)
LEFT JOIN price_factors pfac ON pfac.id = p.price_factor_id
WHERE $where|;
- $form->{item_list} = selectall_hashref_query($form, $dbh, $query, @values);
+ $form->{item_list} = selectall_hashref_query($form, SL::DB->client->dbh, $query, @values);
$main::lxdebug->leave_sub();
}
#
# column flags:
# l_partnumber l_description l_listprice l_sellprice l_lastcost l_priceupdate l_weight l_unit l_rop l_image l_drawing l_microfiche l_partsgroup
+# l_warehouse l_bin
#
# exclusives:
# itemstatus = active | onhand | short | obsolete | orphaned
# joining filters:
# make model - makemodel
# serialnumber transdatefrom transdateto - invoice/orderitems
+# warehouse - warehouse
+# bin - bin
#
# binary flags:
# bought sold onorder ordered rfq quoted - aggreg joins with invoices/orders
# onhand - as above, but masking the simple itemstatus results (doh!)
# warehouse onhand
# search by overrides of description
+# soldtotal drops option default warehouse and bin
+# soldtotal can not work if there are no documents checked
#
# disabled sanity checks and changes:
# - searchitems = assembly will no longer disable bought
my ($self, $myconfig, $form) = @_;
my $dbh = $form->get_standard_dbh($myconfig);
+ # sanity backend check
+ croak "Cannot combine soldtotal with default bin or default warehouse" if ($form->{l_soldtotal} && ($form->{l_bin} || $form->{l_warehouse}));
+
$form->{parts} = +{ };
$form->{soldtotal} = undef if $form->{l_soldtotal}; # security fix. top100 insists on putting strings in there...
my @like_filters = (@simple_filters, @invoice_oi_filters);
my @all_columns = (@simple_filters, @makemodel_filters, @apoe_filters, @project_filters, qw(serialnumber));
my @simple_l_switches = (@all_columns, qw(notes listprice sellprice lastcost priceupdate weight unit rop image shop insertdate));
+ my %no_simple_l_switches = (warehouse => 'wh.description as warehouse', bin => 'bin.description as bin');
my @oe_flags = qw(bought sold onorder ordered rfq quoted);
my @qsooqr_flags = qw(invnumber ordnumber quonumber trans_id name module qty);
my @deliverydate_flags = qw(deliverydate);
# my @other_flags = qw(onhand); # ToDO: implement these
# my @inactive_flags = qw(l_subtotal short l_linetotal);
- my @select_tokens = qw(id factor);
+ my @select_tokens = qw(id factor part_type classification_id);
my @where_tokens = qw(1=1);
my @group_tokens = ();
my @bind_vars = ();
) AS cv ON cv.id = apoe.customer_id OR cv.id = apoe.vendor_id|,
mv => 'LEFT JOIN vendor AS mv ON mv.id = mm.make',
project => 'LEFT JOIN project AS pj ON pj.id = COALESCE(ioi.project_id, apoe.globalproject_id)',
+ warehouse => 'LEFT JOIN warehouse AS wh ON wh.id = p.warehouse_id',
+ bin => 'LEFT JOIN bin ON bin.id = p.bin_id',
);
- my @join_order = qw(partsgroup makemodel mv invoice_oi apoe cv pfac project);
+ my @join_order = qw(partsgroup makemodel mv invoice_oi apoe cv pfac project warehouse bin);
my %table_prefix = (
deliverydate => 'apoe.', serialnumber => 'ioi.',
);
# if the join condition in these blocks are met, the column
- # of the scecified table will gently override (coalesce actually) the original value
+ # of the specified table will gently override (coalesce actually) the original value
# use it to conditionally coalesce values from subtables
my @column_override = (
# column name, prefix, joins_needed, nick name (in case column is named like another)
insertdate => 'itime::DATE',
);
- if (($form->{searchitems} eq 'assembly') && $form->{l_lastcost}) {
- @simple_l_switches = grep { $_ ne 'lastcost' } @simple_l_switches;
- }
-
my $make_token_builder = sub {
my $joins_needed = shift;
sub {
#===== switches and simple filters ========#
# special case transdate
- if (grep { $form->{$_} } qw(transdatefrom transdateto)) {
+ if (grep { trim($form->{$_}) } qw(transdatefrom transdateto)) {
$form->{"l_transdate"} = 1;
push @select_tokens, 'transdate';
for (qw(transdatefrom transdateto)) {
- next unless $form->{$_};
+ my $value = trim($form->{$_});
+ next unless $value;
push @where_tokens, sprintf "transdate %s ?", /from$/ ? '>=' : '<=';
- push @bind_vars, $form->{$_};
+ push @bind_vars, $value;
}
}
+ # special case smart search
+ if ($form->{all}) {
+ $form->{"l_$_"} = 1 for qw(partnumber description unit sellprice lastcost linetotal);
+ $form->{l_service} = 1 if $form->{searchitems} eq 'service' || $form->{searchitems} eq '';
+ $form->{l_assembly} = 1 if $form->{searchitems} eq 'assembly' || $form->{searchitems} eq '';
+ $form->{l_part} = 1 if $form->{searchitems} eq 'part' || $form->{searchitems} eq '';
+ $form->{l_assortment} = 1 if $form->{searchitems} eq 'assortment' || $form->{searchitems} eq '';
+ push @where_tokens, "p.partnumber ILIKE ? OR p.description ILIKE ?";
+ push @bind_vars, (like($form->{all})) x 2;
+ }
+
# special case insertdate
- if (grep { $form->{$_} } qw(insertdatefrom insertdateto)) {
+ if (grep { trim($form->{$_}) } qw(insertdatefrom insertdateto)) {
$form->{"l_insertdate"} = 1;
push @select_tokens, 'insertdate';
my $token = $token_builder->('insertdate');
for (qw(insertdatefrom insertdateto)) {
- next unless $form->{$_};
+ my $value = trim($form->{$_});
+ next unless $value;
push @where_tokens, sprintf "$token %s ?", /from$/ ? '>=' : '<=';
- push @bind_vars, $form->{$_};
+ push @bind_vars, $value;
}
}
next unless $form->{$_};
$form->{"l_$_"} = '1'; # show the column
push @where_tokens, "$table_prefix{$_}$_ ILIKE ?";
- push @bind_vars, "%$form->{$_}%";
+ push @bind_vars, like($form->{$_});
}
foreach (@simple_l_switches) {
push @select_tokens, $_;
}
- for ($form->{searchitems}) {
- push @where_tokens, 'p.inventory_accno_id > 0' if /part/;
- push @where_tokens, 'p.inventory_accno_id IS NULL' if /service/;
- push @where_tokens, 'NOT p.assembly' if /service/;
- push @where_tokens, ' p.assembly' if /assembly/;
+ # Oder Bedingungen fuer Ware Dienstleistung Erzeugnis:
+ if ($form->{l_part} || $form->{l_assembly} || $form->{l_service} || $form->{l_assortment}) {
+ my @or_tokens = ();
+ push @or_tokens, "p.part_type = 'service'" if $form->{l_service};
+ push @or_tokens, "p.part_type = 'assembly'" if $form->{l_assembly};
+ push @or_tokens, "p.part_type = 'part'" if $form->{l_part};
+ push @or_tokens, "p.part_type = 'assortment'" if $form->{l_assortment};
+ push @where_tokens, join ' OR ', map { "($_)" } @or_tokens;
+ }
+ else {
+ # gar keine Teile
+ push @where_tokens, q|'F' = 'T'|;
+ }
+
+ if ( $form->{classification_id} > 0 ) {
+ push @where_tokens, "p.classification_id = ?";
+ push @bind_vars, $form->{classification_id};
}
for ($form->{itemstatus}) {
FROM assembly a_lc
LEFT JOIN parts p_lc ON (a_lc.parts_id = p_lc.id)
LEFT JOIN price_factors pfac_lc ON (p_lc.price_factor_id = pfac_lc.id)
- WHERE (a_lc.id = p.id)) AS lastcost|;
+ WHERE (a_lc.id = p.id)) AS assembly_lastcost|;
$table_prefix{$q_assembly_lastcost} = ' ';
# special case makemodel search
# fortunately makemodel doesn't need to be displayed later, so adding a special clause to where_token is sufficient.
if ($form->{make}) {
push @where_tokens, 'mv.name ILIKE ?';
- push @bind_vars, "%$form->{make}%";
+ push @bind_vars, like($form->{make});
}
if ($form->{model}) {
push @where_tokens, 'mm.model ILIKE ?';
- push @bind_vars, "%$form->{model}%";
+ push @bind_vars, like($form->{model});
}
# special case: sorting by partnumber
push @select_tokens, @qsooqr_flags, 'quotation', 'cv', 'ioi.id', 'ioi.ioi' if $bsooqr;
push @select_tokens, @deliverydate_flags if $bsooqr && $form->{l_deliverydate};
- push @select_tokens, $q_assembly_lastcost if ($form->{searchitems} eq 'assembly') && $form->{l_lastcost};
+ push @select_tokens, $q_assembly_lastcost if $form->{l_assembly} && $form->{l_lastcost};
push @bsooqr_tokens, q|module = 'ir' AND NOT ioi.assemblyitem| if $form->{bought};
push @bsooqr_tokens, q|module = 'is' AND NOT ioi.assemblyitem| if $form->{sold};
push @bsooqr_tokens, q|module = 'oe' AND NOT quotation AND cv = 'customer'| if $form->{ordered};
$joins_needed{cv} = 1 if $bsooqr;
$joins_needed{apoe} = 1 if $joins_needed{project} || $joins_needed{cv} || grep { $form->{$_} || $form->{"l_$_"} } @apoe_filters;
$joins_needed{invoice_oi} = 1 if $joins_needed{project} || $joins_needed{apoe} || grep { $form->{$_} || $form->{"l_$_"} } @invoice_oi_filters;
+ $joins_needed{bin} = 1 if $form->{l_bin};
+ $joins_needed{warehouse} = 1 if $form->{l_warehouse};
# special case for description search.
# up in the simple filter section the description filter got interpreted as something like: WHERE description ILIKE '%$form->{description}%'
my $token_builder = $make_token_builder->(\%joins_needed);
- my @sort_cols = (@simple_filters, qw(id priceupdate onhand invnumber ordnumber quonumber name serialnumber soldtotal deliverydate insertdate shop));
+ my @sort_cols = (@simple_filters, qw(id onhand invnumber ordnumber quonumber name serialnumber soldtotal deliverydate insertdate shop));
$form->{sort} = 'id' unless grep { $form->{"l_$_"} } grep { $form->{sort} eq $_ } @sort_cols; # sort by id if unknown or invisible column
my $sort_order = ($form->{revers} ? ' DESC' : ' ASC');
my $order_clause = " ORDER BY " . $token_builder->($form->{sort}) . ($form->{revers} ? ' DESC' : ' ASC');
my $where_clause = join ' AND ', map { "($_)" } @where_tokens;
my $group_clause = @group_tokens ? ' GROUP BY ' . join ', ', map { $token_builder->($_) } @group_tokens : '';
+ # key of %no_simple_l_switch is the logical l_switch.
+ # the assigned value is the 'not so simple
+ # select token'
+ my $no_simple_select_clause;
+ foreach my $no_simple_l_switch (keys %no_simple_l_switches) {
+ next unless $form->{"l_${no_simple_l_switch}"};
+ $no_simple_select_clause .= ', '. $no_simple_l_switches{$no_simple_l_switch};
+ }
+ $select_clause .= $no_simple_select_clause;
+
my %oe_flag_to_cvar = (
bought => 'invoice',
sold => 'invoice',
push @bind_vars, @cvar_values;
}
+ # simple search for assemblies by items used in assemblies
+ if ($form->{bom} eq '2' && $form->{l_assembly}) {
+ # assembly_qty is the column name
+ $form->{l_assembly_qty} = 1;
+ # nuke where clause and bind vars
+ $where_clause = ' 1=1 AND p.id in (SELECT id from assembly where parts_id IN ' .
+ ' (select id from parts where 1=1';
+ @bind_vars = ();
+ # use only like filter for items used in assemblies
+ foreach (@like_filters) {
+ next unless $form->{$_};
+ $form->{"l_$_"} = '1'; # show the column
+ $where_clause .= " AND $_ ILIKE ? ";
+ push @bind_vars, like($form->{$_});
+ }
+ $where_clause .='))';
+ }
+
my $query = <<" SQL";
SELECT DISTINCT $select_clause
FROM parts p
$order_clause
$limit_clause
SQL
-
$form->{parts} = selectall_hashref_query($form, $dbh, $query, @bind_vars);
map { $_->{onhand} *= 1 } @{ $form->{parts} };
# post processing for assembly parts lists (bom)
# for each part get the assembly parts and add them into the partlist.
my @assemblies;
- if ($form->{searchitems} eq 'assembly' && $form->{bom}) {
+ if ($form->{l_assembly} && $form->{bom}) {
$query =
- qq|SELECT p.id, p.partnumber, p.description, a.qty AS onhand,
+ qq|SELECT p.id, p.partnumber, p.description, a.qty AS assembly_qty,
p.unit, p.notes, p.itime::DATE as insertdate,
p.sellprice, p.listprice, p.lastcost,
- p.rop, p.weight, p.priceupdate,
+ p.rop, p.weight,
p.image, p.drawing, p.microfiche,
pfac.factor
FROM parts p
}
$sth->finish;
}
- };
-
-
- $main::lxdebug->leave_sub();
-
- return @{ $form->{parts} };
-}
-
-sub _create_filter_for_priceupdate {
- $main::lxdebug->enter_sub();
-
- my $self = shift;
- my $myconfig = \%main::myconfig;
- my $form = $main::form;
-
- my @where_values;
- my $where = '1 = 1';
-
- foreach my $item (qw(partnumber drawing microfiche make model pg.partsgroup)) {
- my $column = $item;
- $column =~ s/.*\.//;
- next unless ($form->{$column});
-
- $where .= qq| AND $item ILIKE ?|;
- push(@where_values, '%' . $form->{$column} . '%');
- }
-
- foreach my $item (qw(description serialnumber)) {
- next unless ($form->{$item});
-
- $where .= qq| AND (${item} ILIKE ?)|;
- push(@where_values, '%' . $form->{$item} . '%');
- }
-
-
- # items which were never bought, sold or on an order
- if ($form->{itemstatus} eq 'orphaned') {
- $where .=
- qq| AND (p.onhand = 0)
- AND p.id NOT IN
- (
- SELECT DISTINCT parts_id FROM invoice
- UNION
- SELECT DISTINCT parts_id FROM assembly
- UNION
- SELECT DISTINCT parts_id FROM orderitems
- )|;
-
- } elsif ($form->{itemstatus} eq 'active') {
- $where .= qq| AND p.obsolete = '0'|;
-
- } elsif ($form->{itemstatus} eq 'obsolete') {
- $where .= qq| AND p.obsolete = '1'|;
-
- } elsif ($form->{itemstatus} eq 'onhand') {
- $where .= qq| AND p.onhand > 0|;
-
- } elsif ($form->{itemstatus} eq 'short') {
- $where .= qq| AND p.onhand < p.rop|;
-
- }
-
- foreach my $column (qw(make model)) {
- next unless ($form->{$column});
- $where .= qq| AND p.id IN (SELECT DISTINCT parts_id FROM makemodel WHERE $column ILIKE ?|;
- push(@where_values, '%' . $form->{$column} . '%');
- }
-
- $main::lxdebug->leave_sub();
-
- return ($where, @where_values);
-}
-
-sub get_num_matches_for_priceupdate {
- $main::lxdebug->enter_sub();
-
- my $self = shift;
-
- my $myconfig = \%main::myconfig;
- my $form = $main::form;
-
- my $dbh = $form->get_standard_dbh($myconfig);
-
- my ($where, @where_values) = $self->_create_filter_for_priceupdate();
-
- my $num_updated = 0;
- my $query;
-
- for my $column (qw(sellprice listprice)) {
- next if ($form->{$column} eq "");
-
- $query =
- qq|SELECT COUNT(*)
- FROM parts
- WHERE id IN
- (SELECT p.id
- FROM parts p
- LEFT JOIN partsgroup pg ON (p.partsgroup_id = pg.id)
- WHERE $where)|;
- my ($result) = selectfirst_array_query($form, $dbh, $query, @where_values);
- $num_updated += $result if (0 <= $result);
- }
-
- $query =
- qq|SELECT COUNT(*)
- FROM prices
- WHERE parts_id IN
- (SELECT p.id
- FROM parts p
- LEFT JOIN partsgroup pg ON (p.partsgroup_id = pg.id)
- WHERE $where) AND (pricegroup_id = ?)|;
- my $sth = prepare_query($form, $dbh, $query);
-
- for my $i (1 .. $form->{price_rows}) {
- next if ($form->{"price_$i"} eq "");
-
- my ($result) = do_statement($form, $sth, $query, @where_values, conv_i($form->{"pricegroup_id_$i"}));
- $num_updated += $result if (0 <= $result);
}
- $sth->finish();
$main::lxdebug->leave_sub();
- return $num_updated;
-}
-
-sub update_prices {
- $main::lxdebug->enter_sub();
-
- my ($self, $myconfig, $form) = @_;
-
- my ($where, @where_values) = $self->_create_filter_for_priceupdate();
- my $num_updated = 0;
-
- # connect to database
- my $dbh = $form->get_standard_dbh;
-
- for my $column (qw(sellprice listprice)) {
- next if ($form->{$column} eq "");
-
- my $value = $form->parse_amount($myconfig, $form->{$column});
- my $operator = '+';
-
- if ($form->{"${column}_type"} eq "percent") {
- $value = ($value / 100) + 1;
- $operator = '*';
- }
-
- my $query =
- qq|UPDATE parts SET $column = $column $operator ?
- WHERE id IN
- (SELECT p.id
- FROM parts p
- LEFT JOIN partsgroup pg ON (p.partsgroup_id = pg.id)
- WHERE $where)|;
- my $result = do_query($form, $dbh, $query, $value, @where_values);
- $num_updated += $result if (0 <= $result);
- }
-
- my $q_add =
- qq|UPDATE prices SET price = price + ?
- WHERE parts_id IN
- (SELECT p.id
- FROM parts p
- LEFT JOIN partsgroup pg ON (p.partsgroup_id = pg.id)
- WHERE $where) AND (pricegroup_id = ?)|;
- my $sth_add = prepare_query($form, $dbh, $q_add);
-
- my $q_multiply =
- qq|UPDATE prices SET price = price * ?
- WHERE parts_id IN
- (SELECT p.id
- FROM parts p
- LEFT JOIN partsgroup pg ON (p.partsgroup_id = pg.id)
- WHERE $where) AND (pricegroup_id = ?)|;
- my $sth_multiply = prepare_query($form, $dbh, $q_multiply);
-
- for my $i (1 .. $form->{price_rows}) {
- next if ($form->{"price_$i"} eq "");
-
- my $value = $form->parse_amount($myconfig, $form->{"price_$i"});
- my $result;
-
- if ($form->{"pricegroup_type_$i"} eq "percent") {
- $result = do_statement($form, $sth_multiply, $q_multiply, ($value / 100) + 1, @where_values, conv_i($form->{"pricegroup_id_$i"}));
- } else {
- $result = do_statement($form, $sth_add, $q_add, $value, @where_values, conv_i($form->{"pricegroup_id_$i"}));
- }
-
- $num_updated += $result if (0 <= $result);
- }
-
- $sth_add->finish();
- $sth_multiply->finish();
-
- my $rc= $dbh->commit;
-
- $main::lxdebug->leave_sub();
-
- return $num_updated;
-}
-
-sub create_links {
- $main::lxdebug->enter_sub();
-
- my ($self, $module, $myconfig, $form) = @_;
-
- # connect to database
- my $dbh = $form->get_standard_dbh;
-
- my @values = ('%' . $module . '%');
- my $query;
-
- if ($form->{id}) {
- $query =
- qq|SELECT c.accno, c.description, c.link, c.id,
- p.inventory_accno_id, p.income_accno_id, p.expense_accno_id
- FROM chart c, parts p
- WHERE (c.link LIKE ?) AND (p.id = ?)
- ORDER BY c.accno|;
- push(@values, conv_i($form->{id}));
-
- } else {
- $query =
- qq|SELECT c.accno, c.description, c.link, c.id,
- d.inventory_accno_id, d.income_accno_id, d.expense_accno_id
- FROM chart c, defaults d
- WHERE c.link LIKE ?
- ORDER BY c.accno|;
- }
-
- my $sth = prepare_execute_query($form, $dbh, $query, @values);
- while (my $ref = $sth->fetchrow_hashref("NAME_lc")) {
- foreach my $key (split(/:/, $ref->{link})) {
- if ($key =~ /\Q$module\E/) {
- if ( ($ref->{id} eq $ref->{inventory_accno_id})
- || ($ref->{id} eq $ref->{income_accno_id})
- || ($ref->{id} eq $ref->{expense_accno_id})) {
- push @{ $form->{"${module}_links"}{$key} },
- { accno => $ref->{accno},
- description => $ref->{description},
- selected => "selected" };
- $form->{"${key}_default"} = "$ref->{accno}--$ref->{description}";
- } else {
- push @{ $form->{"${module}_links"}{$key} },
- { accno => $ref->{accno},
- description => $ref->{description},
- selected => "" };
- }
- }
- }
- }
- $sth->finish;
-
- # get buchungsgruppen
- $form->{BUCHUNGSGRUPPEN} = selectall_hashref_query($form, $dbh, qq|SELECT id, description FROM buchungsgruppen|);
-
- # get payment terms
- $form->{payment_terms} = selectall_hashref_query($form, $dbh, qq|SELECT id, description FROM payment_terms ORDER BY sortkey|);
-
- if (!$form->{id}) {
- ($form->{priceupdate}) = selectrow_query($form, $dbh, qq|SELECT current_date|);
- }
-
- $main::lxdebug->leave_sub();
+ return $form->{parts};
}
# get partnumber, description, unit, sellprice and soldtotal with choice through $sortorder for Top100
if ($sortorder eq "all") {
$where .= qq| AND (partnumber ILIKE ?) AND (description ILIKE ?)|;
- push(@values, '%' . $form->{partnumber} . '%', '%' . $form->{description} . '%');
+ push(@values, like($form->{partnumber}), like($form->{description}));
} elsif ($sortorder eq "partnumber") {
$where .= qq| AND (partnumber ILIKE ?)|;
- push(@values, '%' . $form->{partnumber} . '%');
+ push(@values, like($form->{partnumber}));
} elsif ($sortorder eq "description") {
$where .= qq| AND (description ILIKE ?)|;
- push(@values, '%' . $form->{description} . '%');
+ push(@values, like($form->{description}));
$order = "description";
}
my $query =
- qq|SELECT id, partnumber, description, unit, sellprice
+ qq|SELECT id, partnumber, description, unit, sellprice,
+ classification_id
FROM parts
WHERE $where ORDER BY $order|;
}
$j++;
+ $form->{"type_and_classific_$j"} = type_abbreviation($ref->{part_type}).
+ classification_abbreviation($ref->{classification_id});
$form->{"id_$j"} = $ref->{id};
$form->{"partnumber_$j"} = $ref->{partnumber};
$form->{"description_$j"} = $ref->{description};
return $sum;
} #end get_soldtotal
-sub retrieve_languages {
- $main::lxdebug->enter_sub();
-
- my ($self, $myconfig, $form) = @_;
-
- # connect to database
- my $dbh = $form->get_standard_dbh;
-
- my @values;
- my $where;
- my $query;
-
- if ($form->{language_values} ne "") {
- $query =
- qq|SELECT l.id, l.description, tr.translation, tr.longdescription
- FROM language l
- LEFT OUTER JOIN translation tr ON (tr.language_id = l.id) AND (tr.parts_id = ?)
- ORDER BY lower(l.description)|;
- @values = (conv_i($form->{id}));
-
- } else {
- $query = qq|SELECT id, description
- FROM language
- ORDER BY lower(description)|;
- }
-
- my $languages = selectall_hashref_query($form, $dbh, $query, @values);
-
- $main::lxdebug->leave_sub();
-
- return $languages;
-}
-
sub follow_account_chain {
$main::lxdebug->enter_sub(2);
# transdate madness.
my $transdate = "";
- if ($form->{type} eq "invoice" or $form->{type} eq "credit_note") {
+ if ( (any {$form->{type} eq $_} qw(invoice credit_note invoice_for_advance_payment final_invoice)) or ($form->{script} eq 'ir.pl') ) {
# use deliverydate for sales and purchase invoice, if it exists
# also use deliverydate for credit notes
- if (!$form->{deliverydate}) {
- $transdate = $form->{invdate};
- } else {
- $transdate = $form->{deliverydate};
- }
- } elsif ($form->{script} eq 'ir.pl') {
- # when a purchase invoice is opened from the report of purchase invoices
- # $form->{type} isn't set, but $form->{script} is, not sure why this is or
- # whether this distinction matters in some other scenario. Otherwise one
- # could probably take out this elsif and add a
- # " or $form->{script} eq 'ir.pl' "
- # to the above if-statement
- if (!$form->{deliverydate}) {
- $transdate = $form->{invdate};
- } else {
- $transdate = $form->{deliverydate};
- }
- } elsif (($form->{type} eq "credit_note") and $form->{deliverydate}) {
- # if credit_note has a deliverydate, use this instead of invdate
- # useful for credit_notes of invoices from an old period with different tax
- # if there is no deliverydate then invdate is used, old default (see next elsif)
- # Falls hier der Stichtag für Steuern anders bestimmt wird,
- # entsprechend auch bei Taxkeys.pm anpassen
- $transdate = $form->{deliverydate};
- } elsif (($form->{type} eq "credit_note") || ($form->{script} eq 'ir.pl')) {
- $transdate = $form->{invdate};
+ $transdate = $form->{tax_point} || $form->{deliverydate} || $form->{invdate};
} else {
- $transdate = $form->{transdate};
+ my $deliverydate;
+ $deliverydate = $form->{reqdate} if any { $_ eq $form->{type} } qw(sales_order request_quotation purchase_order);
+ $transdate = $form->{tax_point} || $deliverydate || $form->{transdate};
}
if ($transdate eq "") {
my %accno_by_part = map { $_->{id} => $_ }
selectall_hashref_query($form, $dbh, <<SQL, @part_ids);
SELECT
- p.id, p.inventory_accno_id AS is_part,
+ p.id, p.part_type,
bg.inventory_accno_id,
tc.income_accno_id AS income_accno_id,
tc.expense_accno_id AS expense_accno_id,
p.id IN ($in)
SQL
- my $sth_tax = prepare_query($::form, $dbh, <<SQL);
- SELECT c.accno, t.taxdescription AS description, t.rate, t.taxnumber
+ my $query_tax = <<SQL;
+ SELECT c.accno, t.taxdescription AS description, t.id as tax_id, t.rate,
+ c.accno as taxnumber
FROM tax t
LEFT JOIN chart c ON c.id = t.chart_id
WHERE t.id IN
WHERE tk.chart_id = ? AND startdate <= ?
ORDER BY startdate DESC LIMIT 1)
SQL
+ my $sth_tax = prepare_query($::form, $dbh, $query_tax);
while (my ($index => $part_id) = each %args) {
my $ref = $accno_by_part{$part_id} or next;
- $ref->{"inventory_accno_id"} = undef unless $ref->{"is_part"};
+ $ref->{"inventory_accno_id"} = undef unless $ref->{"part_type"} eq 'part';
my %accounts;
for my $type (qw(inventory income expense)) {
$form->{"${_}_accno_$index"} = $accounts{"${_}_accno"} for qw(inventory income expense);
- $sth_tax->execute($accounts{$inc_exp}, quote_db_date($transdate));
+ $sth_tax->execute($accounts{$inc_exp}, quote_db_date($transdate)) || $::form->dberror($query_tax);
$ref = $sth_tax->fetchrow_hashref or next;
$form->{"taxaccounts_$index"} = $ref->{"accno"};
$form->{"taxaccounts"} .= "$ref->{accno} "if $form->{"taxaccounts"} !~ /$ref->{accno}/;
- $form->{"$ref->{accno}_${_}"} = $ref->{$_} for qw(rate description taxnumber);
+ $form->{"$ref->{accno}_${_}"} = $ref->{$_} for qw(rate description taxnumber tax_id);
}
$sth_tax->finish;
$sth->finish();
+ $query = qq|SELECT
+ cp.parts_id,
+ cp.customer_partnumber AS customer_model,
+ c.name AS customer_make
+ FROM part_customer_prices cp
+ LEFT JOIN customer c ON (cp.customer_id = c.id)
+ WHERE cp.parts_id IN ($placeholders)|;
+
+ my %customermodel = ();
+
+ $sth = prepare_execute_query($form, $dbh, $query, @part_ids);
+
+ while (my $ref = $sth->fetchrow_hashref()) {
+ $customermodel{$ref->{parts_id}} ||= [];
+ push @{ $customermodel{$ref->{parts_id}} }, $ref;
+ }
+
+ $sth->finish();
+
my @columns = qw(ean image microfiche drawing);
$query = qq|SELECT id, | . join(', ', @columns) . qq|
my %data = selectall_as_map($form, $dbh, $query, 'id', \@columns, @part_ids);
my %template_arrays;
- map { $template_arrays{$_} = [] } (qw(make model), @columns);
+ map { $template_arrays{$_} = [] } (qw(make model customer_make customer_model), @columns);
foreach my $i (1 .. $rowcount) {
my $id = $form->{"${prefix}${i}"};
push @{ $template_arrays{make} }, [];
push @{ $template_arrays{model} }, [];
- next if (!$makemodel{$id});
+ if ($makemodel{$id}) {
+ foreach my $ref (@{ $makemodel{$id} }) {
+ map { push @{ $template_arrays{$_}->[-1] }, $ref->{$_} } qw(make model);
+ }
+ }
+
+ push @{ $template_arrays{customer_make} }, [];
+ push @{ $template_arrays{customer_model} }, [];
- foreach my $ref (@{ $makemodel{$id} }) {
- map { push @{ $template_arrays{$_}->[-1] }, $ref->{$_} } qw(make model);
+ if ($customermodel{$id}) {
+ foreach my $ref (@{ $customermodel{$id} }) {
+ push @{ $template_arrays{$_}->[-1] }, $ref->{$_} for qw(customer_make customer_model);
+ }
}
+
}
my $parts = SL::DB::Manager::Part->get_all(query => [ id => \@part_ids ]);
for my $i (1..$rowcount) {
my $id = $form->{"${prefix}${i}"};
next unless $id;
-
- push @{ $template_arrays{part_type} }, $parts_by_id{$id}->type;
+ my $prt = $parts_by_id{$id};
+ my $type_abbr = type_abbreviation($prt->part_type);
+ push @{ $template_arrays{part_type} }, $prt->part_type;
+ push @{ $template_arrays{part_abbreviation} }, $type_abbr;
+ push @{ $template_arrays{type_and_classific}}, $type_abbr . classification_abbreviation($prt->classification_id);
+ push @{ $template_arrays{separate} }, separate_abbreviation($prt->classification_id);
}
- return %template_arrays;
$main::lxdebug->leave_sub();
+ return %template_arrays;
}
-sub normalize_text_blocks {
- $main::lxdebug->enter_sub();
-
- my $self = shift;
- my %params = @_;
-
- my $form = $params{form} || $main::form;
-
- # check if feature is enabled (select normalize_part_descriptions from defaults)
- return unless ($::instance_conf->get_normalize_part_descriptions);
-
- foreach (qw(description notes)) {
- $form->{$_} =~ s/\s+$//s;
- $form->{$_} =~ s/^\s+//s;
- $form->{$_} =~ s/ {2,}/ /g;
- }
- $main::lxdebug->leave_sub();
-}
-
-
1;
projects / kivitendo-erp.git / blobdiff