projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Form->show_generic_error: Parameter action, back_button entfernt
[kivitendo-erp.git]
/
SL
/
CP.pm
diff --git
a/SL/CP.pm
b/SL/CP.pm
index
a2a2476
..
dc52af8
100644
(file)
--- a/
SL/CP.pm
+++ b/
SL/CP.pm
@@
-25,7
+25,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.
#======================================================================
#
# Check and receipt printing payment module backend routines
#======================================================================
#
# Check and receipt printing payment module backend routines
@@
-36,6
+37,7
@@
package CP;
use SL::DBUtils;
package CP;
use SL::DBUtils;
+use SL::DB;
use strict;
use strict;
@@
-66,8
+68,7
@@
sub paymentaccounts {
my ($self, $myconfig, $form) = @_;
my ($self, $myconfig, $form) = @_;
- # connect to database
- my $dbh = $form->dbconnect($myconfig);
+ my $dbh = SL::DB->client->dbh;
my $ARAP = $form->{ARAP} eq "AR" ? "AR" : "AP";
my $ARAP = $form->{ARAP} eq "AR" ? "AR" : "AP";
@@
-76,7
+77,7
@@
sub paymentaccounts {
qq|FROM chart | .
qq|WHERE link LIKE ? |.
qq|ORDER BY accno|;
qq|FROM chart | .
qq|WHERE link LIKE ? |.
qq|ORDER BY accno|;
- my $sth = prepare_execute_query($form, $dbh, $query,
'%' . $ARAP . '%'
);
+ my $sth = prepare_execute_query($form, $dbh, $query,
like($ARAP)
);
$form->{PR}{ $form->{ARAP} } = ();
$form->{PR}{"$form->{ARAP}_paid"} = ();
$form->{PR}{ $form->{ARAP} } = ();
$form->{PR}{"$form->{ARAP}_paid"} = ();
@@
-97,8
+98,6
@@
sub paymentaccounts {
$query = qq|SELECT closedto FROM defaults|;
($form->{closedto}) = selectrow_query($form, $dbh, $query);
$query = qq|SELECT closedto FROM defaults|;
($form->{closedto}) = selectrow_query($form, $dbh, $query);
- $dbh->disconnect;
-
$main::lxdebug->leave_sub();
}
$main::lxdebug->leave_sub();
}
@@
-107,7
+106,7
@@
sub get_openvc {
my ($self, $myconfig, $form) = @_;
my ($self, $myconfig, $form) = @_;
- my $dbh =
$form->dbconnect($myconfig)
;
+ my $dbh =
SL::DB->client->dbh
;
my $arap = ($form->{vc} eq 'customer') ? 'ar' : 'ap';
my $vc = $form->{vc} eq "customer" ? "customer" : "vendor";
my $arap = ($form->{vc} eq 'customer') ? 'ar' : 'ap';
my $vc = $form->{vc} eq "customer" ? "customer" : "vendor";
@@
-127,11
+126,6
@@
sub get_openvc {
$form->{"all_$form->{vc}"} = selectall_hashref_query($form, $dbh, $query);
}
$form->{"all_$form->{vc}"} = selectall_hashref_query($form, $dbh, $query);
}
- # aufruf für all_deparments rausgenommen, da die abteilungen nur
- # beim buchen der belege (rechnung, fibu) geändert werden und danach
- # NICHT mehr überschrieben werden
- $dbh->disconnect;
-
$main::lxdebug->leave_sub();
}
$main::lxdebug->leave_sub();
}
@@
-141,7
+135,7
@@
sub get_openinvoices {
my ($self, $myconfig, $form) = @_;
# connect to database
my ($self, $myconfig, $form) = @_;
# connect to database
- my $dbh =
$form->dbconnect($myconfig)
;
+ my $dbh =
SL::DB->client->dbh
;
my $vc = $form->{vc} eq "customer" ? "customer" : "vendor";
my $vc = $form->{vc} eq "customer" ? "customer" : "vendor";
@@
-186,19
+180,24
@@
sub get_openinvoices {
SQL
($form->{openinvoices_other_currencies}) = selectfirst_array_query($form, $dbh, $query, conv_i($form->{"${vc}_id"}), "$form->{currency}");
SQL
($form->{openinvoices_other_currencies}) = selectfirst_array_query($form, $dbh, $query, conv_i($form->{"${vc}_id"}), "$form->{currency}");
- $dbh->disconnect;
-
$main::lxdebug->leave_sub();
}
sub process_payment {
$main::lxdebug->leave_sub();
}
sub process_payment {
+ my ($self, $myconfig, $form) = @_;
$main::lxdebug->enter_sub();
$main::lxdebug->enter_sub();
+ my $rc = SL::DB->client->with_transaction(\&_process_payment, $self, $myconfig, $form);
+
+ $::lxdebug->leave_sub;
+ return $rc;
+}
+
+sub _process_payment {
my ($self, $myconfig, $form) = @_;
my $amount;
my ($self, $myconfig, $form) = @_;
my $amount;
- # connect to database, turn AutoCommit off
- my $dbh = $form->dbconnect_noauto($myconfig);
+ my $dbh = SL::DB->client->dbh;
my ($paymentaccno) = split /--/, $form->{account};
my ($paymentaccno) = split /--/, $form->{account};
@@
-356,17
+355,8
@@
sub process_payment {
# /saving the history
}
}
# /saving the history
}
}
- my $rc;
- # Hier wurden negativen Zahlungseingänge abgefangen
- # da Zahlungsein- und ausgänge immer positiv sind
- # Besser: in Oberfläche schon prüfen erledigt jb 10.2010
- $rc = $dbh->commit;
-
- $dbh->disconnect;
- $main::lxdebug->leave_sub();
-
- return $rc;
+ return 1;
}
1;
}
1;