X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fio.pl;h=081bc3f610566d64b724f7777bc5fc529980a5e3;hb=cd1d67a18323316949089f5db8a7269c26adf205;hp=7b97beb43c0fcef7bab9d88382e9b61024fc4e80;hpb=59d350af569acf4d081454c32bf724872aa48307;p=kivitendo-erp.git
diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 7b97beb43..081bc3f61 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -35,11 +35,13 @@
use CGI;
use CGI::Ajax;
-use List::Util qw(max);
+use List::Util qw(max first);
+use SL::CVar;
use SL::Common;
use SL::CT;
use SL::IC;
+use SL::IO;
require "bin/mozilla/common.pl";
@@ -92,8 +94,31 @@ use Data::Dumper;
########################################
sub display_row {
$lxdebug->enter_sub();
+
+ $auth->assert('part_service_assembly_edit | vendor_invoice_edit | sales_order_edit | invoice_edit |' .
+ 'request_quotation_edit | sales_quotation_edit | purchase_order_edit | ' .
+ 'sales_delivery_order_edit | purchase_delivery_order_edit');
+
my $numrows = shift;
+ my ($readonly, $stock_in_out, $stock_in_out_title);
+
+ my $is_purchase = (first { $_ eq $form->{type} } qw(request_quotation purchase_order purchase_delivery_order)) || ($form->{script} eq 'ir.pl');
+ my $show_min_order_qty = first { $_ eq $form->{type} } qw(request_quotation purchase_order);
+ my $is_delivery_order = $form->{type} =~ /_delivery_order$/;
+
+ if ($is_delivery_order) {
+ $readonly = ' readonly' if ($form->{closed});
+
+ if ($form->{type} eq 'sales_delivery_order') {
+ $stock_in_out_title = $locale->text('Release From Stock');
+ $stock_in_out = 'out';
+ } else {
+ $stock_in_out_title = $locale->text('Transfer To Stock');
+ $stock_in_out = 'in';
+ }
+ }
+
# column_index
my @header_sort = qw(runningnumber partnumber description ship qty unit sellprice_pg sellprice discount linetotal);
my @HEADER = (
@@ -103,15 +128,17 @@ sub display_row {
{ id => 'ship', width => 5, value => ($form->{type} eq 'purchase_order' ? $locale->text('Ship rcvd') : $locale->text('Ship')),
display => $form->{type} =~ /sales_order/ || ($form->{type} =~ /purchase_order/ && !($lizenzen && $form->{vc} eq "customer")) , },
{ id => 'qty', width => 5, value => $locale->text('Qty'), display => 1, },
+ { id => 'price_factor', width => 5, value => $locale->text('Price Factor'), display => 1, },
{ id => 'unit', width => 5, value => $locale->text('Unit'), display => 1, },
{ id => 'license', width => 10, value => $locale->text('License'), display => 0, },
{ id => 'serialnr', width => 10, value => $locale->text('Serial No.'), display => 0, },
{ id => 'projectnr', width => 10, value => $locale->text('Project'), display => 0, },
- { id => 'sellprice', width => 15, value => $locale->text('Price'), display => 1, },
- { id => 'sellprice_pg', width => 15, value => $locale->text('Pricegroup'), display => $form->{type} =~ /^sales_/, },
- { id => 'discount', width => 5, value => $locale->text('Discount'), display => $form->{vc} eq 'customer', },
- { id => 'linetotal', width => 10, value => $locale->text('Extended'), display => 1, },
+ { id => 'sellprice', width => 15, value => $locale->text('Price'), display => !$is_delivery_order, },
+ { id => 'sellprice_pg', width => 15, value => $locale->text('Pricegroup'), display => ($form->{type} =~ /^sales_/) && !$is_delivery_order, },
+ { id => 'discount', width => 5, value => $locale->text('Discount'), display => ($form->{vc} eq 'customer') && !$is_delivery_order, },
+ { id => 'linetotal', width => 10, value => $locale->text('Extended'), display => !$is_delivery_order, },
{ id => 'bin', width => 10, value => $locale->text('Bin'), display => 0, },
+ { id => 'stock_in_out', width => 10, value => $stock_in_out_title, display => $is_delivery_order, },
);
my @column_index = map { $_->{id} } grep { $_->{display} } @HEADER;
@@ -142,7 +169,8 @@ sub display_row {
$deliverydate = $locale->text('Required by');
# special alignings
- my %align = map { $_ => 'right' } qw(qty ship right sellprice_pg discount linetotal);
+ my %align = map { $_ => 'right' } qw(qty ship right sellprice_pg discount linetotal stock_in_out);
+ my %nowrap = map { $_ => 1 } qw(description unit);
$form->{marge_total} = 0;
$form->{sellprice_total} = 0;
@@ -181,21 +209,21 @@ sub display_row {
$this_unit = $form->{"selected_unit_$i"} if AM->convert_unit($this_unit, $form->{"selected_unit_$i"}, $all_units);
$this_unit ||= "kg";
- my $price_factor_select;
if (0 < scalar @{ $form->{ALL_PRICE_FACTORS} }) {
my @values = ('', map { $_->{id} } @{ $form->{ALL_PRICE_FACTORS} });
my %labels = map { $_->{id} => $_->{description} } @{ $form->{ALL_PRICE_FACTORS} };
- $price_factor_select =
+ $column_data{price_factor} =
NTI($cgi->popup_menu('-name' => "price_factor_id_$i",
'-default' => $form->{"price_factor_id_$i"},
'-values' => \@values,
'-labels' => \%labels,
- '-style' => 'width:90px'))
- . ' ';
+ '-style' => 'width:90px'));
+ } else {
+ $column_data{price_factor} = ' ';
}
- $column_data{"unit"} = $price_factor_select . AM->unit_select_html($local_units, "unit_$i", $this_unit, $form->{"id_$i"} ? $form->{"unit_$i"} : undef);
+ $column_data{"unit"} = AM->unit_select_html($local_units, "unit_$i", $this_unit, $form->{"id_$i"} ? $form->{"unit_$i"} : undef);
# / unit ending
$form->{"sellprice_$i"} =~ /\.(\d+)/;
@@ -249,7 +277,11 @@ sub display_row {
$column_data{linetotal} = $form->format_amount(\%myconfig, $linetotal, 2);
$column_data{bin} = $form->{"bin_$i"};
- my @ROW1 = map { value => $column_data{$_}, align => $align{$_} }, @column_index;
+ if ($is_delivery_order) {
+ $column_data{stock_in_out} = (!$form->{"assembly_$i"} && $form->{"inventory_accno_$i"}) ? calculate_stock_in_out($i) : ' ';
+ }
+
+ my @ROW1 = map { value => $column_data{$_}, align => $align{$_}, nowrap => $nowrap{$_} }, @column_index;
# second row
my @ROW2 = ();
@@ -288,23 +320,33 @@ sub display_row {
$marge_color, $locale->text('Ertrag'),$form->{"marge_absolut_$i"}, $form->{"marge_percent_$i"},
$locale->text('LP'), $form->format_amount(\%myconfig, $form->{"listprice_$i"}, 2),
$locale->text('EK'), $form->format_amount(\%myconfig, $form->{"lastcost_$i"}, 2) }
- if $form->{"id_$i"} && $form->{type} =~ /^sales_/;
+ if $form->{"id_$i"} && $form->{type} =~ /^sales_/ && !$is_delivery_order;
# / marge calculations ending
+ my @hidden_vars;
+
+ if ($is_delivery_order) {
+ map { $form->{"${_}_${i}"} = $form->format_amount(\%myconfig, $form->{"${_}_${i}"}) } qw(sellprice discount);
+ push @hidden_vars, qw(sellprice discount);
+ push @hidden_vars, "stock_${stock_in_out}_sum_qty", "stock_${stock_in_out}";
+ }
+
+ push @hidden_vars, qw(partunit) if ($is_purchase);
+
my @HIDDENS = map { value => $_}, (
$cgi->hidden("-name" => "unit_old_$i", "-value" => $form->{"selected_unit_$i"}),
$cgi->hidden("-name" => "price_new_$i", "-value" => $form->format_amount(\%myconfig, $form->{"price_new_$i"})),
map { ($cgi->hidden("-name" => $_, "-value" => $form->{$_})); } map { $_."_$i" }
- qw(orderitems_id bo pricegroup_old price_old id inventory_accno bin partsgroup partnotes
- income_accno expense_accno listprice assembly taxaccounts ordnumber transdate cusordnumber
- longdescription basefactor marge_absolut marge_percent marge_price_factor lastcost)
+ (qw(orderitems_id bo pricegroup_old price_old id inventory_accno bin partsgroup partnotes
+ income_accno expense_accno listprice assembly taxaccounts ordnumber transdate cusordnumber
+ longdescription basefactor marge_absolut marge_percent marge_price_factor lastcost), @hidden_vars)
);
map { $form->{"${_}_base"} += $linetotal } (split(/ /, $form->{"taxaccounts_$i"}));
$form->{invsubtotal} += $linetotal;
- push @ROWS, { ROW1 => \@ROW1, ROW2 => \@ROW2, HIDDENS => \@HIDDENS, colspan => $colspan, };
+ push @ROWS, { ROW1 => \@ROW1, ROW2 => \@ROW2, HIDDENS => \@HIDDENS, colspan => $colspan, error => $form->{"row_error_$i"}, };
}
print $form->parse_html_template('oe/sales_order', { ROWS => \@ROWS,
@@ -323,6 +365,10 @@ sub display_row {
sub set_pricegroup {
$lxdebug->enter_sub();
+
+ $auth->assert('part_service_assembly_edit | vendor_invoice_edit | sales_order_edit | invoice_edit |' .
+ 'request_quotation_edit | sales_quotation_edit | purchase_order_edit');
+
my $rowcount = shift;
for $j (1 .. $rowcount) {
next unless $form->{PRICES}{$j};
@@ -343,6 +389,10 @@ sub set_pricegroup {
sub select_item {
$lxdebug->enter_sub();
+
+ $auth->assert('part_service_assembly_edit | vendor_invoice_edit | sales_order_edit | invoice_edit |' .
+ 'request_quotation_edit | sales_quotation_edit | purchase_order_edit');
+
@column_index = qw(ndx partnumber description onhand unit sellprice);
$column_data{ndx} = qq|| | |;
@@ -448,6 +498,7 @@ sub select_item {
# save all other form variables
foreach $key (keys %${form}) {
+ next if (($key eq 'login') || ($key eq 'password') || ('' ne ref $form->{$key}));
$form->{$key} =~ s/\"/"/g;
print qq|\n|;
}
@@ -470,6 +521,9 @@ sub select_item {
sub item_selected {
$lxdebug->enter_sub();
+ $auth->assert('part_service_assembly_edit | vendor_invoice_edit | sales_order_edit | invoice_edit |' .
+ 'request_quotation_edit | sales_quotation_edit | purchase_order_edit');
+
# replace the last row with the checked row
$i = $form->{rowcount};
$i = $form->{assembly_rows} if ($form->{item} eq 'assembly');
@@ -568,6 +622,9 @@ sub item_selected {
sub new_item {
$lxdebug->enter_sub();
+ $auth->assert('part_service_assembly_edit | vendor_invoice_edit | sales_order_edit | invoice_edit |' .
+ 'request_quotation_edit | sales_quotation_edit | purchase_order_edit');
+
# change callback
$form->{old_callback} = $form->escape($form->{callback}, 1);
$form->{callback} = $form->escape("$form->{script}?action=display_form", 1);
@@ -576,7 +633,7 @@ sub new_item {
my $previousform = join '&', map { $form->{$_} =~ s/&/%26/; "$_=$form->{$_}" } grep { !/action/ } keys %$form;
push @HIDDENS, { 'name' => 'previousform', 'value' => $form->escape($previousform, 1) };
- push @HIDDENS, map +{ 'name' => $_, 'value' => $form->{$_} }, qw(rowcount vc login password);
+ push @HIDDENS, map +{ 'name' => $_, 'value' => $form->{$_} }, qw(rowcount vc);
push @HIDDENS, map +{ 'name' => $_, 'value' => $form->{"${_}_$form->{rowcount}"} }, qw(partnumber description unit sellprice);
push @HIDDENS, { 'name' => 'taxaccount2', 'value' => $form->{taxaccounts} };
@@ -588,29 +645,28 @@ sub new_item {
sub check_form {
$lxdebug->enter_sub();
+
+ $auth->assert('part_service_assembly_edit | vendor_invoice_edit | sales_order_edit | invoice_edit |' .
+ 'request_quotation_edit | sales_quotation_edit | purchase_order_edit');
+
my @a = ();
my $count = 0;
- my @flds = (qw(id partnumber description qty ship sellprice unit discount inventory_accno income_accno expense_accno listprice taxaccounts bin assembly weight projectnumber project_id oldprojectnumber runningnumber serialnumber partsgroup payment_id not_discountable shop ve gv buchungsgruppen_id language_values sellprice_pg pricegroup_old price_old price_new unit_old ordnumber transdate longdescription basefactor marge_total marge_percent marge_price_factor lastcost price_factor_id));
+
+ my @flds = qw(id partnumber description qty ship sellprice unit
+ discount inventory_accno income_accno expense_accno listprice
+ taxaccounts bin assembly weight projectnumber project_id
+ oldprojectnumber runningnumber serialnumber partsgroup payment_id
+ not_discountable shop ve gv buchungsgruppen_id language_values
+ sellprice_pg pricegroup_old price_old price_new unit_old ordnumber
+ transdate longdescription basefactor marge_total marge_percent
+ marge_price_factor lastcost price_factor_id
+ stock_out stock_in);
# remove any makes or model rows
if ($form->{item} eq 'part') {
map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) }
qw(listprice sellprice lastcost weight rop);
- @flds = (make, model);
- for my $i (1 .. ($form->{makemodel_rows})) {
- if (($form->{"make_$i"} ne "") || ($form->{"model_$i"} ne "")) {
- push @a, {};
- my $j = $#a;
-
- map { $a[$j]->{$_} = $form->{"${_}_$i"} } @flds;
- $count++;
- }
- }
-
- $form->redo_rows(\@flds, \@a, $count, $form->{makemodel_rows});
- $form->{makemodel_rows} = $count;
-
} elsif ($form->{item} eq 'assembly') {
$form->{sellprice} = 0;
@@ -643,23 +699,6 @@ sub check_form {
$form->redo_rows(\@flds, \@a, $count, $form->{assembly_rows});
$form->{assembly_rows} = $count;
- $count = 0;
- @flds = qw(make model);
- @a = ();
-
- for my $i (1 .. ($form->{makemodel_rows})) {
- if (($form->{"make_$i"} ne "") || ($form->{"model_$i"} ne "")) {
- push @a, {};
- my $j = $#a;
-
- map { $a[$j]->{$_} = $form->{"${_}_$i"} } @flds;
- $count++;
- }
- }
-
- $form->redo_rows(\@flds, \@a, $count, $form->{makemodel_rows});
- $form->{makemodel_rows} = $count;
-
} elsif ($form->{item} eq 'service') {
map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } qw(listprice sellprice lastcost);
@@ -715,6 +754,9 @@ sub check_form {
sub invoicetotal {
$lxdebug->enter_sub();
+ $auth->assert('part_service_assembly_edit | vendor_invoice_edit | sales_order_edit | invoice_edit |' .
+ 'request_quotation_edit | sales_quotation_edit | purchase_order_edit');
+
$form->{oldinvtotal} = 0;
# add all parts and deduct paid
@@ -753,6 +795,9 @@ sub invoicetotal {
sub validate_items {
$lxdebug->enter_sub();
+ $auth->assert('part_service_assembly_edit | vendor_invoice_edit | sales_order_edit | invoice_edit |' .
+ 'request_quotation_edit | sales_quotation_edit | purchase_order_edit');
+
# check if items are valid
if ($form->{rowcount} == 1) {
&update;
@@ -769,6 +814,10 @@ sub validate_items {
sub order {
$lxdebug->enter_sub();
+
+ $auth->assert('part_service_assembly_edit | vendor_invoice_edit | sales_order_edit | invoice_edit |' .
+ 'request_quotation_edit | sales_quotation_edit | purchase_order_edit');
+
if ($form->{second_run}) {
$form->{print_and_post} = 0;
}
@@ -836,6 +885,10 @@ sub order {
sub quotation {
$lxdebug->enter_sub();
+
+ $auth->assert('part_service_assembly_edit | vendor_invoice_edit | sales_order_edit | invoice_edit |' .
+ 'request_quotation_edit | sales_quotation_edit | purchase_order_edit');
+
if ($form->{second_run}) {
$form->{print_and_post} = 0;
}
@@ -901,6 +954,9 @@ sub request_for_quotation {
sub edit_e_mail {
$lxdebug->enter_sub();
+ $auth->assert('part_service_assembly_edit | vendor_invoice_edit | sales_order_edit | invoice_edit |' .
+ 'request_quotation_edit | sales_quotation_edit | purchase_order_edit');
+
if ($form->{second_run}) {
$form->{print_and_post} = 0;
$form->{resubmit} = 0;
@@ -924,7 +980,7 @@ sub edit_e_mail {
$form->header;
my (@dont_hide_key_list, %dont_hide_key, @hidden_keys);
- @dont_hide_key_list = qw(action email cc bcc subject message sendmode format header override);
+ @dont_hide_key_list = qw(action email cc bcc subject message sendmode format header override login password);
@dont_hide_key{@dont_hide_key_list} = (1) x @dont_hide_key_list;
@hidden_keys = sort grep { !$dont_hide_key{$_} } grep { !ref $form->{$_} } keys %$form;
@@ -941,9 +997,11 @@ sub edit_e_mail {
sub send_email {
$lxdebug->enter_sub();
+ $auth->assert('part_service_assembly_edit | vendor_invoice_edit | sales_order_edit | invoice_edit |' .
+ 'request_quotation_edit | sales_quotation_edit | purchase_order_edit');
+
my $callback = $form->{script} . "?action=edit";
- map({ $callback .= "\&${_}=" . E($form->{$_}); }
- qw(login password type id));
+ map({ $callback .= "\&${_}=" . E($form->{$_}); } qw(type id));
print_form("return");
@@ -967,6 +1025,10 @@ sub send_email {
sub print_options {
$lxdebug->enter_sub();
+ $auth->assert('part_service_assembly_edit | vendor_invoice_edit | sales_order_edit | invoice_edit |' .
+ 'request_quotation_edit | sales_quotation_edit | purchase_order_edit | dunning_edit |' .
+ 'sales_delivery_order_edit | purchase_delivery_order_edit');
+
my %options = @_;
# names 3 parameters and returns a hashref, for use in templates
@@ -996,20 +1058,23 @@ sub print_options {
($form->{type} eq 'sales_order') ? (
opthash("sales_order", $form->{PD}{sales_order}, $locale->text('Confirmation')),
opthash("proforma", $form->{PD}{proforma}, $locale->text('Proforma Invoice')),
- opthash("pick_list", $form->{PD}{pick_list}, $locale->text('Pick List')),
- opthash("packing_list", $form->{PD}{packing_list}, $locale->text('Packing List'))
) : undef,
- ($form->{type} =~ /_quotation$/) ?
- opthash("$`_quotation", $form->{PD}{"$`_quotation"}, $locale->text('Quotation')) : 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')),
- opthash("packing_list", $form->{PD}{packing_list}, $locale->text('Packing List'))
) : undef,
($form->{type} eq 'invoice' && $form->{storno}) ? (
opthash("storno_invoice", $form->{PD}{storno_invoice}, $locale->text('Storno Invoice')),
opthash("storno_packing_list", $form->{PD}{storno_packing_list}, $locale->text('Storno Packing List'))
) : 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;
($form->{type} eq 'credit_note') ?
opthash("credit_note", $form->{PD}{credit_note}, $locale->text('Credit Note')) : undef;
@@ -1022,21 +1087,21 @@ sub print_options {
opthash("screen", $form->{OP}{screen}, $locale->text('Screen')),
(scalar @{ $form->{printers} } && $latex_templates) ?
opthash("printer", $form->{OP}{printer}, $locale->text('Printer')) : undef,
- ($latex_templates && !$options->{no_queue}) ?
+ ($latex_templates && !$options{no_queue}) ?
opthash("queue", $form->{OP}{queue}, $locale->text('Queue')) : undef
if ($form->{media} ne 'email');
push @FORMAT, grep $_,
($opendocument_templates && $openofficeorg_writer_bin && $xvfb_bin && (-x $openofficeorg_writer_bin) && (-x $xvfb_bin)
- && !$options->{no_opendocument_pdf}) ?
+ && !$options{no_opendocument_pdf}) ?
opthash("opendocument_pdf", $form->{DF}{"opendocument_pdf"}, $locale->text("PDF (OpenDocument/OASIS)")) : undef,
($latex_templates) ?
opthash("pdf", $form->{DF}{pdf}, $locale->text('PDF')) : undef,
- ($latex_templates && !$options->{no_postscript}) ?
+ ($latex_templates && !$options{no_postscript}) ?
opthash("postscript", $form->{DF}{postscript}, $locale->text('Postscript')) : undef,
- (!$options->{no_html}) ?
+ (!$options{no_html}) ?
opthash("html", $form->{DF}{html}, "HTML") : undef,
- ($opendocument_templates && !$options->{no_opendocument}) ?
+ ($opendocument_templates && !$options{no_opendocument}) ?
opthash("opendocument", $form->{DF}{opendocument}, $locale->text("OpenDocument/OASIS")) : undef;
push @LANGUAGE_ID,
@@ -1076,6 +1141,10 @@ sub print_options {
sub print {
$lxdebug->enter_sub();
+ $auth->assert('part_service_assembly_edit | vendor_invoice_edit | sales_order_edit | invoice_edit |' .
+ 'request_quotation_edit | sales_quotation_edit | purchase_order_edit | ' .
+ 'order_request_edit_all | order_request_edit');
+
if ($form->{print_nextsub}) {
call_sub($form->{print_nextsub});
$lxdebug->leave_sub();
@@ -1110,6 +1179,11 @@ sub print {
sub print_form {
$lxdebug->enter_sub();
+
+ $auth->assert('part_service_assembly_edit | vendor_invoice_edit | sales_order_edit | invoice_edit |' .
+ 'request_quotation_edit | sales_quotation_edit | purchase_order_edit |' .
+ 'sales_delivery_order_edit | purchase_delivery_order_edit');
+
my ($old_form) = @_;
$inv = "inv";
@@ -1170,14 +1244,6 @@ sub print_form {
# set invnumber for template packing_list
$form->{invnumber} = $form->{ordnumber};
}
- if ($form->{formname} eq 'pick_list') {
- $inv = "ord";
- $due = "req";
- $form->{"${inv}date"} =
- ($form->{transdate}) ? $form->{transdate} : $form->{invdate};
- $form->{label} = $locale->text('Pick List');
- $order = 1 unless $form->{type} eq 'invoice';
- }
if ($form->{formname} eq 'purchase_order') {
$inv = "ord";
$due = "req";
@@ -1221,6 +1287,14 @@ sub print_form {
$order = 1;
}
+ if ($form->{type} =~ /_delivery_order$/) {
+ undef $due;
+ $inv = "do";
+ $form->{"${inv}date"} = $form->{transdate};
+ $numberfld = $form->{type} =~ /^sales/ ? 'sdonumber' : 'pdonumber';
+ $form->{label} = $form->{formname} eq 'pick_list' ? $locale->text('Pick List') : $locale->text('Delivery Order');
+ }
+
$form->isblank("email", $locale->text('E-mail address missing!'))
if ($form->{media} eq 'email');
$form->isblank("${inv}date",
@@ -1274,7 +1348,7 @@ sub print_form {
$salesman_id_saved = $form->{salesman_id};
$cp_id_saved = $form->{cp_id};
- call_sub("$form->{vc}_details");
+ call_sub("$form->{vc}_details") if ($form->{vc});
$form->{language_id} = $language_saved;
$form->{payment_id} = $payment_id_saved;
@@ -1303,7 +1377,15 @@ sub print_form {
($form->{employee}) = split /--/, $form->{employee};
# create the form variables
- if ($order) {
+ if ($form->{formname} eq 'order_request') {
+ order_request_details();
+ } elsif ($form->{formname} eq 'return_material_slip') {
+ rms_details();
+ } elsif ($form->{formname} eq 'release_material_slip') {
+ rlms_details();
+ } elsif ($form->{type} =~ /_delivery_order$/) {
+ DO->order_details();
+ } elsif ($order) {
OE->order_details(\%myconfig, \%$form);
} else {
IS->invoice_details(\%myconfig, \%$form, $locale);
@@ -1397,6 +1479,16 @@ sub print_form {
grep({ /^qty_\d+$/
} keys(%{$form})));
+ my ($cvar_date_fields, $cvar_number_fields) = CVar->get_field_format_list('module' => 'CT', 'prefix' => 'vc_');
+
+ if (scalar @{ $cvar_date_fields }) {
+ format_dates($output_dateformat, $output_longdates, @{ $cvar_date_fields });
+ }
+
+ while (my ($precision, $field_list) = each %{ $cvar_number_fields }) {
+ reformat_numbers($output_numberformat, $precision, @{ $field_list });
+ }
+
$form->{IN} = "$form->{formname}$form->{language}${printer_code}.html";
if ($form->{format} eq 'postscript') {
$form->{postscript} = 1;
@@ -1547,6 +1639,9 @@ sub vendor_details {
sub post_as_new {
$lxdebug->enter_sub();
+ $auth->assert('part_service_assembly_edit | vendor_invoice_edit | sales_order_edit | invoice_edit |' .
+ 'request_quotation_edit | sales_quotation_edit | purchase_order_edit');
+
$form->{postasnew} = 1;
map { delete $form->{$_} } qw(printed emailed queued);
@@ -1557,6 +1652,10 @@ sub post_as_new {
sub ship_to {
$lxdebug->enter_sub();
+
+ $auth->assert('part_service_assembly_edit | vendor_invoice_edit | sales_order_edit | invoice_edit |' .
+ 'request_quotation_edit | sales_quotation_edit | purchase_order_edit');
+
if ($form->{second_run}) {
$form->{print_and_post} = 0;
}
@@ -1685,6 +1784,7 @@ sub ship_to {
$form->{title} = $title;
foreach $key (keys %$form) {
+ next if (($key eq 'login') || ($key eq 'password') || ('' ne ref $form->{$key}));
$form->{$key} =~ s/\"/"/g;
print qq|\n|;
}
@@ -1708,6 +1808,9 @@ sub ship_to {
sub new_license {
$lxdebug->enter_sub();
+ $auth->assert('part_service_assembly_edit | vendor_invoice_edit | sales_order_edit | invoice_edit |' .
+ 'request_quotation_edit | sales_quotation_edit | purchase_order_edit');
+
my $row = shift;
# change callback
@@ -1723,6 +1826,7 @@ sub new_license {
# save all other form variables in a previousform variable
$form->{row} = $row;
foreach $key (keys %$form) {
+ next if (($key eq 'login') || ($key eq 'password') || ('' ne ref $form->{$key}));
# escape ampersands
$form->{$key} =~ s/&/%26/g;
@@ -1737,7 +1841,7 @@ sub new_license {
map { $form->{$_} = $form->escape($form->{$_}, 1) }
qw(partnumber description);
$form->{callback} =
- qq|$form->{script}?login=$form->{login}&password=$form->{password}&action=add&vc=$form->{db}&$form->{db}_id=$form->{id}&$form->{db}=$name&type=$form->{type}&customer=$customer&partnumber=$form->{partnumber}&description=$form->{description}&previousform="$previousform"&initial=1|;
+ qq|$form->{script}?action=add&vc=$form->{db}&$form->{db}_id=$form->{id}&$form->{db}=$name&type=$form->{type}&customer=$customer&partnumber=$form->{partnumber}&description=$form->{description}&previousform="$previousform"&initial=1|;
$form->redirect;
$lxdebug->leave_sub();
@@ -1746,6 +1850,9 @@ sub new_license {
sub relink_accounts {
$lxdebug->enter_sub();
+ $auth->assert('part_service_assembly_edit | vendor_invoice_edit | sales_order_edit | invoice_edit |' .
+ 'request_quotation_edit | sales_quotation_edit | purchase_order_edit');
+
$form->{"taxaccounts"} =~ s/\s*$//;
$form->{"taxaccounts"} =~ s/^\s*//;
foreach my $accno (split(/\s*/, $form->{"taxaccounts"})) {
@@ -1765,6 +1872,9 @@ sub relink_accounts {
sub set_duedate {
$lxdebug->enter_sub();
+ $auth->assert('part_service_assembly_edit | vendor_invoice_edit | sales_order_edit | invoice_edit |' .
+ 'request_quotation_edit | sales_quotation_edit | purchase_order_edit');
+
$form->get_duedate(\%myconfig);
my $q = new CGI;