X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fcp.pl;h=a8caa526b1f1d3eda12614bd57f9f2b94a730197;hb=83542c806dc5c249bf640e344eaf3831cdf2f2ea;hp=d8890a10e95effad6be614cf9346da022226d164;hpb=4dbb09950c9f5596646537c12d991c99086fe7c1;p=kivitendo-erp.git
diff --git a/bin/mozilla/cp.pl b/bin/mozilla/cp.pl
index d8890a10e..a8caa526b 100644
--- a/bin/mozilla/cp.pl
+++ b/bin/mozilla/cp.pl
@@ -31,64 +31,94 @@
#
#======================================================================
-
use SL::CP;
-use SL::OP;
use SL::IS;
use SL::IR;
+use SL::AR;
+use SL::AP;
+use Data::Dumper;
+use strict;
+#use warnings;
+
+require "bin/mozilla/arap.pl";
+require "bin/mozilla/common.pl";
-require "$form->{path}/arap.pl";
+our ($form, %myconfig, $lxdebug, $locale, $auth);
1;
-# end of main
+# end of main
sub payment {
$lxdebug->enter_sub();
-
+ $auth->assert('cash');
+
+ my (@curr);
+
$form->{ARAP} = ($form->{type} eq 'receipt') ? "AR" : "AP";
$form->{arap} = lc $form->{ARAP};
# setup customer/vendor selection for open invoices
if ($form->{all_vc}) {
+ # Dieser Zweig funktioniert derzeit NIE. Ggf. ganz raus oder
+ # alle offenen Zahlungen wieder korrekt anzeigen. jb 12.10.2010
$form->all_vc(\%myconfig, $form->{vc}, $form->{ARAP});
} else {
CP->get_openvc(\%myconfig, \%$form);
}
-
+ # Auswahlliste für vc zusammenbauen
+ # Erweiterung für schliessende option und erweiterung um value
+ # für bugfix 1771 (doppelte Leerzeichen werden nicht 'gepostet')
$form->{"select$form->{vc}"} = "";
-
- if ($form->{"all_$form->{vc}"}) {
- $form->{"$form->{vc}_id"} = $form->{"all_$form->{vc}"}->[0]->{id};
- map { $form->{"select$form->{vc}"} .= "\n" if $form->{vc} eq "customer";
- map { $form->{selectdepartment} .= "\n" }
+ @{ $form->{"all_$form->{vc}"} };
}
-
CP->paymentaccounts(\%myconfig, \%$form);
+ # Standard Konto für Umlaufvermögen
+ my $accno_arap = IS->get_standard_accno_current_assets(\%myconfig, \%$form);
+ # Entsprechend präventiv die Auswahlliste für Kontonummer
+ # auch mit value= zusammenbauen (s.a. oben bugfix 1771)
+ # Wichtig: Auch das Template anpassen, damit hidden input korrekt die "
+ # escaped.
$form->{selectaccount} = "";
$form->{"select$form->{ARAP}"} = "";
- map { $form->{selectaccount} .= "\n";
+ $form->{account} = "$_->{accno}--$_->{description}" if ($_->{accno} eq $accno_arap) } @{ $form->{PR}{"$form->{ARAP}_paid"} };
+
+ # Braucht man das hier überhaupt? Erstmal auskommentieren .. jan 18.12.2010
+ # map {
+ # $form->{"select$form->{ARAP}"} .=
+ # "\n" } @curr;
- $form->{media} = "screen";
&form_header;
&form_footer;
@@ -96,380 +126,99 @@ sub payment {
$lxdebug->leave_sub();
}
-
-
sub form_header {
- $lxdebug->enter_sub();
+ $lxdebug->enter_sub;
+ $auth->assert('cash');
- $vclabel = ucfirst $form->{vc};
- $vclabel = $locale->text($vclabel);
-
- if ($form->{type} eq 'receipt') {
- $form->{title} = $locale->text('Receipt');
- $form->{origtitle} = "Receipt";
- }
- if ($form->{type} eq 'check') {
- $form->{title} = $locale->text('Payment');
- $form->{origtitle} = "Payment";
- }
-
-# $locale->text('Customer')
-# $locale->text('Vendor')
+ my ($vc, $arap, $exchangerate);
+ my ($onload);
- if ($form->{$form->{vc}} eq "") {
+ if ($form->{ $form->{vc} } eq "") {
map { $form->{"addr$_"} = "" } (1 .. 4);
}
- if ($form->{currency} ne $form->{defaultcurrency}) {
- $form->{exchangerate} = $form->format_amount(\%myconfig, $form->{exchangerate});
- if ($form->{forex}) {
- $exchangerate = qq|
-
- |.$locale->text('Exchangerate').qq| |
- {exchangerate}>$form->{exchangerate} |
-
-|;
- } else {
- $exchangerate = qq|
-
- |.$locale->text('Exchangerate').qq| |
- {exchangerate}> |
-
-|;
- }
+ # sometimes it happens that values in customer arrive without the signs '--'
+ # but in order to select the right option field we need values with '--'
+ if ($form->{vc} eq "customer"){
+ my ($customername) = split /--/, $form->{ $form->{vc} };
+ $form->{ $form->{vc} } = $customername . "--" . $form->{customer_id};
}
-
- foreach $item ($form->{vc}, account, currency, $form->{ARAP}, department) {
+ # bugfix 1771
+ # geändert von
+ # offen: $form->{ARAP} kann raus?
+ for my $item ($form->{vc}, "account", "currency", $form->{ARAP}) {
$form->{"select$item"} =~ s/ selected//;
- $form->{"select$item"} =~ s/option>\Q$form->{$item}\E/option selected>$form->{$item}/;
+ $form->{"select$item"} =~ s/option value="\Q$form->{$item}\E">\Q$form->{$item}\E/option selected value="$form->{$item}">$form->{$item}/;
}
- $vc = ($form->{"select$form->{vc}"}) ? qq|| : qq|{vc} size=35 value="$form->{$form->{vc}}">|;
+ $vc =
+ ($form->{"select$form->{vc}"})
+ ? qq||
+ : qq|{vc} size=35 value="$form->{$form->{vc}}">|;
- if ($form->{all_vc}) {
- $allvc = "checked";
- $form->{openinvoices} = "";
- } else {
- $allvc = "";
- $form->{openinvoices} = 1;
- }
-
-# $locale->text('AR')
-# $locale->text('AP')
-
- $department = qq|
-
- |.$locale->text('Department').qq| |
-
-
-
- |
-
-| if $form->{selectdepartment};
-
- $form->{jsscript} = $jscalendar;
- $jsscript = "";
- if ($form->{jsscript})
- {
- # with JavaScript Calendar
- $button1 = qq|
-
- text('button').qq|> |
- |;
- #write Trigger
- $jsscript = Form->write_trigger(\%myconfig,"1","datepaid","BL","trigger1","","","");
- }
- else
- {
- # without JavaScript Calendar
- $button1 = qq|
- | |;
- }
-
- $form->header;
+ $form->{openinvoices} = $form->{all_vc} ? "" : 1;
- $arap = lc $form->{ARAP};
+ # $locale->text('AR')
+ # $locale->text('AP')
- print qq|
-
-
-
-
-
-