#
#======================================================================
+use SL::FU;
use SL::IS;
use SL::PE;
use Data::Dumper;
-use List::Util qw(max);
+use List::Util qw(max sum);
require "bin/mozilla/io.pl";
+require "bin/mozilla/invoice_io.pl";
require "bin/mozilla/arap.pl";
require "bin/mozilla/drafts.pl";
sub add {
$lxdebug->enter_sub();
+ $auth->assert('invoice_edit');
+
return $lxdebug->leave_sub() if (load_draft_maybe());
if ($form->{type} eq "credit_note") {
}
- $form->{callback} =
- "$form->{script}?action=add&type=$form->{type}&login=$form->{login}&password=$form->{password}"
- unless $form->{callback};
+ $form->{callback} = "$form->{script}?action=add&type=$form->{type}" unless $form->{callback};
$form{jsscript} = "date";
- if ($myconfig{acs} =~ "AR--Add Sales Invoice" || $myconfig{acs} =~ "AR--AR")
- {
- $form->error("Access Denied");
- }
&invoice_links;
&prepare_invoice;
&display_form;
sub edit {
$lxdebug->enter_sub();
+ $auth->assert('invoice_edit');
+
# 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");
- }
$edit = 1;
if ($form->{print_and_post}) {
$form->{action} = "print";
sub invoice_links {
$lxdebug->enter_sub();
+ $auth->assert('invoice_edit');
+
$form->{vc} = 'customer';
# create links
sub prepare_invoice {
$lxdebug->enter_sub();
+ $auth->assert('invoice_edit');
+
if ($form->{type} eq "credit_note") {
$form->{type} = "credit_note";
$form->{formname} = "credit_note";
if ($form->{id}) {
- map { $form->{$_} =~ s/\"/"/g }
- qw(invnumber ordnumber quonumber shippingpoint shipvia notes intnotes);
# # get pricegroups for parts
# IS->get_pricegroups_for_parts(\%myconfig, \%$form);
$form->{"qty_$i"} =
$form->format_amount(\%myconfig, $form->{"qty_$i"}, $dec_qty);
- map { $form->{"${_}_$i"} =~ s/\"/"/g }
- qw(partnumber description unit partnotes);
$form->{rowcount} = $i;
}
sub form_header {
$lxdebug->enter_sub();
+ $auth->assert('invoice_edit');
+
$form->{employee_id} = $form->{old_employee_id} if $form->{old_employee_id};
$form->{salesman_id} = $form->{old_salesman_id} if $form->{old_salesman_id};
}
}
- my $set_duedate_url = "$form->{script}?login=$form->{login}&password=$form->{password}&action=set_duedate";
+ my $set_duedate_url = "$form->{script}?action=set_duedate";
my $pjx = new CGI::Ajax( 'set_duedate' => $set_duedate_url );
push(@ { $form->{AJAX} }, $pjx);
my @values = (undef);
foreach my $item (@{ $form->{"ALL_CONTACTS"} }) {
push(@values, $item->{"cp_id"});
- $labels{$item->{"cp_id"}} = $item->{"cp_name"} . ($item->{"cp_abteilung"} ? " ($item->{cp_abteilung})" : "");
+ $labels{$item->{"cp_id"}} = join(',', $item->{"cp_name"}, $item->{"cp_givenname"}) . ($item->{"cp_abteilung"} ? " ($item->{cp_abteilung})" : "");
}
my $contact;
if (scalar @values > 1) {
: (NTI($cgi->popup_menu('-name' => 'customer', '-default' => $form->{oldcustomer},
'-onChange' => 'document.getElementById(\'update_button\').click();',
'-values' => \@values, '-labels' => \%labels, '-style' => 'width: 250px')))) . qq|
- <input type="button" value="?" onclick="show_vc_details('customer')">
+ <input type="button" value="| . $locale->text('Details (one letter abbreviation)') . qq|" onclick="show_vc_details('customer')">
</td>|;
%labels = ();
$jsscript = "";
if ($form->{type} eq "credit_note") {
$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="|
+ <td nowrap><input name="invdate" id="invdate" size="11" title="$myconfig{dateformat}" value="$form->{invdate}" onBlur=\"check_right_date_format(this)\">
+ <input type="button" name="invdate_button" id="trigger1" value="|
. $locale->text('button') . qq|"></td>|;
#write Trigger
"trigger1");
} else {
$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="|
+ <td nowrap><input name="invdate" id="invdate" size="11" title="$myconfig{dateformat}" value="$form->{invdate}" onBlur=\"check_right_date_format(this)\">
+ <input type="button" name="invdate_button" 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)\">
- <input type="button" name="duedate" id="trigger2" value="|
- . $locale->text('button') . qq|"></td></td>
+ <input type="button" name="duedate_button" id="trigger2" value="|
+ . $locale->text('button') . qq|"></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>
+ <input type="button" name="deliverydate_button" id="trigger3" value="|
+ . $locale->text('button') . qq|"></td>
|;
#write Trigger
}
$credittext = $locale->text('Credit Limit exceeded!!!');
+
+ my $follow_up_vc = $form->{customer};
+ $follow_up_vc =~ s/--\d*\s*$//;
+ my $follow_up_trans_info = "$form->{invnumber} ($follow_up_vc)";
+
$onload = ($form->{resubmit} && ($form->{format} eq "html")) ? qq|window.open('about:blank','Beleg'); document.invoice.target = 'Beleg';document.invoice.submit()|
: ($form->{resubmit}) ? qq|document.invoice.submit()|
: ($creditwarning) ? qq|alert('$credittext')|
<script type="text/javascript" src="js/delivery_customer_selection.js"></script>
<script type="text/javascript" src="js/vendor_selection.js"></script>
<script type="text/javascript" src="js/calculate_qty.js"></script>
+<script type="text/javascript" src="js/follow_up.js"></script>
<form method="post" name="invoice" action="$form->{script}">
| ;
creditlimit creditremaining tradediscount business closedto locked shipped storno storno_id
max_dunning_level dunning_amount
shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptocontact shiptophone shiptofax
- shiptoemail shiptodepartment_1 shiptodepartment_2 message email subject cc bcc taxaccounts),
+ shiptoemail shiptodepartment_1 shiptodepartment_2 message email subject cc bcc taxaccounts cursor_fokus
+ convert_from_do_ids convert_from_oe_ids),
map { $_.'_rate', $_.'_description', $_.'_taxnumber' } split / /, $form->{taxaccounts} );
print qq|<p>$form->{saved_message}</p>| if $form->{saved_message};
print qq|
+<input type="hidden" name="follow_up_trans_id_1" value="| . H($form->{id}) . qq|">
+<input type="hidden" name="follow_up_trans_type_1" value="sales_invoice">
+<input type="hidden" name="follow_up_trans_info_1" value="| . H($follow_up_trans_info) . qq|">
+<input type="hidden" name="follow_up_rowcount" value="1">
+
<input type="hidden" name="lizenzen" value="$lizenzen">
<div class="listtop" width="100%">$form->{title}</div>
<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="$form->{selectcustomer}">
+ <input type="hidden" name="customer_klass" value="| . H($form->{customer_klass}) . qq|">
+ <input type="hidden" name="customer_id" value="| . H($form->{customer_id}) . qq|">
+ <input type="hidden" name="oldcustomer" value="| . H($form->{oldcustomer}) . qq|">
+ <input type="hidden" name="selectcustomer" value="| . H($form->{selectcustomer}) . qq|">
</tr>
$contact
$shipto
<th align="right" nowrap>| . $locale->text('Shipping Point') . qq|</th>
<td colspan="3"> | .
$cgi->textfield("-name" => "shippingpoint", "-size" => 35, "-value" => $form->{shippingpoint}) .
- qq|</tr>
+ qq| </td>
+ </tr>
<tr>
<th align="right" nowrap>| . $locale->text('Ship via') . qq|</th>
- <td colspan="3"><input name="shipvia" size="35" value="$form->{shipvia}"></td>
+ <td colspan="3"> | .
+ $cgi->textfield("-name" => "shipvia", "-size" => 35, "-value" => $form->{shipvia}) .
+ qq| </td>
</tr>
<tr>
<th align="right">| . $locale->text('Transaction description') . qq|</th>
$employees
$salesman
|;
+
+#ergänzung in der maske um das feld Lieferscheinnummer (Delivery Order Number), meiner meinung nach sinnvoll ueber dem feld lieferscheindatum 12.02.2009 jb
if ($form->{type} eq "credit_note") {
print qq| <tr>
<th align="right" nowrap>| . $locale->text('Credit Note Number') . qq|</th>
- <td><input name="invnumber" size="11" value="$form->{invnumber}"></td>
+ <td> |.
+ $cgi->textfield("-name" => "invnumber", "-size" => 11, "-value" => $form->{invnumber}) .
+ qq| </td>
</tr>
<tr>
<th align="right">| . $locale->text('Credit Note Date') . qq|</th>
} else {
print qq| <tr>
<th align="right" nowrap>| . $locale->text('Invoice Number') . qq|</th>
- <td><input name="invnumber" size="11" value="$form->{invnumber}"></td>
+ <td> |.
+ $cgi->textfield("-name" => "invnumber", "-size" => 11, "-value" => $form->{invnumber}) .
+ qq| </td>
</tr>
<tr>
<th align="right">| . $locale->text('Invoice Date') . qq|</th>
<th align="right">| . $locale->text('Due Date') . qq|</th>
$button2
</tr>
+ <tr>
+ <th align="right" nowrap>| . $locale->text('Delivery Order Number') . qq|</th>
+ <td> |.
+ $cgi->textfield("-name" => "donumber", "-size" => 11, "-value" => $form->{donumber}) .
+ qq| </td>
+ </tr>
<tr>
<th align="right">| . $locale->text('Delivery Date') . qq|</th>
$button3
}
print qq| <tr>
<th align="right" nowrap>| . $locale->text('Order Number') . qq|</th>
- <td><input name="ordnumber" size="11" value="$form->{ordnumber}"></td>
+ <td> |.
+ $cgi->textfield("-name" => "ordnumber", "-size" => 11, "-value" => $form->{ordnumber}) .
+ qq| </td>
</tr>
<tr>
<th align="right" nowrap>| . $locale->text('Order Date') . qq|</th>
</tr>
<tr>
<th align="right" nowrap>| . $locale->text('Quotation Number') . qq|</th>
- <td><input name="quonumber" size="11" value="$form->{quonumber}"></td>
+ <td> |.
+ $cgi->textfield("-name" => "quonumber", "-size" => 11, "-value" => $form->{quonumber}) .
+ qq| </td>
</tr>
<tr>
<th align="right" nowrap>| . $locale->text('Quotation Date') . qq|</th>
</tr>
<tr>
<th align="right" nowrap>| . $locale->text('Customer Order Number') . qq|</th>
- <td><input name="cusordnumber" size="11" value="$form->{cusordnumber}"></td>
+ <td> |.
+ $cgi->textfield("-name" => "cusordnumber", "-size" => 11, "-value" => $form->{cusordnumber}) .
+ qq| </td>
</tr>
<tr>
<th align="right" nowrap>| . $locale->text('Project Number') . qq|</th>
sub form_footer {
$lxdebug->enter_sub();
+ $auth->assert('invoice_edit');
+
$form->{invtotal} = $form->{invsubtotal};
if (($rows = $form->numtextrows($form->{notes}, 26, 8)) < 2) {
$form->{invtotal} =
$form->format_amount(\%myconfig, $form->{invtotal}, 2, 0);
+ my $follow_ups_block;
+ if ($form->{id}) {
+ my $follow_ups = FU->follow_ups('trans_id' => $form->{id});
+
+ if (@{ $follow_ups} ) {
+ my $num_due = sum map { $_->{due} * 1 } @{ $follow_ups };
+ $follow_ups_block = qq|
+ <tr>
+ <td colspan="2">| . $locale->text("There are #1 unfinished follow-ups of which #2 are due.", scalar @{ $follow_ups }, $num_due) . qq|</td>
+ </tr>
+|;
+ }
+ }
+
print qq|
<tr>
<td>
<tr valign="top">
<td>$notes</td>
<td>$intnotes</td>
- <td><select name="payment_id" onChange="if (this.value) set_duedate(['payment_id__' + this.value],['duedate'])">$payment
+ <td><select name="payment_id" onChange="if (this.value) set_duedate(['payment_id__' + this.value, 'invdate__' + invdate.value],['duedate'])">$payment
</select></td>
</tr>
+ $follow_ups_block
</table>
</td>
<td>
$closedto = $form->datetonum($form->{closedto}, \%myconfig);
if ($form->{id}) {
- my $show_storno = !$form->{storno} && !IS->has_storno(\%myconfig, $form, "ar");
+ my $show_storno = !$form->{storno} && !IS->has_storno(\%myconfig, $form, "ar") && (($totalpaid == 0) || ($totalpaid eq ""));
print qq|
<input class="submit" type="submit" accesskey="u" name="action" id="update_button" value="|
print qq|<input class="submit" type="submit" name="action" value="|
. $locale->text('Use As Template') . qq|">
|;
- if ($form->{id} && !($form->{type} eq "credit_note")) {
- print qq|
+ if ($form->{id} && !($form->{type} eq "credit_note")) {
+ print qq|
<input class="submit" type="submit" name="action" value="|
. $locale->text('Credit Note') . qq|">
|;
- }
+ }
if ($form->{radier}) {
print qq|
<input class="submit" type="submit" name="action" value="|
. $locale->text('Delete') . qq|">
|;
- }
+ }
if ($invdate > $closedto) {
|;
}
+ print qq|
+ <input type="button" class="submit" onclick="follow_up_window()" value="|
+ . $locale->text('Follow-Up')
+ . qq|">|;
+
} else {
if ($invdate > $closedto) {
print qq|<input class="submit" type="submit" name="action" id="update_button" value="|
| .
$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));
-print qq|
+. $cgi->hidden('-name' => 'draft_description', '-default' => [$form->{draft_description}])
+. $cgi->hidden('-name' => 'customer_discount', '-value' => [$form->{customer_discount}])
+. qq|
</form>
</body>
sub mark_as_paid {
$lxdebug->enter_sub();
+
+ $auth->assert('invoice_edit');
+
&mark_as_paid_common(\%myconfig,"ar");
+
$lxdebug->leave_sub();
}
sub update {
$lxdebug->enter_sub();
+ $auth->assert('invoice_edit');
+
my ($recursive_call) = shift;
map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } qw(exchangerate creditlimit creditremaining) unless $recursive_call;
$form->{taxincluded} ||= $taxincluded;
- $form->{exchangerate} = $exchangerate if
- $form->{forex} = $exchangerate = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{invdate}, 'buy');
+ $form->{forex} = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{invdate}, 'buy');
+ $form->{exchangerate} = $form->{forex} if $form->{forex};
for $i (1 .. $form->{paidaccounts}) {
next unless $form->{"paid_$i"};
map { $form->{"${_}_$i"} = $form->parse_amount(\%myconfig, $form->{"${_}_$i"}) } qw(paid exchangerate);
- $form->{"exchangerate_$i"} = $exchangerate if
- $form->{"forex_$i"} = $exchangerate = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{"datepaid_$i"}, 'buy');
+ $form->{"forex_$i"} = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{"datepaid_$i"}, 'buy');
+ $form->{"exchangerate_$i"} = $form->{"forex_$i"} if $form->{"forex_$i"};
}
$i = $form->{rowcount};
$rows = scalar @{ $form->{item_list} };
- $form->{"discount_$i"} = $form->format_amount(\%myconfig, $form->{discount} * 100);
+ $form->{"discount_$i"} = $form->format_amount(\%myconfig, $form->{customer_discount} * 100);
if ($rows) {
$form->{"qty_$i"} = ($form->{"qty_$i"} * 1) ? $form->{"qty_$i"} : 1;
sub post_payment {
$lxdebug->enter_sub();
+ $auth->assert('invoice_edit');
+
$form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
for $i (1 .. $form->{paidaccounts}) {
if ($form->{"paid_$i"}) {
$form->isblank("datepaid_$i", $locale->text('Payment date missing!'));
$form->error($locale->text('Cannot post payment for a closed period!'))
- if ($datepaid <= $closedto);
+ if ($form->date_closed($form->{"datepaid_$i"}, \%myconfig));
if ($form->{currency} ne $form->{defaultcurrency}) {
$form->{"exchangerate_$i"} = $form->{exchangerate}
sub post {
$lxdebug->enter_sub();
+ $auth->assert('invoice_edit');
+
$form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
$form->isblank("invdate", $locale->text('Invoice Date missing!'));
$form->isblank("customer", $locale->text('Customer missing!'));
+ $form->error($locale->text('Cannot post invoice for a closed period!'))
+ if ($form->date_closed($form->{"invdate"}, \%myconfig));
$form->{invnumber} =~ s/^\s*//g;
$form->{invnumber} =~ s/\s*$//g;
$form->isblank("datepaid_$i", $locale->text('Payment date missing!'));
$form->error($locale->text('Cannot post payment for a closed period!'))
- if ($datepaid <= $closedto);
+ if ($form->date_closed($form->{"datepaid_$i"}, \%myconfig));
if ($form->{currency} ne $form->{defaultcurrency}) {
$form->{"exchangerate_$i"} = $form->{exchangerate}
sub print_and_post {
$lxdebug->enter_sub();
+ $auth->assert('invoice_edit');
+
$old_form = new Form;
$print_post = 1;
$form->{print_and_post} = 1;
sub use_as_template {
$lxdebug->enter_sub();
+ $auth->assert('invoice_edit');
+
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}--;
sub storno {
$lxdebug->enter_sub();
+ $auth->assert('invoice_edit');
+
if ($form->{storno}) {
$form->error($locale->text('Cannot storno storno invoice!'));
}
$form->error($locale->text("Invoice has already been storno'd!"));
}
- map({ my $key = $_; delete($form->{$key})
- unless (grep({ $key eq $_ } qw(login password id stylesheet type))); }
- keys(%{ $form }));
+ map({ my $key = $_; delete($form->{$key}) unless (grep({ $key eq $_ } qw(id login password stylesheet type))); } keys(%{ $form }));
invoice_links();
prepare_invoice();
sub preview {
$lxdebug->enter_sub();
+ $auth->assert('invoice_edit');
+
$form->{preview} = 1;
$old_form = new Form;
for (keys %$form) { $old_form->{$_} = $form->{$_} }
sub delete {
$lxdebug->enter_sub();
+
+ $auth->assert('invoice_edit');
+
if ($form->{second_run}) {
$form->{print_and_post} = 0;
}
map { delete $form->{$_} } qw(action header);
foreach $key (keys %$form) {
+ next if (($key eq 'login') || ($key eq 'password') || ('' ne ref $form->{$key}));
$form->{$key} =~ s/\"/"/g;
print qq|<input type="hidden" name="$key" value="$form->{$key}">\n|;
}
sub credit_note {
$lxdebug->enter_sub();
+ $auth->assert('invoice_edit');
+
$form->{transdate} = $form->{invdate} = $form->current_date(\%myconfig);
$form->{duedate} =
$form->current_date(\%myconfig, $form->{invdate}, $form->{terms} * 1);
&invoice_links;
$form->{currency} = $currency;
- $form->{exchangerate} = "";
- $form->{forex} = "";
- $form->{exchangerate} = $exchangerate
- if (
- $form->{forex} = (
- $exchangerate =
- $form->check_exchangerate(
- \%myconfig, $form->{currency}, $form->{invdate}, $buysell
- )));
+ $form->{forex} = $form->check_exchangerate( \%myconfig, $form->{currency}, $form->{invdate}, $buysell);
+ $form->{exchangerate} = $form->{forex} || '';
$form->{creditremaining} -= ($form->{oldinvtotal} - $form->{ordtotal});
sub yes {
$lxdebug->enter_sub();
+
+ $auth->assert('invoice_edit');
+
if (IS->delete_invoice(\%myconfig, \%$form, $spool)) {
# saving the history
if(!exists $form->{addition}) {
sub e_mail {
$lxdebug->enter_sub();
+ $auth->assert('invoice_edit');
+
if (!$form->{id}) {
$print_post = 1;
post();
- my %saved_vars;
- map({ $saved_vars{$_} = $form->{$_}; } qw(id invnumber));
- restore_form($saved_form);
- map({ $form->{$_} = $saved_vars{$_}; } qw(id invnumber));
+ restore_form($saved_form, 0, qw(id invnumber));
}
edit_e_mail();
projects / kivitendo-erp.git / blobdiff