projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Recommit von r1131 von sschoeling: Fix zu Bug362. Danke an Harry fuer die Hilfe.
[kivitendo-erp.git]
/
bin
/
mozilla
/
ic.pl
diff --git
a/bin/mozilla/ic.pl
b/bin/mozilla/ic.pl
index
1e30341
..
62758be
100644
(file)
--- a/
bin/mozilla/ic.pl
+++ b/
bin/mozilla/ic.pl
@@
-356,6
+356,8
@@
sub search {
. $locale->text('Subtotal') . qq|</td>
<td><input name=l_soldtotal class=checkbox type=checkbox value=Y> |
. $locale->text('soldtotal') . qq|</td>
. $locale->text('Subtotal') . qq|</td>
<td><input name=l_soldtotal class=checkbox type=checkbox value=Y> |
. $locale->text('soldtotal') . qq|</td>
+ <td><input name=l_deliverydate class=checkbox type=checkbox value=Y> |
+ . $locale->text('deliverydate') . qq|</td>
</tr>
</table>
</td>
</tr>
</table>
</td>
@@
-1646,8
+1648,12
@@
sub generate_report {
$option .= $locale->text('soldtotal') . qq| : $form->{soldtotal}<br>|;
}
$option .= $locale->text('soldtotal') . qq| : $form->{soldtotal}<br>|;
}
+ if ($form->{l_deliverydate}) {
+ $callback .= "&deliverydate=$form->{deliverydate}";
+ }
+
@columns = $form->sort_columns(
@columns = $form->sort_columns(
- qw(partnumber description partsgroup bin onhand rop unit listprice linetotallistprice sellprice linetotalsellprice lastcost linetotallastcost priceupdate weight image drawing microfiche invnumber ordnumber quonumber name serialnumber soldtotal)
+ qw(partnumber description partsgroup bin onhand rop unit listprice linetotallistprice sellprice linetotalsellprice lastcost linetotallastcost priceupdate weight image drawing microfiche invnumber ordnumber quonumber name serialnumber soldtotal
deliverydate
)
);
if ($form->{l_linetotal}) {
);
if ($form->{l_linetotal}) {
@@
-1784,6
+1790,11
@@
sub generate_report {
. $locale->text('soldtotal')
. qq|</a></th>|;
. $locale->text('soldtotal')
. qq|</a></th>|;
+ $column_header{deliverydate} =
+ qq|<th nowrap><a class=listheading href=$callback&sort=deliverydate&revers=$form->{revers}&lastsort=$form->{lastsort}>|
+ . $locale->text('deliverydate')
+ . qq|</a></th>|;
+
$form->header;
$colspan = $#column_index + 1;
$form->header;
$colspan = $#column_index + 1;
@@
-1935,6
+1946,8
@@
sub generate_report {
. $form->format_amount(\%myconfig, $ref->{soldtotal}, '', " ")
. "</td>";
. $form->format_amount(\%myconfig, $ref->{soldtotal}, '', " ")
. "</td>";
+ $column_data{deliverydate} = "<td>$ref->{deliverydate}</td>";
+
$i++;
$i %= 2;
print "<tr class=listrow$i>";
$i++;
$i %= 2;
print "<tr class=listrow$i>";
@@
-2325,7
+2338,7
@@
sub form_header {
<input name=selectIC_income type=hidden value="$form->{selectIC_income}">
</tr>
<tr>
<input name=selectIC_income type=hidden value="$form->{selectIC_income}">
</tr>
<tr>
- <th align=right>| . $locale->text('
COGS
') . qq|</th>
+ <th align=right>| . $locale->text('
Expense
') . qq|</th>
<td><select name=IC_expense>$form->{selectIC_expense}</select></td>
<input name=selectIC_expense type=hidden value="$form->{selectIC_expense}">
</tr>
<td><select name=IC_expense>$form->{selectIC_expense}</select></td>
<input name=selectIC_expense type=hidden value="$form->{selectIC_expense}">
</tr>
@@
-2960,6
+2973,8
@@
sub assembly_row {
$column_data{total} = qq|<td align=right>$linetotal</td>|;
$column_data{total} = qq|<td align=right>$linetotal</td>|;
+ $column_data{deliverydate} = qq|<td align=right>$deliverydate</td>|;
+
print qq|
<tr>|;
print qq|
<tr>|;