# Order entry module
# Quotation module
#======================================================================
+use Data::Dumper;
use SL::OE;
use SL::IR;
# end of main
-sub add {
+# For locales.pl:
+# $locale->text('Edit the purchase_order');
+# $locale->text('Edit the sales_order');
+# $locale->text('Edit the request_quotation');
+# $locale->text('Edit the sales_quotation');
+
+# $locale->text('Workflow purchase_order');
+# $locale->text('Workflow sales_order');
+# $locale->text('Workflow request_quotation');
+# $locale->text('Workflow sales_quotation');
+
+sub set_headings {
$lxdebug->enter_sub();
+ my ($action) = @_;
+
if ($form->{type} eq 'purchase_order') {
- $form->{title} = $locale->text('Add Purchase Order');
- $form->{vc} = 'vendor';
+ $form->{title} = $action eq "edit" ?
+ $locale->text('Edit Purchase Order') :
+ $locale->text('Add Purchase Order');
+ $form->{heading} = $locale->text('Purchase Order');
+ $form->{vc} = 'vendor';
}
if ($form->{type} eq 'sales_order') {
- $form->{title} = $locale->text('Add Sales Order');
- $form->{vc} = 'customer';
+ $form->{title} = $action eq "edit" ?
+ $locale->text('Edit Sales Order') :
+ $locale->text('Add Sales Order');
+ $form->{heading} = $locale->text('Sales Order');
+ $form->{vc} = 'customer';
}
if ($form->{type} eq 'request_quotation') {
- $form->{title} = $locale->text('Add Request for Quotation');
- $form->{vc} = 'vendor';
+ $form->{title} = $action eq "edit" ?
+ $locale->text('Edit Request for Quotation') :
+ $locale->text('Add Request for Quotation');
+ $form->{heading} = $locale->text('Request for Quotation');
+ $form->{vc} = 'vendor';
}
if ($form->{type} eq 'sales_quotation') {
- $form->{title} = $locale->text('Add Quotation');
- $form->{vc} = 'customer';
+ $form->{title} = $action eq "edit" ?
+ $locale->text('Edit Quotation') :
+ $locale->text('Add Quotation');
+ $form->{heading} = $locale->text('Quotation');
+ $form->{vc} = 'customer';
}
+ $lxdebug->leave_sub();
+}
+
+sub add {
+ $lxdebug->enter_sub();
+
+ set_headings("add");
+
$form->{callback} =
"$form->{script}?action=add&type=$form->{type}&vc=$form->{vc}&login=$form->{login}&path=$form->{path}&password=$form->{password}"
unless $form->{callback};
sub edit {
$lxdebug->enter_sub();
+ $form->{simple_save} = 0;
+
+ set_headings("edit");
+
# editing without stuff to edit? try adding it first
if ($form->{rowcount}) {
- map {$id++ if $form->{"id_$_"}} (1 .. $form->{rowcount});
+ map { $id++ if $form->{"id_$_"} } (1 .. $form->{rowcount});
if (!$id) {
+
# reset rowcount
undef $form->{rowcount};
&add;
}
}
- if ($form->{type} eq 'purchase_order') {
- $form->{title} = $locale->text('Edit Purchase Order');
- $form->{heading} = $locale->text('Purchase Order');
- $form->{vc} = 'vendor';
- }
- if ($form->{type} eq 'sales_order') {
- $form->{title} = $locale->text('Edit Sales Order');
- $form->{heading} = $locale->text('Sales Order');
- $form->{vc} = 'customer';
- }
- if ($form->{type} eq 'request_quotation') {
- $form->{title} = $locale->text('Edit Request for Quotation');
- $form->{heading} = $locale->text('Request for Quotation');
- $form->{vc} = 'vendor';
- }
- if ($form->{type} eq 'sales_quotation') {
- $form->{title} = $locale->text('Edit Quotation');
- $form->{heading} = $locale->text('Quotation');
- $form->{vc} = 'customer';
+ if ($form->{print_and_save}) {
+ $form->{action} = "print";
+ $form->{resubmit} = 1;
+ $language_id = $form->{language_id};
+ $printer_id = $form->{printer_id};
}
+ set_headings("edit");
+
&order_links;
&prepare_order;
+ if ($form->{print_and_save}) {
+ $form->{language_id} = $language_id;
+ $form->{printer_id} = $printer_id;
+ }
&display_form;
$lxdebug->leave_sub();
# retrieve order/quotation
$form->{webdav} = $webdav;
-
-
# set jscalendar
$form->{jscalendar} = $jscalendar;
OE->retrieve(\%myconfig, \%$form);
+ 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};
+ }
+
+
# if multiple rowcounts (== collective order) then check if the
- # there were more than one customer (in that case OE::retrieve removes
+ # 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' && defined $form->{customer} && $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!'));
+ if ( $form->{rowcount}
+ && $form->{type} eq 'sales_order'
+ && defined $form->{customer}
+ && $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};
$intnotes = $form->{intnotes};
# get customer / vendor
- if ($form->{type} =~ /(purchase_order|request_quotation|receive_order)/) {
+ if ($form->{type} =~ /(purchase_order|request_quotation)/) {
IR->get_vendor(\%myconfig, \%$form);
+
+ #quote all_vendor Bug 133
+ foreach $ref (@{ $form->{all_vendor} }) {
+ $ref->{name} = $form->quote($ref->{name});
+ }
+
}
- if ($form->{type} =~ /(sales|ship)_(order|quotation)/) {
+ if ($form->{type} =~ /sales_(order|quotation)/) {
IS->get_customer(\%myconfig, \%$form);
+
+ #quote all_vendor Bug 133
+ foreach $ref (@{ $form->{all_customer} }) {
+ $ref->{name} = $form->quote($ref->{name});
+ }
+
}
$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;
+ }
$form->{intnotes} = $intnotes;
($form->{ $form->{vc} }) = split /--/, $form->{ $form->{vc} };
$form->{"old$form->{vc}"} =
}
# currencies
- @curr = split /:/, $form->{currencies};
+ @curr = split(/:/, $form->{currencies});
chomp $curr[0];
$form->{defaultcurrency} = $curr[0];
$form->{currency} = $form->{defaultcurrency} unless $form->{currency};
sub prepare_order {
$lxdebug->enter_sub();
- $form->{format} = "pdf";
- $form->{media} = "screen";
- $form->{formname} = $form->{type};
-
- map { $form->{$_} =~ s/\"/"/g }
- qw(ordnumber quonumber shippingpoint shipvia notes intnotes shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptocontact);
+ $form->{formname} = $form->{type} unless $form->{formname};
- foreach $ref (@{ $form->{form_details} }) {
- $form->{rowcount} = ++$i;
+ my $i = 0;
+ foreach $ref (@{ $form->{form_details} }) {
+ $form->{rowcount} = ++$i;
- map { $form->{"${_}_$i"} = $ref->{$_} } keys %{$ref};
- }
- for my $i (1 .. $form->{rowcount}) {
- if ($form->{id}) {
- $form->{"discount_$i"} =
- $form->format_amount(\%myconfig, $form->{"discount_$i"} * 100);
- } else {
- $form->{"discount_$i"} =
- $form->format_amount(\%myconfig, $form->{"discount_$i"});
- }
- ($dec) = ($form->{"sellprice_$i"} =~ /\.(\d+)/);
- $dec = length $dec;
- $decimalplaces = ($dec > 2) ? $dec : 2;
-
- # copy reqdate from deliverydate for invoice -> order conversion
- $form->{"reqdate_$i"} = $form->{"deliverydate_$i"} unless $form->{"reqdate_$i"};
-
- $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"}, $dec_qty);
-
- map { $form->{"${_}_$i"} =~ s/\"/"/g }
- qw(partnumber description unit);
+ map { $form->{"${_}_$i"} = $ref->{$_} } keys %{$ref};
+ }
+ for my $i (1 .. $form->{rowcount}) {
+ if ($form->{id}) {
+ $form->{"discount_$i"} =
+ $form->format_amount(\%myconfig, $form->{"discount_$i"} * 100);
+ } else {
+ $form->{"discount_$i"} =
+ $form->format_amount(\%myconfig, $form->{"discount_$i"});
}
+ ($dec) = ($form->{"sellprice_$i"} =~ /\.(\d+)/);
+ $dec = length $dec;
+ $decimalplaces = ($dec > 2) ? $dec : 2;
+
+ # copy reqdate from deliverydate for invoice -> order conversion
+ $form->{"reqdate_$i"} = $form->{"deliverydate_$i"}
+ unless $form->{"reqdate_$i"};
+
+ $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"}, $dec_qty);
+
+ map { $form->{"${_}_$i"} =~ s/\"/"/g }
+ qw(partnumber description unit);
+ }
$lxdebug->leave_sub();
}
sub form_header {
$lxdebug->enter_sub();
- $checkedopen = ($form->{closed}) ? "" : "checked";
- $checkedclosed = ($form->{closed}) ? "checked" : "";
+ my $checkedclosed = $form->{"closed"} ? "checked" : "";
+ my $checkeddelivered = $form->{"delivered"} ? "checked" : "";
+
+ map { $form->{$_} =~ s/\"/"/g }
+ qw(ordnumber quonumber shippingpoint shipvia notes intnotes shiptoname
+ shiptostreet shiptozipcode shiptocity shiptocountry shiptocontact
+ shiptophone shiptofax shiptodepartment_1 shiptodepartment_2);
# use JavaScript Calendar or not
$form->{jsscript} = $form->{jscalendar};
$jsscript = "";
+ $payment = qq|<option value=""></option>|;
+ foreach $item (@{ $form->{payment_terms} }) {
+ if ($form->{payment_id} eq $item->{id}) {
+ $payment .= qq|<option value="$item->{id}" selected>$item->{description}</option>|;
+ } else {
+ $payment .= qq|<option value="$item->{id}">$item->{description}</option>|;
+ }
+ }
if ($form->{jsscript}) {
# with JavaScript Calendar
$openclosed = qq|
<tr>
<td colspan=2 align=center>
- <table>
- <tr>
- <th nowrap><input name=closed type=radio class=radio value=0 $checkedopen> |
- . $locale->text('Open') . qq|</th>
- <th nowrap><input name=closed type=radio class=radio value=1 $checkedclosed> |
- . $locale->text('Closed') . qq|</th>
- </tr>
- </table>
- </td>
+ <input name="closed" id="closed" type="checkbox" class="checkbox" value="1" $checkedclosed>
+ <label for="closed">| . $locale->text('Closed') . qq|</label>
+|;
+
+ if (($form->{"type"} eq "sales_order") ||
+ ($form->{"type"} eq "purchase_order")) {
+ $openclosed .= qq|
+ <input name="delivered" id="delivered" type="checkbox" class="checkbox" value="1" $checkeddelivered>
+ <label for="delivered">| . $locale->text('Delivered') . qq|</label>
+|;
+ }
+
+ $openclosed .= qq|
+ </td>
</tr>
|;
}
# set option selected
- foreach $item ($form->{vc}, currency, department, employee, contact) {
+ foreach $item ($form->{vc}, currency, department, employee) {
$form->{"select$item"} =~ s/ selected//;
$form->{"select$item"} =~
s/option>\Q$form->{$item}\E/option selected>$form->{$item}/;
}
- #build contacts
- if ($form->{all_contacts}) {
+ #quote select[customer|vendor] Bug 133
+ $form->{"select$form->{vc}"} = $form->quote($form->{"select$form->{vc}"});
- $form->{selectcontact} = "";
- foreach $item (@{ $form->{all_contacts} }) {
- if ($form->{cp_id} == $item->{cp_id}) {
- $form->{selectcontact} .=
- "<option selected>$item->{cp_name}--$item->{cp_id}";
- } else {
- $form->{selectcontact} .= "<option>$item->{cp_name}--$item->{cp_id}";
- }
- }
+ my @old_project_ids = ($form->{"globalproject_id"});
+ map({ push(@old_project_ids, $form->{"project_id_$_"})
+ if ($form->{"project_id_$_"}); } (1..$form->{"rowcount"}));
+
+ $form->get_lists("contacts" => "ALL_CONTACTS",
+ "shipto" => "ALL_SHIPTO",
+ "projects" => { "key" => "ALL_PROJECTS",
+ "all" => 0,
+ "old_id" => \@old_project_ids });
+
+ my (%labels, @values);
+ foreach my $item (@{ $form->{"ALL_CONTACTS"} }) {
+ push(@values, $item->{"cp_id"});
+ $labels{$item->{"cp_id"}} = $item->{"cp_name"} .
+ ($item->{"cp_abteilung"} ? " ($item->{cp_abteilung})" : "");
+ }
+ my $contact =
+ NTI($cgi->popup_menu('-name' => 'cp_id', '-values' => \@values,
+ '-labels' => \%labels, '-default' => $form->{"cp_id"}));
+
+ %labels = ();
+ @values = ("");
+ foreach my $item (@{ $form->{"ALL_SHIPTO"} }) {
+ push(@values, $item->{"shipto_id"});
+ $labels{$item->{"shipto_id"}} =
+ $item->{"shiptoname"} . " " . $item->{"shiptodepartment_1"};
+ }
+
+ my $shipto = qq|
+ <th align=right>| . $locale->text('Shipping Address') . qq|</th>
+ <td>| .
+ NTI($cgi->popup_menu('-name' => 'shipto_id', '-values' => \@values,
+ '-labels' => \%labels, '-default' => $form->{"shipto_id"}))
+ . qq|</td>|;
+
+ %labels = ();
+ @values = ("");
+ foreach my $item (@{ $form->{"ALL_PROJECTS"} }) {
+ push(@values, $item->{"id"});
+ $labels{$item->{"id"}} = $item->{"projectnumber"};
}
+ my $globalprojectnumber =
+ NTI($cgi->popup_menu('-name' => 'globalproject_id', '-values' => \@values,
+ '-labels' => \%labels,
+ '-default' => $form->{"globalproject_id"}));
$form->{exchangerate} =
$form->format_amount(\%myconfig, $form->{exchangerate});
+ if (($form->{creditlimit} != 0) && ($form->{creditremaining} < 0) && !$form->{update}) {
+ $creditwarning = 1;
+ } else {
+ $creditwarning = 0;
+ }
+
$form->{creditlimit} =
$form->format_amount(\%myconfig, $form->{creditlimit}, 0, "0");
$form->{creditremaining} =
$form->format_amount(\%myconfig, $form->{creditremaining}, 0, "0");
- $contact =
- ($form->{selectcontact})
- ? qq|<select name=contact>$form->{selectcontact}</select>\n<input type=hidden name="selectcontact" value="$form->{selectcontact}">|
- : qq|<input name=contact value="$form->{contact}" size=35>|;
-
$exchangerate = qq|
<input type=hidden name=forex value=$form->{forex}>
|;
$vclabel = ucfirst $form->{vc};
$vclabel = $locale->text($vclabel);
- $terms = qq|
- <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>
- </tr>
-|;
+
if ($form->{business}) {
$business = qq|
|;
}
+ if ($form->{max_dunning_level}) {
+ $dunning = qq|
+ <tr>
+ <td colspan=4>
+ <table>
+ <tr>
+ <th align=right>| . $locale->text('Max. Dunning Level') . qq|:</th>
+ <td><b>$form->{max_dunning_level}</b></td>
+ <th align=right>| . $locale->text('Dunning Amount') . qq|:</th>
+ <td><b>|
+ . $form->format_amount(\%myconfig, $form->{dunning_amount},2)
+ . qq|</b></td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+|;
+ }
+
+ if (@{ $form->{TAXZONE} }) {
+ $form->{selecttaxzone} = "";
+ foreach $item (@{ $form->{TAXZONE} }) {
+ if ($item->{id} == $form->{taxzone_id}) {
+ $form->{selecttaxzone} .=
+ "<option value=$item->{id} selected>" . H($item->{description}) .
+ "</option>";
+ } else {
+ $form->{selecttaxzone} .=
+ "<option value=$item->{id}>" . H($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>/;
+ }
+ }
+
+ $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>|;
+
+
if ($form->{type} !~ /_quotation$/) {
$ordnumber = qq|
<tr>
<td>$form->{creditlimit}</td>
<td width=20%></td>
<th nowrap>| . $locale->text('Remaining') . qq|</th>
- <td class="plus$n">$form->{creditremaining}</td>
+ <td class="plus$n" nowrap>$form->{creditremaining}</td>
</tr>
</table>
</td>
+ $shipto
</tr>
|;
} else {
</tr>
|;
- $terms = "";
}
$ordnumber .= qq|
$button2
</tr>
|;
-
+ $creditremaining = qq| <tr>
+ <td colspan=4></td>
+ $shipto
+ </tr>|;
}
$vc =
</tr>
|;
}
+ if ($form->{resubmit} && ($form->{format} eq "html")) {
+ $onload =
+ qq|window.open('about:blank','Beleg'); document.oe.target = 'Beleg';document.oe.submit()|;
+ } elsif ($form->{resubmit}) {
+ $onload = qq|document.oe.submit()|;
+ } else {
+ $onload = "fokus()";
+ }
+
+ $credittext = $locale->text('Credit Limit exceeded!!!');
+ if ($creditwarning) {
+ $onload = qq|alert('$credittext')|;
+ }
+
+ $form->{"javascript"} .= qq|<script type="text/javascript" src="js/show_form_details.js"></script>|;
$form->header;
print qq|
-<body>
+<body onLoad="$onload">
-<form method=post action=$form->{script}>
+<form method=post name=oe action=$form->{script}>
+ <script type="text/javascript" src="js/common.js"></script>
+ <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>
<input type=hidden name=id value=$form->{id}>
+<input type=hidden name=action value=$form->{action}>
<input type=hidden name=type value=$form->{type}>
<input type=hidden name=formname value=$form->{formname}>
<input type=hidden name=media value=$form->{media}>
<input type=hidden name=format value=$form->{format}>
+<input type=hidden name=proforma value=$form->{proforma}>
<input type=hidden name=queued value="$form->{queued}">
<input type=hidden name=printed value="$form->{printed}">
</tr>
$creditremaining
$business
+ $dunning
+ $taxzone
$department
<tr>
<th align=right>| . $locale->text('Currency') . qq|</th>
<tr>
<th align=right>| . $locale->text('Ship via') . qq|</th>
<td colspan=3><input name=shipvia size=35 value="$form->{shipvia}"></td>
- </tr>
- </table>
+ </tr>|;
+# <tr>
+# <td colspan=4>
+# <table>
+# <tr>
+# <td colspan=2>
+# <button type="button" onclick="delivery_customer_selection_window('delivery_customer_string','delivery_customer_id')">| . $locale->text('Choose Customer') . qq|</button>
+# </td>
+# <td colspan=2><input type=hidden name=delivery_customer_id value="$form->{delivery_customer_id}">
+# <input size=45 id=delivery_customer_string name=delivery_customer_string value="$form->{delivery_customer_string}"></td>
+# </tr>
+# <tr>
+# <td colspan=2>
+# <button type="button" onclick="vendor_selection_window('delivery_vendor_string','delivery_vendor_id')">| . $locale->text('Choose Vendor') . qq|</button>
+# </td>
+# <td colspan=2><input type=hidden name=delivery_vendor_id value="$form->{delivery_vendor_id}">
+# <input size=45 id=vendor_string name=delivery_vendor_string value="$form->{delivery_vendor_string}"></td>
+# </tr>
+# </table>
+# </td>
+# </tr>
+print qq| </table>
</td>
<td align=right>
<table>
$openclosed
$employee
$ordnumber
- $terms
+ <tr>
+ <th width="70%" align="right" nowrap>| . $locale->text('Project Number') . qq|</th>
+ <td>$globalprojectnumber</td>
+ </tr>
</table>
</td>
</tr>
<input type=hidden name=shiptocontact value="$form->{shiptocontact}">
<input type=hidden name=shiptophone value="$form->{shiptophone}">
<input type=hidden name=shiptofax value="$form->{shiptofax}">
+<input type=hidden name=shiptodepartment_1 value="$form->{shiptodepartment_1}">
+<input type=hidden name=shiptodepartment_2 value="$form->{shiptodepartment_2}">
<input type=hidden name=shiptoemail value="$form->{shiptoemail}">
<!-- email variables -->
<td>$notes</td>
<td>$intnotes</td>
</tr>
+ <th align=right>| . $locale->text('Payment Terms') . qq|</th>
+ <td><select name=payment_id tabindex=24>$payment
+ </select></td>
</table>
</td>
<td align=right width=100%>
</tr>
</table>
-Bearbeiten des $form->{heading}<br>
-<input class=submit type=submit name=action value="|
+| . $locale->text("Edit the $form->{type}") . qq|<br>
+<input class=submit type=submit name=action id=update_button value="|
. $locale->text('Update') . qq|">
<input class=submit type=submit name=action value="|
. $locale->text('Ship to') . qq|">
. $locale->text('E-mail') . qq|">
<input class=submit type=submit name=action value="|
. $locale->text('Save') . qq|">
+<input class=submit type=submit name=action value="|
+ . $locale->text('Save and Close') . qq|">
|;
- if ($form->{id}) {
+ if (($form->{id})) {
print qq|
-<br>Workflow $form->{heading}<br>
+<br>| . $locale->text("Workflow $form->{type}") . qq|<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('Delete') . qq|">|;
- if ($form->{type} =~ /sales_quotation$/) {
+ if (($form->{type} =~ /sales_quotation$/)) {
print qq|
<input class=submit type=submit name=action value="|
. $locale->text('Sales Order') . qq|">|;
<input class=submit type=submit name=action value="|
. $locale->text('Purchase Order') . qq|">|;
}
+ if (1) {
print qq|
<input class=submit type=submit name=action value="|
. $locale->text('Invoice') . qq|">
|;
+}
if ($form->{type} =~ /sales_order$/) {
print qq|
<input class=submit type=submit name=action value="|
. $locale->text('Sales Order') . qq|">
<input class=submit type=submit name=action value="|
- . $locale->text('Quotation') . qq|">
+ . $locale->text('Request for Quotation') . qq|">
|;
} else {
. $locale->text('Order') . qq|">
|;
}
- } elsif ($form->{type} =~ /sales_order$/ && $form->{rowcount}) {
+ } elsif ($form->{type} =~ /sales_order$/ && $form->{rowcount} && !$form->{proforma}) {
print qq|
<br>Workflow $form->{heading}<br>
<input class=submit type=submit name=action value="|
. $locale->text('Invoice') . qq|">
|;
}
-
-
- if ($form->{menubar}) {
- require "$form->{path}/menu.pl";
- &menubar;
- }
print qq|
sub update {
$lxdebug->enter_sub();
+ set_headings($form->{"id"} ? "edit" : "add");
+
map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) }
qw(exchangerate creditlimit creditremaining);
+ $form->{update} = 1;
&check_name($form->{vc});
- &check_project;
-
$buysell = 'buy';
$buysell = 'sell' if ($form->{vc} eq 'vendor');
$form->{exchangerate} = $exchangerate
$form->{creditremaining} += ($form->{oldinvtotal} - $form->{oldtotalpaid});
&check_form;
- } else {
+ } else {
if ( $form->{type} eq 'purchase_order'
|| $form->{type} eq 'request_quotation') {
} else {
$sellprice = $form->parse_amount(\%myconfig, $form->{"sellprice_$i"});
-
+ if ($form->{"not_discountable_$i"}) {
+ $form->{"discount_$i"} = 0;
+ }
map { $form->{item_list}[$i]{$_} =~ s/\"/"/g }
qw(partnumber description unit);
map { $form->{"${_}_$i"} = $form->{item_list}[0]{$_} }
keys %{ $form->{item_list}[0] };
+ if ($form->{"part_payment_id_$i"} ne "") {
+ $form->{payment_id} = $form->{"part_payment_id_$i"};
+ }
$s = ($sellprice) ? $sellprice : $form->{"sellprice_$i"};
} else {
$form->{"sellprice_$i"} *= (1 - $form->{tradediscount});
+
# if there is an exchange rate adjust sellprice
$form->{"sellprice_$i"} /= $exchangerate;
}
$form->{rowcount}--;
$form->{"discount_$i"} = "";
&display_form;
- } else {
+ } else {
$form->{"id_$i"} = 0;
$form->{"unit_$i"} = $locale->text('ea');
}
}
-
$lxdebug->leave_sub();
}
$ordnumber = 'ordnumber';
$employee = $locale->text('Employee');
}
+
if ($form->{type} eq 'request_quotation') {
$form->{title} = $locale->text('Request for Quotations');
$form->{vc} = 'vendor';
$ordnumber = 'quonumber';
$employee = $locale->text('Employee');
}
- if ($form->{type} eq 'receive_order') {
- $form->{title} = $locale->text('Receive Merchandise');
- $form->{vc} = 'vendor';
- $ordlabel = $locale->text('Order Number');
- $ordnumber = 'ordnumber';
- $employee = $locale->text('Employee');
- }
+
if ($form->{type} eq 'sales_order') {
$form->{title} = $locale->text('Sales Orders');
$form->{vc} = 'customer';
$ordnumber = 'ordnumber';
$employee = $locale->text('Salesperson');
}
- if ($form->{type} eq 'ship_order') {
- $form->{title} = $locale->text('Ship Merchandise');
- $form->{vc} = 'customer';
- $ordlabel = $locale->text('Order Number');
- $ordnumber = 'ordnumber';
- $employee = $locale->text('Salesperson');
-
- }
if ($form->{type} eq 'sales_quotation') {
$form->{title} = $locale->text('Quotations');
$employee = $locale->text('Employee');
}
- if ($form->{type} =~ /(ship|receive)_order/) {
- OE->get_warehouses(\%myconfig, \%$form);
-
- # warehouse
- if (@{ $form->{all_warehouses} }) {
- $form->{selectwarehouse} = "<option>\n";
- $form->{warehouse} = qq|$form->{warehouse}--$form->{warehouse_id}|;
-
- map {
- $form->{selectwarehouse} .=
- "<option>$_->{description}--$_->{id}\n"
- } (@{ $form->{all_warehouses} });
-
- $warehouse = qq|
- <tr>
- <th align=right>| . $locale->text('Warehouse') . qq|</th>
- <td colspan=3><select name=warehouse>$form->{selectwarehouse}</select></td>
- <input type=hidden name=selectwarehouse value="$form->{selectwarehouse}">
- </tr>
-|;
-
- }
- }
-
# setup vendor / customer selection
$form->all_vc(\%myconfig, $form->{vc},
($form->{vc} eq 'customer') ? "AR" : "AP");
</tr>
| if $form->{selectdepartment};
- if ($form->{type} !~ /(ship_order|receive_order)/) {
- $openclosed = qq|
- <tr>
- <td><input name="open" class=checkbox type=checkbox value=1 checked> |
- . $locale->text('Open') . qq|</td>
- <td><input name="closed" class=checkbox type=checkbox value=1 $form->{closed}> |
- . $locale->text('Closed') . qq|</td>
- </tr>
+ $openclosed = qq|
+ <input type=hidden name="open" value=1>
|;
- } else {
- $openclosed = qq|
- <input type=hidden name="open" value=1>
+ my $delivered;
+ if (($form->{"type"} eq "sales_order") ||
+ ($form->{"type"} eq "purchase_order")) {
+ $delivered = qq|
+ <tr>
+ <td><input name="notdelivered" id="notdelivered" class="checkbox" type="checkbox" value="1" checked>
+ <label for="notdelivered">|. $locale->text('Not delivered') . qq|</label></td>
+ <td><input name="delivered" id="delivered" class="checkbox" type="checkbox" value="1" checked>
+ <label for="delivered">| . $locale->text('Delivered') . qq|</label></td>
+ </tr>
|;
}
<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>$vclabel</th>
<td colspan=3>$vc</td>
</tr>
- $warehouse
$department
<tr>
<th align=right>$ordlabel</th>
<td colspan=3><input name="$ordnumber" size=20></td>
</tr>
+ <tr>
+ <th align="right">| . $locale->text("Project Number") . qq|</th>
+ <td colspan="3">$projectnumber</td>
+ </tr>
<tr>
<th align=right>| . $locale->text('From') . qq|</th>
$button1
<td colspan=5>
<table>
$openclosed
+ $delivered
<tr>
<td><input name="l_id" class=checkbox type=checkbox value=Y>
| . $locale->text('ID') . qq|</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>
+ <td><input name="l_employee" class=checkbox type=checkbox value=Y checked> $employee</td>
</tr>
<tr>
<td><input name="l_netamount" class=checkbox type=checkbox value=Y> |
. $locale->text('Tax') . qq|</td>
<td><input name="l_amount" class=checkbox type=checkbox value=Y checked> |
. $locale->text('Total') . qq|</td>
+ <td><input name="l_globalprojectnumber" class=checkbox type=checkbox value=Y> |
+ . $locale->text('Project Number') . qq|</td>
</tr>
<tr>
<td><input name="l_subtotal" class=checkbox type=checkbox value=Y> |
$number = $form->escape($form->{$ordnumber});
$name = $form->escape($form->{ $form->{vc} });
$department = $form->escape($form->{department});
- $warehouse = $form->escape($form->{warehouse});
# construct href
$href =
- "$form->{script}?path=$form->{path}&action=orders&type=$form->{type}&vc=$form->{vc}&login=$form->{login}&password=$form->{password}&transdatefrom=$form->{transdatefrom}&transdateto=$form->{transdateto}&open=$form->{open}&closed=$form->{closed}&$ordnumber=$number&$form->{vc}=$name&department=$department&warehouse=$warehouse";
+ "$form->{script}?path=$form->{path}&action=orders&type=$form->{type}&vc=$form->{vc}&login=$form->{login}&password=$form->{password}&transdatefrom=$form->{transdatefrom}&transdateto=$form->{transdateto}&open=$form->{open}&closed=$form->{closed}¬delivered=$form->{notdelivered}&delivered=$form->{delivered}&$ordnumber=$number&$form->{vc}=$name&department=$department";
# construct callback
$number = $form->escape($form->{$ordnumber}, 1);
$name = $form->escape($form->{ $form->{vc} }, 1);
$department = $form->escape($form->{department}, 1);
- $warehouse = $form->escape($form->{warehouse}, 1);
$callback =
- "$form->{script}?path=$form->{path}&action=orders&type=$form->{type}&vc=$form->{vc}&login=$form->{login}&password=$form->{password}&transdatefrom=$form->{transdatefrom}&transdateto=$form->{transdateto}&open=$form->{open}&closed=$form->{closed}&$ordnumber=$number&$form->{vc}=$name&department=$department&warehouse=$warehouse";
+ "$form->{script}?path=$form->{path}&action=orders&type=$form->{type}&vc=$form->{vc}&login=$form->{login}&password=$form->{password}&transdatefrom=$form->{transdatefrom}&transdateto=$form->{transdateto}&open=$form->{open}&closed=$form->{closed}¬delivered=$form->{notdelivered}&delivered=$form->{delivered}&$ordnumber=$number&$form->{vc}=$name&department=$department";
@columns =
$form->sort_columns("transdate", "reqdate", "id", "$ordnumber",
"name", "netamount", "tax", "amount",
- "curr", "employee", "shipvia", "open",
- "closed");
+ "curr", "employee", "shipvia", "globalprojectnumber",
+ "open", "closed", "delivered");
$form->{l_open} = $form->{l_closed} = "Y"
if ($form->{open} && $form->{closed});
+ $form->{"l_delivered"} = "Y"
+ if ($form->{"delivered"} && $form->{"notdelivered"});
+
foreach $item (@columns) {
if ($form->{"l_$item"} eq "Y") {
push @column_index, $item;
}
if ($form->{vc} eq 'vendor') {
- if ($form->{type} eq 'receive_order') {
- $form->{title} = $locale->text('Receive Merchandise');
- } elsif ($form->{type} eq 'purchase_order') {
+ if ($form->{type} eq 'purchase_order') {
$form->{title} = $locale->text('Purchase Orders');
} else {
$form->{title} = $locale->text('Request for Quotations');
if ($form->{type} eq 'sales_order') {
$form->{title} = $locale->text('Sales Orders');
$employee = $locale->text('Salesperson');
- } elsif ($form->{type} eq 'ship_order') {
- $form->{title} = $locale->text('Ship Merchandise');
- $employee = $locale->text('Salesperson');
} else {
$form->{title} = $locale->text('Quotations');
$employee = $locale->text('Employee');
. qq|</a></th>|;
$column_header{quonumber} =
qq|<th><a class=listheading href=$href&sort=quonumber>|
- . $locale->text('Quotation')
+ . ($form->{"type"} eq "request_quotation" ?
+ $locale->text('RFQ') :
+ $locale->text('Quotation'))
. qq|</a></th>|;
$column_header{name} =
qq|<th><a class=listheading href=$href&sort=name>$name</a></th>|;
qq|<th><a class=listheading href=$href&sort=shipvia>|
. $locale->text('Ship via')
. qq|</a></th>|;
+ $column_header{globalprojectnumber} =
+ qq|<th class="listheading">| . $locale->text('Project Number') . qq|</th>|;
$column_header{open} =
qq|<th class=listheading>| . $locale->text('O') . qq|</th>|;
$column_header{closed} =
qq|<th class=listheading>| . $locale->text('C') . qq|</th>|;
+ $column_header{"delivered"} =
+ qq|<th class="listheading">| . $locale->text("Delivered") . qq|</th>|;
$column_header{employee} =
qq|<th><a class=listheading href=$href&sort=employee>$employee</a></th>|;
$option = $locale->text(ucfirst $form->{vc});
$option .= " : $form->{$form->{vc}}";
}
- if ($form->{warehouse}) {
- ($warehouse) = split /--/, $form->{warehouse};
- $option .= "\n<br>" if ($option);
- $option .= $locale->text('Warehouse');
- $option .= " : $warehouse";
- }
if ($form->{department}) {
$option .= "\n<br>" if ($option);
($department) = split /--/, $form->{department};
}
$action = "edit";
- $action = "ship_receive" if ($form->{type} =~ /(ship|receive)_order/);
-
- $warehouse = $form->escape($form->{warehouse});
foreach $oe (@{ $form->{OE} }) {
$form->{rowcount} = ++$j;
$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{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_escaped>$oe->{$ordnumber}</a></td>";
+ "<td><a href=oe.pl?path=$form->{path}&action=$action&type=$form->{type}&id=$oe->{id}&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>";
$column_data{shipvia} = "<td>$oe->{shipvia} </td>";
+ $column_data{globalprojectnumber} = "<td>" . H($oe->{globalprojectnumber}) . "</td>";
if ($oe->{closed}) {
$column_data{closed} = "<td align=center>X</td>";
$column_data{closed} = "<td> </td>";
$column_data{open} = "<td align=center>X</td>";
}
+ $column_data{"delivered"} = "<td>" .
+ ($oe->{"delivered"} ? $locale->text("Yes") : $locale->text("No")) .
+ "</td>";
$i++;
$i %= 2;
</tr>
</table>|;
-# multiple invoice edit button only if gotten there via sales_order form.
+ # multiple invoice edit button only if gotten there via sales_order form.
-if ($form->{type} =~ /sales_order/) {
-print qq|
+ 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|">
+ . $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|
+ print qq|
</form>
<br>
<input type=hidden name=path value=$form->{path}>
<input type=hidden name=login value=$form->{login}>
<input type=hidden name=password value=$form->{password}>
-|;
-
- if ($form->{type} !~ /(ship|receive)_order/) {
- print qq|
-<input class=submit type=submit name=action value="|
- . $locale->text('Add') . qq|">|;
- }
-
- if ($form->{menubar}) {
- require "$form->{path}/menu.pl";
- &menubar;
- }
- print qq|
</form>
</body>
$lxdebug->leave_sub();
}
-sub save {
+sub save_and_close {
$lxdebug->enter_sub();
if ($form->{type} =~ /_order$/) {
}
- $form->{$ordnumber} = $form->update_defaults(\%myconfig, $numberfld)
- unless $form->{$ordnumber};
+ # get new number in sequence if no number is given or if saveasnew was requested
+ if (!$form->{$ordnumber} || $form->{saveasnew}) {
+ $form->{$ordnumber} = $form->update_defaults(\%myconfig, $numberfld);
+ }
+
+ relink_accounts();
$form->redirect(
$form->{label} . " $form->{$ordnumber} " . $locale->text('saved!'))
$lxdebug->leave_sub();
}
-sub delete {
+sub save {
$lxdebug->enter_sub();
- $form->header;
-
if ($form->{type} =~ /_order$/) {
- $msg = $locale->text('Are you sure you want to delete Order Number');
- $ordnumber = 'ordnumber';
+ $form->isblank("transdate", $locale->text('Order Date missing!'));
} else {
- $msg = $locale->text('Are you sure you want to delete Quotation Number');
- $ordnumber = 'quonumber';
+ $form->isblank("transdate", $locale->text('Quotation Date missing!'));
}
- print qq|
-<body>
+ $msg = ucfirst $form->{vc};
+ $form->isblank($form->{vc}, $locale->text($msg . " missing!"));
-<form method=post action=$form->{script}>
-|;
+ # $locale->text('Customer missing!');
+ # $locale->text('Vendor missing!');
- # delete action variable
- map { delete $form->{$_} } qw(action header);
+ $form->isblank("exchangerate", $locale->text('Exchangerate missing!'))
+ if ($form->{currency} ne $form->{defaultcurrency});
- foreach $key (keys %$form) {
- $form->{$key} =~ s/\"/"/g;
- print qq|<input type=hidden name=$key value="$form->{$key}">\n|;
+ &validate_items;
+
+ # if the name changed get new values
+ if (&check_name($form->{vc})) {
+ &update;
+ exit;
}
- print qq|
-<h2 class=confirm>| . $locale->text('Confirm!') . qq|</h2>
+ $form->{id} = 0 if $form->{saveasnew};
-<h4>$msg $form->{$ordnumber}</h4>
-<p>
-<input name=action class=submit type=submit value="|
- . $locale->text('Yes') . qq|">
-</form>
+ # this is for the internal notes section for the [email] Subject
+ if ($form->{type} =~ /_order$/) {
+ if ($form->{type} eq 'sales_order') {
+ $form->{label} = $locale->text('Sales Order');
+
+ $numberfld = "sonumber";
+ $ordnumber = "ordnumber";
+ } else {
+ $form->{label} = $locale->text('Purchase Order');
+
+ $numberfld = "ponumber";
+ $ordnumber = "ordnumber";
+ }
+
+ $err = $locale->text('Cannot save order!');
+
+ } else {
+ if ($form->{type} eq 'sales_quotation') {
+ $form->{label} = $locale->text('Quotation');
+
+ $numberfld = "sqnumber";
+ $ordnumber = "quonumber";
+ } else {
+ $form->{label} = $locale->text('Request for Quotation');
+
+ $numberfld = "rfqnumber";
+ $ordnumber = "quonumber";
+ }
+
+ $err = $locale->text('Cannot save quotation!');
+
+ }
+
+ $form->{$ordnumber} = $form->update_defaults(\%myconfig, $numberfld)
+ unless $form->{$ordnumber};
+
+ relink_accounts();
+
+ OE->save(\%myconfig, \%$form);
+ $form->{simple_save} = 1;
+ if(!$form->{print_and_save}) {
+ set_headings("edit");
+ &update;
+ exit;
+ }
+ $lxdebug->leave_sub();
+}
+
+sub delete {
+ $lxdebug->enter_sub();
+
+ $form->header;
+
+ if ($form->{type} =~ /_order$/) {
+ $msg = $locale->text('Are you sure you want to delete Order Number');
+ $ordnumber = 'ordnumber';
+ } else {
+ $msg = $locale->text('Are you sure you want to delete Quotation Number');
+ $ordnumber = 'quonumber';
+ }
+
+ print qq|
+<body>
+
+<form method=post action=$form->{script}>
+|;
+
+ # delete action variable
+ map { delete $form->{$_} } qw(action header);
+
+ foreach $key (keys %$form) {
+ $form->{$key} =~ s/\"/"/g;
+ print qq|<input type=hidden name=$key value="$form->{$key}">\n|;
+ }
+
+ print qq|
+<h2 class=confirm>| . $locale->text('Confirm!') . qq|</h2>
+
+<h4>$msg $form->{$ordnumber}</h4>
+<p>
+<input name=action class=submit type=submit value="|
+ . $locale->text('Yes') . qq|">
+</form>
</body>
</html>
$lxdebug->enter_sub();
if ($form->{type} =~ /_order$/) {
+
# 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 ) }->{''} );
+ $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) }
+ ->{''});
# also copy deliverydate from the order
$form->{deliverydate} = $form->{reqdate} if $form->{reqdate};
+ $form->{orddate} = $form->{transdate};
} else {
$form->isblank("quonumber", $locale->text('Quotation Number missing!'));
$form->isblank("transdate", $locale->text('Quotation Date missing!'));
$form->{ordnumber} = "";
+ $form->{quodate} = $form->{transdate};
}
# if the name changed get new values
exit;
}
- ($null, $form->{cp_id}) = split /--/, $form->{contact};
$form->{cp_id} *= 1;
+ for $i (1 .. $form->{rowcount}) {
+ map({ $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig,
+ $form->{"${_}_${i}"})
+ if ($form->{"${_}_${i}"}) }
+ qw(ship qty sellprice listprice basefactor));
+ }
+
if ( $form->{type} =~ /_order/
&& $form->{currency} ne $form->{defaultcurrency}) {
# close orders/quotations
$form->{closed} = 1;
- # save order if one ordnumber has been given
+ # save order if 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 '') || ($form->{quonumber} ne '')) {
- OE->save(\%myconfig, \%$form);
+ OE->close_order(\%myconfig, \%$form);
} else {
OE->close_orders(\%myconfig, \%$form);
}
$decimalplaces = ($dec > 2) ? $dec : 2;
# copy delivery date from reqdate for order -> invoice conversion
- $form->{"deliverydate_$i"} = $form->{"reqdate_$i"} unless $form->{"deliverydate_$i"};
+ $form->{"deliverydate_$i"} = $form->{"reqdate_$i"}
+ unless $form->{"deliverydate_$i"};
$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"}, $dec_qty);
+ $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);
} qw(sellprice discount);
}
+ relink_accounts();
+
OE->save(\%myconfig, \%$form);
# rebuild rows for invoice
$form->{saveasnew} = 1;
$form->{closed} = 0;
- map { delete $form->{$_} } qw(printed emailed queued);
+ map { delete $form->{$_} } qw(printed emailed queued ordnumber quonumber);
&save;
if ( $form->{type} eq 'sales_quotation'
|| $form->{type} eq 'request_quotation') {
- $form->{closed} = 1;
- OE->save(\%myconfig, \%$form);
+ OE->close_order(\%myconfig, \%$form);
}
- ($null, $form->{cp_id}) = split /--/, $form->{contact};
$form->{cp_id} *= 1;
$form->{title} = $locale->text('Add Purchase Order');
if ( $form->{type} eq 'sales_quotation'
|| $form->{type} eq 'request_quotation') {
- $form->{closed} = 1;
- OE->save(\%myconfig, \%$form);
+ OE->close_order(\%myconfig, $form);
}
- ($null, $form->{cp_id}) = split /--/, $form->{contact};
$form->{cp_id} *= 1;
$form->{title} = $locale->text('Add Sales Order');
map { delete $form->{$_} }
qw(id subject message cc bcc printed emailed queued customer vendor creditlimit creditremaining discount tradediscount oldinvtotal);
+ for $i (1 .. $form->{rowcount}) {
+ map({ $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig,
+ $form->{"${_}_${i}"})
+ if ($form->{"${_}_${i}"}) }
+ qw(ship qty sellprice listprice basefactor));
+ }
+
&order_links;
&prepare_order;
$lxdebug->leave_sub();
}
-sub ship_receive {
- $lxdebug->enter_sub();
-
- &order_links;
-
- &prepare_order;
-
- OE->get_warehouses(\%myconfig, \%$form);
-
- # warehouse
- if (@{ $form->{all_warehouses} }) {
- $form->{selectwarehouse} = "<option>\n";
-
- map { $form->{selectwarehouse} .= "<option>$_->{description}--$_->{id}\n" }
- (@{ $form->{all_warehouses} });
-
- if ($form->{warehouse}) {
- $form->{selectwarehouse} = "<option>$form->{warehouse}";
- }
- }
-
- $form->{shippingdate} = $form->current_date(\%myconfig);
- $form->{"$form->{vc}"} =~ s/--.*//;
-
- @flds = ();
- @a = ();
- $count = 0;
- foreach $key (keys %$form) {
- if ($key =~ /_1$/) {
- $key =~ s/_1//;
- push @flds, $key;
- }
- }
-
- for $i (1 .. $form->{rowcount}) {
-
- # undo formatting from prepare_order
- map {
- $form->{"${_}_$i"} =
- $form->parse_amount(\%myconfig, $form->{"${_}_$i"})
- } qw(qty ship);
- $n = ($form->{"qty_$i"} -= $form->{"ship_$i"});
- if (abs($n) > 0
- && ($form->{"inventory_accno_$i"} || $form->{"assembly_$i"})) {
- $form->{"ship_$i"} = "";
- $form->{"serialnumber_$i"} = "";
-
- push @a, {};
- $j = $#a;
-
- map { $a[$j]->{$_} = $form->{"${_}_$i"} } @flds;
- $count++;
- }
- }
-
- $form->redo_rows(\@flds, \@a, $count, $form->{rowcount});
- $form->{rowcount} = $count;
-
- &display_ship_receive;
-
- $lxdebug->leave_sub();
-}
-
-sub display_ship_receive {
- $lxdebug->enter_sub();
-
- $vclabel = ucfirst $form->{vc};
- $vclabel = $locale->text($vclabel);
-
- $form->{rowcount}++;
-
- if ($form->{vc} eq 'customer') {
- $form->{title} = $locale->text('Ship Merchandise');
- $shipped = $locale->text('Shipping Date');
- } else {
- $form->{title} = $locale->text('Receive Merchandise');
- $shipped = $locale->text('Date Received');
- }
-
- # set option selected
- foreach $item (warehouse, employee) {
- $form->{"select$item"} =~ s/ selected//;
- $form->{"select$item"} =~
- s/option>\Q$form->{$item}\E/option selected>$form->{$item}/;
- }
-
- $warehouse = qq|
- <tr>
- <th align=right>| . $locale->text('Warehouse') . qq|</th>
- <td><select name=warehouse>$form->{selectwarehouse}</select></td>
- <input type=hidden name=selectwarehouse value="$form->{selectwarehouse}">
- </tr>
-| if $form->{selectwarehouse};
-
- $employee = qq|
- <tr>
- <th align=right nowrap>| . $locale->text('Contact') . qq|</th>
- <td><select name=employee>$form->{selectemployee}</select></td>
- <input type=hidden name=selectemployee value="$form->{selectemployee}">
- </tr>
-|;
-
- $form->header;
-
- print qq|
-<body>
-
-<form method=post action=$form->{script}>
-
-<input type=hidden name=id value=$form->{id}>
-
-<input type=hidden name=display_form value=display_ship_receive>
-
-<input type=hidden name=type value=$form->{type}>
-<input type=hidden name=media value=$form->{media}>
-<input type=hidden name=format value=$form->{format}>
-
-<input type=hidden name=queued value="$form->{queued}">
-<input type=hidden name=printed value="$form->{printed}">
-<input type=hidden name=emailed value="$form->{emailed}">
-
-<input type=hidden name=vc value=$form->{vc}>
-
-<table width=100%>
- <tr class=listtop>
- <th class=listtop>$form->{title}</th>
- </tr>
- <tr height="5"></tr>
- <tr>
- <td>
- <table width="100%">
- <tr valign=top>
- <td>
- <table width=100%>
- <tr>
- <th align=right>$vclabel</th>
- <td colspan=3>$form->{$form->{vc}}</td>
- <input type=hidden name=$form->{vc} value="$form->{$form->{vc}}">
- <input type=hidden name="$form->{vc}_id" value=$form->{"$form->{vc}_id"}>
- </tr>
- $department
- <tr>
- <th align=right>| . $locale->text('Shipping Point') . qq|</th>
- <td colspan=3>
- <input name=shippingpoint size=35 value="$form->{shippingpoint}">
- </tr>
- <tr>
- <th align=right>| . $locale->text('Ship via') . qq|</th>
- <td colspan=3>
- <input name=shipvia size=35 value="$form->{shipvia}">
- </tr>
- $warehouse
- </table>
- </td>
- <td align=right>
- <table>
- $employee
- <tr>
- <th align=right nowrap>| . $locale->text('Order Number') . qq|</th>
- <td>$form->{ordnumber}</td>
- <input type=hidden name=ordnumber value="$form->{ordnumber}">
- </tr>
- <tr>
- <th align=right nowrap>| . $locale->text('Order Date') . qq|</th>
- <td>$form->{transdate}</td>
- <input type=hidden name=transdate value=$form->{transdate}>
- </tr>
- <tr>
- <th align=right nowrap>$shipped</th>
- <td><input name=shippingdate size=11 value=$form->{shippingdate}></td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
- </td>
- </tr>
-
-<!-- shipto are in hidden variables -->
-
-<input type=hidden name=shiptoname value="$form->{shiptoname}">
-<input type=hidden name=shiptostreet value="$form->{shiptostreet}">
-<input type=hidden name=shiptozipcode value="$form->{shiptozipcode}">
-<input type=hidden name=shiptocity value="$form->{shiptocity}">
-<input type=hidden name=shiptocountry value="$form->{shiptocountry}">
-<input type=hidden name=shiptocontact value="$form->{shiptocontact}">
-<input type=hidden name=shiptophone value="$form->{shiptophone}">
-<input type=hidden name=shiptofax value="$form->{shiptofax}">
-<input type=hidden name=shiptoemail value="$form->{shiptoemail}">
-
-<!-- email variables -->
-<input type=hidden name=message value="$form->{message}">
-<input type=hidden name=email value="$form->{email}">
-<input type=hidden name=subject value="$form->{subject}">
-<input type=hidden name=cc value="$form->{cc}">
-<input type=hidden name=bcc value="$form->{bcc}">
-
-|;
-
- @column_index =
- (partnumber, description, qty, ship, unit, bin, serialnumber);
-
- if ($form->{type} eq "ship_order") {
- $column_data{ship} =
- qq|<th class=listheading align=center width="auto">|
- . $locale->text('Ship')
- . qq|</th>|;
- }
- if ($form->{type} eq "receive_order") {
- $column_data{ship} =
- qq|<th class=listheading align=center width="auto">|
- . $locale->text('Recd')
- . qq|</th>|;
- }
-
- my $colspan = $#column_index + 1;
-
- $column_data{partnumber} =
- qq|<th class=listheading nowrap>| . $locale->text('Number') . qq|</th>|;
- $column_data{description} =
- qq|<th class=listheading nowrap>|
- . $locale->text('Description')
- . qq|</th>|;
- $column_data{qty} =
- qq|<th class=listheading nowrap>| . $locale->text('Qty') . qq|</th>|;
- $column_data{unit} =
- qq|<th class=listheading nowrap>| . $locale->text('Unit') . qq|</th>|;
- $column_data{bin} =
- qq|<th class=listheading nowrap>| . $locale->text('Bin') . qq|</th>|;
- $column_data{serialnumber} =
- qq|<th class=listheading nowrap>|
- . $locale->text('Serial No.')
- . qq|</th>|;
-
- print qq|
- <tr>
- <td>
- <table width=100%>
- <tr class=listheading>|;
-
- map { print "\n$column_data{$_}" } @column_index;
-
- print qq|
- </tr>
-|;
-
- for $i (1 .. $form->{rowcount} - 1) {
-
- # undo formatting
- $form->{"ship_$i"} = $form->parse_amount(\%myconfig, $form->{"ship_$i"});
-
- # convert " to "
- map { $form->{"${_}_$i"} =~ s/\"/"/g }
- qw(partnumber description unit bin serialnumber);
-
- $description = $form->{"description_$i"};
- $description =~ s/\n/<br>/g;
-
- $column_data{partnumber} =
- qq|<td>$form->{"partnumber_$i"}<input type=hidden name="partnumber_$i" value="$form->{"partnumber_$i"}"></td>|;
- $column_data{description} =
- 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"}, $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=|
- . $form->format_amount(\%myconfig, $form->{"ship_$i"})
- . qq|></td>|;
- $column_data{unit} =
- qq|<td>$form->{"unit_$i"}<input type=hidden name="unit_$i" value="$form->{"unit_$i"}"></td>|;
- $column_data{bin} =
- qq|<td>$form->{"bin_$i"}<input type=hidden name="bin_$i" value="$form->{"bin_$i"}"></td>|;
-
- $column_data{serialnumber} =
- qq|<td><input name="serialnumber_$i" size=15 value="$form->{"serialnumber_$i"}"></td>|;
-
- print qq|
- <tr valign=top>|;
-
- map { print "\n$column_data{$_}" } @column_index;
-
- print qq|
- </tr>
-
-<input type=hidden name="orderitems_id_$i" value=$form->{"orderitems_id_$i"}>
-<input type=hidden name="id_$i" value=$form->{"id_$i"}>
-<input type=hidden name="assembly_$i" value="$form->{"assembly_$i"}">
-<input type=hidden name="partsgroup_$i" value="$form->{"partsgroup_$i"}">
-
-|;
-
- }
-
- print qq|
- </table>
- </td>
- </tr>
- <tr>
- <td><hr size=3 noshade></td>
- </tr>
- <tr>
- <td>
-|;
-
- $form->{copies} = 1;
-
- &print_options;
-
- print qq|
- </td>
- </tr>
-</table>
-<br>
-<input class=submit type=submit name=action value="|
- . $locale->text('Update') . qq|">
-<input class=submit type=submit name=action value="|
- . $locale->text('Print') . qq|">
-|;
-
- if ($form->{type} eq 'ship_order') {
- print qq|
-<input class=submit type=submit name=action value="|
- . $locale->text('Ship to') . qq|">
-<input class=submit type=submit name=action value="|
- . $locale->text('E-mail') . qq|">
-|;
- }
-
- print qq|
-
-<input class=submit type=submit name=action value="|
- . $locale->text('Done') . qq|">
-|;
-
- if ($form->{menubar}) {
- require "$form->{path}/menu.pl";
- &menubar;
- }
-
- print qq|
-
-<input type=hidden name=rowcount value=$form->{rowcount}>
-
-<input name=callback type=hidden value="$callback">
-
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
-
-</form>
-
-</body>
-</html>
-|;
-
- $lxdebug->leave_sub();
-}
-
-sub done {
- $lxdebug->enter_sub();
-
- if ($form->{type} eq 'ship_order') {
- $form->isblank("shippingdate", $locale->text('Shipping Date missing!'));
- } else {
- $form->isblank("shippingdate", $locale->text('Date received missing!'));
- }
-
- $total = 0;
- map {
- $total += $form->{"ship_$_"} =
- $form->parse_amount(\%myconfig, $form->{"ship_$_"})
- } (1 .. $form->{rowcount} - 1);
-
- $form->error($locale->text('Nothing entered!')) unless $total;
-
- $form->redirect($locale->text('Inventory saved!'))
- if OE->save_inventory(\%myconfig, \%$form);
- $form->error($locale->text('Could not save!'));
-
- $lxdebug->leave_sub();
-}
-
-sub search_transfer {
- $lxdebug->enter_sub();
-
- OE->get_warehouses(\%myconfig, \%$form);
-
- # warehouse
- if (@{ $form->{all_warehouses} }) {
- $form->{selectwarehouse} = "<option>\n";
- $form->{warehouse} = qq|$form->{warehouse}--$form->{warehouse_id}|;
-
- map { $form->{selectwarehouse} .= "<option>$_->{description}--$_->{id}\n" }
- (@{ $form->{all_warehouses} });
- } else {
- $form->error($locale->text('Nothing to transfer!'));
- }
-
- $form->{title} = $locale->text('Transfer Inventory');
-
- $form->header;
-
- print qq|
-<body>
-
-<form method=post action=$form->{script}>
-
-<table width=100%>
- <tr>
- <th class=listtop>$form->{title}</th>
- </tr>
- <tr height="5"></tr>
- <tr>
- <td>
- <table>
- <tr>
- <th align=right nowrap>| . $locale->text('Transfer to') . qq|</th>
- <td><select name=warehouse>$form->{selectwarehouse}</select></td>
- </tr>
- <tr>
- <th align="right" nowrap="true">| . $locale->text('Part Number') . qq|</th>
- <td><input name=partnumber size=20></td>
- </tr>
- <tr>
- <th align="right" nowrap="true">| . $locale->text('Description') . qq|</th>
- <td><input name=description size=40></td>
- </tr>
- <tr>
- <th align=right nowrap>| . $locale->text('Group') . qq|</th>
- <td><input name=partsgroup size=20></td>
- </tr>
- </table>
- </td>
- </tr>
- <tr>
- <td><hr size=3 noshade></td>
- </tr>
-</table>
-
-<br>
-<input type=hidden name=sort value=partnumber>
-<input type=hidden name=nextsub value=list_transfer>
-
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
-
-<input class=submit type=submit name=action value="|
- . $locale->text('Continue') . qq|">
-</form>
-
-</body>
-</html>
-|;
-
- $lxdebug->leave_sub();
-}
-
-sub list_transfer {
- $lxdebug->enter_sub();
-
- OE->get_inventory(\%myconfig, \%$form);
-
- $partnumber = $form->escape($form->{partnumber});
- $warehouse = $form->escape($form->{warehouse});
- $description = $form->escape($form->{description});
- $partsgroup = $form->escape($form->{partsgroup});
-
- # construct href
- $href =
- "$form->{script}?path=$form->{path}&action=list_transfer&partnumber=$partnumber&warehouse=$warehouse&description=$description&partsgroup=$partsgroup&login=$form->{login}&password=$form->{password}";
-
- # construct callback
- $partnumber = $form->escape($form->{partnumber}, 1);
- $warehouse = $form->escape($form->{warehouse}, 1);
- $description = $form->escape($form->{description}, 1);
- $partsgroup = $form->escape($form->{partsgroup}, 1);
-
- $callback =
- "$form->{script}?path=$form->{path}&action=list_transfer&partnumber=$partnumber&warehouse=$warehouse&description=$description&partsgroup=$partsgroup&login=$form->{login}&password=$form->{password}";
-
- @column_index =
- $form->sort_columns(
- qw(partnumber description partsgroup make model warehouse qty transfer));
-
- $column_header{partnumber} =
- qq|<th><a class=listheading href=$href&sort=partnumber>|
- . $locale->text('Part Number')
- . qq|</a></th>|;
- $column_header{description} =
- qq|<th><a class=listheading href=$href&sort=description>|
- . $locale->text('Description')
- . qq|</a></th>|;
- $column_header{partsgroup} =
- qq|<th><a class=listheading href=$href&sort=partsgroup>|
- . $locale->text('Group')
- . qq|</a></th>|;
- $column_header{warehouse} =
- qq|<th><a class=listheading href=$href&sort=warehouse>|
- . $locale->text('From')
- . qq|</a></th>|;
- $column_header{qty} =
- qq|<th><a class=listheading>| . $locale->text('Qty') . qq|</a></th>|;
- $column_header{transfer} =
- qq|<th><a class=listheading>| . $locale->text('Transfer') . qq|</a></th>|;
-
- $option = $locale->text('Transfer to');
-
- ($warehouse, $warehouse_id) = split /--/, $form->{warehouse};
-
- if ($form->{warehouse}) {
- $option .= " : $warehouse";
- }
- if ($form->{partnumber}) {
- $option .= "\n<br>" if ($option);
- $option .= $locale->text('Part Number') . " : $form->{partnumber}";
- }
- if ($form->{description}) {
- $option .= "\n<br>" if ($option);
- $option .= $locale->text('Description') . " : $form->{description}";
- }
- if ($form->{partsgroup}) {
- $option .= "\n<br>" if ($option);
- $option .= $locale->text('Group') . " : $form->{partsgroup}";
- }
-
- $form->{title} = $locale->text('Transfer Inventory');
-
- $form->header;
-
- print qq|
-<body>
-
-<form method=post action=$form->{script}>
-
-<input type=hidden name=warehouse_id value=$warehouse_id>
-
-<table width=100%>
- <tr>
- <th class=listtop>$form->{title}</th>
- </tr>
- <tr height="5"></tr>
- <tr>
- <td>$option</td>
- </tr>
- <tr>
- <td>
- <table width=100%>
- <tr class=listheading>|;
-
- map { print "\n$column_header{$_}" } @column_index;
-
- print qq|
- </tr>
-|;
-
- if (@{ $form->{all_inventory} }) {
- $sameitem = $form->{all_inventory}->[0]->{ $form->{sort} };
- }
-
- $i = 0;
- foreach $ref (@{ $form->{all_inventory} }) {
-
- $i++;
-
- $column_data{partnumber} =
- qq|<td><input type=hidden name="id_$i" value=$ref->{id}>$ref->{partnumber}</td>|;
- $column_data{description} = "<td>$ref->{description} </td>";
- $column_data{partsgroup} = "<td>$ref->{partsgroup} </td>";
- $column_data{warehouse} =
- 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}, $dec_qty)
- . qq|</td>|;
- $column_data{transfer} = qq|<td><input name="transfer_$i" size=4></td>|;
-
- $j++;
- $j %= 2;
- print "
- <tr class=listrow$j>";
-
- map { print "\n$column_data{$_}" } @column_index;
-
- print qq|
- </tr>
-|;
-
- }
-
- print qq|
- </table>
- </td>
- </tr>
-
- <tr>
- <td><hr size=3 noshade></td>
- </tr>
-</table>
-
-<br>
-
-<input name=callback type=hidden value="$callback">
-
-<input type=hidden name=rowcount value=$i>
-
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
-
-<input class=submit type=submit name=action value="|
- . $locale->text('Transfer') . qq|">|;
-
- if ($form->{menubar}) {
- require "$form->{path}/menu.pl";
- &menubar;
- }
-
- print qq|
-</form>
-
-</body>
-</html>
-|;
-
- $lxdebug->leave_sub();
-}
-
-sub transfer {
- $lxdebug->enter_sub();
-
- $form->redirect($locale->text('Inventory transferred!'))
- if OE->transfer(\%myconfig, \%$form);
- $form->error($locale->text('Could not transfer Inventory!'));
-
- $lxdebug->leave_sub();
-}