projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Debitorenbuchung - Abteilung nutzt immer L.select_tag als Dropdown
[kivitendo-erp.git]
/
SL
/
Form.pm
diff --git
a/SL/Form.pm
b/SL/Form.pm
index
60b3c9a
..
7a9c54e
100644
(file)
--- a/
SL/Form.pm
+++ b/
SL/Form.pm
@@
-27,7
+27,8
@@
# 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
# 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
#======================================================================
# Utilities for parsing forms
# and supporting routines for linking account numbers
@@
-1535,18
+1536,18
@@
sub save_exchangerate {
my ($self, $myconfig, $currency, $transdate, $rate, $fld) = @_;
my ($self, $myconfig, $currency, $transdate, $rate, $fld) = @_;
- my $dbh = $self->dbconnect($myconfig);
-
- my ($buy, $sell);
-
- $buy = $rate if $fld eq 'buy';
- $sell = $rate if $fld eq 'sell';
+ SL::DB->client->with_transaction(sub {
+ my $dbh = SL::DB->client->dbh;
+ my ($buy, $sell);
- $self->update_exchangerate($dbh, $currency, $transdate, $buy, $sell);
+ $buy = $rate if $fld eq 'buy';
+ $sell = $rate if $fld eq 'sell';
- $dbh->disconnect;
+ $self->update_exchangerate($dbh, $currency, $transdate, $buy, $sell);
+ 1;
+ }) or do { die SL::DB->client->error };
$main::lxdebug->leave_sub();
}
$main::lxdebug->leave_sub();
}
@@
-3180,16
+3181,13
@@
sub get_partsgroup {
my @values;
if ($p->{searchitems} eq 'part') {
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') {
}
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') {
}
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|;
}
$query .= qq|ORDER BY partsgroup|;