# show history button
$form->{javascript} = qq|<script type="text/javascript" src="js/show_history.js"></script>|;
#/show hhistory button
-
+
if ($myconfig{acs} =~ "AR--Add Sales Invoice" || $myconfig{acs} =~ "AR--AR")
{
$form->error("Access Denied");
$form->{shipto_id} = $shipto_id;
}
- # currencies
- @curr = split(/:/, $form->{currencies});
- chomp $curr[0];
- $form->{defaultcurrency} = $curr[0];
-
- map { $form->{selectcurrency} .= "<option>$_</option>\n" } @curr;
-
$form->{oldcustomer} = "$form->{customer}--$form->{customer_id}";
if (@{ $form->{all_customer} }) {
- $form->{customer} = "$form->{customer}--$form->{customer_id}";
- map { $form->{selectcustomer} .= "<option>$_->{name}--$_->{id}</option>\n" }
- (@{ $form->{all_customer} });
+ $form->{customer} = "$form->{customer}--$form->{customer_id}";
+ $form->{selectcustomer} = "$form->{customer}--$form->{customer_id}";
}
# departments
$form->{employee} = "$form->{employee}--$form->{employee_id}";
- # sales staff
- if ($form->{all_employees}) {
- $form->{selectemployee} = "";
- map { $form->{selectemployee} .= "<option>$_->{name}--$_->{id}</option>\n" }
- (@{ $form->{all_employees} });
- }
-
# forex
$form->{forex} = $form->{exchangerate};
$exchangerate = ($form->{exchangerate}) ? $form->{exchangerate} : 1;
if ($form->{type} eq "credit_note") {
$form->{title} = $locale->text('Edit Credit Note');
-
+
if ($form->{storno}) {
$form->{title} = $locale->text('Edit Storno Credit Note');
}
} else {
$form->{title} = $locale->text('Edit Sales Invoice');
-
+
if ($form->{storno}) {
$form->{title} = $locale->text('Edit Storno Invoice');
}
"all" => 0,
"old_id" => \@old_project_ids },
"employees" => "ALL_SALESMEN",
- "taxzones" => "ALL_TAXZONES");
+ "taxzones" => "ALL_TAXZONES",
+ "currencies" => "ALL_CURRENCIES",
+ "customers" => "ALL_CUSTOMERS");
my %labels;
my @values = (undef);
$labels{$item->{"cp_id"}} = $item->{"cp_name"} .
($item->{"cp_abteilung"} ? " ($item->{cp_abteilung})" : "");
}
- my $contact =
- NTI($cgi->popup_menu('-name' => 'cp_id', '-values' => \@values,
- '-labels' => \%labels, '-default' => $form->{"cp_id"}));
+ my $contact;
+ if (scalar @values > 1) {
+ $contact = qq|
+ <tr>
+ <th align="right">| . $locale->text('Contact Person') . qq|</th>
+ <td>| .
+ NTI($cgi->popup_menu('-name' => 'cp_id', '-values' => \@values,
+ '-labels' => \%labels, '-default' => $form->{"cp_id"}))
+ . qq|
+ </td>
+ </tr>|;
+ }
+
+ %labels = ();
+ @values = ();
+ foreach my $item (@{ $form->{"ALL_SALESMEN"} }) {
+ push(@values, $item->{"id"});
+ $labels{$item->{"id"}} = $item->{"name"};
+ }
+
+ my $employees = qq|
+ <tr>
+ <th align="right">| . $locale->text('Employee') . qq|</th>
+ <td>| .
+ NTI($cgi->popup_menu('-name' => 'employee', '-default' => $form->{"employee_id"},
+ '-values' => \@values, '-labels' => \%labels)) . qq|
+ </td>
+ </tr>|;
+
+
+ %labels = ();
+ @values = ();
+ foreach my $item (@{ $form->{"ALL_CUSTOMERS"} }) {
+ push(@values, $item->{name}.qq|--|.$item->{"id"});
+ $labels{$item->{"id"}} = $item->{name}.qq|--|.$item->{"id"};
+ }
+
+ my $customers = qq|
+ <th align="right">| . $locale->text('Customer') . qq|</th>
+ <td>| .
+ (($myconfig{vclimit} <= scalar(@values))
+ ? qq|<input type="text" value="| . H($form->{"oldcustomer"}) . qq|" name="customer">|
+ : (NTI($cgi->popup_menu('-name' => 'customer', '-default' => $form->{oldcustomer},
+ '-onChange' => 'document.getElementById(\'update_button\').click();',
+ '-values' => \@values, '-labels' => \%labels)))) . qq|
+ <input type="button" value="?" onclick="show_vc_details('customer')">
+ </td>|;
%labels = ();
@values = ("");
$item->{"shiptoname"} . " " . $item->{"shiptodepartment_1"};
}
- my $shipto = qq|
- <th align=right>| . $locale->text('Shipping Address') . qq|</th>
- <td>| .
- NTI($cgi->popup_menu('-name' => 'shipto_id', '-values' => \@values,
- '-labels' => \%labels, '-default' => $form->{"shipto_id"}))
+ my $shipto;
+ if (scalar @values > 1) {
+ $shipto = qq|
+ <tr>
+ <th align="right">| . $locale->text('Shipping Address') . qq|</th>
+ <td>| .
+ NTI($cgi->popup_menu('-name' => 'shipto_id', '-values' => \@values,
+ '-labels' => \%labels, '-default' => $form->{"shipto_id"}))
. qq|</td>|;
+ }
+
+ %labels = ();
+ @values = ();
+ foreach my $item (@{ $form->{"ALL_CURRENCIES"} }) {
+ push(@values, $item);
+ $labels{$item} = $item;
+ }
+
+ $form->{currency} = $form->{defaultcurrency} unless $form->{currency};
+ my $currencies;
+ if (scalar @values) {
+ $currencies = qq|
+ <tr>
+ <th align="right">| . $locale->text('Currency') . qq|</th>
+ <td>| .
+ NTI($cgi->popup_menu('-name' => 'currency', '-default' => $form->{"currency"},
+ '-values' => \@values, '-labels' => \%labels)) . qq|
+ </td>
+ </tr>|;
+ }
%labels = ();
@values = ("");
#substitute \n and \r to \s (bug 543)
$form->{selectcustomer} =~ s/[\n\r]/ /g;
-
+
if (($form->{creditlimit} != 0) && ($form->{creditremaining} < 0) && !$form->{update}) {
$creditwarning = 1;
} else {
<input type="hidden" name="forex" value="$form->{forex}">
|;
- $customer =
- ($form->{selectcustomer})
- ? qq|<select name="customer"
-onchange="document.getElementById('update_button').click();">| .
- qq|$form->{selectcustomer}</select>\n<input type="hidden" name="selectcustomer" value="| .
- Q($form->{selectcustomer}) . qq|">|
- : qq|<input name="customer" value="$form->{customer}" size="35">|;
-
$department = qq|
<tr>
<th align="right" nowrap>| . $locale->text('Department') . qq|</th>
if ($form->{business}) {
$business = qq|
<tr>
- <th align="right">| . $locale->text('Business') . qq|</th>
- <td>$form->{business}</td>
- <th align="right">| . $locale->text('Trade Discount') . qq|</th>
- <td>|
+ <th align="right">| . $locale->text('Customer type') . qq|</th>
+ <td>$form->{business}; | . $locale->text('Trade Discount') . qq| |
. $form->format_amount(\%myconfig, $form->{tradediscount} * 100)
. qq| %</td>
- </tr>
+ </tr>
|;
}
if ($form->{max_dunning_level}) {
$dunning = qq|
- <tr>
- <td colspan="4">
- <table>
- <tr>
- <th align="right">| . $locale->text('Max. Dunning Level') . qq|:</th>
- <td><b>$form->{max_dunning_level}</b></td>
- <th align="right">| . $locale->text('Dunning Amount') . qq|:</th>
- <td><b>|
- . $form->format_amount(\%myconfig, $form->{dunning_amount},2)
- . qq|</b></td>
- </tr>
- </table>
- </td>
- </tr>
+ <tr>
+ <th align="right">| . $locale->text('Max. Dunning Level') . qq|:</th>
+ <td>
+ <b>$form->{max_dunning_level}</b>;
+ | . $locale->text('Dunning Amount') . qq|: <b>|
+ . $form->format_amount(\%myconfig, $form->{dunning_amount},2)
+ . qq|</b>
+ </td>
+ </tr>
|;
}
$form->{fokus} = "invoice.customer";
# use JavaScript Calendar or not
- $form->{jsscript} = $jscalendar;
+ $form->{jsscript} = 1;
$jsscript = "";
if ($form->{type} eq "credit_note") {
- if ($form->{jsscript}) {
-
- # with JavaScript Calendar
- $button1 = qq|
- <td><input name="invdate" id="invdate" size="11" title="$myconfig{dateformat}" value="$form->{invdate}" onBlur=\"check_right_date_format(this)\"></td>
- <td><input type="button" name="invdate" id="trigger1" value="|
- . $locale->text('button') . qq|"></td>|;
-
- #write Trigger
- $jsscript =
- Form->write_trigger(\%myconfig, "1",
- "invdate", "BL",
- "trigger1");
- } else {
-
- # without JavaScript Calendar
- $button1 =
- qq|<td><input name="invdate" size="11" title="$myconfig{dateformat}" value="$form->{invdate}" onBlur=\"check_right_date_format(this)\"></td>|;
- $button2 =
- qq|<td width="13"><input name="duedate" size="11" title="$myconfig{dateformat}" value="$form->{duedate}"></td>|;
- }
+ $button1 = qq|
+ <td><input name="invdate" id="invdate" size="11" title="$myconfig{dateformat}" value="$form->{invdate}" onBlur=\"check_right_date_format(this)\">
+ <input type="button" name="invdate" id="trigger1" value="|
+ . $locale->text('button') . qq|"></td>|;
+
+ #write Trigger
+ $jsscript =
+ Form->write_trigger(\%myconfig, "1",
+ "invdate", "BL",
+ "trigger1");
} else {
- if ($form->{jsscript}) {
-
- # with JavaScript Calendar
- $button1 = qq|
- <td><input name="invdate" id="invdate" size="11" title="$myconfig{dateformat}" value="$form->{invdate}" onBlur=\"check_right_date_format(this)\"></td>
- <td><input type="button" name="invdate" id="trigger1" value="|
- . $locale->text('button') . qq|"></td>
- |;
- $button2 = qq|
- <td width="13"><input name="duedate" id="duedate" size="11" title="$myconfig{dateformat}" value="$form->{duedate}" onBlur=\"check_right_date_format(this)\"></td>
- <td width="4"><input type="button" name="duedate" id="trigger2" value="|
- . $locale->text('button') . qq|"></td></td>
- |;
- $button3 = qq|
- <td width="13"><input name="deliverydate" id="deliverydate" size="11" title="$myconfig{dateformat}" value="$form->{deliverydate}" onBlur=\"check_right_date_format(this)\"></td>
- <td width="4"><input type="button" name="deliverydate" id="trigger3" value="|
- . $locale->text('button') . qq|"></td></td>
+ $button1 = qq|
+ <td><input name="invdate" id="invdate" size="11" title="$myconfig{dateformat}" value="$form->{invdate}" onBlur=\"check_right_date_format(this)\">
+ <input type="button" name="invdate" id="trigger1" value="|
+ . $locale->text('button') . qq|"></td>
|;
-
- #write Trigger
- $jsscript =
- Form->write_trigger(\%myconfig, "3",
- "invdate", "BL",
- "trigger1", "duedate",
- "BL", "trigger2",
- "deliverydate", "BL",
- "trigger3");
- } else {
-
- # without JavaScript Calendar
- $button1 =
- qq|<td><input name="invdate" size="11" title="$myconfig{dateformat}" value="$form->{invdate}" onBlur=\"check_right_date_format(this)\"></td>|;
- $button2 =
- qq|<td width="13"><input name=duedate size=11 title="$myconfig{dateformat}" value=$form->{duedate} onBlur=\"check_right_date_format(this)\"></td>|;
- }
+ $button2 = qq|
+ <td width="13"><input name="duedate" id="duedate" size="11" title="$myconfig{dateformat}" value="$form->{duedate}" onBlur=\"check_right_date_format(this)\">
+ <input type="button" name="duedate" id="trigger2" value="|
+ . $locale->text('button') . qq|"></td></td>
+ |;
+ $button3 = qq|
+ <td width="13"><input name="deliverydate" id="deliverydate" size="11" title="$myconfig{dateformat}" value="$form->{deliverydate}" onBlur=\"check_right_date_format(this)\">
+ <input type="button" name="deliverydate" id="trigger3" value="|
+ . $locale->text('button') . qq|"></td></td>
+ |;
+
+ #write Trigger
+ $jsscript =
+ Form->write_trigger(\%myconfig, "3",
+ "invdate", "BL",
+ "trigger1", "duedate",
+ "BL", "trigger2",
+ "deliverydate", "BL",
+ "trigger3");
}
+
if ($form->{resubmit} && ($form->{format} eq "html")) {
$onload =
qq|window.open('about:blank','Beleg'); document.invoice.target = 'Beleg';document.invoice.submit()|;
}
$form->{"javascript"} .= qq|<script type="text/javascript" src="js/show_form_details.js"></script>|;
+ $form->{javascript} .= qq|<script type="text/javascript" src="js/show_vc_details.js"></script>|;
$jsscript .=
$form->write_trigger(\%myconfig, 2,
<form method="post" name="invoice" action="$form->{script}">
| ;
-map({print $cgi->hidden("-name" => $_ , "-value" => $form->{$_});}
- qw(id action type media format queued printed emailed title vc discount
- creditlimit creditremaining tradediscount business closedto locked shipped storno storno_id)) ;
-print ($form->{saved_message} ? qq|<p>$form->{saved_message}</p>| : "") ;
-print qq|
+
+ $form->hide_form(qw(id action type media format queued printed emailed title vc discount
+ creditlimit creditremaining tradediscount business closedto locked shipped storno storno_id
+ max_dunning_level dunning_amount));
+ print qq|<p>$form->{saved_message}</p>| if $form->{saved_message};
+
+ print qq|
<input type="hidden" name="lizenzen" value="$lizenzen">
+<div class="listtop" width="100%">$form->{title}</div>
+
<table width="100%">
- <tr class="listtop">
- <th class="listtop">$form->{title}</th>
- </tr>
- <tr height="5"></tr>
<tr>
- <td>
- <table width="100%">
- <tr valign="top">
- <td>
- <table>
- <tr>
- <th align="right" nowrap>| . $locale->text('Customer') . qq|</th>
- <td colspan="3">$customer</td>
- <input type="hidden" name="customer_klass" value="$form->{customer_klass}">
- <input type="hidden" name="customer_id" value="$form->{customer_id}">
- <input type="hidden" name="oldcustomer" value="$form->{oldcustomer}">
- <th align="right" nowrap>|
- . $locale->text('Contact Person') . qq|</th>
- <td colspan="3">$contact</td>
- </tr>
- <tr>
- <td></td>
- <td colspan="3">
- <table>
- <tr>
- <th nowrap>| . $locale->text('Credit Limit') . qq|</th>
- <td>$form->{creditlimit}</td>
- <td width="20%"></td>
- <th nowrap>| . $locale->text('Remaining') . qq|</th>
- <td class="plus$n">$form->{creditremaining}</td>
- </tr>
- </table>
- </td>
- $shipto
- </tr>
- $business
- $dunning
+ <td valign="top">
+ <table>
+ <tr>
+ $customers
+ <input type="hidden" name="customer_klass" value="$form->{customer_klass}">
+ <input type="hidden" name="customer_id" value="$form->{customer_id}">
+ <input type="hidden" name="oldcustomer" value="$form->{oldcustomer}">
+ <input type="hidden" name="selectcustomer" value="1">
+ </tr>
+ $contact
+ $shipto
+ <tr>
+ <td align="right">| . $locale->text('Credit Limit') . qq|</td>
+ <td>$form->{creditlimit}; | . $locale->text('Remaining') . qq| <span class="plus$n">$form->{creditremaining}</span></td>
+ </tr>
+ $dunning
+ $business
<tr>
<th align="right" nowrap>| . $locale->text('Record in') . qq|</th>
<td colspan="3"><select name="AR" style="width:280px;">$form->{selectAR}</select></td>
$taxzone
$department
<tr>
- <th align="right" nowrap>| . $locale->text('Currency') . qq|</th>
- <td><select name="currency">$form->{selectcurrency}</select></td>
- <input type="hidden" name="selectcurrency" value="$form->{selectcurrency}">
- <input type="hidden" name="defaultcurrency" value="$form->{defaultcurrency}">
+ $currencies
<input type="hidden" name="fxgain_accno" value="$form->{fxgain_accno}">
<input type="hidden" name="fxloss_accno" value="$form->{fxloss_accno}">
$exchangerate
<tr>
<th align="right" nowrap>| . $locale->text('Ship via') . qq|</th>
<td colspan="3"><input name="shipvia" size="35" value="$form->{shipvia}"></td>
- </tr>|;
+ </tr>
+ <tr>
+ <th align="right">| . $locale->text('Transaction description') . qq|</th>
+ <td colspan="3">| . $cgi->textfield("-name" => "transaction_description", "-size" => 35, "-value" => $form->{transaction_description}) . qq|</td>
+ </tr>|;
# <tr>
# <td colspan=4>
# <table>
# </tr>
print qq| </table>
</td>
- <td align="right">
+ <td align="right" valign="top">
<table>
- <tr>
- <th align="right" nowrap>| . $locale->text('Employee') . qq|</th>
- <td colspan="2"><select name="employee">$form->{selectemployee}</select></td>
- <input type="hidden" name="selectemployee" value="$form->{selectemployee}">
- <td></td>
- </tr>
+ $employees
$salesman
|;
if ($form->{type} eq "credit_note") {
</tr>
<tr>
<th align="right" nowrap>| . $locale->text('Order Date') . qq|</th>
- <td><input name="orddate" id="orddate" size="11" title="$myconfig{dateformat}" value="| . Q($form->{orddate}) . qq|" onBlur=\"check_right_date_format(this)\"></td>
- <td><input type="button" name="b_orddate" id="trigger_orddate" value="?"></td>
+ <td><input name="orddate" id="orddate" size="11" title="$myconfig{dateformat}" value="| . Q($form->{orddate}) . qq|" onBlur=\"check_right_date_format(this)\">
+ <input type="button" name="b_orddate" id="trigger_orddate" value="?"></td>
</tr>
<tr>
<th align="right" nowrap>| . $locale->text('Quotation Number') . qq|</th>
</tr>
<tr>
<th align="right" nowrap>| . $locale->text('Quotation Date') . qq|</th>
- <td><input name="quodate" id="quodate" size="11" title="$myconfig{dateformat}" value="| . Q($form->{quodate}) . qq|" onBlur=\"check_right_date_format(this)\"></td>
- <td><input type="button" name="b_quodate" id="trigger_quodate" value="?"></td>
+ <td><input name="quodate" id="quodate" size="11" title="$myconfig{dateformat}" value="| . Q($form->{quodate}) . qq|" onBlur=\"check_right_date_format(this)\">
+ <input type="button" name="b_quodate" id="trigger_quodate" value="?"></td>
</tr>
<tr>
<th align="right" nowrap>| . $locale->text('Customer Order Number') . qq|</th>
<td>
</td>
</tr>
-| .
+| .
$jsscript
. qq|
<!-- shipto are in hidden variables -->
| ;
-map({ print($cgi->hidden("-name" => $_, "-value" => $form->{$_})); }
+map({ print($cgi->hidden("-name" => $_, "-value" => $form->{$_})); }
qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptocontact shiptophone shiptofax shiptoemail shiptodepartment_1 shiptodepartment_2));
print qq|<!-- email variables --> |;
-map({ print($cgi->hidden("-name" => $_, "-value" => $form->{$_})); }
+map({ print($cgi->hidden("-name" => $_, "-value" => $form->{$_})); }
qw(message email subject cc bcc taxaccounts));
print qq|<input type="hidden" name="webdav" value="| . $webdav . qq|">|;
foreach $item (split(/ /, $form->{taxaccounts})) {
- map({ print($cgi->hidden("-name" => $_, "-value" => $form->{$_})); }
+ map({ print($cgi->hidden("-name" => $_, "-value" => $form->{$_})); }
("${item}_rate", "${item}_description", "${item}_taxnumber"));
}
$lxdebug->leave_sub();
$intnotes =
qq|<textarea name="intnotes" rows="$rows" cols="35" wrap="soft">$form->{intnotes}</textarea>|;
- $form->{taxincluded} = ($form->{taxincluded}) ? "checked" : "";
+ $form->{taxincluded} = ($form->{taxincluded} ? "checked" : "");
$taxincluded = "";
if ($form->{taxaccounts}) {
$taxincluded = qq|
- <input name="taxincluded" class="checkbox" type="checkbox" value=$form->{taxincluded}> <b>|
+ <input name="taxincluded" class="checkbox" type="checkbox" $form->{taxincluded}> <b>|
. $locale->text('Tax Included') . qq|</b><br><br>|;
}
push(@triggers, "datepaid_$i", "BL", "trigger_datepaid_$i");
}
- map({ print($cgi->hidden("-name" => $_, "-value" => $form->{$_})); } qw(paidaccounts selectAR_paid oldinvtotal));
+ map({ print($cgi->hidden("-name" => $_, "-value" => $form->{$_})); } qw(paidaccounts selectAR_paid oldinvtotal));
print qq|<input type="hidden" name="oldtotalpaid" value="$totalpaid">
</table>
</td>
<input type="hidden" name="rowcount" value="$form->{rowcount}">
| .
-$cgi->hidden("-name" => "callback", "-value" => $form->{callback})
+$cgi->hidden("-name" => "callback", "-value" => $form->{callback})
. $cgi->hidden('-name' => 'draft_id', '-default' => [$form->{draft_id}])
. $cgi->hidden('-name' => 'draft_description', '-default' => [$form->{draft_description}]);
map({ print $cgi->hidden("-name" => $_ , "-value" => $form->{$_});} qw(login password));
$form->{print_and_post} = 0;
}
+
+ if($form->{taxincluded}) {
+ $taxincluded = "checked";
+ }
$form->{update} = 1;
&check_name(customer);
+ if(!$form->{taxincluded}) {
+ $form->{taxincluded} = $taxincluded;
+ }
+
+
$form->{exchangerate} = $exchangerate
if (
$form->{forex} = (
$form->isblank("invdate", $locale->text('Invoice Date missing!'));
$form->isblank("customer", $locale->text('Customer missing!'));
+ $form->{invnumber} =~ s/^\s*//g;
+ $form->{invnumber} =~ s/\s*$//g;
+
# if oldcustomer ne customer redo form
if (&check_name(customer)) {
&update;
"POSTED";
$form->save_history($form->dbconnect(\%myconfig));
}
-
+
$form->redirect( $form->{label} . " $form->{invnumber} " . $locale->text('posted!'))
unless $print_post;
}
map({ my $key = $_; delete($form->{$key})
- unless (grep({ $key eq $_ } qw(login password id type))); }
+ unless (grep({ $key eq $_ } qw(login password id stylesheet type))); }
keys(%{ $form }));
- &invoice_links;
- &prepare_invoice;
+ invoice_links();
+ prepare_invoice();
relink_accounts();
+ # Payments must not be recorded for the new storno invoice.
+ $form->{paidaccounts} = 0;
+ map { my $key = $_; delete $form->{$key} if grep { $key =~ /^$_/ } qw(datepaid_ source_ memo_ paid_ exchangerate_ AR_paid_) } keys %{ $form };
+
$form->{storno_id} = $form->{id};
$form->{storno} = 1;
$form->{id} = "";
$form->{invnumber} = "Storno zu " . $form->{invnumber};
+ $form->{rowcount}++;
- &post();
+ post();
$lxdebug->leave_sub();
-
}
sub preview {
$form->{script} = 'is.pl';
$script = "is";
$buysell = 'buy';
-
+
# bo creates the id, reset it
map { delete $form->{$_} }
if (IS->delete_invoice(\%myconfig, \%$form, $spool)) {
# saving the history
if(!exists $form->{addition}) {
- $form->{snumbers} = qq|invnumber_| . $form->{invnumber};
+ $form->{snumbers} = qq|invnumber_| . $form->{invnumber};
$form->{addition} = "DELETED";
$form->save_history($form->dbconnect(\%myconfig));
}
- # /saving the history
- $form->redirect($locale->text('Invoice deleted!'));
+ # /saving the history
+ $form->redirect($locale->text('Invoice deleted!'));
}
$form->error($locale->text('Cannot delete invoice!'));