X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Foe.pl;h=899d263f08d59b827425f8d00b769e43bee10479;hb=0b280f98054da74f79cbc9fdb3e9f4c23326be53;hp=e05d0130a1f0cc994da8e24a867047167241df2e;hpb=8f3dc0b4dfd14847df54366f0c146d058522d022;p=kivitendo-erp.git diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl index e05d0130a..899d263f0 100644 --- a/bin/mozilla/oe.pl +++ b/bin/mozilla/oe.pl @@ -30,41 +30,75 @@ # Order entry module # Quotation module #====================================================================== +use Data::Dumper; use SL::OE; use SL::IR; use SL::IS; use SL::PE; -require "$form->{path}/io.pl"; -require "$form->{path}/arap.pl"; +require "bin/mozilla/io.pl"; +require "bin/mozilla/arap.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,46 +110,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}); + 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(); @@ -123,26 +157,44 @@ 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 + # there were more than one customer (in that case OE::retrieve removes # the content from the field) - if ($form->{rowcount} && $form->{type} eq 'sales_order' && defined $form->{customer} && $form->{customer} eq '') { -# $main::lxdebug->message(0, "Detected Edit order with concurrent customers"); - $form->error($locale->text('Collective Orders only work for orders from one customer!')); + if ( $form->{rowcount} + && $form->{type} eq 'sales_order' + && defined $form->{customer} + && $form->{customer} eq '') { + + # $main::lxdebug->message(0, "Detected Edit order with concurrent customers"); + $form->error( + $locale->text( + 'Collective Orders only work for orders from one customer!') + ); } $taxincluded = $form->{taxincluded}; @@ -158,15 +210,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"}|; @@ -175,18 +248,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 @@ -196,62 +262,58 @@ 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}; - foreach $ref (@{ $form->{form_details} }) { - $form->{rowcount} = ++$i; + my $i = 0; + foreach $ref (@{ $form->{form_details} }) { + $form->{rowcount} = ++$i; - map { $form->{"${_}_$i"} = $ref->{$_} } keys %{$ref}; - } - - for my $i (1 .. $form->{rowcount}) { - $form->{"discount_$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; - ($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"}; - # 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); - $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); + (my $dec_qty) = ($form->{"qty_$i"} =~ /\.(\d+)/); + $dec_qty = length $dec_qty; + $form->{"qty_$i"} = + $form->format_amount(\%myconfig, $form->{"qty_$i"}, $dec_qty); - map { $form->{"${_}_$i"} =~ s/\"/"/g } - qw(partnumber description unit); - } + map { $form->{"${_}_$i"} =~ s/\"/"/g } + qw(partnumber description unit); + } $lxdebug->leave_sub(); } @@ -259,92 +321,259 @@ 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" : ""; + + 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, employee, ($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}) { + #quote select[customer|vendor] Bug 133 + $form->{"select$form->{vc}"} = $form->quote($form->{"select$form->{vc}"}); - $form->{selectcontact} = ""; - foreach $item (@{ $form->{all_contacts} }) { - if ($form->{cp_id} == $item->{cp_id}) { - $form->{selectcontact} .= - "$item->{cp_name}--$item->{cp_id}"; - } else { - $form->{selectcontact} .= "$item->{cp_name}--$item->{cp_id}"; - } + #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_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->{"id"}} = $item->{name}.qq|--|.$item->{"id"}; + } + + $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"})); + + $salesman = ""; + if ($form->{type} =~ /^sales_/) { + %labels = (); + @values = (""); + foreach my $item (@{ $form->{ALL_SALESMEN} }) { + push(@values, $item->{id}); + $labels{$item->{id}} = $item->{name} ne "" ? $item->{name} : $item->{login}; } + + $salesman = + qq| + | . $locale->text('Salesman') . qq| + | . + NTI($cgi->popup_menu('-name' => 'salesman_id', '-default' => $form->{salesman_id}, + '-values' => \@values, '-labels' => \%labels)) + . qq| + |; + } + + %labels = (); + @values = (); + foreach my $item (@{ $form->{"ALL_SALESMEN"} }) { + push(@values, $item->{"id"}); + $labels{$item->{"id"}} = $item->{"name"}; + } + + my $employees = qq| + + | . $locale->text('Employee') . qq| + | . + NTI($cgi->popup_menu('-name' => 'employee', '-default' => $form->{"employee"}, + '-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->{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}> |; @@ -365,27 +594,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| + + |; } @@ -419,19 +649,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 { @@ -457,7 +679,6 @@ sub form_header { |; - $terms = ""; } $ordnumber .= qq| @@ -470,80 +691,74 @@ 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} - - - + $employees |; } } else { $employee = qq| {customer_klass}> - - | . $locale->text('Employee') . qq| - $form->{selectemployee} - - - + $employees |; } + 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| @@ -557,22 +772,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 @@ -583,14 +791,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 + $salesman $ordnumber - $terms + + | . $locale->text('Project Number') . qq| + $globalprojectnumber + @@ -610,6 +846,8 @@ $jsscript + + @@ -674,7 +912,8 @@ sub form_footer { $tax .= qq| - $form->{"${item}_description"} + $form->{"${item}_description"} | + . $form->{"${item}_rate"} * 100 .qq|% $form->{"${item}_total"} |; @@ -713,7 +952,8 @@ sub form_footer { $tax .= qq| - Enthaltene $form->{"${item}_description"} + Enthaltene $form->{"${item}_description"} | + . $form->{"${item}_rate"} * 100 .qq|% $form->{"${item}_total"} @@ -745,7 +985,10 @@ sub form_footer { $notes $intnotes - + + $payments + + $taxincluded @@ -797,22 +1040,20 @@ sub form_footer { print $webdav_list; } - print qq| -{jscalendar}> -|; + print qq| |; - &print_options; + print_options(); print qq| -Bearbeiten des $form->{heading} -{type}") . qq| + @@ -822,24 +1063,39 @@ 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} =~ /quotation$/) { + if (($form->{type} =~ /sales_quotation$/)) { print qq| |; + . $locale->text('Sales Order') . qq|">|; } + if ($form->{type} =~ /request_quotation$/) { + print qq| +|; + } + if (1) { print qq| |; +} if ($form->{type} =~ /sales_order$/) { print qq| @@ -856,7 +1112,7 @@ Bearbeiten des $form->{heading} + . $locale->text('Request for Quotation') . qq|"> |; } else { @@ -866,7 +1122,7 @@ Bearbeiten des $form->{heading} . $locale->text('Order') . qq|"> |; } - } elsif ($form->{type} =~ /sales_order$/ && $form->{rowcount}) { + } elsif ($form->{type} =~ /sales_order$/ && $form->{rowcount} && !$form->{proforma}) { print qq| Workflow $form->{heading} |; } - - if ($form->{menubar}) { - require "$form->{path}/menu.pl"; - &menubar; - } + $form->hide_form("saved_xyznumber"); print qq| @@ -888,7 +1140,6 @@ Bearbeiten des $form->{heading} -{path}> {login}> {password}> @@ -903,13 +1154,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 @@ -932,7 +1192,7 @@ sub update { $form->{creditremaining} += ($form->{oldinvtotal} - $form->{oldtotalpaid}); &check_form; - } else { + } else { if ( $form->{type} eq 'purchase_order' || $form->{type} eq 'request_quotation') { @@ -958,11 +1218,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"}; @@ -975,6 +1240,7 @@ sub update { } else { $form->{"sellprice_$i"} *= (1 - $form->{tradediscount}); + # if there is an exchange rate adjust sellprice $form->{"sellprice_$i"} /= $exchangerate; } @@ -1017,7 +1283,7 @@ sub update { $form->{rowcount}--; $form->{"discount_$i"} = ""; &display_form; - } else { + } else { $form->{"id_$i"} = 0; $form->{"unit_$i"} = $locale->text('ea'); @@ -1028,7 +1294,6 @@ sub update { } } - $lxdebug->leave_sub(); } @@ -1042,6 +1307,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'; @@ -1049,27 +1315,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') { @@ -1080,55 +1332,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} }); } @@ -1139,52 +1353,73 @@ 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 }, + $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)); + + %labels = (); + @values = (""); + + foreach my $item (@{ $form->{($form->{vc} eq "customer" ? "ALL_CUSTOMERS" : "ALL_VENDORS")}}) { + push(@values, $item->{name}.qq|--|.$item->{"id"}); + $labels{$item->{"id"}} = $item->{name}.qq|--|.$item->{"id"}; } + 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| @@ -1201,15 +1436,22 @@ sub search { - $vclabel + $vc_label $vc - $warehouse $department $ordlabel + + | . $locale->text('Transaction description') . qq| + + + + | . $locale->text("Project Number") . qq| + $projectnumber + | . $locale->text('From') . qq| $button1 @@ -1221,7 +1463,13 @@ sub search { | . $locale->text('Include in Report') . qq| - $openclosed + + + | . $locale->text("Open") . qq| + + | . $locale->text("Closed") . qq| + + $delivered | . $locale->text('ID') . qq| @@ -1232,10 +1480,11 @@ sub search { . $locale->text('Required by') . qq| - $vclabel + ucfirst($form->{vc}) $employee | . $locale->text('Ship via') . qq| + $employee | @@ -1246,6 +1495,12 @@ sub search { . $locale->text('Total') . qq| + | + . $locale->text('Project Number') . qq| + | + . $locale->text('Transaction description') . qq| + + | . $locale->text('Subtotal') . qq| @@ -1262,7 +1517,6 @@ $jsscript -{path}> {login}> {password}> {vc}> @@ -1282,41 +1536,42 @@ $jsscript sub orders { $lxdebug->enter_sub(); + $ordnumber = ($form->{type} =~ /_order$/) ? "ordnumber" : "quonumber"; + + # construct href + my @fields = + qw(type vc login password transdatefrom transdateto + open closed notdelivered delivered department + transaction_description); + push @fields, $form->{vc}; + $href = "$form->{script}?action=orders&" + . join("&", map { "${_}=" . E($form->{$_}) } @fields) + . "&${ordnumber}=" . E($form->{$ordnumber}); + $callback = $href; + # split vendor / customer ($form->{ $form->{vc} }, $form->{"$form->{vc}_id"}) = split(/--/, $form->{ $form->{vc} }); OE->transactions(\%myconfig, \%$form); - $ordnumber = ($form->{type} =~ /_order$/) ? "ordnumber" : "quonumber"; - - $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"; - - @columns = - $form->sort_columns("transdate", "reqdate", "id", "$ordnumber", - "name", "netamount", "tax", "amount", - "curr", "employee", "shipvia", "open", - "closed"); + @columns = ( + "transdate", "reqdate", + "id", "$ordnumber", + "name", "netamount", + "tax", "amount", + "curr", "employee", + "shipvia", "globalprojectnumber", + "transaction_description", "open", + "closed", "delivered" + ); $form->{l_open} = $form->{l_closed} = "Y" if ($form->{open} && $form->{closed}); + $form->{"l_delivered"} = "Y" + if ($form->{"delivered"} && $form->{"notdelivered"}); + foreach $item (@columns) { if ($form->{"l_$item"} eq "Y") { push @column_index, $item; @@ -1338,9 +1593,7 @@ sub orders { } if ($form->{vc} eq 'vendor') { - if ($form->{type} eq 'receive_order') { - $form->{title} = $locale->text('Receive Merchandise'); - } elsif ($form->{type} eq 'purchase_order') { + if ($form->{type} eq 'purchase_order') { $form->{title} = $locale->text('Purchase Orders'); } else { $form->{title} = $locale->text('Request for Quotations'); @@ -1351,14 +1604,10 @@ sub orders { if ($form->{vc} eq 'customer') { if ($form->{type} eq 'sales_order') { $form->{title} = $locale->text('Sales Orders'); - $employee = $locale->text('Salesperson'); - } elsif ($form->{type} eq 'ship_order') { - $form->{title} = $locale->text('Ship Merchandise'); - $employee = $locale->text('Salesperson'); } else { $form->{title} = $locale->text('Quotations'); - $employee = $locale->text('Employee'); } + $employee = $locale->text('Employee'); $name = $locale->text('Customer'); } @@ -1380,7 +1629,9 @@ sub orders { . qq||; $column_header{quonumber} = qq|| - . $locale->text('Quotation') + . ($form->{"type"} eq "request_quotation" ? + $locale->text('RFQ') : + $locale->text('Quotation')) . qq||; $column_header{name} = qq|$name|; @@ -1396,13 +1647,20 @@ sub orders { qq|| . $locale->text('Ship via') . qq||; + $column_header{globalprojectnumber} = + qq|| . $locale->text('Project Number') . qq||; $column_header{open} = qq|| . $locale->text('O') . qq||; $column_header{closed} = qq|| . $locale->text('C') . qq||; + $column_header{"delivered"} = + qq|| . $locale->text("Delivered") . qq||; $column_header{employee} = qq|$employee|; + $column_header{transaction_description} = + qq|| + . $locale->text("Transaction description") . qq||; $column_header{ids} = qq||; @@ -1410,12 +1668,6 @@ sub orders { $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); ($department) = split /--/, $form->{department}; @@ -1473,9 +1725,6 @@ sub orders { } $action = "edit"; - $action = "ship_receive" if ($form->{type} =~ /(ship|receive)_order/); - - $warehouse = $form->escape($form->{warehouse}); foreach $oe (@{ $form->{OE} }) { $form->{rowcount} = ++$j; @@ -1507,17 +1756,19 @@ sub orders { $subtotalnetamount += $oe->{netamount}; $subtotalamount += $oe->{amount}; - $column_data{ids} = qq||; + $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}"; + "{type}&id=$oe->{id}&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} "; + $column_data{globalprojectnumber} = "" . H($oe->{globalprojectnumber}) . ""; if ($oe->{closed}) { $column_data{closed} = "X"; @@ -1526,6 +1777,10 @@ sub orders { $column_data{closed} = " "; $column_data{open} = "X"; } + $column_data{"delivered"} = "" . + ($oe->{"delivered"} ? $locale->text("Yes") : $locale->text("No")) . + ""; + $column_data{transaction_description} = "" . H($oe->{transaction_description}) . ""; $i++; $i %= 2; @@ -1573,24 +1828,22 @@ sub orders { |; -# multiple invoice edit button only if gotten there via sales_order form. + # multiple invoice edit button only if gotten there via sales_order form. -if ($form->{type} =~ /sales_order/) { -print qq| - + if ($form->{type} =~ /sales_order/) { + print qq| + . $locale->text('Continue') . qq|"> - |; -} + } -print qq| + print qq| @@ -1601,23 +1854,9 @@ print qq| {type}> {vc}> -{path}> {login}> {password}> -|; - - if ($form->{type} !~ /(ship|receive)_order/) { - print qq| -|; - } - - if ($form->{menubar}) { - require "$form->{path}/menu.pl"; - &menubar; - } - print qq| @@ -1660,7 +1899,7 @@ sub subtotal { $lxdebug->leave_sub(); } -sub save { +sub save_and_close { $lxdebug->enter_sub(); if ($form->{type} =~ /_order$/) { @@ -1669,6 +1908,10 @@ sub save { $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!")); @@ -1679,9 +1922,111 @@ 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; + } + + $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'); + + $numberfld = "sonumber"; + $ordnumber = "ordnumber"; + } else { + $form->{label} = $locale->text('Purchase Order'); + + $numberfld = "ponumber"; + $ordnumber = "ordnumber"; + } + + $err = $locale->text('Cannot save order!'); + + } else { + if ($form->{type} eq 'sales_quotation') { + $form->{label} = $locale->text('Quotation'); + + $numberfld = "sqnumber"; + $ordnumber = "quonumber"; + } else { + $form->{label} = $locale->text('Request for Quotation'); + $numberfld = "rfqnumber"; + $ordnumber = "quonumber"; + } + + $err = $locale->text('Cannot save quotation!'); + + } + + # get new number in sequence if no number is given or if saveasnew was requested + if (!$form->{$ordnumber} || $form->{saveasnew}) { + $form->{$ordnumber} = $form->update_defaults(\%myconfig, $numberfld); + } + + relink_accounts(); + + $form->error($err) if (!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->redirect($form->{label} . " $form->{$ordnumber} " . + $locale->text('saved!')); + + $lxdebug->leave_sub(); +} + +sub save { + $lxdebug->enter_sub(); + + 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!'); + + $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; } @@ -1724,11 +2069,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(); } @@ -1785,8 +2143,16 @@ 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)){ + $form->redirect($msg); + # 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->error($err); $lxdebug->leave_sub(); @@ -1796,26 +2162,46 @@ sub invoice { $lxdebug->enter_sub(); if ($form->{type} =~ /_order$/) { + # these checks only apply if the items don't bring their own ordnumbers/transdates. # The if clause ensures that by searching for empty ordnumber_#/transdate_# fields. - $form->isblank("ordnumber", $locale->text('Order Number missing!')) if ( +{ map { $form->{"ordnumber_$_"}, 1 } ( 1 .. $form->{rowcount}-1 ) }->{''} ); - $form->isblank("transdate", $locale->text('Order Date missing!')) if ( +{ map { $form->{"transdate_$_"}, 1 } ( 1 .. $form->{rowcount}-1 ) }->{''} ); - + $form->isblank("ordnumber", $locale->text('Order Number missing!')) + if (+{ map { $form->{"ordnumber_$_"}, 1 } (1 .. $form->{rowcount} - 1) }->{''}); + $form->isblank("transdate", $locale->text('Order Date missing!')) + if (+{ map { $form->{"transdate_$_"}, 1 } (1 .. $form->{rowcount} - 1) }->{''}); + + # also copy deliverydate from the order + $form->{deliverydate} = $form->{reqdate} if $form->{reqdate}; + $form->{orddate} = $form->{transdate}; } else { $form->isblank("quonumber", $locale->text('Quotation Number missing!')); $form->isblank("transdate", $locale->text('Quotation Date missing!')); $form->{ordnumber} = ""; + $form->{quodate} = $form->{transdate}; } - + + if($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}) { @@ -1836,11 +2222,11 @@ sub invoice { # close orders/quotations $form->{closed} = 1; - # save order if one ordnumber has been given + # save order if one ordnumber has been given # if not it's most likely a collective order, which can't be saved back # so they just have to be closed if (($form->{ordnumber} ne '') || ($form->{quonumber} ne '')) { - OE->save(\%myconfig, \%$form); + OE->close_order(\%myconfig, \%$form); } else { OE->close_orders(\%myconfig, \%$form); } @@ -1882,7 +2268,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); @@ -1917,15 +2303,17 @@ sub invoice { $decimalplaces = ($dec > 2) ? $dec : 2; # copy delivery date from reqdate for order -> invoice conversion - $form->{"deliverydate_$i"} = $form->{"reqdate_$i"} unless $form->{"deliverydate_$i"}; + $form->{"deliverydate_$i"} = $form->{"reqdate_$i"} + unless $form->{"deliverydate_$i"}; $form->{"sellprice_$i"} = $form->format_amount(\%myconfig, $form->{"sellprice_$i"}, $decimalplaces); - + (my $dec_qty) = ($form->{"qty_$i"} =~ /\.(\d+)/); - $dec_qty = length $dec_qty; - $form->{"qty_$i"} = $form->format_amount(\%myconfig, $form->{"qty_$i"}, $dec_qty); + $dec_qty = length $dec_qty; + $form->{"qty_$i"} = + $form->format_amount(\%myconfig, $form->{"qty_$i"}, $dec_qty); map { $form->{"${_}_$i"} =~ s/\"/"/g } qw(partnumber description unit); @@ -1961,7 +2349,6 @@ sub backorder_exchangerate { print qq| -{path}> {login}> {password}> @@ -2062,6 +2449,8 @@ sub create_backorder { } qw(sellprice discount); } + relink_accounts(); + OE->save(\%myconfig, \%$form); # rebuild rows for invoice @@ -2092,6 +2481,16 @@ 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(); @@ -2100,6 +2499,17 @@ sub save_as_new { sub purchase_order { $lxdebug->enter_sub(); + if ( $form->{type} eq 'sales_quotation' + || $form->{type} eq 'request_quotation') { + OE->close_order(\%myconfig, \%$form); + } + + if ($form->{type} =~ /^sales_/) { + delete($form->{ordnumber}); + } + + $form->{cp_id} *= 1; + $form->{title} = $locale->text('Add Purchase Order'); $form->{vc} = "vendor"; $form->{type} = "purchase_order"; @@ -2114,11 +2524,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'); @@ -2142,6 +2554,13 @@ sub poso { 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; @@ -2160,642 +2579,26 @@ 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/--.*//; - - @flds = (); - @a = (); - $count = 0; - foreach $key (keys %$form) { - if ($key =~ /_1$/) { - $key =~ s/_1//; - push @flds, $key; - } - } + $form->{print_and_save} = 1; - for $i (1 .. $form->{rowcount}) { + if (!$form->{id}) { + $print_post = 1; - # 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"} = ""; + my $saved_form = save_form(); - push @a, {}; - $j = $#a; + save(); - map { $a[$j]->{$_} = $form->{"${_}_$i"} } @flds; - $count++; - } + my %saved_vars; + map({ $saved_vars{$_} = $form->{$_}; } qw(id ordnumber quonumber)); + restore_form($saved_form); + map({ $form->{$_} = $saved_vars{$_}; } qw(id ordnumber quonumber)); } - $form->redo_rows(\@flds, \@a, $count, $form->{rowcount}); - $form->{rowcount} = $count; - - &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}/; - } - - $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}> - - - - - -|; - - $lxdebug->leave_sub(); -} - -sub done { - $lxdebug->enter_sub(); - - if ($form->{type} eq 'ship_order') { - $form->isblank("shippingdate", $locale->text('Shipping Date missing!')); - } else { - $form->isblank("shippingdate", $locale->text('Date received missing!')); - } - - $total = 0; - map { - $total += $form->{"ship_$_"} = - $form->parse_amount(\%myconfig, $form->{"ship_$_"}) - } (1 .. $form->{rowcount} - 1); - - $form->error($locale->text('Nothing entered!')) unless $total; - - $form->redirect($locale->text('Inventory saved!')) - if OE->save_inventory(\%myconfig, \%$form); - $form->error($locale->text('Could not save!')); - - $lxdebug->leave_sub(); -} - -sub search_transfer { - $lxdebug->enter_sub(); - - OE->get_warehouses(\%myconfig, \%$form); - - # warehouse - if (@{ $form->{all_warehouses} }) { - $form->{selectwarehouse} = "\n"; - $form->{warehouse} = qq|$form->{warehouse}--$form->{warehouse_id}|; - - map { $form->{selectwarehouse} .= "$_->{description}--$_->{id}\n" } - (@{ $form->{all_warehouses} }); - } else { - $form->error($locale->text('Nothing to transfer!')); - } - - $form->{title} = $locale->text('Transfer Inventory'); - - $form->header; - - print qq| - - -{script}> - - - - $form->{title} - - - - - - - | . $locale->text('Transfer to') . qq| - $form->{selectwarehouse} - - - | . $locale->text('Part Number') . qq| - - - - | . $locale->text('Description') . qq| - - - - | . $locale->text('Group') . qq| - - - - - - - - - - - - - - -{path}> -{login}> -{password}> - - - - - -