X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Foe.pl;h=cb55f0714f7fb776811dafe350bb61293ee8cdea;hb=29d636435456494e8dc702ccc1015452a71275d9;hp=baa041f364d9288bd5da8c5070f8d38153c946d3;hpb=72539cb39a3d19f930a8e0e41e46bf41afe9a8f1;p=kivitendo-erp.git diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl index baa041f36..cb55f0714 100644 --- a/bin/mozilla/oe.pl +++ b/bin/mozilla/oe.pl @@ -31,40 +31,77 @@ # 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 -sub add { +# For locales.pl: +# $locale->text('Edit the purchase_order'); +# $locale->text('Edit the sales_order'); +# $locale->text('Edit the request_quotation'); +# $locale->text('Edit the sales_quotation'); + +# $locale->text('Workflow purchase_order'); +# $locale->text('Workflow sales_order'); +# $locale->text('Workflow request_quotation'); +# $locale->text('Workflow sales_quotation'); + +sub set_headings { $lxdebug->enter_sub(); + my ($action) = @_; + if ($form->{type} eq 'purchase_order') { - $form->{title} = $locale->text('Add Purchase Order'); - $form->{vc} = 'vendor'; + $form->{title} = $action eq "edit" ? + $locale->text('Edit Purchase Order') : + $locale->text('Add Purchase Order'); + $form->{heading} = $locale->text('Purchase Order'); + $form->{vc} = 'vendor'; } if ($form->{type} eq 'sales_order') { - $form->{title} = $locale->text('Add Sales Order'); - $form->{vc} = 'customer'; + $form->{title} = $action eq "edit" ? + $locale->text('Edit Sales Order') : + $locale->text('Add Sales Order'); + $form->{heading} = $locale->text('Sales Order'); + $form->{vc} = 'customer'; } if ($form->{type} eq 'request_quotation') { - $form->{title} = $locale->text('Add Request for Quotation'); - $form->{vc} = 'vendor'; + $form->{title} = $action eq "edit" ? + $locale->text('Edit Request for Quotation') : + $locale->text('Add Request for Quotation'); + $form->{heading} = $locale->text('Request for Quotation'); + $form->{vc} = 'vendor'; } if ($form->{type} eq 'sales_quotation') { - $form->{title} = $locale->text('Add Quotation'); - $form->{vc} = 'customer'; + $form->{title} = $action eq "edit" ? + $locale->text('Edit Quotation') : + $locale->text('Add Quotation'); + $form->{heading} = $locale->text('Quotation'); + $form->{vc} = 'customer'; } + $lxdebug->leave_sub(); +} + +sub add { + $lxdebug->enter_sub(); + + set_headings("add"); + $form->{callback} = - "$form->{script}?action=add&type=$form->{type}&vc=$form->{vc}&login=$form->{login}&path=$form->{path}&password=$form->{password}" + "$form->{script}?action=add&type=$form->{type}&vc=$form->{vc}&login=$form->{login}&password=$form->{password}" unless $form->{callback}; &order_links; @@ -76,47 +113,46 @@ sub add { sub edit { $lxdebug->enter_sub(); + # show history button + $form->{javascript} = qq||; + #/show hhistory button + + $form->{simple_save} = 0; + + set_headings("edit"); # editing without stuff to edit? try adding it first - if ($form->{rowcount}) { - map { $id++ if $form->{"id_$_"} } (1 .. $form->{rowcount}); + 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; } - } else { - if (!$form->{id}) { - &add; - return; - } + } elsif (!$form->{id}) { + &add; + $lxdebug->leave_sub(); + return; } - if ($form->{type} eq 'purchase_order') { - $form->{title} = $locale->text('Edit Purchase Order'); - $form->{heading} = $locale->text('Purchase Order'); - $form->{vc} = 'vendor'; - } - if ($form->{type} eq 'sales_order') { - $form->{title} = $locale->text('Edit Sales Order'); - $form->{heading} = $locale->text('Sales Order'); - $form->{vc} = 'customer'; - } - if ($form->{type} eq 'request_quotation') { - $form->{title} = $locale->text('Edit Request for Quotation'); - $form->{heading} = $locale->text('Request for Quotation'); - $form->{vc} = 'vendor'; - } - if ($form->{type} eq 'sales_quotation') { - $form->{title} = $locale->text('Edit Quotation'); - $form->{heading} = $locale->text('Quotation'); - $form->{vc} = 'customer'; + if ($form->{print_and_save}) { + $form->{action} = "print"; + $form->{resubmit} = 1; + $language_id = $form->{language_id}; + $printer_id = $form->{printer_id}; } + set_headings("edit"); + &order_links; &prepare_order; + if ($form->{print_and_save}) { + $form->{language_id} = $language_id; + $form->{printer_id} = $printer_id; + } &display_form; $lxdebug->leave_sub(); @@ -124,19 +160,31 @@ sub edit { sub order_links { $lxdebug->enter_sub(); - # get customer/vendor $form->all_vc(\%myconfig, $form->{vc}, ($form->{vc} eq 'customer') ? "AR" : "AP"); # retrieve order/quotation - $form->{webdav} = $webdav; + $form->{webdav} = $webdav; + $form->{jsscript} = 1; - # set jscalendar - $form->{jscalendar} = $jscalendar; + 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) @@ -165,15 +213,36 @@ sub order_links { $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; + 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"}|; @@ -182,18 +251,11 @@ sub order_links { if (@{ $form->{"all_$form->{vc}"} }) { $form->{ $form->{vc} } = qq|$form->{$form->{vc}}--$form->{"$form->{vc}_id"}|; - map { $form->{"select$form->{vc}"} .= "$_->{name}--$_->{id}\n" } + 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 @@ -203,34 +265,25 @@ sub order_links { map { $form->{selectdepartment} .= - "$_->{description}--$_->{id}\n" + "$_->{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} = "pdf"; - $form->{media} = "screen"; - $form->{formname} = $form->{type}; - - map { $form->{$_} =~ s/\"/"/g } - qw(ordnumber quonumber shippingpoint shipvia notes intnotes shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptocontact); + $form->{formname} = $form->{type} unless $form->{formname}; + my $i = 0; foreach $ref (@{ $form->{form_details} }) { $form->{rowcount} = ++$i; @@ -271,92 +324,280 @@ sub prepare_order { 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}; + $form->{jsscript} = 1; $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"); + $button1 = qq| + + text('button') . qq|> + |; + $button2 = qq| + + text('button') . qq|> + |; - } else { + #write Trigger + $jsscript = + Form->write_trigger(\%myconfig, "2", "transdate", "BL", "trigger1", + "reqdate", "BL", "trigger2"); - # without JavaScript Calendar - $button1 = qq| - {transdate}>|; - $button2 = qq| - {reqdate}>|; + 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}/; } - #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}"; - } + #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"}; + } + + $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"); - $contact = - ($form->{selectcontact}) - ? qq|$form->{selectcontact}\n| - : qq||; - $exchangerate = qq| {forex}> |; @@ -377,27 +618,28 @@ sub form_header { } } - $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->{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| + + |; } @@ -431,19 +673,11 @@ sub form_header { $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 { @@ -469,7 +703,6 @@ sub form_header { |; - $terms = ""; } $ordnumber .= qq| @@ -482,80 +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} + $form->{selectdepartment} - -| if $form->{selectdepartment}; - - $employee = qq| - -|; + | if $form->{selectdepartment}; if ($form->{type} eq 'sales_order') { if ($form->{selectemployee}) { - $employee = qq| - {customer_klass}> - - | . $locale->text('Salesperson') . qq| - $form->{selectemployee} - - - -|; + $employee .= qq| + |; } } else { - $employee = qq| - {customer_klass}> - - | . $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()"; } + $credittext = $locale->text('Credit Limit exceeded!!!'); + if ($creditwarning) { + $onload = qq|alert('$credittext')|; + } + + $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||; + $form->header; print qq| - - -{script}> - -{id}> - -{type}> -{formname}> -{media}> -{format}> + - - - +{script}> -{vc}> - - + + + + +|; -{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| @@ -569,22 +792,15 @@ 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 @@ -595,14 +811,42 @@ sub form_header { | . $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 + @@ -622,6 +866,8 @@ $jsscript + + @@ -686,7 +932,8 @@ sub form_footer { $tax .= qq| - $form->{"${item}_description"} + $form->{"${item}_description"} | + . $form->{"${item}_rate"} * 100 .qq|% $form->{"${item}_total"} |; @@ -725,7 +972,8 @@ sub form_footer { $tax .= qq| - Enthaltene $form->{"${item}_description"} + Enthaltene $form->{"${item}_description"} | + . $form->{"${item}_rate"} * 100 .qq|% $form->{"${item}_total"} @@ -757,11 +1005,36 @@ sub form_footer { $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 @@ -791,11 +1064,11 @@ sub form_footer { Dateiname Webdavlink |; - foreach $file (keys %{ $form->{WEBDAV} }) { + foreach $file (@{ $form->{WEBDAV} }) { $webdav_list .= qq| - $file - $form->{WEBDAV}{$file} + $file->{name} + $file->{type} |; } @@ -809,22 +1082,20 @@ sub form_footer { print $webdav_list; } - print qq| -{jscalendar}> -|; + print qq| |; - &print_options; + print_options(); print qq| -Bearbeiten des $form->{heading} -{type}") . qq| + @@ -834,16 +1105,24 @@ Bearbeiten des $form->{heading} . $locale->text('E-mail') . qq|"> + |; - if ($form->{id}) { + if (($form->{id})) { print qq| -Workflow $form->{heading} + + +| . $locale->text("Workflow $form->{type}") . qq| |; - if ($form->{type} =~ /sales_quotation$/) { + if (($form->{type} =~ /sales_quotation$/)) { print qq| |; @@ -873,7 +1152,7 @@ Bearbeiten des $form->{heading} + . $locale->text('Request for Quotation') . qq|"> |; } else { @@ -883,20 +1162,9 @@ Bearbeiten des $form->{heading} . $locale->text('Order') . qq|"> |; } - } elsif ($form->{type} =~ /sales_order$/ && $form->{rowcount}) { - print qq| -Workflow $form->{heading} - - -|; } - if ($form->{menubar}) { - require "$form->{path}/menu.pl"; - &menubar; - } + $form->hide_form("saved_xyznumber"); print qq| @@ -904,7 +1172,6 @@ Bearbeiten des $form->{heading} -{path}> {login}> {password}> @@ -919,13 +1186,22 @@ Bearbeiten des $form->{heading} sub update { $lxdebug->enter_sub(); + set_headings($form->{"id"} ? "edit" : "add"); + map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } qw(exchangerate creditlimit creditremaining); - + $form->{update} = 1; + + if($form->{payment_id}) { + $payment_id = $form->{payment_id}; + } + &check_name($form->{vc}); - - &check_project; - + + if($form->{payment_id} eq "") { + $form->{payment_id} = $payment_id; + } + $buysell = 'buy'; $buysell = 'sell' if ($form->{vc} eq 'vendor'); $form->{exchangerate} = $exchangerate @@ -948,7 +1224,7 @@ sub update { $form->{creditremaining} += ($form->{oldinvtotal} - $form->{oldtotalpaid}); &check_form; - } else { + } else { if ( $form->{type} eq 'purchase_order' || $form->{type} eq 'request_quotation') { @@ -974,11 +1250,16 @@ sub update { } else { $sellprice = $form->parse_amount(\%myconfig, $form->{"sellprice_$i"}); - + if ($form->{"not_discountable_$i"}) { + $form->{"discount_$i"} = 0; + } map { $form->{item_list}[$i]{$_} =~ s/\"/"/g } qw(partnumber description unit); map { $form->{"${_}_$i"} = $form->{item_list}[0]{$_} } keys %{ $form->{item_list}[0] }; + if ($form->{"part_payment_id_$i"} ne "") { + $form->{payment_id} = $form->{"part_payment_id_$i"}; + } $s = ($sellprice) ? $sellprice : $form->{"sellprice_$i"}; @@ -1034,7 +1315,7 @@ sub update { $form->{rowcount}--; $form->{"discount_$i"} = ""; &display_form; - } else { + } else { $form->{"id_$i"} = 0; $form->{"unit_$i"} = $locale->text('ea'); @@ -1058,6 +1339,7 @@ sub search { $ordnumber = 'ordnumber'; $employee = $locale->text('Employee'); } + if ($form->{type} eq 'request_quotation') { $form->{title} = $locale->text('Request for Quotations'); $form->{vc} = 'vendor'; @@ -1065,27 +1347,13 @@ sub search { $ordnumber = 'quonumber'; $employee = $locale->text('Employee'); } - if ($form->{type} eq 'receive_order') { - $form->{title} = $locale->text('Receive Merchandise'); - $form->{vc} = 'vendor'; - $ordlabel = $locale->text('Order Number'); - $ordnumber = 'ordnumber'; - $employee = $locale->text('Employee'); - } + if ($form->{type} eq 'sales_order') { $form->{title} = $locale->text('Sales Orders'); $form->{vc} = 'customer'; $ordlabel = $locale->text('Order Number'); $ordnumber = 'ordnumber'; - $employee = $locale->text('Salesperson'); - } - if ($form->{type} eq 'ship_order') { - $form->{title} = $locale->text('Ship Merchandise'); - $form->{vc} = 'customer'; - $ordlabel = $locale->text('Order Number'); - $ordnumber = 'ordnumber'; - $employee = $locale->text('Salesperson'); - + $employee = $locale->text('Employee'); } if ($form->{type} eq 'sales_quotation') { @@ -1096,55 +1364,17 @@ sub search { $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} - - -|; - - } - } - # 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>|; - # departments if (@{ $form->{all_departments} }) { $form->{selectdepartment} = "\n"; map { $form->{selectdepartment} .= - "$_->{description}--$_->{id}\n" + "$_->{description}--$_->{id}\n" } (@{ $form->{all_departments} }); } @@ -1155,52 +1385,91 @@ sub search { | 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; + $form->{jsscript} = 1; $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| - |; + $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| @@ -1217,15 +1486,23 @@ 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| $button1 @@ -1237,7 +1514,13 @@ sub search { | . $locale->text('Include in Report') . qq| - $openclosed + + + | . $locale->text("Open") . qq| + + | . $locale->text("Closed") . qq| + + $delivered | . $locale->text('ID') . qq| @@ -1248,7 +1531,7 @@ sub search { . $locale->text('Required by') . qq| - $vclabel + $vc_label $employee | . $locale->text('Ship via') . qq| @@ -1260,6 +1543,18 @@ sub search { . $locale->text('Tax') . qq| | . $locale->text('Total') . qq| + + + | + . $locale->text('Ertrag') . qq| + | + . $locale->text('Ertrag prozentual') . qq| + + + | + . $locale->text('Project Number') . qq| + | + . $locale->text('Transaction description') . qq| | @@ -1278,7 +1573,6 @@ $jsscript -{path}> {login}> {password}> {vc}> @@ -1295,384 +1589,360 @@ $jsscript $lxdebug->leave_sub(); } -sub orders { +sub create_subtotal_row { $lxdebug->enter_sub(); - # split vendor / customer - ($form->{ $form->{vc} }, $form->{"$form->{vc}_id"}) = - split(/--/, $form->{ $form->{vc} }); + my ($totals, $columns, $column_alignment, $subtotal_columns, $class) = @_; - OE->transactions(\%myconfig, \%$form); + my $row = { map { $_ => { 'data' => '', 'class' => $class, 'align' => $column_alignment->{$_}, } } @{ $columns } }; - $ordnumber = ($form->{type} =~ /_order$/) ? "ordnumber" : "quonumber"; + map { $row->{$_}->{data} = $form->format_amount(\%myconfig, $totals->{$_}, 2) } @{ $subtotal_columns }; - $number = $form->escape($form->{$ordnumber}); - $name = $form->escape($form->{ $form->{vc} }); - $department = $form->escape($form->{department}); - $warehouse = $form->escape($form->{warehouse}); + $row->{tax}->{data} = $form->format_amount(\%myconfig, $totals->{amount} - $totals->{netamount}, 2); - # 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"; + map { $totals->{$_} = 0 } @{ $subtotal_columns }; - # 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); + $lxdebug->leave_sub(); + + return $row; +} - $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"; +sub orders { + $lxdebug->enter_sub(); - @columns = - $form->sort_columns("transdate", "reqdate", "id", "$ordnumber", - "name", "netamount", "tax", "amount", - "curr", "employee", "shipvia", "open", - "closed"); + $ordnumber = ($form->{type} =~ /_order$/) ? "ordnumber" : "quonumber"; - $form->{l_open} = $form->{l_closed} = "Y" - if ($form->{open} && $form->{closed}); + ($form->{ $form->{vc} }, $form->{"${form->{vc}}_id"}) = split(/--/, $form->{ $form->{vc} }); - foreach $item (@columns) { - if ($form->{"l_$item"} eq "Y") { - push @column_index, $item; + $form->{sort} ||= 'transdate'; - # add column to href and callback - $callback .= "&l_$item=Y"; - $href .= "&l_$item=Y"; - } - } + OE->transactions(\%myconfig, \%$form); + + $form->{rowcount} = scalar @{ $form->{OE} }; + + my @columns = ( + "transdate", "reqdate", + "id", $ordnumber, + "name", "netamount", + "tax", "amount", + "curr", "employee", + "shipvia", "globalprojectnumber", + "transaction_description", "open", + "delivered", "marge_total", "marge_percent" + ); # only show checkboxes if gotten here via sales_order form. - if ($form->{type} =~ /sales_order/) { - unshift @column_index, "ids"; + 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|; - - $column_header{ids} = qq||; - - if ($form->{ $form->{vc} }) { - $option = $locale->text(ucfirst $form->{vc}); - $option .= " : $form->{$form->{vc}}"; - } - if ($form->{warehouse}) { - ($warehouse) = split /--/, $form->{warehouse}; - $option .= "\n" if ($option); - $option .= $locale->text('Warehouse'); - $option .= " : $warehouse"; } - if ($form->{department}) { - $option .= "\n" if ($option); + + 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->{vendor}) { + push @options, $locale->text('Vendor') . " : $form->{vendor}"; + } + if ($form->{department}) { ($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; + $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(); - print qq| - + # add sort and escape callback, this one we use for the add sub + $form->{callback} = $href .= "&sort=$form->{sort}"; - - - - $form->{title} - - - - $option - - - - - |; + # escape callback for href + $callback = $form->escape($href); - map { print "\n$column_header{$_}" } @column_index; + my @subtotal_columns = qw(netamount amount marge_total); - print qq| - -|; + my %totals = map { $_ => 0 } @subtotal_columns; + my %subtotals = map { $_ => 0 } @subtotal_columns; - # add sort and escape callback - $callback_escaped = $form->escape($callback . "&sort=$form->{sort}"); + my $idx = 0; - if (@{ $form->{OE} }) { - $sameitem = $form->{OE}->[0]->{ $form->{sort} }; - } + my $edit_url = build_std_url('action=edit', 'type', 'vc'); - $action = "edit"; - $action = "ship_receive" if ($form->{type} =~ /(ship|receive)_order/); + foreach $oe (@{ $form->{OE} }) { + map { $oe->{$_} *= $oe->{exchangerate} } @subtotal_columns; - $warehouse = $form->escape($form->{warehouse}); + $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'); - foreach $oe (@{ $form->{OE} }) { - $form->{rowcount} = ++$j; + map { $subtotals{$_} += $oe->{$_}; + $totals{$_} += $oe->{$_} } @subtotal_columns; - if ($form->{l_subtotal} eq 'Y') { - if ($sameitem ne $oe->{ $form->{sort} }) { - &subtotal; - $sameitem = $oe->{ $form->{sort} }; - } - } + map { $oe->{$_} = $form->format_amount(\%myconfig, $oe->{$_}, 2) } qw(netamount tax amount marge_total marge_percent); - 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}; - - $subtotalnetamount += $oe->{netamount}; - $subtotalamount += $oe->{amount}; - - $column_data{ids} = - qq||; - $column_data{id} = "$oe->{id}"; - $column_data{transdate} = "$oe->{transdate} "; - $column_data{reqdate} = "$oe->{reqdate} "; - - $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_escaped>$oe->{$ordnumber}"; - $column_data{name} = "$oe->{name}"; - - $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"; + my $row = { }; + + foreach my $column (@columns) { + next if ($column eq 'ids'); + $row->{$column} = { + 'data' => $oe->{$column}, + 'align' => $column_alignment{$column}, + }; } - $i++; - $i %= 2; - print " - "; + $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', + }; - map { print "\n$column_data{$_}" } @column_index; + $row->{$ordnumber}->{link} = $edit_url . "&id=" . E($oe->{id}) . "&callback=${callback}"; - print qq| - -|; + my $row_set = [ $row ]; - } + 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'); + } + + $report->add_data($row_set); - if ($form->{l_subtotal} eq 'Y') { - &subtotal; + $idx++; } - # print totals - print qq| - |; + $report->add_separator(); + $report->add_data(create_subtotal_row(\%totals, \@columns, \%column_alignment, \@subtotal_columns, 'listtotal')); - map { $column_data{$_} = " " } @column_index; + $report->generate_with_headers(); - $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, " ") . ""; + $lxdebug->leave_sub(); +} - map { print "\n$column_data{$_}" } @column_index; +sub check_delivered_flag { + $lxdebug->enter_sub(); - print qq| - - - - - - - -|; + if (($form->{type} ne 'sales_order') && ($form->{type} ne 'purchase_order')) { + return $lxdebug->leave_sub(); + } - # multiple invoice edit button only if gotten there via sales_order form. + my $all_delivered = 0; - if ($form->{type} =~ /sales_order/) { - print qq| - - - - - - - - - - |; - } + foreach my $i (1 .. $form->{rowcount}) { + next if (!$form->{"id_$i"}); - print qq| - + if ($form->parse_amount(\%myconfig, $form->{"qty_$i"}) == $form->parse_amount(\%myconfig, $form->{"ship_$i"})) { + $all_delivered = 1; + next; + } - -{script}> + $all_delivered = 0; + last; + } - + $form->{delivered} = 1 if $all_delivered; -{type}> -{vc}> + $lxdebug->leave_sub(); +} -{path}> -{login}> -{password}> -|; +sub save_and_close { + $lxdebug->enter_sub(); - if ($form->{type} !~ /(ship|receive)_order/) { - print qq| -|; + $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!')); } - if ($form->{menubar}) { - require "$form->{path}/menu.pl"; - &menubar; + 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!'); + + $form->isblank("exchangerate", $locale->text('Exchangerate missing!')) + if ($form->{currency} ne $form->{defaultcurrency}); + + &validate_items; + + if($form->{payment_id}) { + $payment_id = $form->{payment_id}; + } + + # if the name changed get new values + if (&check_name($form->{vc})) { + if($form->{payment_id} eq "") { + $form->{payment_id} = $payment_id; + } + &update; + exit; } - print qq| - + $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') { + $form->{label} = $locale->text('Sales Order'); - $lxdebug->leave_sub(); -} + $numberfld = "sonumber"; + $ordnumber = "ordnumber"; + } else { + $form->{label} = $locale->text('Purchase Order'); -sub subtotal { - $lxdebug->enter_sub(); + $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 { + $form->{label} = $locale->text('Request for Quotation'); + + $numberfld = "rfqnumber"; + $ordnumber = "quonumber"; + } - map { $column_data{$_} = " " } @column_index; + $err = $locale->text('Cannot save quotation!'); - $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, " ") . ""; + } - $subtotalnetamount = 0; - $subtotalamount = 0; + # 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 " - -"; + relink_accounts(); - map { print "\n$column_data{$_}" } @column_index; + $form->error($err) if (!OE->save(\%myconfig, \%$form)); - print qq| - -|; + # saving the history + if(!exists $form->{addition}) { + $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber}; + $form->{addition} = "SAVED"; + $form->save_history($form->dbconnect(\%myconfig)); + } + # /saving the history + + $form->redirect($form->{label} . " $form->{$ordnumber} " . + $locale->text('saved!')); $lxdebug->leave_sub(); } @@ -1680,12 +1950,19 @@ sub subtotal { sub save { $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!")); @@ -1696,9 +1973,16 @@ sub save { if ($form->{currency} ne $form->{defaultcurrency}); &validate_items; - + + if($form->{payment_id}) { + $payment_id = $form->{payment_id}; + } + # if the name changed get new values if (&check_name($form->{vc})) { + if($form->{payment_id} eq "") { + $form->{payment_id} = $payment_id; + } &update; exit; } @@ -1721,6 +2005,8 @@ sub save { $err = $locale->text('Cannot save order!'); + check_delivered_flag(); + } else { if ($form->{type} eq 'sales_quotation') { $form->{label} = $locale->text('Quotation'); @@ -1741,11 +2027,24 @@ sub save { $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); + relink_accounts(); + + OE->save(\%myconfig, \%$form); + # saving the history + if(!exists $form->{addition}) { + $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber}; + $form->{addition} = "SAVED"; + $form->save_history($form->dbconnect(\%myconfig)); + } + # /saving the history + + $form->{simple_save} = 1; + if(!$form->{print_and_save}) { + set_headings("edit"); + &update; + exit; + } $lxdebug->leave_sub(); } @@ -1781,8 +2080,11 @@ sub delete { $msg $form->{$ordnumber} + +| + . $locale->text('No') . qq| @@ -1792,7 +2094,7 @@ sub delete { $lxdebug->leave_sub(); } -sub yes { +sub delete_order_quotation { $lxdebug->enter_sub(); if ($form->{type} =~ /_order$/) { @@ -1802,8 +2104,17 @@ sub yes { $msg = $locale->text('Quotation deleted!'); $err = $locale->text('Cannot delete quotation!'); } - - $form->redirect($msg) if (OE->delete(\%myconfig, \%$form, $spool)); + if (OE->delete(\%myconfig, \%$form, $spool)){ + # saving the history + if(!exists $form->{addition}) { + $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber}; + $form->{addition} = "DELETED"; + $form->save_history($form->dbconnect(\%myconfig)); + } + # /saving the history + $form->info($msg); + exit(); + } $form->error($err); $lxdebug->leave_sub(); @@ -1812,34 +2123,50 @@ sub yes { sub invoice { $lxdebug->enter_sub(); + $form->{old_employee_id} = $form->{employee_id}; + $form->{old_salesman_id} = $form->{salesman_id}; + if ($form->{type} =~ /_order$/) { # these checks only apply if the items don't bring their own ordnumbers/transdates. # The if clause ensures that by searching for empty ordnumber_#/transdate_# fields. $form->isblank("ordnumber", $locale->text('Order Number missing!')) - if (+{ map { $form->{"ordnumber_$_"}, 1 } (1 .. $form->{rowcount} - 1) } - ->{''}); + if (+{ map { $form->{"ordnumber_$_"}, 1 } (1 .. $form->{rowcount} - 1) }->{''}); $form->isblank("transdate", $locale->text('Order Date missing!')) - if (+{ map { $form->{"transdate_$_"}, 1 } (1 .. $form->{rowcount} - 1) } - ->{''}); + if (+{ map { $form->{"transdate_$_"}, 1 } (1 .. $form->{rowcount} - 1) }->{''}); # also copy deliverydate from the order $form->{deliverydate} = $form->{reqdate} if $form->{reqdate}; + $form->{orddate} = $form->{transdate}; } else { $form->isblank("quonumber", $locale->text('Quotation Number missing!')); $form->isblank("transdate", $locale->text('Quotation Date missing!')); $form->{ordnumber} = ""; + $form->{quodate} = $form->{transdate}; } - + + if($form->{payment_id}) { + $payment_id = $form->{payment_id}; + } + # if the name changed get new values if (&check_name($form->{vc})) { + if($form->{payment_id} eq "") { + $form->{payment_id} = $payment_id; + } &update; exit; } - ($null, $form->{cp_id}) = split /--/, $form->{contact}; $form->{cp_id} *= 1; + for $i (1 .. $form->{rowcount}) { + map({ $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig, + $form->{"${_}_${i}"}) + if ($form->{"${_}_${i}"}) } + qw(ship qty sellprice listprice basefactor)); + } + if ( $form->{type} =~ /_order/ && $form->{currency} ne $form->{defaultcurrency}) { @@ -1864,7 +2191,7 @@ sub invoice { # if not it's most likely a collective order, which can't be saved back # so they just have to be closed if (($form->{ordnumber} ne '') || ($form->{quonumber} ne '')) { - OE->save(\%myconfig, \%$form); + OE->close_order(\%myconfig, \%$form) if ($form->{id}); } else { OE->close_orders(\%myconfig, \%$form); } @@ -1878,6 +2205,8 @@ sub invoice { $form->{rowcount}--; $form->{shipto} = 1; + $form->{defaultcurrency} = $form->get_default_currency(\%myconfig); + if ($form->{type} =~ /_order$/) { $form->{exchangerate} = $exchangerate; &create_backorder; @@ -1906,7 +2235,7 @@ sub invoice { # locale messages $locale = new Locale "$myconfig{countrycode}", "$script"; - require "$form->{path}/$form->{script}"; + require "bin/mozilla/$form->{script}"; map { $form->{"select$_"} = "" } ($form->{vc}, currency); @@ -1987,7 +2316,6 @@ sub backorder_exchangerate { print qq| -{path}> {login}> {password}> @@ -2088,6 +2416,8 @@ sub create_backorder { } qw(sellprice discount); } + relink_accounts(); + OE->save(\%myconfig, \%$form); # rebuild rows for invoice @@ -2118,21 +2448,85 @@ sub save_as_new { $form->{closed} = 0; map { delete $form->{$_} } qw(printed emailed queued); + # Let Lx-Office assign a new order number if the user hasn't changed the + # previous one. If it has been changed manually then use it as-is. + my $idx = $form->{type} =~ /_quotation$/ ? "quonumber" : "ordnumber"; + $form->{$idx} =~ s/^\s*//g; + $form->{$idx} =~ s/\s*$//g; + if ($form->{saved_xyznumber} && + ($form->{saved_xyznumber} eq $form->{$idx})) { + delete($form->{$idx}); + } + &save; $lxdebug->leave_sub(); } +sub check_for_direct_delivery_yes { + $lxdebug->enter_sub(); + + $form->{direct_delivery_checked} = 1; + delete @{$form}{grep /^shipto/, keys %{ $form }}; + map { s/^CFDD_//; $form->{$_} = $form->{"CFDD_${_}"} } grep /^CFDD_/, keys %{ $form }; + $form->{shipto} = 1; + purchase_order(); + $lxdebug->leave_sub(); +} + +sub check_for_direct_delivery_no { + $lxdebug->enter_sub(); + + $form->{direct_delivery_checked} = 1; + delete @{$form}{grep /^shipto/, keys %{ $form }}; + purchase_order(); + + $lxdebug->leave_sub(); +} + +sub check_for_direct_delivery { + $lxdebug->enter_sub(); + + if ($form->{direct_delivery_checked} + || (!$form->{shiptoname} && !$form->{shiptostreet} && !$form->{shipto_id})) { + $lxdebug->leave_sub(); + return; + } + + if ($form->{shipto_id}) { + Common->get_shipto_by_id(\%myconfig, $form, $form->{shipto_id}, "CFDD_"); + + } else { + map { $form->{"CFDD_${_}"} = $form->{$_ } } grep /^shipto/, keys %{ $form }; + } + + delete $form->{action}; + $form->{VARIABLES} = [ map { { "key" => $_, "value" => $form->{$_} } } grep { ref $_ eq "" } keys %{ $form } ]; + + $form->header(); + print $form->parse_html_template("oe/check_for_direct_delivery"); + + $lxdebug->leave_sub(); + + exit 0; +} + sub purchase_order { $lxdebug->enter_sub(); + if ($form->{type} eq 'sales_order') { + check_for_direct_delivery(); + } + if ( $form->{type} eq 'sales_quotation' || $form->{type} eq 'request_quotation') { - $form->{closed} = 1; - OE->save(\%myconfig, \%$form); + OE->close_order(\%myconfig, \%$form); + } + + if ($form->{type} =~ /^sales_/) { + delete($form->{ordnumber}); } - ($null, $form->{cp_id}) = split /--/, $form->{contact}; $form->{cp_id} *= 1; $form->{title} = $locale->text('Add Purchase Order'); @@ -2149,11 +2543,13 @@ sub sales_order { if ( $form->{type} eq 'sales_quotation' || $form->{type} eq 'request_quotation') { - $form->{closed} = 1; - OE->save(\%myconfig, \%$form); + OE->close_order(\%myconfig, $form); + } + + if ($form->{type} eq "purchase_order") { + delete($form->{ordnumber}); } - ($null, $form->{cp_id}) = split /--/, $form->{contact}; $form->{cp_id} *= 1; $form->{title} = $locale->text('Add Sales Order'); @@ -2173,10 +2569,20 @@ sub poso { $form->{closed} = 0; + $form->{old_employee_id} = $form->{employee_id}; + $form->{old_salesman_id} = $form->{salesman_id}; + # reset map { delete $form->{$_} } qw(id subject message cc bcc printed emailed queued customer vendor creditlimit creditremaining discount tradediscount oldinvtotal); + for $i (1 .. $form->{rowcount}) { + map({ $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig, + $form->{"${_}_${i}"}) + if ($form->{"${_}_${i}"}) } + qw(ship qty sellprice listprice basefactor)); + } + &order_links; &prepare_order; @@ -2195,642 +2601,31 @@ sub poso { $lxdebug->leave_sub(); } -sub ship_receive { +sub e_mail { $lxdebug->enter_sub(); - &order_links; - - &prepare_order; - - OE->get_warehouses(\%myconfig, \%$form); - - # warehouse - if (@{ $form->{all_warehouses} }) { - $form->{selectwarehouse} = "\n"; - - map { $form->{selectwarehouse} .= "$_->{description}--$_->{id}\n" } - (@{ $form->{all_warehouses} }); - - if ($form->{warehouse}) { - $form->{selectwarehouse} = "$form->{warehouse}"; - } - } - - $form->{shippingdate} = $form->current_date(\%myconfig); - $form->{"$form->{vc}"} =~ s/--.*//; + $form->{print_and_save} = 1; - @flds = (); - @a = (); - $count = 0; - foreach $key (keys %$form) { - if ($key =~ /_1$/) { - $key =~ s/_1//; - push @flds, $key; - } - } - - for $i (1 .. $form->{rowcount}) { - - # undo formatting from prepare_order - map { - $form->{"${_}_$i"} = - $form->parse_amount(\%myconfig, $form->{"${_}_$i"}) - } qw(qty ship); - $n = ($form->{"qty_$i"} -= $form->{"ship_$i"}); - if (abs($n) > 0 - && ($form->{"inventory_accno_$i"} || $form->{"assembly_$i"})) { - $form->{"ship_$i"} = ""; - $form->{"serialnumber_$i"} = ""; + $print_post = 1; - push @a, {}; - $j = $#a; + my $saved_form = save_form(); - map { $a[$j]->{$_} = $form->{"${_}_$i"} } @flds; - $count++; - } - } + save(); - $form->redo_rows(\@flds, \@a, $count, $form->{rowcount}); - $form->{rowcount} = $count; + my %saved_vars; + map({ $saved_vars{$_} = $form->{$_}; } qw(id ordnumber quonumber)); + restore_form($saved_form); + map({ $form->{$_} = $saved_vars{$_}; } qw(id ordnumber quonumber)); - &display_ship_receive; + edit_e_mail(); $lxdebug->leave_sub(); } -sub display_ship_receive { - $lxdebug->enter_sub(); - - $vclabel = ucfirst $form->{vc}; - $vclabel = $locale->text($vclabel); - - $form->{rowcount}++; - - if ($form->{vc} eq 'customer') { - $form->{title} = $locale->text('Ship Merchandise'); - $shipped = $locale->text('Shipping Date'); - } else { - $form->{title} = $locale->text('Receive Merchandise'); - $shipped = $locale->text('Date Received'); - } - - # set option selected - foreach $item (warehouse, employee) { - $form->{"select$item"} =~ s/ selected//; - $form->{"select$item"} =~ - s/option>\Q$form->{$item}\E/option selected>$form->{$item}/; - } +sub yes { + call_sub($form->{yes_nextsub}); +} - $warehouse = qq| - - | . $locale->text('Warehouse') . qq| - $form->{selectwarehouse} - - -| if $form->{selectwarehouse}; - - $employee = qq| - - | . $locale->text('Contact') . qq| - $form->{selectemployee} - - -|; - - $form->header; - - print qq| - - -{script}> - -{id}> - - - -{type}> -{media}> -{format}> - - - - - -{vc}> - - - - $form->{title} - - - - - - - - - - $vclabel - $form->{$form->{vc}} - {vc} value="$form->{$form->{vc}}"> - {"$form->{vc}_id"}> - - $department - - | . $locale->text('Shipping Point') . qq| - - - - - | . $locale->text('Ship via') . qq| - - - - $warehouse - - - - - $employee - - | . $locale->text('Order Number') . qq| - $form->{ordnumber} - - - - | . $locale->text('Order Date') . qq| - $form->{transdate} - {transdate}> - - - $shipped - {shippingdate}> - - - - - - - - - - - - - - - - - - - - - - - - - - - -|; - - @column_index = - (partnumber, description, qty, ship, unit, bin, serialnumber); - - if ($form->{type} eq "ship_order") { - $column_data{ship} = - qq|| - . $locale->text('Ship') - . qq||; - } - if ($form->{type} eq "receive_order") { - $column_data{ship} = - qq|| - . $locale->text('Recd') - . qq||; - } - - my $colspan = $#column_index + 1; - - $column_data{partnumber} = - qq|| . $locale->text('Number') . qq||; - $column_data{description} = - qq|| - . $locale->text('Description') - . qq||; - $column_data{qty} = - qq|| . $locale->text('Qty') . qq||; - $column_data{unit} = - qq|| . $locale->text('Unit') . qq||; - $column_data{bin} = - qq|| . $locale->text('Bin') . qq||; - $column_data{serialnumber} = - qq|| - . $locale->text('Serial No.') - . qq||; - - print qq| - - - - |; - - map { print "\n$column_data{$_}" } @column_index; - - print qq| - -|; - - for $i (1 .. $form->{rowcount} - 1) { - - # undo formatting - $form->{"ship_$i"} = $form->parse_amount(\%myconfig, $form->{"ship_$i"}); - - # convert " to " - map { $form->{"${_}_$i"} =~ s/\"/"/g } - qw(partnumber description unit bin serialnumber); - - $description = $form->{"description_$i"}; - $description =~ s/\n//g; - - $column_data{partnumber} = - qq|$form->{"partnumber_$i"}|; - $column_data{description} = - qq|$description|; - $column_data{qty} = - qq|| - . $form->format_amount(\%myconfig, $form->{"qty_$i"}, $dec_qty) - . qq||; - $column_data{ship} = - qq|format_amount(\%myconfig, $form->{"ship_$i"}) - . qq|>|; - $column_data{unit} = - qq|$form->{"unit_$i"}|; - $column_data{bin} = - qq|$form->{"bin_$i"}|; - - $column_data{serialnumber} = - qq||; - - print qq| - |; - - map { print "\n$column_data{$_}" } @column_index; - - print qq| - - -{"orderitems_id_$i"}> -{"id_$i"}> - - - -|; - - } - - print qq| - - - - - - - - -|; - - $form->{copies} = 1; - - &print_options; - - print qq| - - - - - - -|; - - if ($form->{type} eq 'ship_order') { - print qq| - - -|; - } - - print qq| - - -|; - - if ($form->{menubar}) { - require "$form->{path}/menu.pl"; - &menubar; - } - - print qq| - -{rowcount}> - - - -{path}> -{login}> -{password}> - - - - -
+ +| + . $locale->text('No') . qq| @@ -1792,7 +2094,7 @@ sub delete { $lxdebug->leave_sub(); } -sub yes { +sub delete_order_quotation { $lxdebug->enter_sub(); if ($form->{type} =~ /_order$/) { @@ -1802,8 +2104,17 @@ sub yes { $msg = $locale->text('Quotation deleted!'); $err = $locale->text('Cannot delete quotation!'); } - - $form->redirect($msg) if (OE->delete(\%myconfig, \%$form, $spool)); + if (OE->delete(\%myconfig, \%$form, $spool)){ + # saving the history + if(!exists $form->{addition}) { + $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber}; + $form->{addition} = "DELETED"; + $form->save_history($form->dbconnect(\%myconfig)); + } + # /saving the history + $form->info($msg); + exit(); + } $form->error($err); $lxdebug->leave_sub(); @@ -1812,34 +2123,50 @@ sub yes { sub invoice { $lxdebug->enter_sub(); + $form->{old_employee_id} = $form->{employee_id}; + $form->{old_salesman_id} = $form->{salesman_id}; + if ($form->{type} =~ /_order$/) { # these checks only apply if the items don't bring their own ordnumbers/transdates. # The if clause ensures that by searching for empty ordnumber_#/transdate_# fields. $form->isblank("ordnumber", $locale->text('Order Number missing!')) - if (+{ map { $form->{"ordnumber_$_"}, 1 } (1 .. $form->{rowcount} - 1) } - ->{''}); + if (+{ map { $form->{"ordnumber_$_"}, 1 } (1 .. $form->{rowcount} - 1) }->{''}); $form->isblank("transdate", $locale->text('Order Date missing!')) - if (+{ map { $form->{"transdate_$_"}, 1 } (1 .. $form->{rowcount} - 1) } - ->{''}); + if (+{ map { $form->{"transdate_$_"}, 1 } (1 .. $form->{rowcount} - 1) }->{''}); # also copy deliverydate from the order $form->{deliverydate} = $form->{reqdate} if $form->{reqdate}; + $form->{orddate} = $form->{transdate}; } else { $form->isblank("quonumber", $locale->text('Quotation Number missing!')); $form->isblank("transdate", $locale->text('Quotation Date missing!')); $form->{ordnumber} = ""; + $form->{quodate} = $form->{transdate}; } - + + if($form->{payment_id}) { + $payment_id = $form->{payment_id}; + } + # if the name changed get new values if (&check_name($form->{vc})) { + if($form->{payment_id} eq "") { + $form->{payment_id} = $payment_id; + } &update; exit; } - ($null, $form->{cp_id}) = split /--/, $form->{contact}; $form->{cp_id} *= 1; + for $i (1 .. $form->{rowcount}) { + map({ $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig, + $form->{"${_}_${i}"}) + if ($form->{"${_}_${i}"}) } + qw(ship qty sellprice listprice basefactor)); + } + if ( $form->{type} =~ /_order/ && $form->{currency} ne $form->{defaultcurrency}) { @@ -1864,7 +2191,7 @@ sub invoice { # if not it's most likely a collective order, which can't be saved back # so they just have to be closed if (($form->{ordnumber} ne '') || ($form->{quonumber} ne '')) { - OE->save(\%myconfig, \%$form); + OE->close_order(\%myconfig, \%$form) if ($form->{id}); } else { OE->close_orders(\%myconfig, \%$form); } @@ -1878,6 +2205,8 @@ sub invoice { $form->{rowcount}--; $form->{shipto} = 1; + $form->{defaultcurrency} = $form->get_default_currency(\%myconfig); + if ($form->{type} =~ /_order$/) { $form->{exchangerate} = $exchangerate; &create_backorder; @@ -1906,7 +2235,7 @@ sub invoice { # locale messages $locale = new Locale "$myconfig{countrycode}", "$script"; - require "$form->{path}/$form->{script}"; + require "bin/mozilla/$form->{script}"; map { $form->{"select$_"} = "" } ($form->{vc}, currency); @@ -1987,7 +2316,6 @@ sub backorder_exchangerate { print qq| -{path}> {login}> {password}> @@ -2088,6 +2416,8 @@ sub create_backorder { } qw(sellprice discount); } + relink_accounts(); + OE->save(\%myconfig, \%$form); # rebuild rows for invoice @@ -2118,21 +2448,85 @@ sub save_as_new { $form->{closed} = 0; map { delete $form->{$_} } qw(printed emailed queued); + # Let Lx-Office assign a new order number if the user hasn't changed the + # previous one. If it has been changed manually then use it as-is. + my $idx = $form->{type} =~ /_quotation$/ ? "quonumber" : "ordnumber"; + $form->{$idx} =~ s/^\s*//g; + $form->{$idx} =~ s/\s*$//g; + if ($form->{saved_xyznumber} && + ($form->{saved_xyznumber} eq $form->{$idx})) { + delete($form->{$idx}); + } + &save; $lxdebug->leave_sub(); } +sub check_for_direct_delivery_yes { + $lxdebug->enter_sub(); + + $form->{direct_delivery_checked} = 1; + delete @{$form}{grep /^shipto/, keys %{ $form }}; + map { s/^CFDD_//; $form->{$_} = $form->{"CFDD_${_}"} } grep /^CFDD_/, keys %{ $form }; + $form->{shipto} = 1; + purchase_order(); + $lxdebug->leave_sub(); +} + +sub check_for_direct_delivery_no { + $lxdebug->enter_sub(); + + $form->{direct_delivery_checked} = 1; + delete @{$form}{grep /^shipto/, keys %{ $form }}; + purchase_order(); + + $lxdebug->leave_sub(); +} + +sub check_for_direct_delivery { + $lxdebug->enter_sub(); + + if ($form->{direct_delivery_checked} + || (!$form->{shiptoname} && !$form->{shiptostreet} && !$form->{shipto_id})) { + $lxdebug->leave_sub(); + return; + } + + if ($form->{shipto_id}) { + Common->get_shipto_by_id(\%myconfig, $form, $form->{shipto_id}, "CFDD_"); + + } else { + map { $form->{"CFDD_${_}"} = $form->{$_ } } grep /^shipto/, keys %{ $form }; + } + + delete $form->{action}; + $form->{VARIABLES} = [ map { { "key" => $_, "value" => $form->{$_} } } grep { ref $_ eq "" } keys %{ $form } ]; + + $form->header(); + print $form->parse_html_template("oe/check_for_direct_delivery"); + + $lxdebug->leave_sub(); + + exit 0; +} + sub purchase_order { $lxdebug->enter_sub(); + if ($form->{type} eq 'sales_order') { + check_for_direct_delivery(); + } + if ( $form->{type} eq 'sales_quotation' || $form->{type} eq 'request_quotation') { - $form->{closed} = 1; - OE->save(\%myconfig, \%$form); + OE->close_order(\%myconfig, \%$form); + } + + if ($form->{type} =~ /^sales_/) { + delete($form->{ordnumber}); } - ($null, $form->{cp_id}) = split /--/, $form->{contact}; $form->{cp_id} *= 1; $form->{title} = $locale->text('Add Purchase Order'); @@ -2149,11 +2543,13 @@ sub sales_order { if ( $form->{type} eq 'sales_quotation' || $form->{type} eq 'request_quotation') { - $form->{closed} = 1; - OE->save(\%myconfig, \%$form); + OE->close_order(\%myconfig, $form); + } + + if ($form->{type} eq "purchase_order") { + delete($form->{ordnumber}); } - ($null, $form->{cp_id}) = split /--/, $form->{contact}; $form->{cp_id} *= 1; $form->{title} = $locale->text('Add Sales Order'); @@ -2173,10 +2569,20 @@ sub poso { $form->{closed} = 0; + $form->{old_employee_id} = $form->{employee_id}; + $form->{old_salesman_id} = $form->{salesman_id}; + # reset map { delete $form->{$_} } qw(id subject message cc bcc printed emailed queued customer vendor creditlimit creditremaining discount tradediscount oldinvtotal); + for $i (1 .. $form->{rowcount}) { + map({ $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig, + $form->{"${_}_${i}"}) + if ($form->{"${_}_${i}"}) } + qw(ship qty sellprice listprice basefactor)); + } + &order_links; &prepare_order; @@ -2195,642 +2601,31 @@ sub poso { $lxdebug->leave_sub(); } -sub ship_receive { +sub e_mail { $lxdebug->enter_sub(); - &order_links; - - &prepare_order; - - OE->get_warehouses(\%myconfig, \%$form); - - # warehouse - if (@{ $form->{all_warehouses} }) { - $form->{selectwarehouse} = "\n"; - - map { $form->{selectwarehouse} .= "$_->{description}--$_->{id}\n" } - (@{ $form->{all_warehouses} }); - - if ($form->{warehouse}) { - $form->{selectwarehouse} = "$form->{warehouse}"; - } - } - - $form->{shippingdate} = $form->current_date(\%myconfig); - $form->{"$form->{vc}"} =~ s/--.*//; + $form->{print_and_save} = 1; - @flds = (); - @a = (); - $count = 0; - foreach $key (keys %$form) { - if ($key =~ /_1$/) { - $key =~ s/_1//; - push @flds, $key; - } - } - - for $i (1 .. $form->{rowcount}) { - - # undo formatting from prepare_order - map { - $form->{"${_}_$i"} = - $form->parse_amount(\%myconfig, $form->{"${_}_$i"}) - } qw(qty ship); - $n = ($form->{"qty_$i"} -= $form->{"ship_$i"}); - if (abs($n) > 0 - && ($form->{"inventory_accno_$i"} || $form->{"assembly_$i"})) { - $form->{"ship_$i"} = ""; - $form->{"serialnumber_$i"} = ""; + $print_post = 1; - push @a, {}; - $j = $#a; + my $saved_form = save_form(); - map { $a[$j]->{$_} = $form->{"${_}_$i"} } @flds; - $count++; - } - } + save(); - $form->redo_rows(\@flds, \@a, $count, $form->{rowcount}); - $form->{rowcount} = $count; + my %saved_vars; + map({ $saved_vars{$_} = $form->{$_}; } qw(id ordnumber quonumber)); + restore_form($saved_form); + map({ $form->{$_} = $saved_vars{$_}; } qw(id ordnumber quonumber)); - &display_ship_receive; + edit_e_mail(); $lxdebug->leave_sub(); } -sub display_ship_receive { - $lxdebug->enter_sub(); - - $vclabel = ucfirst $form->{vc}; - $vclabel = $locale->text($vclabel); - - $form->{rowcount}++; - - if ($form->{vc} eq 'customer') { - $form->{title} = $locale->text('Ship Merchandise'); - $shipped = $locale->text('Shipping Date'); - } else { - $form->{title} = $locale->text('Receive Merchandise'); - $shipped = $locale->text('Date Received'); - } - - # set option selected - foreach $item (warehouse, employee) { - $form->{"select$item"} =~ s/ selected//; - $form->{"select$item"} =~ - s/option>\Q$form->{$item}\E/option selected>$form->{$item}/; - } +sub yes { + call_sub($form->{yes_nextsub}); +} - $warehouse = qq| - - | . $locale->text('Warehouse') . qq| - $form->{selectwarehouse} - - -| if $form->{selectwarehouse}; - - $employee = qq| - - | . $locale->text('Contact') . qq| - $form->{selectemployee} - - -|; - - $form->header; - - print qq| - - -{script}> - -{id}> - - - -{type}> -{media}> -{format}> - - - - - -{vc}> - - - - $form->{title} - - - - - - - - - - $vclabel - $form->{$form->{vc}} - {vc} value="$form->{$form->{vc}}"> - {"$form->{vc}_id"}> - - $department - - | . $locale->text('Shipping Point') . qq| - - - - - | . $locale->text('Ship via') . qq| - - - - $warehouse - - - - - $employee - - | . $locale->text('Order Number') . qq| - $form->{ordnumber} - - - - | . $locale->text('Order Date') . qq| - $form->{transdate} - {transdate}> - - - $shipped - {shippingdate}> - - - - - - - - - - - - - - - - - - - - - - - - - - - -|; - - @column_index = - (partnumber, description, qty, ship, unit, bin, serialnumber); - - if ($form->{type} eq "ship_order") { - $column_data{ship} = - qq|| - . $locale->text('Ship') - . qq||; - } - if ($form->{type} eq "receive_order") { - $column_data{ship} = - qq|| - . $locale->text('Recd') - . qq||; - } - - my $colspan = $#column_index + 1; - - $column_data{partnumber} = - qq|| . $locale->text('Number') . qq||; - $column_data{description} = - qq|| - . $locale->text('Description') - . qq||; - $column_data{qty} = - qq|| . $locale->text('Qty') . qq||; - $column_data{unit} = - qq|| . $locale->text('Unit') . qq||; - $column_data{bin} = - qq|| . $locale->text('Bin') . qq||; - $column_data{serialnumber} = - qq|| - . $locale->text('Serial No.') - . qq||; - - print qq| - - - - |; - - map { print "\n$column_data{$_}" } @column_index; - - print qq| - -|; - - for $i (1 .. $form->{rowcount} - 1) { - - # undo formatting - $form->{"ship_$i"} = $form->parse_amount(\%myconfig, $form->{"ship_$i"}); - - # convert " to " - map { $form->{"${_}_$i"} =~ s/\"/"/g } - qw(partnumber description unit bin serialnumber); - - $description = $form->{"description_$i"}; - $description =~ s/\n//g; - - $column_data{partnumber} = - qq|$form->{"partnumber_$i"}|; - $column_data{description} = - qq|$description|; - $column_data{qty} = - qq|| - . $form->format_amount(\%myconfig, $form->{"qty_$i"}, $dec_qty) - . qq||; - $column_data{ship} = - qq|format_amount(\%myconfig, $form->{"ship_$i"}) - . qq|>|; - $column_data{unit} = - qq|$form->{"unit_$i"}|; - $column_data{bin} = - qq|$form->{"bin_$i"}|; - - $column_data{serialnumber} = - qq||; - - print qq| - |; - - map { print "\n$column_data{$_}" } @column_index; - - print qq| - - -{"orderitems_id_$i"}> -{"id_$i"}> - - - -|; - - } - - print qq| - - - - - - - - -|; - - $form->{copies} = 1; - - &print_options; - - print qq| - - - - - - -|; - - if ($form->{type} eq 'ship_order') { - print qq| - - -|; - } - - print qq| - - -|; - - if ($form->{menubar}) { - require "$form->{path}/menu.pl"; - &menubar; - } - - print qq| - -{rowcount}> - - - -{path}> -{login}> -{password}> - - - - -