X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Foe.pl;h=cb55f0714f7fb776811dafe350bb61293ee8cdea;hb=29d636435456494e8dc702ccc1015452a71275d9;hp=91e178dc589ca4c0425a3269a1dda954a7ddc7e9;hpb=4dbb09950c9f5596646537c12d991c99086fe7c1;p=kivitendo-erp.git diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl index 91e178dc5..cb55f0714 100644 --- a/bin/mozilla/oe.pl +++ b/bin/mozilla/oe.pl @@ -1,4 +1,4 @@ -#===================================================================== +# #===================================================================== # LX-Office ERP # Copyright (C) 2004 # Based on SQL-Ledger Version 2.1.9 @@ -31,41 +31,79 @@ # Quotation module #====================================================================== +use POSIX qw(strftime); use SL::OE; use SL::IR; use SL::IS; use SL::PE; +use SL::ReportGenerator; -require "$form->{path}/io.pl"; -require "$form->{path}/arap.pl"; +require "bin/mozilla/io.pl"; +require "bin/mozilla/arap.pl"; +require "bin/mozilla/reportgenerator.pl"; 1; + # end of main +# 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'); -sub add { +# $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'; } - $form->{callback} = "$form->{script}?action=add&type=$form->{type}&vc=$form->{vc}&login=$form->{login}&path=$form->{path}&password=$form->{password}" unless $form->{callback}; - + $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}&password=$form->{password}" + unless $form->{callback}; + &order_links; &prepare_order; &display_form; @@ -73,312 +111,585 @@ sub add { $lxdebug->leave_sub(); } - sub edit { $lxdebug->enter_sub(); + # show history button + $form->{javascript} = qq||; + #/show hhistory button - 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'; + $form->{simple_save} = 0; + + set_headings("edit"); + + # editing without stuff to edit? try adding it first + if ($form->{rowcount} && !$form->{print_and_save}) { + map { $id++ if $form->{"multi_id_$_"} } (1 .. $form->{rowcount}); + if (!$id) { + + # reset rowcount + undef $form->{rowcount}; + &add; + $lxdebug->leave_sub(); + return; + } + } elsif (!$form->{id}) { + &add; + $lxdebug->leave_sub(); + return; } - 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(); } - - sub order_links { $lxdebug->enter_sub(); # get customer/vendor - $form->all_vc(\%myconfig, $form->{vc}, ($form->{vc} eq 'customer') ? "AR" : "AP"); - + $form->all_vc(\%myconfig, $form->{vc}, + ($form->{vc} eq 'customer') ? "AR" : "AP"); + # retrieve order/quotation - $form->{webdav} = $webdav; - - # set jscalendar - $form->{jscalendar} = $jscalendar; - + $form->{webdav} = $webdav; + $form->{jsscript} = 1; + + my $editing = $form->{id}; + 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}; + } + + $salesman_id = $form->{salesman_id} if ($editing); + + + # if multiple rowcounts (== collective order) then check if the + # there were more than one customer (in that case OE::retrieve removes + # the content from the field) + if ( $form->{rowcount} + && $form->{type} eq 'sales_order' + && 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}; $form->{shipto} = 1 if $form->{id}; - + if ($form->{"all_$form->{vc}"}) { unless ($form->{"$form->{vc}_id"}) { $form->{"$form->{vc}_id"} = $form->{"all_$form->{vc}"}->[0]->{id}; } } - - $cp_id = $form->{cp_id}; - $intnotes=$form->{intnotes}; + + $cp_id = $form->{cp_id}; + $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; - - $form->{intnotes}=$intnotes; - ($form->{$form->{vc}}) = split /--/, $form->{$form->{vc}}; - $form->{"old$form->{vc}"} = qq|$form->{$form->{vc}}--$form->{"$form->{vc}_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 if $intnotes; + ($form->{ $form->{vc} }) = split /--/, $form->{ $form->{vc} }; + $form->{"old$form->{vc}"} = + qq|$form->{$form->{vc}}--$form->{"$form->{vc}_id"}|; # build the popup menus if (@{ $form->{"all_$form->{vc}"} }) { - $form->{$form->{vc}} = qq|$form->{$form->{vc}}--$form->{"$form->{vc}_id"}|; - map { $form->{"select$form->{vc}"} .= "$_->{name}--$_->{id}\n" } (@{ $form->{"all_$form->{vc}"} }); + $form->{ $form->{vc} } = + qq|$form->{$form->{vc}}--$form->{"$form->{vc}_id"}|; + map { $form->{"select$form->{vc}"} .= +"$_->{name}--$_->{id}\n" } + (@{ $form->{"all_$form->{vc}"} }); } - - # currencies - @curr = split /:/, $form->{currencies}; - chomp $curr[0]; - $form->{defaultcurrency} = $curr[0]; - $form->{currency} = $form->{defaultcurrency} unless $form->{currency}; - - map { $form->{selectcurrency} .= "$_\n" } @curr; $form->{taxincluded} = $taxincluded if ($form->{id}); # departments if (@{ $form->{all_departments} }) { $form->{selectdepartment} = "\n"; - $form->{department} = "$form->{department}--$form->{department_id}"; + $form->{department} = "$form->{department}--$form->{department_id}"; - map { $form->{selectdepartment} .= "$_->{description}--$_->{id}\n" } (@{ $form->{all_departments} }); + map { + $form->{selectdepartment} .= + "$_->{description}--$_->{id}\n" + } (@{ $form->{all_departments} }); } - + $form->{employee} = "$form->{employee}--$form->{employee_id}"; - # sales staff - if (@{ $form->{all_employees} }) { - $form->{selectemployee} = ""; - map { $form->{selectemployee} .= "$_->{name}--$_->{id}\n" } (@{ $form->{all_employees} }); - } - + # forex $form->{forex} = $form->{exchangerate}; + $form->{salesman_id} = $salesman_id if ($editing); + $lxdebug->leave_sub(); } - sub prepare_order { $lxdebug->enter_sub(); - $form->{format} = "html"; - $form->{media} = "screen"; - $form->{formname} = $form->{type}; - - if ($form->{id}) { - - map { $form->{$_} =~ s/\"/"/g } qw(ordnumber quonumber shippingpoint shipvia notes intnotes shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptocontact); - - foreach $ref (@{ $form->{form_details} } ) { - $i++; - map { $form->{"${_}_$i"} = $ref->{$_} } keys %{ $ref }; - $form->{"discount_$i"} = $form->format_amount(\%myconfig, $form->{"discount_$i"} * 100); - - ($dec) = ($form->{"sellprice_$i"} =~ /\.(\d+)/); - $dec = length $dec; - $decimalplaces = ($dec > 2) ? $dec : 2; - - $form->{"sellprice_$i"} = $form->format_amount(\%myconfig, $form->{"sellprice_$i"}, $decimalplaces); - $form->{"qty_$i"} = $form->format_amount(\%myconfig, $form->{"qty_$i"}); - - map { $form->{"${_}_$i"} =~ s/\"/"/g } qw(partnumber description unit); - $form->{rowcount} = $i; + $form->{formname} = $form->{type} unless $form->{formname}; + + 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); } $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" : ""; + + if ($form->{old_employee_id}) { + $form->{employee_id} = $form->{old_employee_id}; + } + if ($form->{old_salesman_id}) { + $form->{salesman_id} = $form->{old_salesman_id}; + } + + $form->{defaultcurrency} = $form->get_default_currency(\%myconfig); + + + if ($form->{old_employee_id}) { + $form->{employee_id} = $form->{old_employee_id}; + } + if ($form->{old_salesman_id}) { + $form->{salesman_id} = $form->{old_salesman_id}; + } + + 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 = ""; - - if ($form->{jsscript}) - { - # with JavaScript Calendar - $button1 = qq| - {transdate}> - text('button').qq|> - |; - $button2 = qq| - {reqdate}> - text('button').qq|> - |; - #write Trigger - $jsscript = Form->write_trigger(\%myconfig,"2","transdate","BL","trigger1","reqdate","BL","trigger2"); - - } - else - { - # without JavaScript Calendar - $button1 = qq| - {transdate}>|; - $button2 = qq| - {reqdate}>|; - } - - + $form->{jsscript} = 1; + $jsscript = ""; + + $button1 = qq| + + text('button') . qq|> + |; + $button2 = qq| + + text('button') . qq|> + |; + + #write Trigger + $jsscript = + Form->write_trigger(\%myconfig, "2", "transdate", "BL", "trigger1", + "reqdate", "BL", "trigger2"); + + my @tmp; + + if (($form->{"type"} eq "sales_order") || + ($form->{"type"} eq "purchase_order")) { + push(@tmp, qq| + + | . $locale->text('Delivered') . qq||); + } + if ($form->{id}) { - $openclosed = qq| + push(@tmp, qq| + + | . $locale->text('Closed') . qq||); + } + + if (@tmp) { + $openclosed .= qq| - - - - |.$locale->text('Open').qq| - |.$locale->text('Closed').qq| - - - + | . join("\n", @tmp) . qq| + |; } # set option selected - foreach $item ($form->{vc}, currency, department, employee, contact) { + foreach $item ($form->{vc}, currency, department, ($form->{vc} eq "customer" ? customer : vendor)) { $form->{"select$item"} =~ s/ selected//; - $form->{"select$item"} =~ s/option>\Q$form->{$item}\E/option selected>$form->{$item}/; + $form->{"select$item"} =~ + s/option>\Q$form->{$item}\E/option selected>$form->{$item}/; + } + + #quote select[customer|vendor] Bug 133 + $form->{"select$form->{vc}"} = $form->quote($form->{"select$form->{vc}"}); + + #substitute \n and \r to \s (bug 543) + $form->{"select$form->{vc}"} =~ s/[\n\r]/ /g; + + my @old_project_ids = ($form->{"globalproject_id"}); + map({ push(@old_project_ids, $form->{"project_id_$_"}) + if ($form->{"project_id_$_"}); } (1..$form->{"rowcount"})); + + my $vc = $form->{vc} eq "customer" ? "customers" : "vendors"; + $form->get_lists("contacts" => "ALL_CONTACTS", + "shipto" => "ALL_SHIPTO", + "projects" => { "key" => "ALL_PROJECTS", + "all" => 0, + "old_id" => \@old_project_ids }, + "employees" => "ALL_EMPLOYEES", + "salesmen" => "ALL_SALESMEN", + "taxzones" => "ALL_TAXZONES", + "payments" => "ALL_PAYMENTS", + "currencies" => "ALL_CURRENCIES", + $vc => "ALL_" . uc($vc)); + + my %labels; + my @values = (undef); + 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; + if (scalar @values > 1) { + $contact = qq| + + | . $locale->text('Contact Person') . qq| + | . + NTI($cgi->popup_menu('-name' => 'cp_id', '-values' => \@values, '-style' => 'width: 250px', + '-labels' => \%labels, '-default' => $form->{"cp_id"})) + . qq| + + |; + } + + %labels = (); + @values = (); + + foreach my $item (@{ $form->{($form->{vc} eq "customer" ? "ALL_CUSTOMERS" : "ALL_VENDORS")}}) { + push(@values, $item->{"name"}.qq|--|.$item->{"id"}); + $labels{$item->{"name"}.qq|--|.$item->{"id"}} = $item->{name}; + } + + $vc = qq| + {vc}_id"}) . qq|"> + {vc}"}) . qq|"> + | . $locale->text(ucfirst($form->{vc})) . qq| + | . + (($myconfig{vclimit} <= scalar(@values)) + ? qq|{vc}"} =~ /^(.*)\-\-.*$/)) . qq|" name="$form->{vc}">| + : (NTI($cgi->popup_menu('-name' => "$form->{vc}", '-default' => $form->{"old$form->{vc}"}, + '-onChange' => 'document.getElementById(\'update_button\').click();', + '-values' => \@values, '-labels' => \%labels, '-style' => 'width: 250px')))) . qq| + + {vc}"}) . qq|">|; + + %labels = (); + @values = (""); + foreach my $item (@{ $form->{"ALL_PAYMENTS"} }) { + push(@values, $item->{"id"}); + $labels{$item->{"id"}} = $item->{"description"}; + } + + $payments = qq| + | . $locale->text('Payment Terms') . qq| + | . + NTI($cgi->popup_menu('-name' => 'payment_id', '-values' => \@values, '-style' => 'width: 250px', + '-labels' => \%labels, '-default' => $form->{payment_id})) + . qq||; + + %labels = (); + @values = (""); + foreach my $item (@{ $form->{"ALL_SHIPTO"} }) { + push(@values, $item->{"shipto_id"}); + $labels{$item->{"shipto_id"}} = join "; ", grep { $_ } map { $item->{"shipto${_}" } } qw(name department_1 street city); + } + + my $shipto; + if (scalar @values > 1) { + $shipto = qq| + + | . $locale->text('Shipping Address') . qq| + | . + NTI($cgi->popup_menu('-name' => 'shipto_id', '-values' => \@values, '-style' => 'width: 250px', + '-labels' => \%labels, '-default' => $form->{"shipto_id"})) + . qq||; + } + + %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"})); + + my $salesmen = ""; + %labels = (); + @values = (); + if ($form->{type} =~ /^sales_/) { + foreach my $item (@{ $form->{"ALL_SALESMEN"} }) { + push(@values, $item->{"id"}); + $labels{$item->{"id"}} = ($item->{"name"} ne "" ? $item->{"name"} : $item->{"login"}); + } + $salesmen = + qq| + | . $locale->text('Salesman') . qq| + | . + NTI($cgi->popup_menu('-name' => 'salesman_id', '-default' => $form->{"salesman_id"} ? $form->{"salesman_id"} : $form->{"employee_id"}, + '-values' => \@values, '-labels' => \%labels)) + . qq| + |; + } + + %labels = (); + @values = (); + foreach my $item (@{ $form->{"ALL_EMPLOYEES"} }) { + push(@values, $item->{"id"}); + $labels{$item->{"id"}} = $item->{"name"} ne "" ? $item->{"name"} : $item->{"login"}; + } + + my $employee = qq| + + | . $locale->text('Employee') . qq| + | . + NTI($cgi->popup_menu('-name' => 'employee_id', '-default' => $form->{"employee_id"}, + '-values' => \@values, '-labels' => \%labels)) . qq| + + |; + + %labels = (); + @values = (); + foreach my $item (@{ $form->{"ALL_TAXZONES"} }) { + push(@values, $item->{"id"}); + $labels{$item->{"id"}} = $item->{"description"}; } - #build contacts - if ($form->{all_contacts}) { - - $form->{selectcontact} = ""; - foreach $item (@{$form->{all_contacts}}) { - if ($form->{cp_id} == $item->{cp_id}) - { - $form->{selectcontact} .= "$item->{cp_name}--$item->{cp_id}"; - } - else - { - $form->{selectcontact} .= "$item->{cp_name}--$item->{cp_id}"; - } - } - } - - $form->{exchangerate} = $form->format_amount(\%myconfig, $form->{exchangerate}); + $taxzone = qq| + + | . $locale->text('Steuersatz') . qq| + | . + NTI($cgi->popup_menu('-name' => 'taxzone_id', '-default' => $form->{"taxzone_id"}, + '-values' => \@values, '-labels' => \%labels, '-style' => 'width: 250px')) . qq| + + |; + + %labels = (); + @values = (); + my $i = 0; + foreach my $item (@{ $form->{"ALL_CURRENCIES"} }) { + push(@values, $item); + $labels{$item} = $item; + } + + $form->{currency} = $form->{defaultcurrency} unless $form->{currency}; + my $currencies; + if (scalar @values) { + $currencies = qq| + + | . $locale->text('Currency') . qq| + | . + NTI($cgi->popup_menu('-name' => 'currency', '-default' => $form->{"currency"}, + '-values' => \@values, '-labels' => \%labels)) . qq| + + |; + } + + $form->{exchangerate} = + $form->format_amount(\%myconfig, $form->{exchangerate}); + + if (!$form->{exchangerate}) { + $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"); - $form->{creditlimit} = $form->format_amount(\%myconfig, $form->{creditlimit}, 0, "0"); - $form->{creditremaining} = $form->format_amount(\%myconfig, $form->{creditremaining}, 0, "0"); - - $contact = ($form->{selectcontact}) ? qq|$form->{selectcontact}\n| : qq||; - $exchangerate = qq| {forex}> |; if ($form->{currency} ne $form->{defaultcurrency}) { if ($form->{forex}) { - $exchangerate .= qq||.$locale->text('Exchangerate').qq|$form->{exchangerate} + $exchangerate .= + qq|| + . $locale->text('Exchangerate') + . qq|$form->{exchangerate} {exchangerate}> |; } else { - $exchangerate .= qq||.$locale->text('Exchangerate').qq|{exchangerate}>|; + $exchangerate .= + qq|| + . $locale->text('Exchangerate') + . qq|{exchangerate}>|; } } - - $vclabel = ucfirst $form->{vc}; - $vclabel = $locale->text($vclabel); - - $terms = qq| - - |.$locale->text('Terms: Net').qq| - {terms}> |.$locale->text('days').qq| - -|; - - if ($form->{business}) { $business = qq| - |.$locale->text('Business').qq| - $form->{business} - |.$locale->text('Trade Discount').qq| - |.$form->format_amount(\%myconfig, $form->{tradediscount} * 100).qq| % - + | . ($form->{vc} eq "customer" ? $locale->text('Customer type') : $locale->text('Vendor type')) . qq| + $form->{business}; | . $locale->text('Trade Discount') . qq| | + . $form->format_amount(\%myconfig, $form->{tradediscount} * 100) + . qq| % + |; } + if ($form->{max_dunning_level}) { + $dunning = qq| + + | . $locale->text('Max. Dunning Level') . qq|: + + $form->{max_dunning_level}; + | . $locale->text('Dunning Amount') . qq|: | + . $form->format_amount(\%myconfig, $form->{dunning_amount},2) + . qq| + + +|; + } if ($form->{type} !~ /_quotation$/) { $ordnumber = qq| - |.$locale->text('Order Number').qq| + | . $locale->text('Order Number') . qq| - |.$locale->text('Quotation Number').qq| + | + . $locale->text('Quotation Number') . qq| - |.$locale->text('Customer Order Number').qq| + | + . $locale->text('Customer Order Number') . qq| - |.$locale->text('Order Date').qq| + | . $locale->text('Order Date') . qq| $button1 - |.$locale->text('Required by').qq| + | . $locale->text('Required by') . qq| $button2 |; - + $n = ($form->{creditremaining} =~ /-/) ? "0" : "1"; - + $creditremaining = qq| - - - - - - |.$locale->text('Credit Limit').qq| - $form->{creditlimit} - - |.$locale->text('Remaining').qq| - $form->{creditremaining} - - - + $shipto + + | . $locale->text('Credit Limit') . qq| + $form->{creditlimit}; | . $locale->text('Remaining') . qq| $form->{creditremaining} + |; } else { - $reqlabel = ($form->{type} eq 'sales_quotation') ? $locale->text('Valid until') : $locale->text('Required by'); + $reqlabel = + ($form->{type} eq 'sales_quotation') + ? $locale->text('Valid until') + : $locale->text('Required by'); if ($form->{type} eq 'sales_quotation') { $ordnumber = qq| - |.$locale->text('Quotation Number').qq| + | + . $locale->text('Quotation Number') . qq| @@ -386,19 +697,17 @@ sub form_header { } else { $ordnumber = qq| - |.$locale->text('RFQ Number').qq| + | . $locale->text('RFQ Number') . qq| |; - $terms = ""; } - $ordnumber .= qq| - |.$locale->text('Quotation Date').qq| + | . $locale->text('Quotation Date') . qq| $button1 @@ -406,76 +715,70 @@ sub form_header { $button2 |; - + $creditremaining = qq| + + $shipto + |; } - $vc = ($form->{"select$form->{vc}"}) ? qq|{vc}>$form->{"select$form->{vc}"}\n{vc}"}">| : qq|{vc} value="$form->{$form->{vc}}" size=35>|; - $department = qq| - |.$locale->text('Department').qq| - $form->{selectdepartment} + | . $locale->text('Department') . qq| + $form->{selectdepartment} - -| if $form->{selectdepartment}; - - $employee = qq| - -|; + | if $form->{selectdepartment}; if ($form->{type} eq 'sales_order') { if ($form->{selectemployee}) { - $employee = qq| - - |.$locale->text('Salesperson').qq| - $form->{selectemployee} - - - -|; + $employee .= qq| + |; } } else { - $employee = qq| - - |.$locale->text('Employee').qq| - $form->{selectemployee} - - - -|; + $employee .= qq| + |; + } + 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 = "focus()"; } - - $form->header; + $credittext = $locale->text('Credit Limit exceeded!!!'); + if ($creditwarning) { + $onload = qq|alert('$credittext')|; + } - print qq| - - -{script}> - -{id}> + $onload .= qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|; + $onload .= qq|;setupPoints('|. $myconfig{numberformat} .qq|', '|. $locale->text("wrongformat") .qq|')|; + + $form->{"javascript"} .= qq||; + # show history button js + $form->{javascript} .= qq||; + #/show history button js + $form->{javascript} .= qq||; -{type}> -{formname}> -{media}> -{format}> + $form->header; - - - + print qq| + -{vc}> +{script}> - + + + + +|; -{discount}> -{creditlimit}> -{creditremaining}> + $form->hide_form(qw(id action type vc formname media format proforma queued printed emailed + title discount creditlimit creditremaining tradediscount business + max_dunning_level dunning_amount)); -{tradediscount}> -{business}> - + print qq| @@ -489,46 +792,68 @@ sub form_header { - $vclabel - $vc - {vc}_id value=$form->{"$form->{vc}_id"}> - {vc}"}"> - |.$locale->text('Contact Person').qq| - $contact - + $vc + $contact $creditremaining $business + $dunning + $taxzone $department - |.$locale->text('Currency').qq| - $form->{selectcurrency} - - {defaultcurrency}> + $currencies $exchangerate - |.$locale->text('Shipping Point').qq| + | . $locale->text('Shipping Point') . qq| - |.$locale->text('Ship via').qq| + | . $locale->text('Ship via') . qq| - + + | . $locale->text('Transaction description') . qq| + + |; +# +# +# +# +# +# | . $locale->text('Choose Customer') . qq| +# +# +# +# +# +# +# | . $locale->text('Choose Vendor') . qq| +# +# +# +# +# +# +# +print qq| $openclosed $employee + $salesmen $ordnumber - $terms + + | . $locale->text('Project Number') . qq| + $globalprojectnumber + - + $jsscript @@ -541,10 +866,12 @@ $jsscript + + - + @@ -565,7 +892,6 @@ $jsscript $lxdebug->leave_sub(); } - sub form_footer { $lxdebug->enter_sub(); @@ -578,39 +904,48 @@ sub form_footer { $introws = 2; } $rows = ($rows > $introws) ? $rows : $introws; - $notes = qq|$form->{notes}|; - $intnotes = qq|$form->{intnotes}|; + $notes = + qq|$form->{notes}|; + $intnotes = + qq|$form->{intnotes}|; $form->{taxincluded} = ($form->{taxincluded}) ? "checked" : ""; $taxincluded = ""; if ($form->{taxaccounts}) { $taxincluded = qq| - {taxincluded}> |.$locale->text('Tax Included').qq| + {taxincluded}> | + . $locale->text('Tax Included') . qq| |; } if (!$form->{taxincluded}) { - + foreach $item (split / /, $form->{taxaccounts}) { if ($form->{"${item}_base"}) { - $form->{invtotal} += $form->{"${item}_total"} = $form->round_amount($form->{"${item}_base"} * $form->{"${item}_rate"}, 2); - $form->{"${item}_total"} = $form->format_amount(\%myconfig, $form->{"${item}_total"}, 2); - - $tax .= qq| + $form->{invtotal} += $form->{"${item}_total"} = + $form->round_amount( + $form->{"${item}_base"} * $form->{"${item}_rate"}, + 2); + $form->{"${item}_total"} = + $form->format_amount(\%myconfig, $form->{"${item}_total"}, 2); + + $tax .= qq| - $form->{"${item}_description"} + $form->{"${item}_description"} | + . $form->{"${item}_rate"} * 100 .qq|% $form->{"${item}_total"} |; } } - $form->{invsubtotal} = $form->format_amount(\%myconfig, $form->{invsubtotal}, 2, 0); - + $form->{invsubtotal} = + $form->format_amount(\%myconfig, $form->{invsubtotal}, 2, 0); + $subtotal = qq| - |.$locale->text('Subtotal').qq| + | . $locale->text('Subtotal') . qq| $form->{invsubtotal} |; @@ -618,17 +953,27 @@ sub form_footer { } if ($form->{taxincluded}) { - foreach $item (split / /, $form->{taxaccounts}) { - if ($form->{"${item}_base"}) { - $form->{"${item}_total"} = $form->round_amount(($form->{"${item}_base"} * $form->{"${item}_rate"} / (1 + $form->{"${item}_rate"})) , 2); - $form->{"${item}_netto"} = $form->round_amount(($form->{"${item}_base"}-$form->{"${item}_total"}), 2); - $form->{"${item}_total"} = $form->format_amount(\%myconfig, $form->{"${item}_total"}, 2); - $form->{"${item}_netto"} = $form->format_amount(\%myconfig, $form->{"${item}_netto"}, 2); - - - $tax .= qq| + foreach $item (split / /, $form->{taxaccounts}) { + if ($form->{"${item}_base"}) { + $form->{"${item}_total"} = + $form->round_amount( + ($form->{"${item}_base"} * $form->{"${item}_rate"} / + (1 + $form->{"${item}_rate"}) + ), + 2); + $form->{"${item}_netto"} = + $form->round_amount( + ($form->{"${item}_base"} - $form->{"${item}_total"}), + 2); + $form->{"${item}_total"} = + $form->format_amount(\%myconfig, $form->{"${item}_total"}, 2); + $form->{"${item}_netto"} = + $form->format_amount(\%myconfig, $form->{"${item}_netto"}, 2); + + $tax .= qq| - Enthaltene $form->{"${item}_description"} + Enthaltene $form->{"${item}_description"} | + . $form->{"${item}_rate"} * 100 .qq|% $form->{"${item}_total"} @@ -638,13 +983,12 @@ sub form_footer { |; } } - - + } - - $form->{oldinvtotal} = $form->{invtotal}; - $form->{invtotal} = $form->format_amount(\%myconfig, $form->{invtotal}, 2, 0); + $form->{oldinvtotal} = $form->{invtotal}; + $form->{invtotal} = + $form->format_amount(\%myconfig, $form->{invtotal}, 2, 0); print qq| @@ -654,22 +998,47 @@ sub form_footer { - |.$locale->text('Notes').qq| - |.$locale->text('Internal Notes').qq| + | . $locale->text('Notes') . qq| + | . $locale->text('Internal Notes') . qq| $notes $intnotes - + + $payments + + - + + +|; + + if ($form->{type} =~ /^sales_/) { + print qq| + + | . $locale->text('Ertrag') . qq| + | . $form->format_amount(\%myconfig, $form->{marge_total}, 2, 0) . qq| + + + | . $locale->text('Ertrag prozentual') . qq| + | . $form->format_amount(\%myconfig, $form->{marge_percent}, 2, 0) . qq| % + +|; + } + + print qq| + + + + + $taxincluded - + $subtotal $tax - |.$locale->text('Total').qq| + | . $locale->text('Total') . qq| $form->{invtotal} @@ -685,26 +1054,25 @@ sub form_footer { |; - if ($webdav) { - $webdav_list = qq| + $webdav_list = qq| - + Dokumente im Webdav-Repository Dateiname Webdavlink |; - foreach $file (keys %{ $form->{WEBDAV}}) { - $webdav_list .= qq| - - $file - $form->{WEBDAV}{$file} + foreach $file (@{ $form->{WEBDAV} }) { + $webdav_list .= qq| + + $file->{name} + $file->{type} |; - } - $webdav_list .= qq| + } + $webdav_list .= qq| @@ -712,77 +1080,98 @@ sub form_footer { |; -print $webdav_list; -} -print qq| -{jscalendar}> -|; -print qq| + print $webdav_list; + } + + print qq| |; - &print_options; + print_options(); print qq| -Bearbeiten des $form->{heading} - - - - - +| . $locale->text("Edit the $form->{type}") . qq| + + + + + + |; - if ($form->{id}) { - print qq| -Workflow $form->{heading} - -|; - if ($form->{type} =~ /quotation$/) { + if (($form->{id})) { print qq| -|; + + +| . $locale->text("Workflow $form->{type}") . qq| + +|; + if (($form->{type} =~ /sales_quotation$/)) { + print qq| +|; + } + if ($form->{type} =~ /request_quotation$/) { + print qq| +|; } - print qq| - + print qq| + |; - if ($form->{type} =~ /sales_order$/) { - print qq| + if ($form->{type} =~ /sales_order$/) { + print qq| $form->{heading} als neue Vorlage verwenden für - - + + |; - } elsif ($form->{type} =~ /purchase_order$/) { - print qq| + } elsif ($form->{type} =~ /purchase_order$/) { + print qq| $form->{heading} als neue Vorlage verwenden für - - + + |; - - } else { - print qq| + + } else { + print qq| $form->{heading} als neue Vorlage verwenden für - + |; - } } - - if ($form->{menubar}) { - require "$form->{path}/menu.pl"; - &menubar; } - - print qq| + + $form->hide_form("saved_xyznumber"); + + print qq| {rowcount}> -{path}> {login}> {password}> @@ -794,32 +1183,51 @@ Bearbeiten des $form->{heading} $lxdebug->leave_sub(); } - sub update { $lxdebug->enter_sub(); - map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } qw(exchangerate creditlimit creditremaining); + set_headings($form->{"id"} ? "edit" : "add"); + map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } + qw(exchangerate creditlimit creditremaining); + $form->{update} = 1; + + if($form->{payment_id}) { + $payment_id = $form->{payment_id}; + } + &check_name($form->{vc}); - - &check_project; - - $buysell = 'buy'; - $buysell = 'sell' if ($form->{vc} eq 'vendor'); - $form->{exchangerate} = $exchangerate if ($form->{forex} = ($exchangerate = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{transdate}, $buysell))); + if($form->{payment_id} eq "") { + $form->{payment_id} = $payment_id; + } + + $buysell = 'buy'; + $buysell = 'sell' if ($form->{vc} eq 'vendor'); + $form->{exchangerate} = $exchangerate + if ( + $form->{forex} = ( + $exchangerate = + $form->check_exchangerate( + \%myconfig, $form->{currency}, $form->{transdate}, $buysell + ))); + + # for pricegroups + $i = $form->{rowcount}; - my $i = $form->{rowcount}; $exchangerate = ($form->{exchangerate}) ? $form->{exchangerate} : 1; - if (($form->{"partnumber_$i"} eq "") && ($form->{"description_$i"} eq "") && ($form->{"partsgroup_$i"} eq "")) { + if ( ($form->{"partnumber_$i"} eq "") + && ($form->{"description_$i"} eq "") + && ($form->{"partsgroup_$i"} eq "")) { $form->{creditremaining} += ($form->{oldinvtotal} - $form->{oldtotalpaid}); &check_form; - + } else { - - if ($form->{type} eq 'purchase_order' || $form->{type} eq 'request_quotation') { + + if ( $form->{type} eq 'purchase_order' + || $form->{type} eq 'request_quotation') { IR->retrieve_item(\%myconfig, \%$form); } if ($form->{type} eq 'sales_order' || $form->{type} eq 'sales_quotation') { @@ -827,209 +1235,241 @@ sub update { } my $rows = scalar @{ $form->{item_list} }; - - $form->{"discount_$i"} = $form->format_amount(\%myconfig, $form->{discount} * 100); + + $form->{"discount_$i"} = + $form->format_amount(\%myconfig, $form->{discount} * 100); if ($rows) { - $form->{"qty_$i"} = 1 unless ($form->{"qty_$i"}); - + $form->{"qty_$i"} = 1 unless ($form->{"qty_$i"}); + if ($rows > 1) { - - &select_item; - exit; - + + &select_item; + exit; + } else { - - $sellprice = $form->parse_amount(\%myconfig, $form->{"sellprice_$i"}); - - map { $form->{item_list}[$i]{$_} =~ s/\"/"/g } qw(partnumber description unit); - map { $form->{"${_}_$i"} = $form->{item_list}[0]{$_} } keys %{ $form->{item_list}[0] }; - - $s = ($sellprice) ? $sellprice : $form->{"sellprice_$i"}; - - ($dec) = ($s =~ /\.(\d+)/); - $dec = length $dec; - $decimalplaces = ($dec > 2) ? $dec : 2; - if ($sellprice) { - $form->{"sellprice_$i"} = $sellprice; - } else { - # if there is an exchange rate adjust sellprice - $form->{"sellprice_$i"} /= $exchangerate; - } - - $amount = $form->{"sellprice_$i"} * $form->{"qty_$i"} * (1 - $form->{"discount_$i"} / 100); - map { $form->{"${_}_base"} = 0 } (split / /, $form->{taxaccounts}); - map { $form->{"${_}_base"} += $amount } (split / /, $form->{"taxaccounts_$i"}); - map { $amount += ($form->{"${_}_base"} * $form->{"${_}_rate"}) } split / /, $form->{taxaccounts} if !$form->{taxincluded}; - - $form->{creditremaining} -= $amount; - - $form->{"sellprice_$i"} = $form->format_amount(\%myconfig, $form->{"sellprice_$i"}, $decimalplaces); - $form->{"qty_$i"} = $form->format_amount(\%myconfig, $form->{"qty_$i"}); - } + $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"}; + + ($dec) = ($s =~ /\.(\d+)/); + $dec = length $dec; + $decimalplaces = ($dec > 2) ? $dec : 2; + + if ($sellprice) { + $form->{"sellprice_$i"} = $sellprice; + } else { + + $form->{"sellprice_$i"} *= (1 - $form->{tradediscount}); + + # if there is an exchange rate adjust sellprice + $form->{"sellprice_$i"} /= $exchangerate; + } + + $amount = + $form->{"sellprice_$i"} * $form->{"qty_$i"} * + (1 - $form->{"discount_$i"} / 100); + map { $form->{"${_}_base"} = 0 } (split / /, $form->{taxaccounts}); + map { $form->{"${_}_base"} += $amount } + (split / /, $form->{"taxaccounts_$i"}); + map { $amount += ($form->{"${_}_base"} * $form->{"${_}_rate"}) } + split / /, $form->{taxaccounts} + if !$form->{taxincluded}; + + $form->{creditremaining} -= $amount; + + $form->{"sellprice_$i"} = + $form->format_amount(\%myconfig, $form->{"sellprice_$i"}, + $decimalplaces); + $form->{"qty_$i"} = + $form->format_amount(\%myconfig, $form->{"qty_$i"}, $dec_qty); + + # get pricegroups for parts + IS->get_pricegroups_for_parts(\%myconfig, \%$form); + + # build up html code for prices_$i + &set_pricegroup($i); + } &display_form; } else { + # ok, so this is a new part # ask if it is a part or service item - if ($form->{"partsgroup_$i"} && ($form->{"partsnumber_$i"} eq "") && ($form->{"description_$i"} eq "")) { - $form->{rowcount}--; - $form->{"discount_$i"} = ""; - &display_form; + if ( $form->{"partsgroup_$i"} + && ($form->{"partsnumber_$i"} eq "") + && ($form->{"description_$i"} eq "")) { + $form->{rowcount}--; + $form->{"discount_$i"} = ""; + &display_form; } else { - - $form->{"id_$i"} = 0; - $form->{"unit_$i"} = $locale->text('ea'); - &new_item; + $form->{"id_$i"} = 0; + $form->{"unit_$i"} = $locale->text('ea'); + + &new_item; } } } + $lxdebug->leave_sub(); } - - sub search { $lxdebug->enter_sub(); - + if ($form->{type} eq 'purchase_order') { $form->{title} = $locale->text('Purchase Orders'); - $form->{vc} = 'vendor'; - $ordlabel = $locale->text('Order Number'); - $ordnumber = 'ordnumber'; - $employee = $locale->text('Employee'); + $form->{vc} = 'vendor'; + $ordlabel = $locale->text('Order Number'); + $ordnumber = 'ordnumber'; + $employee = $locale->text('Employee'); } + if ($form->{type} eq 'request_quotation') { $form->{title} = $locale->text('Request for Quotations'); - $form->{vc} = 'vendor'; - $ordlabel = $locale->text('RFQ Number'); - $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'); + $form->{vc} = 'vendor'; + $ordlabel = $locale->text('RFQ Number'); + $ordnumber = 'quonumber'; + $employee = $locale->text('Employee'); } + if ($form->{type} eq 'sales_order') { $form->{title} = $locale->text('Sales Orders'); - $form->{vc} = 'customer'; - $ordlabel = $locale->text('Order Number'); - $ordnumber = 'ordnumber'; - $employee = $locale->text('Salesperson'); + $form->{vc} = 'customer'; + $ordlabel = $locale->text('Order Number'); + $ordnumber = 'ordnumber'; + $employee = $locale->text('Employee'); } - 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'); - $form->{vc} = 'customer'; - $ordlabel = $locale->text('Quotation Number'); - $ordnumber = 'quonumber'; - $employee = $locale->text('Employee'); - } - - if ($form->{type} =~ /(ship|receive)_order/) { - OE->get_warehouses(\%myconfig, \%$form); - - # warehouse - if (@{ $form->{all_warehouses} }) { - $form->{selectwarehouse} = "\n"; - $form->{warehouse} = qq|$form->{warehouse}--$form->{warehouse_id}|; - - map { $form->{selectwarehouse} .= "$_->{description}--$_->{id}\n" } (@{ $form->{all_warehouses} }); - - $warehouse = qq| - - |.$locale->text('Warehouse').qq| - $form->{selectwarehouse} - - -|; - - } + $form->{vc} = 'customer'; + $ordlabel = $locale->text('Quotation Number'); + $ordnumber = 'quonumber'; + $employee = $locale->text('Employee'); } # setup vendor / customer selection - $form->all_vc(\%myconfig, $form->{vc}, ($form->{vc} eq 'customer') ? "AR" : "AP"); - - map { $vc .= "$_->{name}--$_->{id}\n" } @{ $form->{"all_$form->{vc}"} }; - - $vclabel = ucfirst $form->{vc}; - $vclabel = $locale->text($vclabel); - -# $locale->text('Vendor') -# $locale->text('Customer') - - $vc = ($vc) ? qq|{vc}>\n$vc| : qq|{vc} size=35>|; + $form->all_vc(\%myconfig, $form->{vc}, + ($form->{vc} eq 'customer') ? "AR" : "AP"); - # departments + # departments if (@{ $form->{all_departments} }) { $form->{selectdepartment} = "\n"; - map { $form->{selectdepartment} .= "$_->{description}--$_->{id}\n" } (@{ $form->{all_departments} }); + map { + $form->{selectdepartment} .= + "$_->{description}--$_->{id}\n" + } (@{ $form->{all_departments} }); } - $department = qq| - - |.$locale->text('Department').qq| + $department = qq| + + | . $locale->text('Department') . qq| $form->{selectdepartment} -| if $form->{selectdepartment}; +| if $form->{selectdepartment}; - if ($form->{type} !~ /(ship_order|receive_order)/) { - $openclosed = qq| - - |.$locale->text('Open').qq| - {closed}> |.$locale->text('Closed').qq| - -|; - } else { - - $openclosed = qq| - + my $delivered; + if (($form->{"type"} eq "sales_order") || + ($form->{"type"} eq "purchase_order")) { + $delivered = qq| + + + |. $locale->text('Not delivered') . qq| + + | . $locale->text('Delivered') . qq| + |; } - + # use JavaScript Calendar or not - $form->{jsscript} = $jscalendar; - $jsscript = ""; - if ($form->{jsscript}) - { - # with JavaScript Calendar - $button1 = qq| - - text('button').qq|> - |; - $button2 = qq| - - text('button').qq|> - |; - #write Trigger - $jsscript = Form->write_trigger(\%myconfig,"2","transdatefrom","BR","trigger3","transdateto","BL","trigger4") - } - else - { - # without JavaScript Calendar - $button1 = qq| - |; - $button2 = qq| - |; - } - + $form->{jsscript} = 1; + $jsscript = ""; + + $button1 = qq| + + text('button') . qq|> + |; + $button2 = qq| + + text('button') . qq|> + |; + + #write Trigger + $jsscript = + Form->write_trigger(\%myconfig, "2", "transdatefrom", "BR", "trigger3", + "transdateto", "BL", "trigger4"); + + my $vc = $form->{vc} eq "customer" ? "customers" : "vendors"; + + $form->get_lists("projects" => { "key" => "ALL_PROJECTS", + "all" => 1 }, + "employees" => "ALL_EMPLOYEES", + $vc => "ALL_" . uc($vc)); + + 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)); + + #employees + %labels = (); + @values = (""); + foreach my $item (@{ $form->{"ALL_EMPLOYEES"} }) { + push(@values, $item->{"id"}); + $labels{$item->{"id"}} = $item->{"name"} ne "" ? $item->{"name"} : $item->{"login"}; + } + + my $employee_block = qq| + + | . $locale->text('Employee') . qq| + | . + NTI($cgi->popup_menu('-name' => 'employee_id', + '-values' => \@values, + '-labels' => \%labels)) . qq| + + |; + + %labels = (); + @values = (""); + + foreach my $item (@{ $form->{($form->{vc} eq "customer" ? "ALL_CUSTOMERS" : "ALL_VENDORS")}}) { + push(@values, $item->{name}.qq|--|.$item->{"id"}); + $labels{$item->{name}.qq|--|.$item->{"id"}} = $item->{"name"}; + } + + my $vc_label = $form->{vc} eq "customer" ? $locale->text('Customer') : $locale->text('Vendor'); + $vc = + $myconfig{vclimit} <= scalar(@values) + ? qq|{vc}"} =~ /^(.*)\-\-.*$/)) . qq|" name="$form->{vc}">| + : NTI($cgi->popup_menu('-name' => "$form->{vc}", + '-default' => $form->{"old$form->{vc}"}, + '-onChange' => 'document.getElementById(\'update_button\').click();', + '-values' => \@values, + '-labels' => \%labels)); $form->header; print qq| @@ -1046,46 +1486,79 @@ sub search { - $vclabel + $vc_label $vc - $warehouse $department $ordlabel + $employee_block + + | . $locale->text('Transaction description') . qq| + + + + | . $locale->text("Project Number") . qq| + $projectnumber + - |.$locale->text('From').qq| + | . $locale->text('From') . qq| $button1 - |.$locale->text('Bis').qq| + | . $locale->text('Bis') . qq| $button2 - |.$locale->text('Include in Report').qq| + | . $locale->text('Include in Report') . qq| - $openclosed + + + | . $locale->text("Open") . qq| + + | . $locale->text("Closed") . qq| + + $delivered - |.$locale->text('ID').qq| + | . $locale->text('ID') . qq| $ordlabel - |.$locale->text('Date').qq| - |.$locale->text('Required by').qq| + | + . $locale->text('Date') . qq| + | + . $locale->text('Required by') . qq| - $vclabel + $vc_label $employee - |.$locale->text('Ship via').qq| + | + . $locale->text('Ship via') . qq| + + + | + . $locale->text('Amount') . qq| + | + . $locale->text('Tax') . qq| + | + . $locale->text('Total') . qq| - |.$locale->text('Amount').qq| - |.$locale->text('Tax').qq| - |.$locale->text('Total').qq| + | + . $locale->text('Ertrag') . qq| + | + . $locale->text('Ertrag prozentual') . qq| - |.$locale->text('Subtotal').qq| + | + . $locale->text('Project Number') . qq| + | + . $locale->text('Transaction description') . qq| + + + | + . $locale->text('Subtotal') . qq| @@ -1100,13 +1573,13 @@ $jsscript -{path}> {login}> {password}> {vc}> {type}> - + @@ -1116,326 +1589,306 @@ $jsscript $lxdebug->leave_sub(); } +sub create_subtotal_row { + $lxdebug->enter_sub(); + + my ($totals, $columns, $column_alignment, $subtotal_columns, $class) = @_; + + my $row = { map { $_ => { 'data' => '', 'class' => $class, 'align' => $column_alignment->{$_}, } } @{ $columns } }; + + map { $row->{$_}->{data} = $form->format_amount(\%myconfig, $totals->{$_}, 2) } @{ $subtotal_columns }; + + $row->{tax}->{data} = $form->format_amount(\%myconfig, $totals->{amount} - $totals->{netamount}, 2); + + map { $totals->{$_} = 0 } @{ $subtotal_columns }; + + $lxdebug->leave_sub(); + + return $row; +} sub orders { $lxdebug->enter_sub(); - # split vendor / customer - ($form->{$form->{vc}}, $form->{"$form->{vc}_id"}) = split(/--/, $form->{$form->{vc}}); + $ordnumber = ($form->{type} =~ /_order$/) ? "ordnumber" : "quonumber"; - OE->transactions(\%myconfig, \%$form); + ($form->{ $form->{vc} }, $form->{"${form->{vc}}_id"}) = split(/--/, $form->{ $form->{vc} }); - $ordnumber = ($form->{type} =~ /_order$/) ? "ordnumber" : "quonumber"; + $form->{sort} ||= 'transdate'; - $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"; - - # 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"; + OE->transactions(\%myconfig, \%$form); - @columns = $form->sort_columns("transdate", "reqdate", "id", "$ordnumber", "name", "netamount", "tax", "amount", "curr", "employee", "shipvia", "open", "closed"); + $form->{rowcount} = scalar @{ $form->{OE} }; - $form->{l_open} = $form->{l_closed} = "Y" if ($form->{open} && $form->{closed}) ; + my @columns = ( + "transdate", "reqdate", + "id", $ordnumber, + "name", "netamount", + "tax", "amount", + "curr", "employee", + "shipvia", "globalprojectnumber", + "transaction_description", "open", + "delivered", "marge_total", "marge_percent" + ); - foreach $item (@columns) { - if ($form->{"l_$item"} eq "Y") { - push @column_index, $item; - - # add column to href and callback - $callback .= "&l_$item=Y"; - $href .= "&l_$item=Y"; - } + # only show checkboxes if gotten here via sales_order form. + my $allow_multiple_orders = $form->{type} eq 'sales_order'; + if ($allow_multiple_orders) { + unshift @columns, "ids"; } - - if ($form->{l_subtotal} eq 'Y') { - $callback .= "&l_subtotal=Y"; - $href .= "&l_subtotal=Y"; - } - - + + $form->{l_open} = $form->{l_closed} = "Y" if ($form->{open} && $form->{closed}); + $form->{l_delivered} = "Y" if ($form->{delivered} && $form->{notdelivered}); + + my $attachment_basename; if ($form->{vc} eq 'vendor') { - if ($form->{type} eq 'receive_order') { - $form->{title} = $locale->text('Receive Merchandise'); - } elsif ($form->{type} eq 'purchase_order') { - $form->{title} = $locale->text('Purchase Orders'); + if ($form->{type} eq 'purchase_order') { + $form->{title} = $locale->text('Purchase Orders'); + $attachment_basename = $locale->text('purchase_order_list'); } else { - $form->{title} = $locale->text('Request for Quotations'); + $form->{title} = $locale->text('Request for Quotations'); + $attachment_basename = $locale->text('rfq_list'); } - $name = $locale->text('Vendor'); - $employee = $locale->text('Employee'); - } - if ($form->{vc} eq 'customer') { + + } else { 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'); + $form->{title} = $locale->text('Sales Orders'); + $attachment_basename = $locale->text('sales_order_list'); } else { - $form->{title} = $locale->text('Quotations'); - $employee = $locale->text('Employee'); + $form->{title} = $locale->text('Quotations'); + $attachment_basename = $locale->text('quotation_list'); } - $name = $locale->text('Customer'); - } - - $column_header{id} = qq||.$locale->text('ID').qq||; - $column_header{transdate} = qq||.$locale->text('Date').qq||; - $column_header{reqdate} = qq||.$locale->text('Required by').qq||; - $column_header{ordnumber} = qq||.$locale->text('Order').qq||; - $column_header{quonumber} = qq||.$locale->text('Quotation').qq||; - $column_header{name} = qq|$name|; - $column_header{netamount} = qq||.$locale->text('Amount').qq||; - $column_header{tax} = qq||.$locale->text('Tax').qq||; - $column_header{amount} = qq||.$locale->text('Total').qq||; - $column_header{curr} = qq||.$locale->text('Curr').qq||; - $column_header{shipvia} = qq||.$locale->text('Ship via').qq||; - $column_header{open} = qq||.$locale->text('O').qq||; - $column_header{closed} = qq||.$locale->text('C').qq||; - - $column_header{employee} = qq|$employee|; + } - - if ($form->{$form->{vc}}) { - $option = $locale->text(ucfirst $form->{vc}); - $option .= " : $form->{$form->{vc}}"; + my $report = SL::ReportGenerator->new(\%myconfig, $form); + + my @hidden_variables = map { "l_${_}" } @columns; + push @hidden_variables, "l_subtotal", $form->{vc}, qw(l_closed l_notdelivered open closed delivered notdelivered ordnumber quonumber + transaction_description transdatefrom transdateto type vc employee_id); + + my $href = build_std_url('action=orders', grep { $form->{$_} } @hidden_variables); + + my %column_defs = ( + 'ids' => { 'text' => '', }, + 'transdate' => { 'text' => $locale->text('Date'), }, + 'reqdate' => { 'text' => $locale->text('Required by'), }, + 'id' => { 'text' => $locale->text('ID'), }, + 'ordnumber' => { 'text' => $locale->text('Order'), }, + 'quonumber' => { 'text' => $form->{type} eq "request_quotation" ? $locale->text('RFQ') : $locale->text('Quotation'), }, + 'name' => { 'text' => $form->{vc} eq 'customer' ? $locale->text('Customer') : $locale->text('Vendor'), }, + 'netamount' => { 'text' => $locale->text('Amount'), }, + 'tax' => { 'text' => $locale->text('Tax'), }, + 'amount' => { 'text' => $locale->text('Total'), }, + 'curr' => { 'text' => $locale->text('Curr'), }, + 'employee' => { 'text' => $locale->text('Salesperson'), }, + 'shipvia' => { 'text' => $locale->text('Ship via'), }, + 'globalprojectnumber' => { 'text' => $locale->text('Project Number'), }, + 'transaction_description' => { 'text' => $locale->text('Transaction description'), }, + 'open' => { 'text' => $locale->text('Open'), }, + 'delivered' => { 'text' => $locale->text('Delivered'), }, + 'marge_total' => { 'text' => $locale->text('Ertrag'), }, + 'marge_percent' => { 'text' => $locale->text('Ertrag prozentual'), } + ); + + foreach my $name (qw(id transdate reqdate quonumber ordnumber name employee shipvia)) { + $column_defs{$name}->{link} = $href . "&sort=$name"; + } + + my %column_alignment = map { $_ => 'right' } qw(netamount tax amount curr); + + $form->{"l_type"} = "Y"; + map { $column_defs{$_}->{visible} = $form->{"l_${_}"} ? 1 : 0 } @columns; + $column_defs{ids}->{visible} = $allow_multiple_orders ? 'HTML' : 0; + + $report->set_columns(%column_defs); + $report->set_column_order(@columns); + + $report->set_export_options('orders', @hidden_variables); + + $report->set_sort_indicator($form->{sort}, 1); + + my @options; + if ($form->{customer}) { + push @options, $locale->text('Customer') . " : $form->{customer}"; } - if ($form->{warehouse}) { - ($warehouse) = split /--/, $form->{warehouse}; - $option .= "\n" if ($option); - $option .= $locale->text('Warehouse'); - $option .= " : $warehouse"; + if ($form->{vendor}) { + push @options, $locale->text('Vendor') . " : $form->{vendor}"; } if ($form->{department}) { - $option .= "\n" if ($option); ($department) = split /--/, $form->{department}; - $option .= $locale->text('Department')." : $department"; + push @options, $locale->text('Department') . " : $department"; + } + if ($form->{ordnumber}) { + push @options, $locale->text('Order Number') . " : $form->{ordnumber}"; + } + if ($form->{notes}) { + push @options, $locale->text('Notes') . " : $form->{notes}"; + } + if ($form->{transaction_description}) { + push @options, $locale->text('Transaction description') . " : $form->{transaction_description}"; } if ($form->{transdatefrom}) { - $option .= "\n".$locale->text('From')." ".$locale->date(\%myconfig, $form->{transdatefrom}, 1); + push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{transdatefrom}, 1); } if ($form->{transdateto}) { - $option .= "\n".$locale->text('Bis')." ".$locale->date(\%myconfig, $form->{transdateto}, 1); + push @options, $locale->text('Bis') . " " . $locale->date(\%myconfig, $form->{transdateto}, 1); } if ($form->{open}) { - $option .= "\n" if ($option); - $option .= $locale->text('Open'); + push @options, $locale->text('Open'); } if ($form->{closed}) { - $option .= "\n" if ($option); - $option .= $locale->text('Closed'); + push @options, $locale->text('Closed'); + } + if ($form->{delivered}) { + push @options, $locale->text('Delivered'); + } + if ($form->{notdelivered}) { + push @options, $locale->text('Not delivered'); } - - $form->header; - - print qq| - - - - $form->{title} - - - - $option - - - - - |; + $report->set_options('top_info_text' => join("\n", @options), + 'raw_top_info_text' => $form->parse_html_template('oe/orders_top'), + 'raw_bottom_info_text' => $form->parse_html_template('oe/orders_bottom', { 'SHOW_CONTINUE_BUTTON' => $allow_multiple_orders }), + 'output_format' => 'HTML', + 'title' => $form->{title}, + 'attachment_basename' => $attachment_basename . strftime('_%Y%m%d', localtime time), + ); + $report->set_options_from_form(); -map { print "\n$column_header{$_}" } @column_index; + # add sort and escape callback, this one we use for the add sub + $form->{callback} = $href .= "&sort=$form->{sort}"; -print qq| - -|; + # escape callback for href + $callback = $form->escape($href); - # add sort and escape callback - $callback = $form->escape($callback . "&sort=$form->{sort}"); + my @subtotal_columns = qw(netamount amount marge_total); - if (@{ $form->{OE} }) { - $sameitem = $form->{OE}->[0]->{$form->{sort}}; - } + my %totals = map { $_ => 0 } @subtotal_columns; + my %subtotals = map { $_ => 0 } @subtotal_columns; - $action = "edit"; - $action = "ship_receive" if ($form->{type} =~ /(ship|receive)_order/); + my $idx = 0; - $warehouse = $form->escape($form->{warehouse}); + my $edit_url = build_std_url('action=edit', 'type', 'vc'); foreach $oe (@{ $form->{OE} }) { + map { $oe->{$_} *= $oe->{exchangerate} } @subtotal_columns; - if ($form->{l_subtotal} eq 'Y') { - if ($sameitem ne $oe->{$form->{sort}}) { - &subtotal; - $sameitem = $oe->{$form->{sort}}; - } - } - - map { $oe->{$_} *= $oe->{exchangerate} } (qw(netamount amount)); - - $column_data{netamount} = "".$form->format_amount(\%myconfig, $oe->{netamount}, 2, " ").""; - $column_data{tax} = "".$form->format_amount(\%myconfig, $oe->{amount} - $oe->{netamount}, 2, " ").""; - $column_data{amount} = "".$form->format_amount(\%myconfig, $oe->{amount}, 2, " ").""; - - $totalnetamount += $oe->{netamount}; - $totalamount += $oe->{amount}; + $oe->{tax} = $oe->{amount} - $oe->{netamount}; + $oe->{open} = $oe->{closed} ? $locale->text('No') : $locale->text('Yes'); + $oe->{delivered} = $oe->{delivered} ? $locale->text('Yes') : $locale->text('No'); - $subtotalnetamount += $oe->{netamount}; - $subtotalamount += $oe->{amount}; + map { $subtotals{$_} += $oe->{$_}; + $totals{$_} += $oe->{$_} } @subtotal_columns; - $column_data{id} = "$oe->{id}"; - $column_data{transdate} = "$oe->{transdate} "; - $column_data{reqdate} = "$oe->{reqdate} "; + map { $oe->{$_} = $form->format_amount(\%myconfig, $oe->{$_}, 2) } qw(netamount tax amount marge_total marge_percent); - $column_data{$ordnumber} = "{path}&action=$action&type=$form->{type}&id=$oe->{id}&warehouse=$warehouse&vc=$form->{vc}&login=$form->{login}&password=$form->{password}&callback=$callback>$oe->{$ordnumber}"; - $column_data{name} = "$oe->{name}"; + my $row = { }; - $column_data{employee} = "$oe->{employee} "; - $column_data{shipvia} = "$oe->{shipvia} "; - - if ($oe->{closed}) { - $column_data{closed} = "X"; - $column_data{open} = " "; - } else { - $column_data{closed} = " "; - $column_data{open} = "X"; + foreach my $column (@columns) { + next if ($column eq 'ids'); + $row->{$column} = { + 'data' => $oe->{$column}, + 'align' => $column_alignment{$column}, + }; } - $i++; $i %= 2; - print " - "; - - map { print "\n$column_data{$_}" } @column_index; - - print qq| - -|; - - } - - if ($form->{l_subtotal} eq 'Y') { - &subtotal; - } - - # print totals - print qq| - |; - - map { $column_data{$_} = " " } @column_index; - - $column_data{netamount} = "".$form->format_amount(\%myconfig, $totalnetamount, 2, " ").""; - $column_data{tax} = "".$form->format_amount(\%myconfig, $totalamount - $totalnetamount, 2, " ").""; - $column_data{amount} = "".$form->format_amount(\%myconfig, $totalamount, 2, " ").""; - - map { print "\n$column_data{$_}" } @column_index; - - print qq| - - - - - - - - - - -{script}> + $row->{ids} = { + 'raw_data' => $cgi->hidden('-name' => "trans_id_${idx}", '-value' => $oe->{id}) + . $cgi->checkbox('-name' => "multi_id_${idx}", '-value' => 1, '-label' => ''), + 'valign' => 'center', + 'align' => 'center', + }; - + $row->{$ordnumber}->{link} = $edit_url . "&id=" . E($oe->{id}) . "&callback=${callback}"; -{type}> -{vc}> + my $row_set = [ $row ]; -{path}> -{login}> -{password}> -|; + if (($form->{l_subtotal} eq 'Y') + && (($idx == (scalar @{ $form->{OE} } - 1)) + || ($oe->{ $form->{sort} } ne $form->{OE}->[$idx + 1]->{ $form->{sort} }))) { + push @{ $row_set }, create_subtotal_row(\%subtotals, \@columns, \%column_alignment, \@subtotal_columns, 'listsubtotal'); + } - if ($form->{type} !~ /(ship|receive)_order/) { - print qq| -|; - } + $report->add_data($row_set); - if ($form->{menubar}) { - require "$form->{path}/menu.pl"; - &menubar; + $idx++; } - print qq| - + $report->add_separator(); + $report->add_data(create_subtotal_row(\%totals, \@columns, \%column_alignment, \@subtotal_columns, 'listtotal')); - - -|; + $report->generate_with_headers(); $lxdebug->leave_sub(); } +sub check_delivered_flag { + $lxdebug->enter_sub(); + if (($form->{type} ne 'sales_order') && ($form->{type} ne 'purchase_order')) { + return $lxdebug->leave_sub(); + } -sub subtotal { - $lxdebug->enter_sub(); + my $all_delivered = 0; - map { $column_data{$_} = " " } @column_index; - - $column_data{netamount} = "".$form->format_amount(\%myconfig, $subtotalnetamount, 2, " ").""; - $column_data{tax} = "".$form->format_amount(\%myconfig, $subtotalamount - $subtotalnetamount, 2, " ").""; - $column_data{amount} = "".$form->format_amount(\%myconfig, $subtotalamount, 2, " ").""; + foreach my $i (1 .. $form->{rowcount}) { + next if (!$form->{"id_$i"}); - $subtotalnetamount = 0; - $subtotalamount = 0; + if ($form->parse_amount(\%myconfig, $form->{"qty_$i"}) == $form->parse_amount(\%myconfig, $form->{"ship_$i"})) { + $all_delivered = 1; + next; + } - print " - -"; - - map { print "\n$column_data{$_}" } @column_index; + $all_delivered = 0; + last; + } - print qq| - -|; + $form->{delivered} = 1 if $all_delivered; $lxdebug->leave_sub(); } - -sub save { +sub save_and_close { $lxdebug->enter_sub(); + $form->{defaultcurrency} = $form->get_default_currency(\%myconfig); + if ($form->{type} =~ /_order$/) { $form->isblank("transdate", $locale->text('Order Date missing!')); } else { $form->isblank("transdate", $locale->text('Quotation Date missing!')); } - + + my $idx = $form->{type} =~ /_quotation$/ ? "quonumber" : "ordnumber"; + $form->{$idx} =~ s/^\s*//g; + $form->{$idx} =~ s/\s*$//g; + $msg = ucfirst $form->{vc}; $form->isblank($form->{vc}, $locale->text($msg . " missing!")); -# $locale->text('Customer missing!'); -# $locale->text('Vendor missing!'); + # $locale->text('Customer missing!'); + # $locale->text('Vendor missing!'); + + $form->isblank("exchangerate", $locale->text('Exchangerate missing!')) + if ($form->{currency} ne $form->{defaultcurrency}); + + &validate_items; - $form->isblank("exchangerate", $locale->text('Exchangerate missing!')) if ($form->{currency} ne $form->{defaultcurrency}); + if($form->{payment_id}) { + $payment_id = $form->{payment_id}; + } - &validate_items; - # if the name changed get new values if (&check_name($form->{vc})) { + if($form->{payment_id} eq "") { + $form->{payment_id} = $payment_id; + } &update; exit; } $form->{id} = 0 if $form->{saveasnew}; - + # this is for the internal notes section for the [email] Subject if ($form->{type} =~ /_order$/) { if ($form->{type} eq 'sales_order') { @@ -1445,17 +1898,19 @@ sub save { $ordnumber = "ordnumber"; } else { $form->{label} = $locale->text('Purchase Order'); - + $numberfld = "ponumber"; $ordnumber = "ordnumber"; } $err = $locale->text('Cannot save order!'); - + + check_delivered_flag(); + } else { if ($form->{type} eq 'sales_quotation') { $form->{label} = $locale->text('Quotation'); - + $numberfld = "sqnumber"; $ordnumber = "quonumber"; } else { @@ -1464,113 +1919,264 @@ sub save { $numberfld = "rfqnumber"; $ordnumber = "quonumber"; } - - $err = $locale->text('Cannot save quotation!'); - - } - - $form->{$ordnumber} = $form->update_defaults(\%myconfig, $numberfld) unless $form->{$ordnumber}; - - $form->redirect($form->{label}." $form->{$ordnumber} ".$locale->text('saved!')) if (OE->save(\%myconfig, \%$form)); - $form->error($err); - $lxdebug->leave_sub(); -} - - - -sub delete { - $lxdebug->enter_sub(); - - $form->header; + $err = $locale->text('Cannot save quotation!'); - 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| - - -{script}> -|; - - # delete action variable - map { delete $form->{$_} } qw(action header); - foreach $key (keys %$form) { - $form->{$key} =~ s/\"/"/g; - print qq|\n|; + # 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); } - print qq| -|.$locale->text('Confirm!').qq| + relink_accounts(); -$msg $form->{$ordnumber} - - - + $form->error($err) if (!OE->save(\%myconfig, \%$form)); - -
- -