# 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.
#======================================================================
# Utilities for parsing forms
# and supporting routines for linking account numbers
use SL::DB::PaymentTerm;
use SL::DB::Vendor;
use SL::DO;
+use SL::Helper::Flash qw();
use SL::IC;
use SL::IS;
use SL::Layout::Dispatcher;
'label_error' => $error,
};
- if ($params{action}) {
- my @vars;
-
- map { delete($self->{$_}); } qw(action);
- map { push @vars, { "name" => $_, "value" => $self->{$_} } if (!ref($self->{$_})); } keys %{ $self };
-
- $add_params->{SHOW_BUTTON} = 1;
- $add_params->{BUTTON_LABEL} = $params{label} || $params{action};
- $add_params->{VARIABLES} = \@vars;
-
- } elsif ($params{back_button}) {
- $add_params->{SHOW_BACK_BUTTON} = 1;
- }
-
$self->{title} = $params{title} if $params{title};
$self->header();
$self->info($msg);
} else {
+ SL::Helper::Flash::flash_later('info', $msg) if $msg;
$self->_store_redirect_info_in_session;
print $::form->redirect_header($self->{callback});
}
return scalar(@{ $self->{name_list} });
}
-# the selection sub is used in the AR, AP, IS, IR, DO and OE module
-#
-sub all_vc {
- $main::lxdebug->enter_sub();
-
- my ($self, $myconfig, $table, $module) = @_;
-
- my $ref;
- my $dbh = $self->get_standard_dbh;
-
- $table = $table eq "customer" ? "customer" : "vendor";
-
- # build selection list
- # Hotfix für Bug 1837 - Besser wäre es alte Buchungsbelege
- # OHNE Auswahlliste (reines Textfeld) zu laden. Hilft aber auch
- # nicht für veränderbare Belege (oe, do, ...)
- my $obsolete = $self->{id} ? '' : "WHERE NOT obsolete";
- my $query = qq|SELECT count(*) FROM $table $obsolete|;
- my ($count) = selectrow_query($self, $dbh, $query);
-
- if ($count <= $myconfig->{vclimit}) {
- $query = qq|SELECT id, name, salesman_id
- FROM $table $obsolete
- ORDER BY name|;
- $self->{"all_$table"} = selectall_hashref_query($self, $dbh, $query);
- }
-
- # get self
- $self->get_employee($dbh);
-
- # setup sales contacts
- $query = qq|SELECT e.id, e.name
- FROM employee e
- WHERE (e.sales = '1') AND (NOT e.id = ?)
- ORDER BY name|;
- $self->{all_employees} = selectall_hashref_query($self, $dbh, $query, $self->{employee_id});
-
- # this is for self
- push(@{ $self->{all_employees} },
- { id => $self->{employee_id},
- name => $self->{employee} });
-
- # prepare query for departments
- $query = qq|SELECT id, description
- FROM department
- ORDER BY description|;
-
- $self->{all_departments} = selectall_hashref_query($self, $dbh, $query);
-
- # get languages
- $query = qq|SELECT id, description
- FROM language
- ORDER BY id|;
-
- $self->{languages} = selectall_hashref_query($self, $dbh, $query);
-
- # get printer
- $query = qq|SELECT printer_description, id
- FROM printers
- ORDER BY printer_description|;
-
- $self->{printers} = selectall_hashref_query($self, $dbh, $query);
-
- # get payment terms
- $query = qq|SELECT id, description
- FROM payment_terms
- ORDER BY sortkey|;
-
- $self->{payment_terms} = selectall_hashref_query($self, $dbh, $query);
-
- $main::lxdebug->leave_sub();
-}
-
sub new_lastmtime {
$main::lxdebug->enter_sub();
}
}
+# language_payment duplicates some of the functionality of all_vc (language,
+# printer, payment_terms), and at least in the case of sales invoices both
+# all_vc and language_payment are called when adding new invoices
sub language_payment {
$main::lxdebug->enter_sub();
# get payment terms
$query = qq|SELECT id, description
FROM payment_terms
- ORDER BY sortkey|;
-
- $self->{payment_terms} = selectall_hashref_query($self, $dbh, $query);
+ WHERE ( obsolete IS FALSE OR id = ? )
+ ORDER BY sortkey |;
+ $self->{payment_terms} = selectall_hashref_query($self, $dbh, $query, $self->{payment_id} || undef);
# get buchungsgruppen
$query = qq|SELECT id, description
$arap = "ap";
}
- $self->all_vc($myconfig, $table, $module);
-
# get last customers or vendors
my ($query, $sth, $ref);
}
# now get the account numbers
-# $query = qq|SELECT c.accno, c.description, c.link, c.taxkey_id, tk.tax_id
-# FROM chart c, taxkeys tk
-# WHERE (c.link LIKE ?) AND (c.id = tk.chart_id) AND tk.id =
-# (SELECT id FROM taxkeys WHERE (taxkeys.chart_id = c.id) AND (startdate <= $transdate) ORDER BY startdate DESC LIMIT 1)
-# ORDER BY c.accno|;
-
-# same query as above, but without expensive subquery for each row. about 80% faster
$query = qq|
- SELECT c.accno, c.description, c.link, c.taxkey_id, tk2.tax_id
+ SELECT c.accno, c.description, c.link, c.taxkey_id, c.id AS chart_id, tk2.tax_id
FROM chart c
-- find newest entries in taxkeys
INNER JOIN (
push @{ $self->{"${module}_links"}{$key} },
{ accno => $ref->{accno},
+ chart_id => $ref->{chart_id},
description => $ref->{description},
taxkey => $ref->{taxkey_id},
tax_id => $ref->{tax_id} };
}
# now get the account numbers
- $query = qq|SELECT c.accno, c.description, c.link, c.taxkey_id, tk.tax_id
+ $query = qq|SELECT c.accno, c.description, c.link, c.taxkey_id, c.id AS chart_id, tk.tax_id
FROM chart c
LEFT JOIN taxkeys tk ON (tk.chart_id = c.id)
WHERE c.link LIKE ?
push @{ $self->{"${module}_links"}{$key} },
{ accno => $ref->{accno},
+ chart_id => $ref->{chart_id},
description => $ref->{description},
taxkey => $ref->{taxkey_id},
tax_id => $ref->{tax_id} };
$query =
qq|SELECT
c.accno, c.description,
- a.acc_trans_id, a.source, a.amount, a.memo, a.transdate, a.gldate, a.cleared, a.project_id, a.taxkey,
+ a.acc_trans_id, a.source, a.amount, a.memo, a.transdate, a.gldate, a.cleared, a.project_id, a.taxkey, a.chart_id,
p.projectnumber,
t.rate, t.id
FROM acc_trans a
my @values;
if ($p->{searchitems} eq 'part') {
- $query .= qq|WHERE p.inventory_accno_id > 0|;
+ $query .= qq|WHERE p.part_type = 'part'|;
}
if ($p->{searchitems} eq 'service') {
- $query .= qq|WHERE p.inventory_accno_id IS NULL|;
+ $query .= qq|WHERE p.part_type = 'service'|;
}
if ($p->{searchitems} eq 'assembly') {
- $query .= qq|WHERE p.assembly = '1'|;
- }
- if ($p->{searchitems} eq 'labor') {
- $query .= qq|WHERE (p.inventory_accno_id > 0) AND (p.income_accno_id IS NULL)|;
+ $query .= qq|WHERE p.part_type = 'assembly'|;
}
$query .= qq|ORDER BY partsgroup|;
projects / kivitendo-erp.git / blobdiff