# 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");
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');
}
<tr>
<th align="right">| . $locale->text('Contact Person') . qq|</th>
<td>| .
- NTI($cgi->popup_menu('-name' => 'cp_id', '-values' => \@values,
+ NTI($cgi->popup_menu('-name' => 'cp_id', '-values' => \@values, '-style' => 'width: 250px',
'-labels' => \%labels, '-default' => $form->{"cp_id"}))
. qq|
</td>
@values = ();
foreach my $item (@{ $form->{"ALL_SALESMEN"} }) {
push(@values, $item->{"id"});
- $labels{$item->{"id"}} = $item->{"name"};
+ $labels{$item->{id}} = $item->{name} ne "" ? $item->{name} : $item->{login};
}
my $employees = qq|
<tr>
<th align="right">| . $locale->text('Employee') . qq|</th>
<td>| .
- NTI($cgi->popup_menu('-name' => 'employee', '-default' => $form->{"employee_id"},
+ NTI($cgi->popup_menu('-name' => 'employee_id', '-default' => $form->{"employee_id"},
'-values' => \@values, '-labels' => \%labels)) . qq|
</td>
</tr>|;
@values = ();
foreach my $item (@{ $form->{"ALL_CUSTOMERS"} }) {
push(@values, $item->{name}.qq|--|.$item->{"id"});
- $labels{$item->{"id"}} = $item->{name}.qq|--|.$item->{"id"};
+ $labels{$item->{name}.qq|--|.$item->{"id"}} = $item->{"name"};
}
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},
+ <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|
+ '-values' => \@values, '-labels' => \%labels, '-style' => 'width: 250px')))) . qq|
+ <input type="button" value="?" onclick="show_vc_details('customer')">
</td>|;
-
+
%labels = ();
@values = ("");
foreach my $item (@{ $form->{"ALL_SHIPTO"} }) {
push(@values, $item->{"shipto_id"});
- $labels{$item->{"shipto_id"}} =
- $item->{"shiptoname"} . " " . $item->{"shiptodepartment_1"};
+ $labels{$item->{"shipto_id"}} = join "; ", grep { $_ } map { $item->{"shipto${_}" } } qw(name department_1 street city);
}
my $shipto;
<tr>
<th align="right">| . $locale->text('Shipping Address') . qq|</th>
<td>| .
- NTI($cgi->popup_menu('-name' => 'shipto_id', '-values' => \@values,
+ NTI($cgi->popup_menu('-name' => 'shipto_id', '-values' => \@values, '-style' => 'width: 250px',
'-labels' => \%labels, '-default' => $form->{"shipto_id"}))
. qq|</td>|;
}
push(@values, $item);
$labels{$item} = $item;
}
-
+
$form->{currency} = $form->{defaultcurrency} unless $form->{currency};
my $currencies;
if (scalar @values) {
'-default' => $form->{"globalproject_id"}));
%labels = ();
- @values = ("");
+ @values = ();
foreach my $item (@{ $form->{ALL_SALESMEN} }) {
push(@values, $item->{id});
$labels{$item->{id}} = $item->{name} ne "" ? $item->{name} : $item->{login};
qq|<tr>
<th align="right">| . $locale->text('Salesman') . qq|</th>
<td>| .
- NTI($cgi->popup_menu('-name' => 'salesman_id', '-default' => $form->{salesman_id},
- '-values' => \@values, '-labels' => \%labels))
+ NTI($cgi->popup_menu('-name' => 'salesman_id', '-default' => $form->{salesman_id} ? $form->{salesman_id} : $form->{employee_id},
+ '-values' => \@values, '-labels' => \%labels))
. qq|</td>
</tr>|;
<th align="right">| . $locale->text('Steuersatz') . qq|</th>
<td>| .
NTI($cgi->popup_menu('-name' => 'taxzone_id', '-default' => $form->{"taxzone_id"},
- '-values' => \@values, '-labels' => \%labels)) . qq|
+ '-values' => \@values, '-labels' => \%labels, '-style' => 'width: 250px',)) . qq|
</td>
</tr>|;
#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 {
$department = qq|
<tr>
<th align="right" nowrap>| . $locale->text('Department') . qq|</th>
- <td colspan="3"><select name="department">$form->{selectdepartment}</select>
+ <td colspan="3"><select name="department" style="width: 250px">$form->{selectdepartment}</select>
<input type="hidden" name="selectdepartment" value="$form->{selectdepartment}">
</td>
</tr>
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>
|;
}
}
$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">
$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>
+ <td colspan="3"><select name="AR" style="width:250px;">$form->{selectAR}</select></td>
<input type="hidden" name="selectAR" value="$form->{selectAR}">
</tr>
$taxzone
<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();
qq|<textarea name="notes" rows="$rows" cols="26" wrap="soft">$form->{notes}</textarea>|;
$intnotes =
qq|<textarea name="intnotes" rows="$rows" cols="35" wrap="soft">$form->{intnotes}</textarea>|;
-
+
$form->{taxincluded} = ($form->{taxincluded} ? "checked" : "");
$taxincluded = "";
</tr>
";
- my @triggers = ();
+ my @triggers = ();
+ my $totalpaid = 0;
$form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"});
for $i (1 .. $form->{paidaccounts}) {
push(@triggers, "datepaid_$i", "BL", "trigger_datepaid_$i");
}
- map({ print($cgi->hidden("-name" => $_, "-value" => $form->{$_})); } qw(paidaccounts selectAR_paid oldinvtotal));
+ my $paid_missing = $form->{oldinvtotal} - $totalpaid;
+
+ print qq|
+ <tr>
+ <td></td>
+ <td></td>
+ <td align="center">| . $locale->text('Total') . qq|</td>
+ <td align="center">| . H($form->format_amount(\%myconfig, $totalpaid, 2)) . qq|</td>
+ </tr>
+ <tr>
+ <td></td>
+ <td></td>
+ <td align="center">| . $locale->text('Missing amount') . qq|</td>
+ <td align="center">| . H($form->format_amount(\%myconfig, $paid_missing, 2)) . qq|</td>
+ </tr>
+|;
+
+ 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->{AR}) = split /--/, $form->{AR};
($form->{AR_paid}) = split /--/, $form->{AR_paid};
relink_accounts();
- $form->redirect($locale->text(' Payment posted!'))
+ $form->redirect($locale->text('Payment posted!'))
if (IS->post_payment(\%myconfig, \%$form));
$form->error($locale->text('Cannot post payment!'));
"POSTED";
$form->save_history($form->dbconnect(\%myconfig));
}
-
+
$form->redirect( $form->{label} . " $form->{invnumber} " . $locale->text('posted!'))
unless $print_post;
$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!'));