$form->{fokus} = "arledger.customer";
# use JavaScript Calendar or not
- $form->{jsscript} = $jscalendar;
+ $form->{jsscript} = 1;
$jsscript = "";
if ($form->{jsscript}) {
qq|<td><input name=duedate id=duedate size=11 title="$myconfig{dateformat}" value="$form->{duedate}" onBlur=\"check_right_date_format(this)\"></td>|;
}
+ $form->{javascript} .=
+ qq|<script type="text/javascript" src="js/common.js"></script>| .
+ qq|<script type="text/javascript" src="js/show_vc_details.js"></script>|;
+
$form->header;
$onload = qq|focus()|;
$onload .= qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|;
<table>
<tr>
<th align="right" nowrap>| . $locale->text('Customer') . qq|</th>
- <td colspan=3>$customer</td>
+ <td colspan=3>$customer <input type="button" value="?" onclick="show_vc_details('customer')"></td>
<input type=hidden name=selectcustomer value="$form->{selectcustomer}">
<input type=hidden name=oldcustomer value="$form->{oldcustomer}">
<input type=hidden name=customer_id value="$form->{customer_id}">
sub post_payment {
$lxdebug->enter_sub();
for $i (1 .. $form->{paidaccounts}) {
- if ($form->{"paid_$i"}) {
+ if ($form->parse_amount(\%myconfig, $form->{"paid_$i"})) {
$datepaid = $form->datetonum($form->{"datepaid_$i"}, \%myconfig);
$form->isblank("datepaid_$i", $locale->text('Payment date missing!'));
$closedto = $form->datetonum($form->{closedto}, \%myconfig);
$transdate = $form->datetonum($form->{transdate}, \%myconfig);
+ $form->error($locale->text('Cannot post transaction for a closed period!')) if ($transdate <= $closedto);
- $form->error($locale->text('Cannot post transaction for a closed period!'))
- if ($transdate <= $closedto);
+ my $zero_amount_posting = 1;
+ for $i (1 .. $form->{rowcount}) {
+ if ($form->parse_amount(\%myconfig, $form->{"amount_$i"})) {
+ $zero_amount_posting = 0;
+ last;
+ }
+ }
+
+ $form->error($locale->text('Zero amount posting!')) if $zero_amount_posting;
$form->isblank("exchangerate", $locale->text('Exchangerate missing!'))
if ($form->{currency} ne $form->{defaultcurrency});
$form->{javascript} .= qq|<script type="text/javascript" src="js/common.js"></script>|;
# use JavaScript Calendar or not
- $form->{jsscript} = $jscalendar;
+ $form->{jsscript} = 1;
$jsscript = "";
if ($form->{jsscript}) {
<th align=right nowrap>| . $locale->text('Order Number') . qq|</th>
<td colspan=3><input name=ordnumber size=20></td>
</tr>
+ <tr>
+ <th align=right nowrap>| . $locale->text('Transaction description') . qq|</th>
+ <td colspan=3><input name=transaction_description size=40></td>
+ </tr>
<tr>
<th align=right nowrap>| . $locale->text('Notes') . qq|</th>
<td colspan=3><input name=notes size=40></td>
<td nowrap>| . $locale->text('Subtotal') . qq|</td>
<td align=right><input name="l_globalprojectnumber" class=checkbox type=checkbox value=Y></td>
<td nowrap>| . $locale->text('Project Number') . qq|</td>
+ <td align=right><input name="l_transaction_description" class=checkbox type=checkbox value=Y></td>
+ <td nowrap>| . $locale->text('Transaction description') . qq|</td>
</tr>
</table>
</td>
$option .= "\n<br>" 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<br>" if $option;
+ $option .= $locale->text('Transaction description') . " : $form->{transaction_description}";
+ }
if ($form->{transdatefrom}) {
$callback .= "&transdatefrom=$form->{transdatefrom}";
@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";
. "</a></th>";
$column_header{globalprojectnumber} =
qq|<th class="listheading">| . $locale->text('Project Number') . qq|</th>|;
+ $column_header{transaction_description} =
+ "<th class=listheading>" . $locale->text('Transaction description') . "</th>";
$form->{title} = $locale->text('AR Transactions');
$column_data{invnumber} =
"<td><a href=$module?action=edit&id=$ar->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ar->{invnumber}</a></td>";
+
+ my $is_storno = $ar->{storno} && ($ar->{invnumber} =~ /^Storno zu/);
+ my $has_storno = $ar->{storno} && !$is_storno;
+
$column_data{type} = "<td>" .
- ($ar->{storno} ? $locale->text("Storno (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{employee} = "<td>$ar->{employee} </td>";
$column_data{globalprojectnumber} =
"<td>" . H($ar->{globalprojectnumber}) . "</td>";
+ $column_data{transaction_description} =
+ "<td>" . H($ar->{transaction_description}) . "</td>";
$i++;
$i %= 2;