X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Far.pl;h=382e733d3624e01e1386c62d66e5fa081b60e938;hb=599030d5e26bcef0f9850ddbbedba106ded70ebb;hp=af964bbd71ada527df1848e00e269ea6363f3f7a;hpb=db68b6fd72b9f0d7d8be953746c0e7d6154f5eaf;p=kivitendo-erp.git diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl index af964bbd7..382e733d3 100644 --- a/bin/mozilla/ar.pl +++ b/bin/mozilla/ar.pl @@ -36,7 +36,7 @@ use SL::IS; use SL::PE; use Data::Dumper; -require "$form->{path}/arap.pl"; +require "bin/mozilla/arap.pl"; require "bin/mozilla/common.pl"; require "bin/mozilla/drafts.pl"; @@ -79,6 +79,7 @@ sub add { # saving the history if(!exists $form->{addition} && ($form->{id} ne "")) { + $form->{snumbers} = qq|invnumber_| . $form->{invnumber}; $form->{addition} = "ADDED"; $form->save_history($form->dbconnect(\%myconfig)); } @@ -86,11 +87,13 @@ sub add { $form->{title} = "Add"; $form->{callback} = - "$form->{script}?action=add&path=$form->{path}&login=$form->{login}&password=$form->{password}" + "$form->{script}?action=add&login=$form->{login}&password=$form->{password}" unless $form->{callback}; - &create_links; AR->get_transdate(\%myconfig, $form); + $form->{initial_transdate} = $form->{transdate}; + &create_links; + $form->{transdate} = $form->{initial_transdate}; &display_form; $lxdebug->leave_sub(); } @@ -100,7 +103,7 @@ sub edit { # show history button $form->{javascript} = qq||; #/show hhistory button - + $form->{javascript} .= qq||; $form->{title} = "Edit"; &create_links; @@ -134,6 +137,9 @@ sub create_links { $form->{oldcustomer} = "$form->{customer}--$form->{customer_id}"; $form->{rowcount} = 1; + # notes + $form->{notes} = $form->{intnotes} unless $form->{notes}; + # currencies @curr = split(/:/, $form->{currencies}); chomp $curr[0]; @@ -171,31 +177,10 @@ sub create_links { # build the popup menus $form->{taxincluded} = ($form->{id}) ? $form->{taxincluded} : "checked"; - map { - $tax .= - qq|{id}--$_->{rate}\">$_->{taxdescription} | - . ($_->{rate} * 100) . qq| %| - } @{ $form->{TAX} }; - $form->{taxchart} = $tax; - $form->{selecttaxchart} = $tax; - # forex $form->{forex} = $form->{exchangerate}; $exchangerate = ($form->{exchangerate}) ? $form->{exchangerate} : 1; foreach $key (keys %{ $form->{AR_links} }) { - - foreach $ref (@{ $form->{AR_links}{$key} }) { - if ($key eq "AR_paid") { - $form->{"select$key"} .= - "{accno}\">$ref->{accno}--$ref->{description}\n"; - } else { - $form->{"select$key"} .= - "{accno}--$ref->{tax_id}\">$ref->{accno}--$ref->{description}\n"; - } - } - - $form->{$key} = $form->{"select$key"}; - # if there is a value we have an old entry my $j = 0; my $k = 0; @@ -203,8 +188,7 @@ sub create_links { for $i (1 .. scalar @{ $form->{acc_trans}{$key} }) { if ($key eq "AR_paid") { $j++; - $form->{"AR_paid_$j"} = - "$form->{acc_trans}{$key}->[$i-1]->{accno}--$form->{acc_trans}{$key}->[$i-1]->{description}"; + $form->{"AR_paid_$j"} = $form->{acc_trans}{$key}->[$i-1]->{accno}; # reverse paid $form->{"paid_$j"} = $form->{acc_trans}{$key}->[$i - 1]->{amount} * -1; @@ -215,9 +199,9 @@ sub create_links { $form->{"forex_$j"} = $form->{"exchangerate_$i"} = $form->{acc_trans}{$key}->[$i - 1]->{exchangerate}; - $form->{"AR_paid_$j"} = "$form->{acc_trans}{$key}->[$i-1]->{accno}"; $form->{"paid_project_id_$j"} = $form->{acc_trans}{$key}->[$i - 1]->{project_id}; $form->{paidaccounts}++; + } else { $akey = $key; @@ -262,19 +246,17 @@ sub create_links { $form->{"project_id_$k"} = "$form->{acc_trans}{$key}->[$i-1]->{project_id}"; } - $form->{"${key}_$k"} = - "$form->{acc_trans}{$key}->[$i-1]->{accno}--$form->{acc_trans}{$key}->[$i-1]->{description}"; $form->{"${key}_$i"} = "$form->{acc_trans}{$key}->[$i-1]->{accno}--$form->{acc_trans}{$key}->[$i-1]->{description}"; - my $q_description = quotemeta($form->{acc_trans}{$key}->[$i-1]->{description}); - $form->{"select${key}"} =~ - /{acc_trans}{$key}->[$i-1]->{accno}--[^\"]*)\">$form->{acc_trans}{$key}->[$i-1]->{accno}--${q_description}<\/option>\n/; - $form->{"${key}_$k"} = $1; - if ($akey eq 'amount') { - $form->{"taxchart_$k"} = $form->{taxchart}; - $form->{"taxchart_$k"} =~ - /{acc_trans}{$key}->[$i-1]->{id}--[^\"]*)/; - $form->{"taxchart_$k"} = $1; + + if ($akey eq "AR") { + $form->{ARselected} = $form->{acc_trans}{$key}->[$i-1]->{accno}; + + } elsif ($akey eq "amount") { + $form->{"${key}_$k"} = $form->{acc_trans}{$key}->[$i-1]->{accno} . + "--" . $form->{acc_trans}{$key}->[$i-1]->{id}; + $form->{"taxchart_$k"} = $form->{acc_trans}{$key}->[$i-1]->{id} . + "--" . $form->{acc_trans}{$key}->[$i-1]->{rate}; } } } @@ -306,8 +288,6 @@ sub create_links { ($form->datetonum($form->{transdate}, \%myconfig) <= $form->datetonum($form->{closedto}, \%myconfig)); - $form->{"ARselected"} = $form->{"AR_1"}; - $lxdebug->leave_sub(); } @@ -343,28 +323,19 @@ sub form_header { # show history button js $form->{javascript} .= qq||; #/show history button js - + $form->{javascript} .= qq||; $readonly = ($form->{id}) ? "readonly" : ""; $form->{radier} = ($form->current_date(\%myconfig) eq $form->{gldate}) ? 1 : 0; $readonly = ($form->{radier}) ? "" : $readonly; - my $ARselected_quoted = quotemeta($form->{"ARselected"}); - $form->{selectAR} = $form->{AR}; - $form->{selectAR} =~ - s/value=\"${ARselected_quoted}\"/value=\"$form->{ARselected}\" selected/; - # set option selected foreach $item (qw(customer currency department employee)) { $form->{"select$item"} =~ s/ selected//; $form->{"select$item"} =~ s/option>\Q$form->{$item}\E/option selected>$form->{$item}/; } - $selectAR_amount_unquoted = $form->{selectAR_amount}; - $taxchart = $form->{taxchart}; - map { $form->{$_} =~ s/\"/"/g } - qw(AR_amount selectAR_amount AR taxchart); # format amounts $form->{exchangerate} = @@ -392,8 +363,6 @@ sub form_header { } } - $taxincluded = ""; - $taxincluded = qq| {taxincluded}> @@ -420,7 +389,9 @@ sub form_header { $customer = ($form->{selectcustomer}) - ? qq|$form->{selectcustomer}| + ? qq|$form->{ +selectcustomer}| : qq||; $employee = qq| @@ -443,7 +414,13 @@ sub form_header { $form->get_lists("projects" => { "key" => "ALL_PROJECTS", "all" => 0, - "old_id" => \@old_project_ids }); + "old_id" => \@old_project_ids }, + "charts" => { "key" => "ALL_CHARTS", + "transdate" => $form->{transdate} }, + "taxcharts" => "ALL_TAXCHARTS"); + + map({ $_->{link_split} = [ split(/:/, $_->{link}) ]; } + @{ $form->{ALL_CHARTS} }); my %project_labels = (); my @project_values = (""); @@ -452,6 +429,45 @@ sub form_header { $project_labels{$item->{"id"}} = $item->{"projectnumber"}; } + my (%AR_amount_labels, @AR_amount_values); + my (%AR_labels, @AR_values); + my (%AR_paid_labels, @AR_paid_values); + my %charts; + my $taxchart_init; + + foreach my $item (@{ $form->{ALL_CHARTS} }) { + if (grep({ $_ eq "AR_amount" } @{ $item->{link_split} })) { + $taxchart_init = $item->{tax_id} if ($taxchart_init eq ""); + my $key = "$item->{accno}--$item->{tax_id}"; + push(@AR_amount_values, $key); + $AR_amount_labels{$key} = + "$item->{accno}--$item->{description}"; + + } elsif (grep({ $_ eq "AR" } @{ $item->{link_split} })) { + push(@AR_values, $item->{accno}); + $AR_labels{$item->{accno}} = "$item->{accno}--$item->{description}"; + + } elsif (grep({ $_ eq "AR_paid" } @{ $item->{link_split} })) { + push(@AR_paid_values, $item->{accno}); + $AR_paid_labels{$item->{accno}} = + "$item->{accno}--$item->{description}"; + } + + $charts{$item->{accno}} = $item; + } + + my %taxchart_labels = (); + my @taxchart_values = (); + my %taxcharts = (); + foreach my $item (@{ $form->{ALL_TAXCHARTS} }) { + my $key = "$item->{id}--$item->{rate}"; + $taxchart_init = $key if ($taxchart_init eq $item->{id}); + push(@taxchart_values, $key); + $taxchart_labels{$key} = + "$item->{taxdescription} " . ($item->{rate} * 100) . ' %'; + $taxcharts{$item->{id}} = $item; + } + $form->{fokus} = "arledger.customer"; # use JavaScript Calendar or not @@ -461,12 +477,12 @@ sub form_header { # with JavaScript Calendar $button1 = qq| - {transdate}> + text('button') . qq|> |; $button2 = qq| - {duedate}> + text('button') . qq|> |; @@ -479,15 +495,17 @@ sub form_header { # without JavaScript Calendar $button1 = - qq|{transdate}>|; + qq||; $button2 = - qq|{duedate}>|; + qq||; } $form->header; - + $onload = qq|focus()|; + $onload .= qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|; + $onload .= qq|;setupPoints('|. $myconfig{numberformat} .qq|', '|. $locale->text("wrongformat") .qq|')|; print qq| - + {script}> @@ -573,9 +591,6 @@ sub form_header { $jsscript - - - {rowcount}> @@ -605,14 +620,45 @@ $jsscript $form->{"amount_$i"} = $form->format_amount(\%myconfig, $form->{"amount_$i"}, 2); $form->{"tax_$i"} = $form->format_amount(\%myconfig, $form->{"tax_$i"}, 2); - $selectAR_amount = $selectAR_amount_unquoted; - $selectAR_amount =~ - s/option value=\"$form->{"AR_amount_$i"}\"/option value=\"$form->{"AR_amount_$i"}\" selected/; - $tax = $taxchart; - $tax_selected = $form->{"taxchart_$i"}; - $tax =~ s/value=\"$tax_selected\"/value=\"$tax_selected\" selected/; - $tax = - qq|$tax|; + + my $selected_accno_full; + my ($accno_row) = split(/--/, $form->{"AR_amount_$i"}); + my $item = $charts{$accno_row}; + $selected_accno_full = "$item->{accno}--$item->{tax_id}"; + + my $selected_taxchart = $form->{"taxchart_$i"}; + my ($selected_accno, $selected_tax_id) = split(/--/, $selected_accno_full); + my ($previous_accno, $previous_tax_id) = split(/--/, $form->{"previous_AR_amount_$i"}); + + if ($previous_accno && + ($previous_accno eq $selected_accno) && + ($previous_tax_id ne $selected_tax_id)) { + my $item = $taxcharts{$selected_tax_id}; + $selected_taxchart = "$item->{id}--$item->{rate}"; + } + + $selected_taxchart = $taxchart_init unless ($form->{"taxchart_$i"}); + + $selectAR_amount = + NTI($cgi->popup_menu('-name' => "AR_amount_$i", + '-id' => "AR_amount_$i", + '-style' => 'width:400px', + '-onChange' => "setTaxkey(this, $i)", + '-values' => \@AR_amount_values, + '-labels' => \%AR_amount_labels, + '-default' => $selected_accno_full)) + . $cgi->hidden('-name' => "previous_AR_amount_$i", + '-default' => $selected_accno_full); + + $tax = qq|| . + NTI($cgi->popup_menu('-name' => "taxchart_$i", + '-id' => "taxchart_$i", + '-style' => 'width:200px', + '-values' => \@taxchart_values, + '-labels' => \%taxchart_labels, + '-default' => $selected_taxchart)) + . qq||; + $korrektur_checked = ($form->{"korrektur_$i"} ? 'checked' : ''); my $projectnumber = @@ -623,7 +669,7 @@ $jsscript print qq| - $selectAR_amount + $selectAR_amount {"amount_$i"}> {"tax_$i"}> @@ -637,6 +683,12 @@ $jsscript $form->{invtotal} = $form->format_amount(\%myconfig, $form->{invtotal}, 2); + $ARselected = + NTI($cgi->popup_menu('-name' => "ARselected", '-id' => "ARselected", + '-style' => 'width:400px', + '-values' => \@AR_values, '-labels' => \%AR_labels, + '-default' => $form->{ARselected})); + print qq| @@ -644,8 +696,7 @@ $jsscript - $form->{selectAR} - + ${ARselected} $form->{invtotal} {oldinvtotal}> @@ -708,9 +759,12 @@ $jsscript "; - $form->{"selectAR_paid_$i"} = $form->{selectAR_paid}; - $form->{"selectAR_paid_$i"} =~ - s/option value=\"$form->{"AR_paid_$i"}\">/option value=\"$form->{"AR_paid_$i"}\" selected>/; + $selectAR_paid = + NTI($cgi->popup_menu('-name' => "AR_paid_$i", + '-id' => "AR_paid_$i", + '-values' => \@AR_paid_values, + '-labels' => \%AR_paid_labels, + '-default' => $form->{"AR_paid_$i"})); # format amounts if ($form->{"paid_$i"}) { @@ -736,12 +790,12 @@ $jsscript |; $column_data{paid} = - qq|{"paid_$i"}>|; + qq||; $column_data{AR_paid} = - qq|$form->{"selectAR_paid_$i"}|; + qq|${selectAR_paid}|; $column_data{exchangerate} = qq|$exchangerate|; $column_data{datepaid} = - qq|{"datepaid_$i"}> + qq| |; $column_data{source} = qq||; @@ -763,12 +817,10 @@ $jsscript "; push(@triggers, "datepaid_$i", "BL", "trigger_datepaid_$i"); } - map { $form->{$_} =~ s/\"/"/g } qw(selectAR_paid); print $form->write_trigger(\%myconfig, scalar(@triggers) / 3, @triggers) . qq| {paidaccounts}> - @@ -791,7 +843,6 @@ sub form_footer { -{path}> {login}> {password}> | @@ -802,10 +853,19 @@ sub form_footer { |; + if (!$form->{id} && $form->{draft_id}) { + print(NTI($cgi->checkbox('-name' => 'remove_draft', '-id' => 'remove_draft', + '-value' => 1, '-checked' => $form->{remove_draft}, + '-label' => '')) . + qq| | . + $locale->text("Remove draft when posting") . + qq||); + } + $transdate = $form->datetonum($form->{transdate}, \%myconfig); $closedto = $form->datetonum($form->{closedto}, \%myconfig); - print qq| |; if ($form->{id}) { @@ -838,7 +898,7 @@ sub form_footer { } if ($form->{menubar}) { - require "$form->{path}/menu.pl"; + require "bin/mozilla/menu.pl"; &menubar; } # button for saving history @@ -866,24 +926,8 @@ sub update { my $display = shift; - # if ($display) { - # goto TAXCALC; - # } - $form->{invtotal} = 0; - # $form->{selectAR_amount} = $form->{AR_amount}; - # $form->{selectAR_amount} =~ - # s/value=\"$form->{AR_amountselected}\"/value=\"$form->{AR_amountselected}\" selected/; - - ($AR_amountaccno, $AR_amounttaxkey) = - split(/--/, $form->{AR_amountselected}); - $form->{selecttaxchart} = $form->{taxchart}; - $form->{selecttaxchart} =~ - s/value=\"$AR_amounttaxkey--([^\"]*)\"/value=\"$AR_amounttaxkey--$1\" selected/; - - $form->{rate} = $1; - map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } qw(exchangerate creditlimit creditremaining); @@ -1042,20 +1086,13 @@ sub post { exit; } - my ($creditaccno, $credittaxkey) = split /--/, $form->{AR_amountselected}; - my ($taxkey, $NULL) = split /--/, $form->{taxchartselected}; - my ($receivablesaccno, $payablestaxkey) = split /--/, $form->{ARselected}; - $form->{AR}{amount_1} = $creditaccno; - $form->{AR}{receivables} = $receivablesaccno; - $form->{taxkey} = $taxkey; - - $form->{invnumber} = $form->update_defaults(\%myconfig, "invnumber") - unless $form->{invnumber}; + $form->{AR}{receivables} = $form->{ARselected}; $form->{id} = 0 if $form->{postasnew}; if (AR->post_transaction(\%myconfig, \%$form)) { # saving the history if(!exists $form->{addition} && $form->{id} ne "") { + $form->{snumbers} = qq|invnumber_| . $form->{invnumber}; $form->{addition} = "POSTED"; $form->save_history($form->dbconnect(\%myconfig)); } @@ -1074,6 +1111,7 @@ sub post_as_new { $form->{postasnew} = 1; # saving the history if(!exists $form->{addition} && $form->{id} ne "") { + $form->{snumbers} = qq|invnumber_| . $form->{invnumber}; $form->{addition} = "POSTED AS NEW"; $form->save_history($form->dbconnect(\%myconfig)); } @@ -1138,6 +1176,7 @@ sub yes { if (AR->delete_transaction(\%myconfig, \%$form, $spool)) { # saving the history if(!exists $form->{addition}) { + $form->{snumbers} = qq|invnumber_| . $form->{invnumber}; $form->{addition} = "DELETED"; $form->save_history($form->dbconnect(\%myconfig)); } @@ -1181,7 +1220,9 @@ sub search { | if $form->{selectdepartment}; $form->{title} = $locale->text('AR Transactions'); - + + $form->{javascript} .= qq||; + # use JavaScript Calendar or not $form->{jsscript} = $jscalendar; $jsscript = ""; @@ -1189,12 +1230,12 @@ sub search { # with JavaScript Calendar $button1 = qq| - + text('button') . qq|> |; $button2 = qq| - + text('button') . qq|> |; @@ -1207,9 +1248,9 @@ sub search { # without JavaScript Calendar $button1 = qq| - |; + |; $button2 = qq| - |; + |; } $form->get_lists("projects" => { "key" => "ALL_PROJECTS", @@ -1227,9 +1268,11 @@ sub search { $form->{fokus} = "search.customer"; $form->header; - + $onload = qq|focus()|; + $onload .= qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|; + $onload .= qq|;setupPoints('|. $myconfig{numberformat} .qq|', '|. $locale->text("wrongformat") .qq|')|; print qq| - + {script}> @@ -1252,6 +1295,10 @@ sub search { | . $locale->text('Order Number') . qq| + + | . $locale->text('Transaction description') . qq| + + | . $locale->text('Notes') . qq| @@ -1328,6 +1375,8 @@ sub search { | . $locale->text('Subtotal') . qq| | . $locale->text('Project Number') . qq| + + | . $locale->text('Transaction description') . qq| @@ -1342,7 +1391,6 @@ sub search { {nextsub}> -{path}> {login}> {password}> @@ -1371,7 +1419,7 @@ sub ar_transactions { AR->ar_transactions(\%myconfig, \%$form); $callback = - "$form->{script}?action=ar_transactions&path=$form->{path}&login=$form->{login}&password=$form->{password}"; + "$form->{script}?action=ar_transactions&login=$form->{login}&password=$form->{password}"; $href = $callback; if ($form->{customer}) { @@ -1404,6 +1452,12 @@ sub ar_transactions { $option .= "\n" if $option; $option .= $locale->text('Notes') . " : $form->{notes}"; } + if ($form->{transaction_description}) { + $callback .= "&transaction_description=" . $form->escape($form->{transaction_description}, 1); + $href .= "&transaction_description=" . $form->escape($form->{transaction_description}); + $option .= "\n" if $option; + $option .= $locale->text('Transaction description') . " : $form->{transaction_description}"; + } if ($form->{transdatefrom}) { $callback .= "&transdatefrom=$form->{transdatefrom}"; @@ -1440,7 +1494,7 @@ sub ar_transactions { @columns = qw(transdate id type invnumber ordnumber name netamount tax amount paid - datepaid due duedate notes employee shippingpoint shipvia + datepaid due duedate transaction_description notes employee shippingpoint shipvia globalprojectnumber); $form->{"l_type"} = "Y"; @@ -1516,6 +1570,8 @@ sub ar_transactions { . ""; $column_header{globalprojectnumber} = qq|| . $locale->text('Project Number') . qq||; + $column_header{transaction_description} = + "" . $locale->text('Transaction description') . ""; $form->{title} = $locale->text('AR Transactions'); @@ -1601,12 +1657,18 @@ sub ar_transactions { $module = ($ar->{invoice}) ? "is.pl" : $form->{script}; $column_data{invnumber} = - "{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ar->{invnumber}"; + "{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ar->{invnumber}"; + + my $is_storno = $ar->{storno} && ($ar->{invnumber} =~ /^Storno zu/); + my $has_storno = $ar->{storno} && !$is_storno; + $column_data{type} = "" . - ($ar->{storno} ? $locale->text("Storno (one letter abbreviation)") : - $ar->{amount} < 0 ? - $locale->text("Credit note (one letter abbreviation)") : - $locale->text("Invoice (one letter abbreviation)")) . ""; + ($has_storno ? $locale->text("Invoice with Storno (abbreviation)") : + $is_storno ? $locale->text("Storno (one letter abbreviation)") : + $ar->{amount} < 0 ? $locale->text("Credit note (one letter abbreviation)") : + $ar->{invoice} ? $locale->text("Invoice (one letter abbreviation)") : + $locale->text("AR Transaction (abbreviation)")) + . ""; $column_data{ordnumber} = "$ar->{ordnumber} "; $column_data{name} = "$ar->{name}"; $ar->{notes} =~ s/\r\n//g; @@ -1616,6 +1678,8 @@ sub ar_transactions { $column_data{employee} = "$ar->{employee} "; $column_data{globalprojectnumber} = "" . H($ar->{globalprojectnumber}) . ""; + $column_data{transaction_description} = + "" . H($ar->{transaction_description}) . ""; $i++; $i %= 2; @@ -1676,7 +1740,6 @@ sub ar_transactions { -{path}> {login}> {password}>