$form->create_links("AP", \%myconfig, "vendor");
+ #quote all_vendor Bug 133
+ foreach $ref (@{ $form->{all_vendor} }) {
+ $ref->{name} = $form->quote($ref->{name});
+ }
+
if ($form->{all_vendor}) {
unless ($form->{vendor_id}) {
$form->{vendor_id} = $form->{all_vendor}->[0]->{id};
}
}
+ if ($form->{payment_id}) {
+ $payment_id = $form->{payment_id};
+ }
+ if ($form->{language_id}) {
+ $language_id = $form->{language_id};
+ }
+ if ($form->{taxzone_id}) {
+ $taxzone_id = $form->{taxzone_id};
+ }
$cp_id = $form->{cp_id};
IR->get_vendor(\%myconfig, \%$form);
IR->retrieve_invoice(\%myconfig, \%$form);
$form->{cp_id} = $cp_id;
+
+ if ($payment_id) {
+ $form->{payment_id} = $payment_id;
+ }
+ if ($language_id) {
+ $form->{language_id} = $language_id;
+ }
+ if ($taxzone_id) {
+ $form->{taxzone_id} = $taxzone_id;
+ }
# currencies
@curr = split /:/, $form->{currencies};
$form->{"sellprice_$i"} =
$form->format_amount(\%myconfig, $form->{"sellprice_$i"},
$decimalplaces);
+
+ (my $dec_qty) = ($form->{"qty_$i"} =~ /\.(\d+)/);
+ $dec_qty = length $dec_qty;
+
$form->{"qty_$i"} =
- $form->format_amount(\%myconfig, ($form->{"qty_$i"} * -1));
+ $form->format_amount(\%myconfig, ($form->{"qty_$i"} * -1), $dec_qty);
$form->{rowcount} = $i;
}
s/option>\Q$form->{$item}\E/option selected>$form->{$item}/;
}
+ #quote selectvendor Bug 133
+ $form->{"selectvendor"} = $form->quote($form->{"selectvendor"});
+
$form->{exchangerate} =
$form->format_amount(\%myconfig, $form->{exchangerate});
if ($form->{forex}) {
$exchangerate .= qq|
<th align=right nowrap>|
- . $locale->text('Exchangerate')
- . qq|</th>
+ . $locale->text('Exchangerate') . qq|</th>
<td>$form->{exchangerate}<input type=hidden name=exchangerate value=$form->{exchangerate}></td>
|;
} else {
$exchangerate .= qq|
<th align=right nowrap>|
- . $locale->text('Exchangerate')
- . qq|</th>
+ . $locale->text('Exchangerate') . qq|</th>
<td><input name=exchangerate size=10 value=$form->{exchangerate}></td>
|;
}
<input type=hidden name=forex value=$form->{forex}>
|;
+
+ if (@{ $form->{TAXZONE} }) {
+ $form->{selecttaxzone} = "";
+ foreach $item (@{ $form->{TAXZONE} }) {
+ if ($item->{id} == $form->{taxzone_id}) {
+ $form->{selecttaxzone} .=
+ "<option value=$item->{id} selected>$item->{description}</option>";
+ } else {
+ $form->{selecttaxzone} .=
+ "<option value=$item->{id}>$item->{description}</option>";
+ }
+
+ }
+ } else {
+ $form->{selecttaxzone} =~ s/ selected//g;
+ if ($form->{taxzone_id} ne "") {
+ $form->{selecttaxzone} =~ s/value=$form->{taxzone_id}/value=$form->{taxzone_id} selected/;
+ }
+ }
+ if ($form->{rowcount} >1) {
+ $form->{selecttaxzone} =~ /<option value=\d+ selected>.*?<\/option>/;
+ $form->{selecttaxzone} = $&;
+ }
+
+
+ $taxzone = qq|
+ <tr>
+ <th align=right>| . $locale->text('Steuersatz') . qq|</th>
+ <td><select name=taxzone_id>$form->{selecttaxzone}</select></td>
+ <input type=hidden name=selecttaxzone value="$form->{selecttaxzone}">
+ </tr>|;
+
+
+
$vendor =
($form->{selectvendor})
? qq|<select name=vendor>$form->{selectvendor}</select>\n<input type=hidden name="selectvendor" value="$form->{selectvendor}">|
$button1 = qq|
<td><input name=invdate id=invdate size=11 title="$myconfig{dateformat}" value=$form->{invdate}></td>
<td><input type=button name=invdate id="trigger1" value=|
- . $locale->text('button')
- . qq|></td>
+ . $locale->text('button') . qq|></td>
|;
$button2 = qq|
<td width="13"><input name=duedate id=duedate size=11 title="$myconfig{dateformat}" value=$form->{duedate}></td>
<td width="4"><input type=button name=duedate id="trigger2" value=|
- . $locale->text('button')
- . qq|></td></td>
+ . $locale->text('button') . qq|></td></td>
|;
#write Trigger
<input type=hidden name=title value="$form->{title}">
<input type=hidden name=vc value="vendor">
<input type=hidden name=type value=$form->{type}>
+<input type=hidden name=level value=$form->{level}>
<input type=hidden name=creditlimit value=$form->{creditlimit}>
<input type=hidden name=creditremaining value=$form->{creditremaining}>
<input type=hidden name=locked value=$form->{locked}>
<input type=hidden name=shipped value=$form->{shipped}>
-
+<input type=hidden name=storno value=$form->{storno}>
+<input type=hidden name=storno_id value=$form->{storno_id}>
<table width=100%>
<tr class=listtop>
<tr>
<th align=right nowrap>| . $locale->text('Vendor') . qq|</th>
<td colspan=3>$vendor</td>
-
+
<th align=richt nowrap>|
- . $locale->text('Contact Person')
- . qq|</th>
+ . $locale->text('Contact Person') . qq|</th>
<td colspan=3>$contact</td>
-
+
<input type=hidden name=vendor_id value=$form->{vendor_id}>
<input type=hidden name=oldvendor value="$form->{oldvendor}">
<td colspan=3><select name=AP>$form->{selectAP}</select></td>
<input type=hidden name=selectAP value="$form->{selectAP}">
</tr>
+ $taxzone
$department
<tr>
<th align=right nowrap>| . $locale->text('Currency') . qq|</th>
</tr>
$jsscript
-
+
<input type=hidden name=selectcurrency value="$form->{selectcurrency}">
<input type=hidden name=defaultcurrency value=$form->{defaultcurrency}>
<input type=hidden name=fxgain_accno value=$form->{fxgain_accno}>
<tr>
<td><hr size=3 noshade></td>
</tr>
- <tr>
+ <tr>
<th class=listtop align=left>Dokumente im Webdav-Repository</th>
</tr>
<table width=100%>
|;
foreach $file (keys %{ $form->{WEBDAV} }) {
$webdav_list .= qq|
- <tr>
+ <tr>
<td align=left>$file</td>
<td align=left><a href="$form->{WEBDAV}{$file}">$form->{WEBDAV}{$file}</a></td>
</tr>
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|
- <input class=submit type=submit name=action value="|
- . $locale->text('Post') . qq|">
- <input class=submit type=submit name=action value="|
- . $locale->text('Delete') . qq|">
+ . $locale->text('Post Payment') . qq|">
|;
- }
- }
-
- if ($invdate > $closedto) {
- print qq|
- <input class=submit type=submit name=action value="|
- . $locale->text('Post as new') . qq|">
- <input class=submit type=submit name=action value="|
- . $locale->text('Order') . qq|">
-|;
- }
+ print qq|<input class=submit type=submit name=action value="|
+ . $locale->text('Storno') . qq|">
+| unless ($form->{storno});
} else {
if ($invdate > $closedto) {
$form->{creditremaining} += ($form->{oldinvtotal} - $form->{oldtotalpaid});
&check_form;
- } else {
+ } else {
+
+ $form->{"selected_unit_$i"} = $form->{"unit_$i"};
IR->retrieve_item(\%myconfig, \%$form);
$form->format_amount(\%myconfig, $form->{"sellprice_$i"},
$decimalplaces);
$form->{"qty_$i"} =
- $form->format_amount(\%myconfig, $form->{"qty_$i"});
+ $form->format_amount(\%myconfig, $form->{"qty_$i"}, $dec_qty);
}
&display_form;
$lxdebug->leave_sub();
}
+sub storno {
+ $lxdebug->enter_sub();
+
+ if ($form->{storno}) {
+ $form->error($locale->text('Cannot storno storno invoice!'));
+ }
+
+ $form->{storno_id} = $form->{id};
+ $form->{storno} = 1;
+ $form->{id} = "";
+ $form->{invnumber} = "Storno zu " . $form->{invnumber};
+ $form->{rowcount}--;
+
+ &post();
+ $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 (IR->post_payment(\%myconfig, \%$form));
+ $form->error($locale->text('Cannot post payment!'));
+
+
+ $lxdebug->leave_sub();
+}
+
sub post {
$lxdebug->enter_sub();
if ($form->{currency} ne $form->{defaultcurrency});
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};
+ # get new invnumber in sequence if no invnumber is given or if posasnew was requested
+ if (!$form->{invnumber} || $form->{postasnew}) {
+ $form->{invnumber} = $form->update_defaults(\%myconfig, "invnumber");
+ }
+
$form->redirect( $locale->text('Invoice')
. " $form->{invnumber} "
. $locale->text('posted!'))
$lxdebug->leave_sub();
}
-