X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fio.pl;h=abbdda173ae42ce81be6d07cbcdf7bba5c0565e6;hb=baf226d0b65e64f9475dea46b35d88d52fed1cc6;hp=2ef7319e7f14c230c82e17f8cc4f5ecf35da0a19;hpb=5bc87ade7044239fa9e893b9d7cbd476dc627eea;p=kivitendo-erp.git
diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 2ef7319e7..abbdda173 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -28,7 +28,8 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1335, USA.
#
#######################################################################
#
@@ -57,7 +58,7 @@ use SL::DB::Language;
use SL::DB::Printer;
use SL::DB::Vendor;
use SL::Helper::CreatePDF;
-use SL::Helper::Flash;
+use SL::Helper::Flash qw(flash);
require "bin/mozilla/common.pl";
@@ -103,7 +104,6 @@ if (-f "bin/mozilla/$::myconfig{login}_io.pl") {
# $locale->text('Nov')
# $locale->text('Dec')
use SL::IS;
-use SL::PE;
use SL::AM;
use Data::Dumper;
@@ -159,7 +159,7 @@ sub display_row {
# column_index
my @header_sort = qw(
- runningnumber partnumber description ship ship_missing qty price_factor
+ runningnumber partnumber type_and_classific description ship ship_missing qty price_factor
unit weight price_source sellprice discount linetotal
bin stock_in_out
);
@@ -169,6 +169,8 @@ sub display_row {
my %column_def = (
runningnumber => { width => 5, value => $locale->text('No.'), display => 1, },
partnumber => { width => 8, value => $locale->text('Number'), display => 1, },
+ type_and_classific
+ => { width => 2, value => $locale->text('Type'), display => 1, },
description => { width => 30, value => $locale->text('Part Description'), display => 1, },
ship => { width => 5, value => $locale->text('Delivered'), display => $is_s_p_order, },
ship_missing => { width => 5, value => $locale->text('Not delivered'), display => $show_ship_missing, },
@@ -295,12 +297,14 @@ sub display_row {
my $rows = $form->numtextrows($form->{"description_$i"}, 30, 6);
# quick delete single row
- $column_data{runningnumber} .= q|| .
+ $column_data{runningnumber} = q|| .
q|
|;
$column_data{runningnumber} .= $cgi->textfield(-name => "runningnumber_$i", -id => "runningnumber_$i", -size => 5, -value => $i); # HuT
$column_data{partnumber} = $cgi->textfield(-name => "partnumber_$i", -id => "partnumber_$i", -size => 12, -value => $form->{"partnumber_$i"});
+ $column_data{type_and_classific} = $::request->presenter->type_abbreviation($form->{"part_type_$i"}).
+ $::request->presenter->classification_abbreviation($form->{"classification_id_$i"}) if $form->{"id_$i"};
$column_data{description} = (($rows > 1) # if description is too large, use a textbox instead
? $cgi->textarea( -name => "description_$i", -id => "description_$i", -default => $form->{"description_$i"}, -rows => $rows, -columns => 30)
: $cgi->textfield(-name => "description_$i", -id => "description_$i", -value => $form->{"description_$i"}, -size => 30))
@@ -319,7 +323,8 @@ sub display_row {
$ship_qty *= $all_units->{$form->{"partunit_$i"}}->{factor};
$ship_qty /= ( $all_units->{$form->{"unit_$i"}}->{factor} || 1 );
- $column_data{ship} = $form->format_amount(\%myconfig, $form->round_amount($ship_qty, 2) * 1) . ' ' . $form->{"unit_$i"};
+ $column_data{ship} = $form->format_amount(\%myconfig, $form->round_amount($ship_qty, 2) * 1) . ' ' . $form->{"unit_$i"}
+ . $cgi->hidden(-name => "ship_$i", -value => $form->format_amount(\%myconfig, $form->{"ship_$i"}, $qty_dec));
my $ship_missing_qty = $form->{"qty_$i"} - $ship_qty;
my $ship_missing_amount = $form->round_amount($ship_missing_qty * $form->{"sellprice_$i"} * (100 - $form->{"discount_$i"}) / 100 / $price_factor, 2);
@@ -345,7 +350,7 @@ sub display_row {
if ($form->{"id_${i}"} && !$is_delivery_order) {
my $price_source = SL::PriceSource->new(record_item => $record_item, record => $record);
my $price = $price_source->price_from_source($::form->{"active_price_source_$i"});
- my $discount = $price_source->price_from_source($::form->{"active_discount_source_$i"});
+ my $discount = $price_source->discount_from_source($::form->{"active_discount_source_$i"});
my $best_price = $price_source->best_price;
my $best_discount = $price_source->best_discount;
$column_data{price_source} .= $cgi->button(-value => $price->source_description, -onClick => "kivi.io.price_chooser($i)");
@@ -353,8 +358,8 @@ sub display_row {
$column_data{price_source} .= ' ' . $cgi->img({src => 'image/flag-red.png', alt => $price->invalid, title => $price->invalid }) if $price->invalid;
$column_data{price_source} .= ' ' . $cgi->img({src => 'image/flag-red.png', alt => $price->missing, title => $price->missing }) if $price->missing;
if (!$price->missing && !$price->invalid) {
- $column_data{price_source} .= ' ' . $cgi->img({src => 'image/up.png', alt => t8('This price has since gone up'), title => t8('This price has since gone up' ) }) if $price->price > $record_item->sellprice;
- $column_data{price_source} .= ' ' . $cgi->img({src => 'image/down.png', alt => t8('This price has since gone down'), title => t8('This price has since gone down') }) if $price->price < $record_item->sellprice;
+ $column_data{price_source} .= ' ' . $cgi->img({src => 'image/up.png', alt => t8('This price has since gone up'), title => t8('This price has since gone up' ) }) if $price->price - $record_item->sellprice > 0.01;
+ $column_data{price_source} .= ' ' . $cgi->img({src => 'image/down.png', alt => t8('This price has since gone down'), title => t8('This price has since gone down') }) if $price->price - $record_item->sellprice < -0.01;
$column_data{price_source} .= ' ' . $cgi->img({src => 'image/ok.png', alt => t8('There is a better price available'), title => t8('There is a better price available') }) if $best_price && $price->source ne $price_source->best_price->source;
}
}
@@ -362,8 +367,8 @@ sub display_row {
$column_data{discount_source} .= ' ' . $cgi->img({src => 'image/flag-red.png', alt => $discount->invalid, title => $discount->invalid }) if $discount->invalid;
$column_data{discount_source} .= ' ' . $cgi->img({src => 'image/flag-red.png', alt => $discount->missing, title => $discount->missing }) if $discount->missing;
if (!$discount->missing && !$discount->invalid) {
- $column_data{price_source} .= ' ' . $cgi->img({src => 'image/up.png', alt => t8('This discount has since gone up'), title => t8('This discount has since gone up') }) if $discount->discount * 100 > $record_item->discount;
- $column_data{price_source} .= ' ' . $cgi->img({src => 'image/down.png', alt => t8('This discount has since gone down'), title => t8('This discount has since gone down') }) if $discount->discount * 100 < $record_item->discount;
+ $column_data{price_source} .= ' ' . $cgi->img({src => 'image/up.png', alt => t8('This discount has since gone up'), title => t8('This discount has since gone up') }) if $discount->discount * 100 - $record_item->discount > 0.01;
+ $column_data{price_source} .= ' ' . $cgi->img({src => 'image/down.png', alt => t8('This discount has since gone down'), title => t8('This discount has since gone down') }) if $discount->discount * 100 - $record_item->discount < -0.01;
$column_data{price_source} .= ' ' . $cgi->img({src => 'image/ok.png', alt => t8('There is a better discount available'), title => t8('There is a better discount available') }) if $best_discount && $discount->source ne $price_source->best_discount->source;
}
}
@@ -503,11 +508,14 @@ sub select_item {
_check_io_auth();
my $previous_form = $::auth->save_form_in_session(form => $::form);
- $::form->{title} = $::locale->text('Select from one of the items below');
+ $::form->{title} = $::myconfig{item_multiselect} ?
+ $::locale->text('Set count for one or more of the items to select them'):
+ $::locale->text('Select from one of the items below');
$::form->header;
my @item_list = map {
- $_->{display_sellprice} /= $_->{price_factor} if ($_->{price_factor});
+ # maybe there is a better backend function or way to calc
+ $_->{display_sellprice} = ($_->{price_factor}) ? $_->{sellprice} / $_->{price_factor} : $_->{sellprice};
$_;
} @{ $::form->{item_list} };
@@ -600,7 +608,7 @@ sub item_selected {
my @new_fields =
qw(id partnumber description sellprice listprice inventory_accno
- income_accno expense_accno bin unit weight assembly taxaccounts
+ income_accno expense_accno bin unit weight part_type taxaccounts
partsgroup formel longdescription not_discountable partnotes lastcost
price_factor_id price_factor);
@@ -661,15 +669,14 @@ sub item_selected {
map { $amount += ($form->{"${_}_base"} * $form->{"${_}_rate"}) } split / /, $form->{"taxaccounts_$i"} if !$form->{taxincluded};
$form->{creditremaining} -= $amount;
-
$form->{"runningnumber_$i"} = $i;
# format amounts
map {
$form->{"${_}_$i"} =
$form->format_amount(\%myconfig, $form->{"${_}_$i"}, $decimalplaces)
- } qw(sellprice lastcost qty) if $form->{item} ne 'assembly';
- $form->{"discount_$i"} = $form->format_amount(\%myconfig, $form->{"discount_$i"} * 100.0) if $form->{item} ne 'assembly';
+ } qw(sellprice lastcost qty) if $form->{part_type} ne 'assembly';
+ $form->{"discount_$i"} = $form->format_amount(\%myconfig, $form->{"discount_$i"} * 100.0) if $form->{part_type} ne 'assembly';
delete $form->{nextsub};
@@ -723,7 +730,7 @@ sub check_form {
my $count = 0;
# remove any makes or model rows
- if ($form->{item} eq 'assembly') {
+ if ($form->{part_type} eq 'assembly') {
# fuer assemblies auskommentiert. seiteneffekte? ;-) wird die woanders benoetigt?
#$form->{sellprice} = 0;
@@ -756,21 +763,12 @@ sub check_form {
$form->redo_rows(\@flds, \@a, $count, $form->{assembly_rows});
$form->{assembly_rows} = $count;
- } elsif ($form->{item} !~ m{^(?:part|service)$}) {
+ } elsif ($form->{part_type} !~ m{^(?:part|service)$}) {
remove_emptied_rows(1);
$form->{creditremaining} -= &invoicetotal;
}
- #sk
- # if pricegroups
- if ( $form->{type} =~ (/sales_quotation/)
- or (($form->{level} =~ /Sales/) and ($form->{type} =~ /invoice/))
- or (($form->{level} eq undef) and ($form->{type} =~ /invoice/))
- or ($form->{type} =~ /sales_order/)) {
-
- }
-
&display_form;
$main::lxdebug->leave_sub();
@@ -865,7 +863,7 @@ sub validate_items {
if ($form->{rowcount} == 1) {
flash('warning', $::locale->text('The action you\'ve chosen has not been executed because the document does not contain any item yet.'));
&update;
- ::end_of_request();
+ $::dispatcher->end_request;
}
for my $i (1 .. $form->{rowcount} - 1) {
@@ -893,10 +891,22 @@ sub order {
$form->{old_employee_id} = $form->{employee_id};
$form->{old_salesman_id} = $form->{salesman_id};
- # link doc invoice -> quotation (single id no multi mode)
- $form->{convert_from_ar_ids} = delete $form->{id};
-
delete $form->{$_} foreach (qw(printed emailed queued));
+
+ # When creating a new sales order from a saved sales invoice, reset id,
+ # ordnumber, transdate and deliverydate as we are creating a new order. This
+ # workflow is probably mainly used as a template mechanism for creating new
+ # orders from existing invoices, so we probably don't want to link the items.
+ # Is this order function called anywhere else?
+ # The worksflows in oe already call sales_order and purchase_order in oe, not
+ # this general function which now only seems to be called from saved sales
+ # invoices
+ # Why is ordnumber set to invnumber above, does this ever make sense?
+
+ if ( $form->{script} eq 'is.pl' && $form->{type} eq 'invoice' ) {
+ delete $form->{$_} foreach (qw(ordnumber id transdate deliverydate));
+ };
+
my $buysell;
if ($form->{script} eq 'ir.pl' || $form->{type} eq 'request_quotation') {
$form->{title} = $locale->text('Add Purchase Order');
@@ -959,9 +969,6 @@ sub quotation {
if ($form->{type} =~ /(sales|purchase)_order/) {
$form->{"converted_from_orderitems_id_$_"} = delete $form->{"orderitems_id_$_"} for 1 .. $form->{"rowcount"};
}
- # link doc order -> quotation (single id no multi mode)
- $form->{convert_from_oe_ids} = delete $form->{id};
-
if ($form->{second_run}) {
$form->{print_and_post} = 0;
}
@@ -1064,6 +1071,7 @@ sub edit_e_mail {
a_filename => $attachment_filename,
subject => $subject,
print_options => print_options('inline' => 1),
+ action => 'send_email',
HIDDEN => [ map +{ name => $_, value => $form->{$_} }, @hidden_keys ],
SHOW_BCC => $::auth->assert('email_bcc', 'may fail') });
@@ -1091,144 +1099,32 @@ sub send_email {
$main::lxdebug->leave_sub();
}
-# generate the printing options displayed at the bottom of oe and is forms.
-# this function will attempt to guess what type of form is displayed, and will generate according options
-#
-# about the coding:
-# this version builds the arrays of options pretty directly. if you have trouble understanding how,
-# the opthash function builds hashrefs which are then pieced together for the template arrays.
-# unneeded options are "undef"ed out, and then grepped out.
-#
-# the inline options is untested, but intended to be used later in metatemplating
sub print_options {
- $main::lxdebug->enter_sub();
+ $::lxdebug->enter_sub();
- my $form = $main::form;
- my %myconfig = %main::myconfig;
- my $locale = $main::locale;
+ my (%options) = @_;
_check_io_auth();
- my %options = @_;
-
- # names 3 parameters and returns a hashref, for use in templates
- sub opthash { +{ value => shift, selected => shift, oname => shift } }
- my (@FORMNAME, @LANGUAGE_ID, @FORMAT, @SENDMODE, @MEDIA, @PRINTER_ID, @SELECTS) = ();
-
- # note: "||"-selection is only correct for values where "0" is _not_ a correct entry
- $form->{sendmode} = "attachment";
- $form->{format} = $form->{format} || $myconfig{template_format} || "pdf";
- $form->{copies} = $form->{copies} || $myconfig{copies} || 3;
- $form->{media} = $form->{media} || $myconfig{default_media} || "screen";
- $form->{printer_id} = defined $form->{printer_id} ? $form->{printer_id} :
- defined $myconfig{default_printer_id} ? $myconfig{default_printer_id} : "";
-
- $form->{PD}{ $form->{formname} } = "selected";
- $form->{DF}{ $form->{format} } = "selected";
- $form->{OP}{ $form->{media} } = "selected";
- $form->{SM}{ $form->{formname} } = "selected";
-
- push @FORMNAME, grep $_,
- ($form->{type} eq 'purchase_order') ? (
- opthash("purchase_order", $form->{PD}{purchase_order}, $locale->text('Purchase Order')),
- opthash("bin_list", $form->{PD}{bin_list}, $locale->text('Bin List'))
- ) : undef,
- ($form->{type} eq 'credit_note') ?
- opthash("credit_note", $form->{PD}{credit_note}, $locale->text('Credit Note')) : undef,
- ($form->{type} eq 'sales_order') ? (
- opthash("sales_order", $form->{PD}{sales_order}, $locale->text('Confirmation')),
- opthash("proforma", $form->{PD}{proforma}, $locale->text('Proforma Invoice')),
- ) : undef,
- ($form->{type} =~ /sales_quotation$/) ?
- opthash('sales_quotation', $form->{PD}{sales_quotation}, $locale->text('Quotation')) : undef,
- ($form->{type} =~ /request_quotation$/) ?
- opthash('request_quotation', $form->{PD}{request_quotation}, $locale->text('Request for Quotation')) : undef,
- ($form->{type} eq 'invoice') ? (
- opthash("invoice", $form->{PD}{invoice}, $locale->text('Invoice')),
- opthash("proforma", $form->{PD}{proforma}, $locale->text('Proforma Invoice')),
- ) : undef,
- ($form->{type} eq 'invoice' && $form->{storno}) ? (
- opthash("storno_invoice", $form->{PD}{storno_invoice}, $locale->text('Storno Invoice')),
- ) : undef,
- ($form->{type} =~ /_delivery_order$/) ? (
- opthash($form->{type}, $form->{PD}{$form->{type}}, $locale->text('Delivery Order')),
- opthash('pick_list', $form->{PD}{pick_list}, $locale->text('Pick List')),
- ) : undef;
-
- push @SENDMODE,
- opthash("attachment", $form->{SM}{attachment}, $locale->text('Attachment')),
- opthash("inline", $form->{SM}{inline}, $locale->text('In-line'))
- if ($form->{media} eq 'email');
-
- my $printable_templates = any { $::lx_office_conf{print_templates}->{$_} } qw(latex opendocument);
- push @MEDIA, grep $_,
- opthash("screen", $form->{OP}{screen}, $locale->text('Screen')),
- ($printable_templates && $form->{printers} && scalar @{ $form->{printers} }) ?
- opthash("printer", $form->{OP}{printer}, $locale->text('Printer')) : undef,
- ($printable_templates && !$options{no_queue}) ?
- opthash("queue", $form->{OP}{queue}, $locale->text('Queue')) : undef
- if ($form->{media} ne 'email');
-
- push @FORMAT, grep $_,
- ($::lx_office_conf{print_templates}->{opendocument} && $::lx_office_conf{applications}->{openofficeorg_writer} && $::lx_office_conf{applications}->{xvfb}
- && (-x $::lx_office_conf{applications}->{openofficeorg_writer}) && (-x $::lx_office_conf{applications}->{xvfb})
- && !$options{no_opendocument_pdf}) ?
- opthash("opendocument_pdf", $form->{DF}{"opendocument_pdf"}, $locale->text("PDF (OpenDocument/OASIS)")) : undef,
- ($::lx_office_conf{print_templates}->{latex}) ?
- opthash("pdf", $form->{DF}{pdf}, $locale->text('PDF')) : undef,
- ($::lx_office_conf{print_templates}->{latex} && !$options{no_postscript}) ?
- opthash("postscript", $form->{DF}{postscript}, $locale->text('Postscript')) : undef,
- (!$options{no_html}) ?
- opthash("html", $form->{DF}{html}, "HTML") : undef,
- ($::lx_office_conf{print_templates}->{opendocument} && !$options{no_opendocument}) ?
- opthash("opendocument", $form->{DF}{opendocument}, $locale->text("OpenDocument/OASIS")) : undef,
- ($::lx_office_conf{print_templates}->{excel} && !$options{no_excel}) ?
- opthash("excel", $form->{DF}{excel}, $locale->text("Excel")) : undef;
-
- push @LANGUAGE_ID,
- map { opthash($_->{id}, ($_->{id} eq $form->{language_id} ? 'selected' : ''), $_->{description}) } +{}, @{ $form->{languages} }
- if (ref $form->{languages} eq 'ARRAY');
-
- push @PRINTER_ID,
- map { opthash($_->{id}, ($_->{id} eq $form->{printer_id} ? 'selected' : ''), $_->{printer_description}) } +{}, @{ $form->{printers} }
- if ((ref $form->{printers} eq 'ARRAY') && scalar @{ $form->{printers } });
-
- @SELECTS = map {
- sname => $_->[1],
- DATA => $_->[0],
- show => !$options{"hide_" . $_->[1]} && scalar @{ $_->[0] }
- },
- [ \@FORMNAME, 'formname', ],
- [ \@LANGUAGE_ID, 'language_id', ],
- [ \@FORMAT, 'format', ],
- [ \@SENDMODE, 'sendmode', ],
- [ \@MEDIA, 'media', ],
- [ \@PRINTER_ID, 'printer_id', ];
-
- my %dont_display_groupitems = (
- 'dunning' => 1,
- );
-
- my %template_vars = (
- display_copies => scalar @{ $form->{printers} || [] } && $::lx_office_conf{print_templates}->{latex} && $form->{media} ne 'email',
- display_remove_draft => (!$form->{id} && $form->{draft_id}),
- display_groupitems => !$dont_display_groupitems{$form->{type}},
- groupitems_checked => $form->{groupitems} ? "checked" : '',
- remove_draft_checked => $form->{remove_draft} ? "checked" : ''
- );
+ my $inline = delete $options{inline};
- my $print_options = $form->parse_html_template("generic/print_options", { SELECTS => \@SELECTS, %template_vars } );
+ require SL::Helper::PrintOptions;
+ my $print_options = SL::Helper::PrintOptions->get_print_options(
+ form => $::form,
+ myconfig => \%::myconfig,
+ locale => $::locale,
+ options => \%options);
- if ($options{inline}) {
- $main::lxdebug->leave_sub();
+ if ($inline) {
+ $::lxdebug->leave_sub();
return $print_options;
}
print $print_options;
-
- $main::lxdebug->leave_sub();
+ $::lxdebug->leave_sub();
}
+
sub print {
$main::lxdebug->enter_sub();
@@ -1263,7 +1159,7 @@ sub print {
$form->{formname} = $formname;
&edit();
$::lxdebug->leave_sub();
- ::end_of_request();
+ $::dispatcher->end_request;
}
&print_form($old_form);
@@ -1363,6 +1259,17 @@ sub print_form {
$order = 1;
}
+ if (($form->{type} eq 'sales_order') && ($form->{formname} eq 'ic_supply') ) {
+ $inv = "inv";
+ $due = "due";
+ $form->{"${inv}date"} = $form->{transdate};
+ $form->{"invdate"} = $form->{transdate};
+ $form->{invnumber} = $form->{ordnumber};
+ $form->{label} = $locale->text('Intra-Community supply');
+ $numberfld = "sonumber";
+ $order = 1;
+ }
+
if ($form->{formname} eq 'request_quotation') {
$inv = "quo";
$due = "req";
@@ -1503,11 +1410,13 @@ sub print_form {
format_dates($output_dateformat, $output_longdates,
qw(invdate orddate quodate pldate duedate reqdate transdate
shippingdate deliverydate validitydate paymentdate
- datepaid transdate_oe deliverydate_oe dodate
+ datepaid transdate_oe transdate_do transdate_quo deliverydate_oe dodate
employee_startdate employee_enddate
),
grep({ /^datepaid_\d+$/ ||
/^transdate_oe_\d+$/ ||
+ /^transdate_do_\d+$/ ||
+ /^transdate_quo_\d+$/ ||
/^deliverydate_oe_\d+$/ ||
/^reqdate_\d+$/ ||
/^deliverydate_\d+$/ ||
@@ -1694,7 +1603,7 @@ sub print_form {
}
call_sub($display_form);
- ::end_of_request();
+ $::dispatcher->end_request;
}
my $msg =
@@ -1708,7 +1617,7 @@ sub print_form {
}
if ($form->{printing}) {
call_sub($display_form);
- ::end_of_request();
+ $::dispatcher->end_request;
}
$main::lxdebug->leave_sub();
@@ -1761,22 +1670,25 @@ sub ship_to {
map { $::form->{$_} = $::form->parse_amount(\%::myconfig, $::form->{$_}) } qw(exchangerate creditlimit creditremaining);
# get details for customer/vendor
- call_sub($::form->{vc} . "_details", qw(name department_1 department_2 street zipcode city country contact email phone fax), $::form->{vc} . "number");
-
+ call_sub($::form->{vc} . "_details", qw(name department_1 department_2 street zipcode city country gln contact email phone fax), $::form->{vc} . "number");
$::form->{rowcount}--;
- my @shipto_vars = qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry
+ my $cvars = SL::DB::Shipto->new->cvars_by_config;
+ my @shipto_vars = qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptogln
shiptocontact shiptocp_gender shiptophone shiptofax shiptoemail
shiptodepartment_1 shiptodepartment_2);
- my $previous_form = $::auth->save_form_in_session(skip_keys => [ @shipto_vars, qw(header shipto_id) ]);
+ my $previous_form = $::auth->save_form_in_session(skip_keys => [ @shipto_vars, qw(header shipto_id), map { "shiptocvar_" . $_->config->name } @{ $cvars } ]);
$::form->{title} = $::locale->text('Ship to');
$::form->header;
my $vc_obj = ($::form->{vc} eq 'customer' ? "SL::DB::Customer" : "SL::DB::Vendor")->new(id => $::form->{$::form->{vc} . "_id"})->load;
+ $_->value($::form->{"shiptocvar_" . $_->config->name}) for @{ $cvars };
+
print $::form->parse_html_template('io/ship_to', { previousform => $previous_form,
nextsub => $::form->{display_form} || 'display_form',
vc_obj => $vc_obj,
+ cvars => $cvars,
});
$main::lxdebug->leave_sub();
@@ -1850,9 +1762,11 @@ sub _update_part_information {
foreach my $i (1..$form->{rowcount}) {
next unless ($form->{"id_${i}"});
- my $info = $form->{PART_INFORMATION}->{$form->{"id_${i}"}} || { };
- $form->{"partunit_${i}"} = $info->{unit};
- $form->{"weight_$i"} = $info->{weight};
+ my $info = $form->{PART_INFORMATION}->{$form->{"id_${i}"}} || { };
+ $form->{"partunit_${i}"} = $info->{unit};
+ $form->{"weight_$i"} = $info->{weight};
+ $form->{"part_type_$i"} = $info->{part_type};
+ $form->{"classification_id_$i"} = $info->{classification_id};
}
$main::lxdebug->leave_sub();
@@ -1872,36 +1786,21 @@ sub _update_ship {
my $all_units = AM->retrieve_all_units();
- my %ship = DO->get_shipped_qty('type' => ($form->{type} eq 'purchase_order') ? 'purchase' : 'sales',
- 'oe_id' => $form->{id},);
+ my %ship = DO->get_shipped_qty('oe_id' => $form->{id});
foreach my $i (1..$form->{rowcount}) {
next unless ($form->{"id_${i}"});
$form->{"ship_$i"} = 0;
- my $ship_entry = $ship{$form->{"id_$i"}};
-
- next if (!$ship_entry || ($ship_entry->{qty} <= 0));
-
- my $rowqty =
- ($form->{simple_save} ? $form->{"qty_$i"} : $form->parse_amount(\%myconfig, $form->{"qty_$i"}))
- * $all_units->{$form->{"unit_$i"}}->{factor}
- / $all_units->{$form->{"partunit_$i"}}->{factor};
+ my $ship_entry = $ship{$i};
- $form->{"ship_$i"} = min($rowqty, $ship_entry->{qty});
- $ship_entry->{qty} -= $form->{"ship_$i"};
- }
-
- foreach my $i (1..$form->{rowcount}) {
- next unless ($form->{"id_${i}"});
-
- my $ship_entry = $ship{$form->{"id_$i"}};
-
- next if (!$ship_entry || ($ship_entry->{qty} <= 0.01));
+ next if (!$ship_entry || ($ship_entry->{qty_ordered} <= 0));
- $form->{"ship_$i"} += $ship_entry->{qty};
- $ship_entry->{qty} = 0;
+ my $rowqty = $ship_entry->{qty_ordered} - $ship_entry->{qty_notdelivered};
+ $rowqty *= $all_units->{$form->{"unit_$i"}}->{factor} /
+ $all_units->{$form->{"partunit_$i"}}->{factor} if !$form->{simple_save};
+ $form->{"ship_$i"} = $rowqty;
}
$main::lxdebug->leave_sub();
@@ -2050,15 +1949,18 @@ sub _make_record_item {
: $class->new;
for my $method (apply { s/_$row$// } grep { /_$row$/ } keys %$::form) {
- next unless $obj->meta->column($method);
- if ($obj->meta->column($method)->isa('Rose::DB::Object::Metadata::Column::Date')) {
- $obj->${\"$method\_as_date"}($::form->{"$method\_$row"});
- } elsif ((ref $obj->meta->column($method)) =~ /^Rose::DB::Object::Metadata::Column::(?:Numeric|Float|DoublePrecsion)$/) {
- $obj->${\"$method\_as_number"}($::form->{"$method\_$row"});
- } elsif ((ref $obj->meta->column($method)) =~ /^Rose::DB::Object::Metadata::Column::Boolean$/) {
- $obj->$method(!!$::form->{$method});
+ if ($obj->meta->column($method)) {
+ if ($obj->meta->column($method)->isa('Rose::DB::Object::Metadata::Column::Date')) {
+ $obj->${\"$method\_as_date"}($::form->{"$method\_$row"});
+ } elsif ((ref $obj->meta->column($method)) =~ /^Rose::DB::Object::Metadata::Column::(?:Numeric|Float|DoublePrecsion)$/) {
+ $obj->${\"$method\_as_number"}($::form->{"$method\_$row"});
+ } elsif ((ref $obj->meta->column($method)) =~ /^Rose::DB::Object::Metadata::Column::Boolean$/) {
+ $obj->$method(!!$::form->{$method});
+ } else {
+ $obj->$method($::form->{"$method\_$row"});
+ }
} else {
- $obj->$method($::form->{"$method\_$row"});
+ $obj->{__additional_form_attributes}{$method} = $::form->{"$method\_$row"};
}
}