unless $form->{callback};
&create_links;
+ AR->get_transdate(\%myconfig, $form);
&display_form;
$lxdebug->leave_sub();
$duedate = $form->{duedate};
$taxincluded = $form->{taxincluded};
-
+ my $id = $form->{id};
IS->get_customer(\%myconfig, \%$form);
+ $form->{taxincluded} = $taxincluded;
+ $form->{id} = $id;
$form->{duedate} = $duedate if $duedate;
$form->{oldcustomer} = "$form->{customer}--$form->{customer_id}";
- $form->{rowcount} = 1;
+ $form->{rowcount} = 1;
+
# currencies
- @curr = split /:/, $form->{currencies};
+ @curr = split(/:/, $form->{currencies});
chomp $curr[0];
$form->{defaultcurrency} = $curr[0];
map {
$tax .=
- qq|<option value=\"$_->{taxkey}--$_->{rate}\">$_->{taxdescription} |
+ qq|<option value=\"$_->{id}--$_->{rate}\">$_->{taxdescription} |
. ($_->{rate} * 100) . qq| %|
} @{ $form->{TAX} };
$form->{taxchart} = $tax;
"<option value=\"$ref->{accno}\">$ref->{accno}--$ref->{description}</option>\n";
} else {
$form->{"select$key"} .=
- "<option value=\"$ref->{accno}--$ref->{taxkey}\">$ref->{accno}--$ref->{description}</option>\n";
+ "<option value=\"$ref->{accno}--$ref->{tax_id}\">$ref->{accno}--$ref->{description}</option>\n";
}
}
# if there is a value we have an old entry
my $j = 0;
my $k = 0;
- print(STDERR Dumper($form->{acc_trans}));
+
for $i (1 .. scalar @{ $form->{acc_trans}{$key} }) {
if ($key eq "AR_paid") {
$j++;
$akey = $key;
$akey =~ s/AR_//;
- if ($key eq "AR_tax") {
+ if ($key eq "AR_tax" || $key eq "AP_tax") {
$form->{"${key}_$form->{acc_trans}{$key}->[$i-1]->{accno}"} =
"$form->{acc_trans}{$key}->[$i-1]->{accno}--$form->{acc_trans}{$key}->[$i-1]->{description}";
$form->{"${akey}_$form->{acc_trans}{$key}->[$i-1]->{accno}"} =
$form->{"${akey}_$form->{acc_trans}{$key}->[$i-1]->{accno}"};
$withholdingrate +=
$form->{"$form->{acc_trans}{$key}->[$i-1]->{accno}_rate"};
- }
- print(STDERR $form->{acc_trans}{$key}->[$i - 1]->{amount}, " ACC_TRANS\n");
- print(STDERR "$key KEY, $k Zeile\n");
+ }
$index = $form->{acc_trans}{$key}->[$i - 1]->{index};
$form->{"tax_$index"} = $form->{acc_trans}{$key}->[$i - 1]->{amount};
+ $totaltax += $form->{"tax_$index"};
} else {
$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}"} =~
- /<option value=\"($form->{acc_trans}{$key}->[$i-1]->{accno}--[^\"]*)\">$form->{acc_trans}{$key}->[$i-1]->{accno}--$form->{acc_trans}{$key}->[$i-1]->{description}<\/option>\n/;
- $test = $1;
+ /<option value=\"($form->{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"} =~
- /<option value=\"($form->{acc_trans}{$key}->[$i-1]->{taxkey}--[^\"]*)/;
+ /<option value=\"($form->{acc_trans}{$key}->[$i-1]->{id}--[^\"]*)/;
$form->{"taxchart_$k"} = $1;
}
}
($totaltax + $totalwithholding) * $form->{"amount_$i"} / $totalamount;
$tax = $form->round_amount($taxamount, 2);
$diff += ($taxamount - $tax);
- $form->{"amount_$i"} += $tax;
+ $form->{"amount_$i"} += $form->{"tax_$i"};
}
$form->{amount_1} += $form->round_amount($diff, 2);
}
- # check if calculated is equal to stored
- if ($form->{taxincluded} && $form->{taxrate} && $withholdingrate) {
- if ($form->{"taxrate"} > 0) {
- $taxamount =
- $form->round_amount(
- ($form->{amount_1} - ($form->{amount_1} / ($form->{taxrate} + 1))),
- 2);
- } else {
- $taxamount =
- $form->round_amount(
- ($totalamount + $totaltax + $totalwithholding) * $withholdingrate /
- (1 - $withholdingrate),
- 2
- ) * $form->{"taxrate"} / $withholdingrate;
- }
- } else {
- $taxamount = $totalamount * $form->{"taxrate"};
- }
$taxamount = $form->round_amount($taxamount, 2);
$form->{tax} = $taxamount;
- $form->{invtotal} = $totalamount + $totaltax + $totalwithholding;
+ $form->{invtotal} = $totalamount + $totaltax;
$form->{locked} =
($form->datetonum($form->{transdate}, \%myconfig) <=
<!--
function setTaxkey(accno, row) {
var taxkey = accno.options[accno.selectedIndex].value;
- var reg = /--([0-9])*/;
+ var reg = /--([0-9]*)/;
var found = reg.exec(taxkey);
var index = found[1];
index = parseInt(index);
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);
+ $taxchart = $form->{taxchart};
+ map { $form->{$_} =~ s/\"/"/g }
+ qw(AR_amount selectAR_amount AR taxchart);
# format amounts
$form->{exchangerate} =
$button1 = qq|
<td><input name=transdate id=transdate size=11 title="$myconfig{dateformat}" value=$form->{transdate}></td>
<td><input type=button name=transdate id="trigger1" value=|
- . $locale->text('button')
- . qq|></td>
+ . $locale->text('button') . qq|></td>
|;
$button2 = qq|
<td><input name=duedate id=duedate size=11 title="$myconfig{dateformat}" value=$form->{duedate}></td>
<td><input type=button name=duedate id="trigger2" value=|
- . $locale->text('button')
- . qq|></td></td>
+ . $locale->text('button') . qq|></td></td>
|;
#write Trigger
</tr>
|;
-
-
$amount = $locale->text('Amount');
$project = $locale->text('Project');
for $i (1 .. $form->{rowcount}) {
# format amounts
- $form->{"amount_$i"} = $form->format_amount(\%myconfig, $form->{"amount_$i"}, 2);
+ $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/;
+ $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|<td><select id="taxchart_$i" name="taxchart_$i">$tax</select></td>|;
+ qq|<td><select id="taxchart_$i" name="taxchart_$i" style="width:200px">$tax</select></td>|;
+ $korrektur_checked = ($form->{"korrektur_$i"} ? 'checked' : '');
print qq|
<tr>
- <td width=50%><select name="AR_amount_$i">$selectAR_amount</select></td>
- <td><input name="amount_$i" onChange="setTaxkey(this, $i)" size=10 value=$form->{"amount_$i"}></td>
+ <td width=50%><select name="AR_amount_$i" onChange="setTaxkey(this, $i)" style="width:100%">$selectAR_amount</select></td>
+ <td><input name="amount_$i" size=10 value=$form->{"amount_$i"}></td>
<td><input name="tax_$i" size=10 value=$form->{"tax_$i"}></td>
- <td><input type="checkbox" name="korrektur_$i" value="1"></td>
+ <td><input type="checkbox" name="korrektur_$i" value="1" $korrektur_checked></td>
$tax
<td><input name="projectnumber_$i" size=20 value="$form->{"projectnumber_$i"}">
<input type=hidden name="project_id_$i" value=$form->{"project_id_$i"}>
$project = "";
}
-
-
-
$form->{invtotal} = $form->format_amount(\%myconfig, $form->{invtotal}, 2);
print qq|
<table width=100%>
<tr class=listheading>
<th colspan=6 class=listheading>|
- . $locale->text('Incoming Payments')
- . qq|</th>
+ . $locale->text('Incoming Payments') . qq|</th>
</tr>
|;
</tr>
";
+ my @triggers = ();
$form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"});
for $i (1 .. $form->{paidaccounts}) {
print "
s/option value=\"$form->{"AR_paid_$i"}\">/option value=\"$form->{"AR_paid_$i"}\" selected>/;
# format amounts
- $form->{"paid_$i"} =
- $form->format_amount(\%myconfig, $form->{"paid_$i"}, 2);
+ if ($form->{"paid_$i"}) {
+ $form->{"paid_$i"} =
+ $form->format_amount(\%myconfig, $form->{"paid_$i"}, 2);
+ }
$form->{"exchangerate_$i"} =
$form->format_amount(\%myconfig, $form->{"exchangerate_$i"});
qq|<td align=center><select name="AR_paid_$i">$form->{"selectAR_paid_$i"}</select></td>|;
$column_data{exchangerate} = qq|<td align=center>$exchangerate</td>|;
$column_data{datepaid} =
- qq|<td align=center><input name="datepaid_$i" size=11 value=$form->{"datepaid_$i"}></td>|;
+ qq|<td align=center><input name="datepaid_$i" size=11 value=$form->{"datepaid_$i"}>
+ <input type="button" name="datepaid_$i" id="trigger_datepaid_$i" value="?"></td>|;
$column_data{source} =
qq|<td align=center><input name="source_$i" size=11 value="$form->{"source_$i"}"></td>|;
$column_data{memo} =
print "
</tr>
";
+ push(@triggers, "datepaid_$i", "BL", "trigger_datepaid_$i");
}
map { $form->{$_} =~ s/\"/"/g } qw(selectAR_paid);
- print qq|
+
+ print $form->write_trigger(\%myconfig, scalar(@triggers) / 3, @triggers) .
+ qq|
<input type=hidden name=paidaccounts value=$form->{paidaccounts}>
<input type=hidden name=selectAR_paid value="$form->{selectAR_paid}">
$transdate = $form->datetonum($form->{transdate}, \%myconfig);
$closedto = $form->datetonum($form->{closedto}, \%myconfig);
- if ($form->{id} && $form->{radier}) {
-
- print qq|<input class=submit type=submit name=action value="|
- . $locale->text('Update') . qq|">
-|;
-
- if (!$form->{revtrans}) {
- if (!$form->{locked}) {
+ if ($form->{id}) {
+ if ($form->{radier}) {
+ print qq|<input class=submit type=submit name=action value="|
+ . $locale->text('Update') . qq|">
+ |;
+
+ print qq|
+ <input class=submit type=submit name=action value="|
+ . $locale->text('Post') . qq|">
+ <input class=submit type=submit name=action value="|
+ . $locale->text('Delete') . qq|">
+ |;
+ }
+ if ($transdate > $closedto) {
print qq|
- <input class=submit type=submit name=action value="|
- . $locale->text('Post') . qq|">
- <input class=submit type=submit name=action value="|
- . $locale->text('Delete') . qq|">
-|;
+ <input class=submit type=submit name=action value="|
+ . $locale->text('Use As Template') . qq|">
+ |;
}
- }
-
- if ($transdate > $closedto) {
- print qq|
-<input class=submit type=submit name=action value="|
- . $locale->text('Post as new') . qq|">
-|;
- }
-
+
} else {
if ($transdate > $closedto) {
print qq|<input class=submit type=submit name=action value="|
}
}
- if ($form->{menubar}) {
- require "$form->{path}/menu.pl";
- &menubar;
- }
-
print "
</form>
$form->{invtotal} = 0;
-# $form->{selectAR_amount} = $form->{AR_amount};
-# $form->{selectAR_amount} =~
-# s/value=\"$form->{AR_amountselected}\"/value=\"$form->{AR_amountselected}\" selected/;
+ # $form->{selectAR_amount} = $form->{AR_amount};
+ # $form->{selectAR_amount} =~
+ # s/value=\"$form->{AR_amountselected}\"/value=\"$form->{AR_amountselected}\" selected/;
$form->{selectAR} = $form->{AR};
for $i (1 .. $form->{rowcount}) {
$form->{"amount_$i"} =
$form->parse_amount(\%myconfig, $form->{"amount_$i"});
- $form->{"tax_$i"} =
- $form->parse_amount(\%myconfig, $form->{"tax_$i"});
+ $form->{"tax_$i"} = $form->parse_amount(\%myconfig, $form->{"tax_$i"});
if ($form->{"amount_$i"}) {
push @a, {};
$j = $#a;
&check_project;
-
$form->{invtotal} =
($form->{taxincluded}) ? $form->{invtotal} : $form->{invtotal} + $totaltax;
for $i (1 .. $form->{paidaccounts}) {
- if ($form->{"paid_$i"}) {
+ if ($form->parse_amount(\%myconfig, $form->{"paid_$i"})) {
map {
$form->{"${_}_$i"} =
$form->parse_amount(\%myconfig, $form->{"${_}_$i"})
delete($form->{AR});
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!'));
$lxdebug->leave_sub();
}
+sub use_as_template {
+ $lxdebug->enter_sub();
+
+ map { delete $form->{$_} } qw(printed emailed queued invnumber invdate deliverydate id datepaid_1 source_1 memo_1 paid_1 exchangerate_1 AP_paid_1 storno);
+ $form->{paidaccounts} = 1;
+ $form->{rowcount}--;
+ $form->{invdate} = $form->current_date(\%myconfig);
+ &update;
+
+ $lxdebug->leave_sub();
+}
+
sub delete {
$lxdebug->enter_sub();
$button1 = qq|
<td><input name=transdatefrom id=transdatefrom size=11 title="$myconfig{dateformat}">
<input type=button name=transdatefrom id="trigger1" value=|
- . $locale->text('button')
- . qq|></td>
+ . $locale->text('button') . qq|></td>
|;
$button2 = qq|
<td><input name=transdateto id=transdateto size=11 title="$myconfig{dateformat}">
<input type=button name=transdateto name=transdateto id="trigger2" value=|
- . $locale->text('button')
- . qq|></td>
+ . $locale->text('button') . qq|></td>
|;
#write Trigger
$option .= $locale->text('Closed');
}
- @columns =
- $form->sort_columns(
- qw(transdate id invnumber ordnumber name netamount tax amount paid datepaid due duedate notes employee shippingpoint shipvia)
- );
+ @columns = $form->sort_columns(
+ qw(transdate id type invnumber ordnumber name netamount tax amount paid datepaid due duedate notes employee shippingpoint shipvia)
+ );
+
+ $form->{"l_type"} = "Y";
foreach $item (@columns) {
if ($form->{"l_$item"} eq "Y") {
"<th><a class=listheading href=$href&sort=duedate>"
. $locale->text('Due Date')
. "</a></th>";
+ $column_header{type} =
+ "<th class=\"listheading\">" . $locale->text('Type') . "</th>";
$column_header{invnumber} =
"<th><a class=listheading href=$href&sort=invnumber>"
. $locale->text('Invoice')
$column_data{invnumber} =
"<td><a href=$module?action=edit&id=$ar->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ar->{invnumber}</a></td>";
+ $column_data{type} = "<td>" .
+ ($ar->{storno} ? $locale->text("Storno (one letter abbreviation)") :
+ $ar->{amount} < 0 ?
+ $locale->text("Credit note (one letter abbreviation)") :
+ $locale->text("Invoice (one letter abbreviation)")) . "</td>";
$column_data{ordnumber} = "<td>$ar->{ordnumber} </td>";
$column_data{name} = "<td>$ar->{name}</td>";
$ar->{notes} =~ s/\r\n/<br>/g;
<input class=submit type=submit name=action value="|
. $locale->text('AR Transaction') . qq|">
<input class=submit type=submit name=action value="|
- . $locale->text('Sales Invoice') . qq|">|;
+ . $locale->text('Sales Invoice') . qq|">
- if ($form->{menubar}) {
- require "$form->{path}/menu.pl";
- &menubar;
- }
-
- print qq|
</form>
</body>