use SL::PE;
require "$form->{path}/arap.pl";
+require "bin/mozilla/common.pl";
+require "bin/mozilla/drafts.pl";
1;
sub add {
$lxdebug->enter_sub();
+ return $lxdebug->leave_sub() if (load_draft_maybe());
+
$form->{title} = "Add";
$form->{callback} =
unless $form->{callback};
&create_links;
+ AP->get_transdate(\%myconfig, $form);
&display_form;
$lxdebug->leave_sub();
sub edit {
$lxdebug->enter_sub();
+ # show history button
+ $form->{javascript} = qq|<script type="text/javascript" src="js/show_history.js"></script>|;
+ #/show hhistory button
$form->{title} = "Edit";
$form->{"forex_$j"} = $form->{"exchangerate_$i"} =
$form->{acc_trans}{$key}->[$i - 1]->{exchangerate};
$form->{"AP_paid_$j"} = "$form->{acc_trans}{$key}->[$i-1]->{accno}";
+ $form->{"paid_project_id_$j"} = $form->{acc_trans}{$key}->[$i - 1]->{project_id};
$form->{paidaccounts}++;
} else {
}
$form->{"${key}_$k"} =
"$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->datetonum($form->{transdate}, \%myconfig) <=
$form->datetonum($form->{closedto}, \%myconfig));
+ $form->{"APselected"} = $form->{"AP_1"};
+
$lxdebug->leave_sub();
}
}
$readonly = ($form->{id}) ? "readonly" : "";
+ my $APselected_quoted = quotemeta($form->{"APselected"});
+ $form->{selectAP} = $form->{AP};
+ $form->{selectAP} =~
+ s/value=\"${APselected_quoted}\"/value=\"$form->{APselected}\" selected/;
+
$form->{radier} =
($form->current_date(\%myconfig) eq $form->{gldate}) ? 1 : 0;
$readonly = ($form->{radier}) ? "" : $readonly;
? qq|<select name=vendor>$form->{selectvendor}</select>|
: qq|<input name=vendor value="$form->{vendor}" size=35>|;
+ my @old_project_ids = ();
+ map({ push(@old_project_ids, $form->{"project_id_$_"})
+ if ($form->{"project_id_$_"}); } (1..$form->{"rowcount"}));
+
+ $form->get_lists("projects" => { "key" => "ALL_PROJECTS",
+ "all" => 0,
+ "old_id" => \@old_project_ids });
+
+ my %project_labels = ();
+ my @project_values = ("");
+ foreach my $item (@{ $form->{"ALL_PROJECTS"} }) {
+ push(@project_values, $item->{"id"});
+ $project_labels{$item->{"id"}} = $item->{"projectnumber"};
+ }
+
# use JavaScript Calendar or not
$form->{jsscript} = $jscalendar;
$jsscript = "";
<input type=hidden name=locked value=$form->{locked}>
<input type=hidden name=title value="$title">
+| . ($form->{saved_message} ? qq|<p>$form->{saved_message}</p>| : "") . qq|
+
<table width=100%>
<tr class=listtop>
<th class=listtop>$form->{title}</th>
my $korrektur = $form->{"korrektur_$i"} ? 'checked' : '';
+ my $projectnumber =
+ NTI($cgi->popup_menu('-name' => "project_id_$i",
+ '-values' => \@project_values,
+ '-labels' => \%project_labels,
+ '-default' => $form->{"project_id_$i"} ));
+
print qq|
<tr>
<td width=50%><select name="AP_amount_$i" onChange="setTaxkey(this, $i)" style="width:100%">$selectAP_amount</select></td>
<td><input name="tax_$i" size=10 value=$form->{"tax_$i"}></td>
<td><input type="checkbox" name="korrektur_$i" value="1" "$korrektur"></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"}>
- <input type=hidden name="oldprojectnumber_$i" value="$form->{"oldprojectnumber_$i"}"></td>
+ <td>$projectnumber</td>
</tr>
|;
$amount = "";
<td>
<table width=100%>
<tr class=listheading>
- <th class=listheading colspan=6>| . $locale->text('Payments') . qq|</th>
+ <th class=listheading colspan=7>| . $locale->text('Payments') . qq|</th>
</tr>
|;
if ($form->{currency} eq $form->{defaultcurrency}) {
- @column_index = qw(datepaid source memo paid AP_paid);
+ @column_index = qw(datepaid source memo paid AP_paid paid_project_id);
} else {
- @column_index = qw(datepaid source memo paid exchangerate AP_paid);
+ @column_index = qw(datepaid source memo paid exchangerate AP_paid paid_project_id);
}
$column_data{datepaid} = "<th>" . $locale->text('Date') . "</th>";
$column_data{AP_paid} = "<th>" . $locale->text('Account') . "</th>";
$column_data{source} = "<th>" . $locale->text('Source') . "</th>";
$column_data{memo} = "<th>" . $locale->text('Memo') . "</th>";
+ $column_data{paid_project_id} = "<th>" . $locale->text('Project Number') . "</th>";
print "
<tr>
</tr>
";
+ my @triggers = ();
$form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"});
for $i (1 .. $form->{paidaccounts}) {
print "
qq|<td align=center><select name="AP_paid_$i">$form->{"selectAP_paid_$i"}</select></td>|;
$column_data{"exchangerate_$i"} = qq|<td align=center>$exchangerate</td>|;
$column_data{"datepaid_$i"} =
- qq|<td align=center><input name="datepaid_$i" size=11 title="($myconfig{'dateformat'})" value=$form->{"datepaid_$i"}></td>|;
+ qq|<td align=center><input name="datepaid_$i" id="datepaid_$i" size=11 title="($myconfig{'dateformat'})" value=$form->{"datepaid_$i"}>
+ <input type="button" name="datepaid_$i" id="trigger_datepaid_$i" value="?"></td>|;
$column_data{"source_$i"} =
qq|<td align=center><input name="source_$i" size=11 value="$form->{"source_$i"}"></td>|;
$column_data{"memo_$i"} =
qq|<td align=center><input name="memo_$i" size=11 value="$form->{"memo_$i"}"></td>|;
+ $column_data{"paid_project_id_$i"} =
+ qq|<td>|
+ . NTI($cgi->popup_menu('-name' => "paid_project_id_$i",
+ '-values' => \@project_values,
+ '-labels' => \%project_labels,
+ '-default' => $form->{"paid_project_id_$i"} ))
+ . qq|</td>|;
map { print qq|$column_data{"${_}_$i"}\n| } @column_index;
print "
</tr>
";
+ push(@triggers, "datepaid_$i", "BL", "trigger_datepaid_$i");
}
map { $form->{$_} =~ s/\"/"/g } qw(selectAP_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=selectAP_paid value="$form->{selectAP_paid}">
print qq|
<input name=callback type=hidden value="$form->{callback}">
+<input name="gldate" type="hidden" value="| . Q($form->{gldate}) . qq|">
<input type=hidden name=path value=$form->{path}>
<input type=hidden name=login value=$form->{login}>
<input type=hidden name=password value=$form->{password}>
+|
+. $cgi->hidden('-name' => 'draft_id', '-default' => [$form->{draft_id}])
+. $cgi->hidden('-name' => 'draft_description', '-default' => [$form->{draft_description}])
+. qq|
<br>
|;
$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->{id}) {
# print qq|<input class=submit type=submit name=action value="|.$locale->text('Update').qq|">
# |;
-
- if (!$form->{revtrans}) {
- if (!$form->{locked}) {
- print qq|
+ if ($form->{radier}) {
+ 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|
+ print qq|
<input class=submit type=submit name=action value="|
- . $locale->text('Post as new') . qq|">
+ . $locale->text('Use As Template') . qq|">
+<input class=submit type=submit name=action value="|
+ . $locale->text('Post Payment') . qq|">
|;
- }
-
- } else {
- if (($transdate > $closedto) && !$form->{id}) {
- print qq|<input class=submit type=submit name=action value="|
- . $locale->text('Update') . qq|">
+ } elsif (($transdate > $closedto) && !$form->{id}) {
+ print qq|
<input class=submit type=submit name=action value="|
- . $locale->text('Post') . qq|">|;
- }
+ . $locale->text('Post') . qq|"> | .
+ NTI($cgi->submit('-name' => 'action', '-value' => $locale->text('Save draft'),
+ '-class' => 'submit'));
}
-
- if ($form->{menubar}) {
- require "$form->{path}/menu.pl";
- &menubar;
+ # button for saving history
+ if($form->{id} ne "") {
+ print qq|
+ <input type=button class=submit onclick=set_history_window(|
+ . $form->{id}
+ . qq|); name=history id=history value=|
+ . $locale->text('history')
+ . qq|>|;
}
-
+ # /button for saving history
print "
</form>
# $form->{selectAP_amount} =~
# s/value=\"$form->{AP_amountselected}\"/value=\"$form->{AP_amountselected}\" selected/;
- $form->{selectAP} = $form->{AP};
- $form->{selectAP} =~
- s/value=\"$form->{APselected}\"/value=\"$form->{APselected}\" selected/;
-
($AP_amountaccno, $AP_amounttaxkey) =
split(/--/, $form->{AP_amountselected});
$form->{selecttaxchart} = $form->{taxchart};
&check_name(vendor);
$form->{AP} = $save_AP;
- &check_project;
$form->{rowcount} = $count + 1;
$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"})
$lxdebug->leave_sub();
}
+
+sub post_payment {
+ $lxdebug->enter_sub();
+ for $i (1 .. $form->{paidaccounts}) {
+ if ($form->{"paid_$i"}) {
+ $datepaid = $form->datetonum($form->{"datepaid_$i"}, \%myconfig);
+
+ $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->{currency} ne $form->{defaultcurrency}) {
+ $form->{"exchangerate_$i"} = $form->{exchangerate}
+ if ($invdate == $datepaid);
+ $form->isblank("exchangerate_$i",
+ $locale->text('Exchangerate for payment missing!'));
+ }
+ }
+ }
+
+ ($form->{AP}) = split /--/, $form->{AP};
+ ($form->{AP_paid}) = split /--/, $form->{AP_paid};
+ $form->redirect($locale->text(' Payment posted!'))
+ if (AP->post_payment(\%myconfig, \%$form));
+ $form->error($locale->text('Cannot post payment!'));
+
+
+ $lxdebug->leave_sub();
+}
+
+
sub post {
$lxdebug->enter_sub();
delete($form->{AP});
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!'));
$form->{id} = 0 if $form->{postasnew};
- $form->redirect($locale->text('Transaction posted!'))
- if (AP->post_transaction(\%myconfig, \%$form));
+ if (AP->post_transaction(\%myconfig, \%$form)) {
+ # saving the history
+ if(!exists $form->{addition} && $form->{id} ne "") {
+ $form->{addition} = "POSTED";
+ $form->save_history($form->dbconnect(\%myconfig));
+ }
+ # /saving the history
+ remove_draft() if $form->{remove_draft};
+ $form->redirect($locale->text('Transaction posted!'));
+ }
$form->error($locale->text('Cannot post transaction!'));
$lxdebug->leave_sub();
$lxdebug->enter_sub();
$form->{postasnew} = 1;
+ # saving the history
+ if(!exists $form->{addition} && $form->{id} ne "") {
+ $form->{addition} = "POSTED AS NEW";
+ $form->save_history($form->dbconnect(\%myconfig));
+ }
+ # /saving the history
&post;
$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();
sub yes {
$lxdebug->enter_sub();
-
- $form->redirect($locale->text('Transaction deleted!'))
- if (AP->delete_transaction(\%myconfig, \%$form, $spool));
+ if (AP->delete_transaction(\%myconfig, \%$form, $spool)) {
+ # saving the history
+ if(!exists $form->{addition}) {
+ $form->{addition} = "DELETED";
+ $form->save_history($form->dbconnect(\%myconfig));
+ }
+ # /saving the history
+ $form->redirect($locale->text('Transaction deleted!'));
+ }
$form->error($locale->text('Cannot delete transaction!'));
$lxdebug->leave_sub();
<td><input name=transdateto id=transdateto size=11 title="$myconfig{dateformat}"></td>|;
}
+ $form->get_lists("projects" => { "key" => "ALL_PROJECTS",
+ "all" => 1 });
+
+ my %labels = ();
+ my @values = ("");
+ foreach my $item (@{ $form->{"ALL_PROJECTS"} }) {
+ push(@values, $item->{"id"});
+ $labels{$item->{"id"}} = $item->{"projectnumber"};
+ }
+ my $projectnumber =
+ NTI($cgi->popup_menu('-name' => 'project_id', '-values' => \@values,
+ '-labels' => \%labels));
+
$form->header;
print qq|
<th align=right nowrap>| . $locale->text('Notes') . qq|</th>
<td colspan=3><input name=notes size=40></td>
</tr>
+ <tr>
+ <th align="right">| . $locale->text("Project Number") . qq|</th>
+ <td colspan="3">$projectnumber</td>
+ </tr>
<tr>
<th align=right nowrap>| . $locale->text('From') . qq|</th>
$button1
<tr>
<td align=right><input name="l_subtotal" class=checkbox type=checkbox value=Y></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>
</tr>
</table>
</td>
$option .= "\n<br>" if ($option);
$option .= $locale->text('Closed');
}
+ if ($form->{globalproject_id}) {
+ $callback .= "&globalproject_id=" . E($form->{globalproject_id});
+ $href .= "&globalproject_id=" . E($form->{globalproject_id});
+ }
- @columns = $form->sort_columns(
- qw(transdate id invnumber ordnumber name netamount tax amount paid datepaid due duedate notes employee)
- );
+ @columns =
+ qw(transdate id invnumber ordnumber name netamount tax amount paid datepaid
+ due duedate notes employee globalprojectnumber);
foreach $item (@columns) {
if ($form->{"l_$item"} eq "Y") {
$column_header{employee} =
"<th><a class=listheading href=$href&sort=employee>"
. $locale->text('Employee') . "</th>";
+ $column_header{globalprojectnumber} =
+ qq|<th class="listheading">| . $locale->text('Project Number') . qq|</th>|;
$form->{title} = $locale->text('AP Transactions');
$ap->{notes} =~ s/\r\n/<br>/g;
$column_data{notes} = "<td>$ap->{notes} </td>";
$column_data{employee} = "<td>$ap->{employee} </td>";
+ $column_data{globalprojectnumber} =
+ "<td>" . H($ap->{globalprojectnumber}) . "</td>";
$i++;
$i %= 2;
. $locale->text('AP Transaction') . qq|">
<input class=submit type=submit name=action value="|
- . $locale->text('Vendor Invoice') . qq|">|;
-
- if ($form->{menubar}) {
- require "$form->{path}/menu.pl";
- &menubar;
- }
+ . $locale->text('Vendor Invoice') . qq|">
- print qq|
</form>
</body>
projects / kivitendo-erp.git / blobdiff