-#=====================================================================
+# #=====================================================================
# LX-Office ERP
# Copyright (C) 2004
# Based on SQL-Ledger Version 2.1.9
sub edit {
$lxdebug->enter_sub();
+ # editing without stuff to edit? try adding it first
+ if ($form->{rowcount}) {
+ map {$id++ if $form->{"id_$_"}} (1 .. $form->{rowcount});
+ if (!$id) {
+ # reset rowcount
+ undef $form->{rowcount};
+ &add;
+ return;
+ }
+ } else {
+ if (!$form->{id}) {
+ &add;
+ return;
+ }
+ }
+
if ($form->{type} eq 'purchase_order') {
$form->{title} = $locale->text('Edit Purchase Order');
$form->{heading} = $locale->text('Purchase Order');
# retrieve order/quotation
$form->{webdav} = $webdav;
+
# set jscalendar
$form->{jscalendar} = $jscalendar;
OE->retrieve(\%myconfig, \%$form);
+ # if multiple rowcounts (== collective order) then check if the
+ # there were more than one customer (in that case OE::retrieve removes
+ # the content from the field)
+ if ($form->{rowcount} && $form->{type} eq 'sales_order' && $form->{customer} eq '') {
+# $main::lxdebug->message(0, "Detected Edit order with concurrent customers");
+ $form->error($locale->text('Collective Orders only work for orders from one customer!'));
+ }
+
$taxincluded = $form->{taxincluded};
$form->{shipto} = 1 if $form->{id};
$form->{media} = "screen";
$form->{formname} = $form->{type};
- if ($form->{id}) {
-
map { $form->{$_} =~ s/\"/"/g }
qw(ordnumber quonumber shippingpoint shipvia notes intnotes shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptocontact);
foreach $ref (@{ $form->{form_details} }) {
- $i++;
+ $form->{rowcount} = ++$i;
+
map { $form->{"${_}_$i"} = $ref->{$_} } keys %{$ref};
- $form->{"discount_$i"} =
+ }
+
+ for my $i (1 .. $form->{rowcount}) {
+ $form->{"discount_$i"} =
$form->format_amount(\%myconfig, $form->{"discount_$i"} * 100);
- ($dec) = ($form->{"sellprice_$i"} =~ /\.(\d+)/);
+ ($dec) = ($form->{"sellprice_$i"} =~ /\.(\d+)/);
$dec = length $dec;
$decimalplaces = ($dec > 2) ? $dec : 2;
$form->{"sellprice_$i"} =
$form->format_amount(\%myconfig, $form->{"sellprice_$i"},
$decimalplaces);
- $form->{"qty_$i"} = $form->format_amount(\%myconfig, $form->{"qty_$i"});
+
+ (my $dec_qty) = ($form->{"qty_$i"} =~ /\.(\d+)/);
+ $dec_qty = length $dec_qty;
+ $form->{"qty_$i"} = $form->format_amount(\%myconfig, $form->{"qty_$i"}, $dec_qty);
map { $form->{"${_}_$i"} =~ s/\"/"/g }
qw(partnumber description unit);
- $form->{rowcount} = $i;
}
- }
$lxdebug->leave_sub();
}
$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 width="13"><input name=reqdate id=reqdate size=11 title="$myconfig{dateformat}" value=$form->{reqdate}></td>
<td width="4"><input type=button name=reqdate name=reqdate id="trigger2" value=|
- . $locale->text('button')
- . qq|></td>
+ . $locale->text('button') . qq|></td>
|;
#write Trigger
<table>
<tr>
<th nowrap><input name=closed type=radio class=radio value=0 $checkedopen> |
- . $locale->text('Open')
- . qq|</th>
+ . $locale->text('Open') . qq|</th>
<th nowrap><input name=closed type=radio class=radio value=1 $checkedclosed> |
- . $locale->text('Closed')
- . qq|</th>
+ . $locale->text('Closed') . qq|</th>
</tr>
</table>
</td>
<tr>
<th align=right nowrap>| . $locale->text('Terms: Net') . qq|</th>
<td nowrap><input name=terms size="3" maxlength="3" value=$form->{terms}> |
- . $locale->text('days')
- . qq|</td>
+ . $locale->text('days') . qq|</td>
</tr>
|;
</tr>
<tr>
<th width=70% align=right nowrap>|
- . $locale->text('Quotation Number')
- . qq|</th>
+ . $locale->text('Quotation Number') . qq|</th>
<td><input name=quonumber size=11 value="$form->{quonumber}"></td>
</tr>
<tr>
<th width=70% align=right nowrap>|
- . $locale->text('Customer Order Number')
- . qq|</th>
+ . $locale->text('Customer Order Number') . qq|</th>
<td><input name=cusordnumber size=11 value="$form->{cusordnumber}"></td>
</tr>
<tr>
$ordnumber = qq|
<tr>
<th width=70% align=right nowrap>|
- . $locale->text('Quotation Number')
- . qq|</th>
+ . $locale->text('Quotation Number') . qq|</th>
<td><input name=quonumber size=11 value="$form->{quonumber}"></td>
<input type=hidden name=ordnumber value="$form->{ordnumber}">
</tr>
if ($form->{type} eq 'sales_order') {
if ($form->{selectemployee}) {
$employee = qq|
+ <input type=hidden name=customer_klass value=$form->{customer_klass}>
<tr>
<th align=right nowrap>| . $locale->text('Salesperson') . qq|</th>
<td colspan=2><select name=employee>$form->{selectemployee}</select></td>
}
} else {
$employee = qq|
+ <input type=hidden name=customer_klass value=$form->{customer_klass}>
<tr>
<th align=right nowrap>| . $locale->text('Employee') . qq|</th>
<td colspan=2><select name=employee>$form->{selectemployee}</select></td>
<input type=hidden name=$form->{vc}_id value=$form->{"$form->{vc}_id"}>
<input type=hidden name="old$form->{vc}" value="$form->{"old$form->{vc}"}">
<th align=richt nowrap>|
- . $locale->text('Contact Person')
- . qq|</th>
+ . $locale->text('Contact Person') . qq|</th>
<td colspan=3>$contact</td>
</tr>
$creditremaining
if ($form->{taxaccounts}) {
$taxincluded = qq|
<input name=taxincluded class=checkbox type=checkbox value=1 $form->{taxincluded}> <b>|
- . $locale->text('Tax Included')
- . qq|</b><br><br>
+ . $locale->text('Tax Included') . qq|</b><br><br>
|;
}
. $locale->text('Order') . qq|">
|;
}
+ } elsif ($form->{type} =~ /sales_order$/ && $form->{rowcount}) {
+ print qq|
+<br>Workflow $form->{heading}<br>
+<input class=submit type=submit name=action value="|
+ . $locale->text('Save as new') . qq|">
+<input class=submit type=submit name=action value="|
+ . $locale->text('Invoice') . qq|">
+|;
}
+
if ($form->{menubar}) {
require "$form->{path}/menu.pl";
\%myconfig, $form->{currency}, $form->{transdate}, $buysell
)));
- my $i = $form->{rowcount};
+ # for pricegroups
+ $i = $form->{rowcount};
+
$exchangerate = ($form->{exchangerate}) ? $form->{exchangerate} : 1;
if ( ($form->{"partnumber_$i"} eq "")
$form->{"sellprice_$i"} = $sellprice;
} else {
+ $form->{"sellprice_$i"} *= (1 - $form->{tradediscount});
# if there is an exchange rate adjust sellprice
$form->{"sellprice_$i"} /= $exchangerate;
}
$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);
+
+ # get pricegroups for parts
+ IS->get_pricegroups_for_parts(\%myconfig, \%$form);
+
+ # build up html code for prices_$i
+ &set_pricegroup($i);
}
&display_form;
}
}
}
+
+
$lxdebug->leave_sub();
}
$form->{warehouse} = qq|$form->{warehouse}--$form->{warehouse_id}|;
map {
- $form->{selectwarehouse} .= "<option>$_->{description}--$_->{id}\n"
+ $form->{selectwarehouse} .=
+ "<option>$_->{description}--$_->{id}\n"
} (@{ $form->{all_warehouses} });
$warehouse = qq|
$openclosed = qq|
<tr>
<td><input name="open" class=checkbox type=checkbox value=1 checked> |
- . $locale->text('Open')
- . qq|</td>
+ . $locale->text('Open') . qq|</td>
<td><input name="closed" class=checkbox type=checkbox value=1 $form->{closed}> |
- . $locale->text('Closed')
- . qq|</td>
+ . $locale->text('Closed') . qq|</td>
</tr>
|;
} else {
$button1 = qq|
<td><input name=transdatefrom id=transdatefrom size=11 title="$myconfig{dateformat}">
<input type=button name=transdatefrom id="trigger3" 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="trigger4" value=|
- . $locale->text('button')
- . qq|></td>
+ . $locale->text('button') . qq|></td>
|;
#write Trigger
| . $locale->text('ID') . qq|</td>
<td><input name="l_$ordnumber" class=checkbox type=checkbox value=Y checked> $ordlabel</td>
<td><input name="l_transdate" class=checkbox type=checkbox value=Y checked> |
- . $locale->text('Date')
- . qq|</td>
+ . $locale->text('Date') . qq|</td>
<td><input name="l_reqdate" class=checkbox type=checkbox value=Y checked> |
- . $locale->text('Required by')
- . qq|</td>
+ . $locale->text('Required by') . qq|</td>
</tr>
<tr>
<td><input name="l_name" class=checkbox type=checkbox value=Y checked> $vclabel</td>
<td><input name="l_employee" class=checkbox type=checkbox value=Y checked> $employee</td>
<td><input name="l_shipvia" class=checkbox type=checkbox value=Y> |
- . $locale->text('Ship via')
- . qq|</td>
+ . $locale->text('Ship via') . qq|</td>
</tr>
<tr>
<td><input name="l_netamount" class=checkbox type=checkbox value=Y> |
- . $locale->text('Amount')
- . qq|</td>
+ . $locale->text('Amount') . qq|</td>
<td><input name="l_tax" class=checkbox type=checkbox value=Y> |
- . $locale->text('Tax')
- . qq|</td>
+ . $locale->text('Tax') . qq|</td>
<td><input name="l_amount" class=checkbox type=checkbox value=Y checked> |
- . $locale->text('Total')
- . qq|</td>
+ . $locale->text('Total') . qq|</td>
</tr>
<tr>
<td><input name="l_subtotal" class=checkbox type=checkbox value=Y> |
- . $locale->text('Subtotal')
- . qq|</td>
+ . $locale->text('Subtotal') . qq|</td>
</tr>
</table>
</td>
}
}
+ # only show checkboxes if gotten here via sales_order form.
+ if ($form->{type} =~ /sales_order/) {
+ unshift @column_index, "ids";
+ }
+
if ($form->{l_subtotal} eq 'Y') {
$callback .= "&l_subtotal=Y";
$href .= "&l_subtotal=Y";
$column_header{employee} =
qq|<th><a class=listheading href=$href&sort=employee>$employee</a></th>|;
+ $column_header{ids} = qq|<th></th>|;
+
if ($form->{ $form->{vc} }) {
$option = $locale->text(ucfirst $form->{vc});
$option .= " : $form->{$form->{vc}}";
print qq|
<body>
+<form method="post" action="oe.pl">
<table width=100%>
<tr>
<th class=listtop>$form->{title}</th>
|;
# add sort and escape callback
- $callback = $form->escape($callback . "&sort=$form->{sort}");
+ $callback_escaped = $form->escape($callback . "&sort=$form->{sort}");
if (@{ $form->{OE} }) {
$sameitem = $form->{OE}->[0]->{ $form->{sort} };
$warehouse = $form->escape($form->{warehouse});
foreach $oe (@{ $form->{OE} }) {
+ $form->{rowcount} = ++$j;
if ($form->{l_subtotal} eq 'Y') {
if ($sameitem ne $oe->{ $form->{sort} }) {
$subtotalnetamount += $oe->{netamount};
$subtotalamount += $oe->{amount};
+ $column_data{ids} = qq|<td><input name="id_$j" class=checkbox type=checkbox><input type="hidden" name="trans_id_$j" value="$oe->{id}"></td>|;
$column_data{id} = "<td>$oe->{id}</td>";
$column_data{transdate} = "<td>$oe->{transdate} </td>";
$column_data{reqdate} = "<td>$oe->{reqdate} </td>";
$column_data{$ordnumber} =
- "<td><a href=oe.pl?path=$form->{path}&action=$action&type=$form->{type}&id=$oe->{id}&warehouse=$warehouse&vc=$form->{vc}&login=$form->{login}&password=$form->{password}&callback=$callback>$oe->{$ordnumber}</a></td>";
+ "<td><a href=oe.pl?path=$form->{path}&action=$action&type=$form->{type}&id=$oe->{id}&warehouse=$warehouse&vc=$form->{vc}&login=$form->{login}&password=$form->{password}&callback=$callback_escaped>$oe->{$ordnumber}</a></td>";
$column_data{name} = "<td>$oe->{name}</td>";
$column_data{employee} = "<td>$oe->{employee} </td>";
<tr>
<td><hr size=3 noshade></td>
</tr>
-</table>
+</table>|;
+
+# multiple invoice edit button only if gotten there via sales_order form.
+
+if ($form->{type} =~ /sales_order/) {
+print qq|
+ <input type="hidden" name="path" value="$form->{path}">
+ <input class"submit" type="submit" name="action" value="|
+. $locale->text('Continue') .qq|">
+ <input type="hidden" name="nextsub" value="edit">
+ <input type="hidden" name="type" value="$form->{type}">
+ <input type="hidden" name="warehouse" value="$warehouse">
+ <input type="hidden" name="vc" value="$form->{vc}">
+ <input type="hidden" name="login" value="$form->{login}">
+ <input type="hidden" name="password" value="$form->{password}">
+ <input type="hidden" name="callback" value="$callback">
+ <input type="hidden" name="rowcount" value="$form->{rowcount}">|;
+}
+
+print qq|
+</form>
<br>
<form method=post action=$form->{script}>
$lxdebug->enter_sub();
if ($form->{type} =~ /_order$/) {
- $form->isblank("ordnumber", $locale->text('Order Number missing!'));
- $form->isblank("transdate", $locale->text('Order Date missing!'));
+ # these checks only apply if the items don't bring their own ordnumbers/transdates.
+ # The if clause ensures that by searching for empty ordnumber_#/transdate_# fields.
+ $form->isblank("ordnumber", $locale->text('Order Number missing!')) if ( +{ map { $form->{"ordnumber_$_"}, 1 } ( 1 .. $form->{rowcount}-1 ) }->{''} );
+ $form->isblank("transdate", $locale->text('Order Date missing!')) if ( +{ map { $form->{"transdate_$_"}, 1 } ( 1 .. $form->{rowcount}-1 ) }->{''} );
} else {
$form->isblank("quonumber", $locale->text('Quotation Number missing!'));
# close orders/quotations
$form->{closed} = 1;
- OE->save(\%myconfig, \%$form);
+
+ # save order iff one ordnumber has been given
+ # if not it's most likely a collective order, which can't be saved back
+ # so they just have to be closed
+ if ($form->{ordnumber} ne '') {
+ OE->save(\%myconfig, \%$form);
+ } else {
+ OE->close_orders(\%myconfig, \%$form);
+ }
$form->{transdate} = $form->{invdate} = $form->current_date(\%myconfig);
$form->{duedate} =
$form->{"sellprice_$i"} =
$form->format_amount(\%myconfig, $form->{"sellprice_$i"},
$decimalplaces);
- $form->{"qty_$i"} = $form->format_amount(\%myconfig, $form->{"qty_$i"});
+
+ (my $dec_qty) = ($form->{"qty_$i"} =~ /\.(\d+)/);
+ $dec_qty = length $dec_qty;
+ $form->{"qty_$i"} = $form->format_amount(\%myconfig, $form->{"qty_$i"}, $dec_qty);
map { $form->{"${_}_$i"} =~ s/\"/"/g }
qw(partnumber description unit);
# undo formatting from prepare_order
map {
- $form->{"${_}_$i"} = $form->parse_amount(\%myconfig, $form->{"${_}_$i"})
+ $form->{"${_}_$i"} =
+ $form->parse_amount(\%myconfig, $form->{"${_}_$i"})
} qw(qty ship);
$n = ($form->{"qty_$i"} -= $form->{"ship_$i"});
if (abs($n) > 0
qq|<td>$description<input type=hidden name="description_$i" value="$form->{"description_$i"}"></td>|;
$column_data{qty} =
qq|<td align=right>|
- . $form->format_amount(\%myconfig, $form->{"qty_$i"})
+ . $form->format_amount(\%myconfig, $form->{"qty_$i"}, $dec_qty)
. qq|<input type=hidden name="qty_$i" value="$form->{"qty_$i"}"></td>|;
$column_data{ship} =
qq|<td align=right><input name="ship_$i" size=5 value=|
qq|<td><input type=hidden name="warehouse_id_$i" value=$ref->{warehouse_id}>$ref->{warehouse} </td>|;
$column_data{qty} =
qq|<td><input type=hidden name="qty_$i" value=$ref->{qty}>|
- . $form->format_amount(\%myconfig, $ref->{qty})
+ . $form->format_amount(\%myconfig, $ref->{qty}, $dec_qty)
. qq|</td>|;
$column_data{transfer} = qq|<td><input name="transfer_$i" size=4></td>|;
projects / kivitendo-erp.git / blobdiff