X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Foe.pl;h=4a8e3162b79293bc6f1b08fd73ca1c3acc6172fa;hb=2ac999504a5039c972da30c0f6177b34f6e2177b;hp=1d98eabc05b06ff61cebba474498d67ad78b7bd5;hpb=43a8613412146763e13e3164bbc69b1e109f2364;p=kivitendo-erp.git
diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index 1d98eabc0..4a8e3162b 100644
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -24,35 +24,41 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1335, USA.
#======================================================================
#
# Order entry module
# Quotation module
#======================================================================
+
+use Carp;
use POSIX qw(strftime);
+use SL::DB::Order;
use SL::DO;
use SL::FU;
use SL::OE;
use SL::IR;
use SL::IS;
-use SL::MoreCommon qw(ary_diff);
-use SL::PE;
+use SL::MoreCommon qw(ary_diff restore_form save_form);
use SL::ReportGenerator;
-use List::MoreUtils qw(any none);
-use List::Util qw(max reduce sum);
+use List::MoreUtils qw(uniq any none);
+use List::Util qw(min max reduce sum);
use Data::Dumper;
+use SL::DB::Customer;
+use SL::DB::TaxZone;
+use SL::DB::PaymentTerm;
+use SL::DB::Vendor;
+
+require "bin/mozilla/common.pl";
require "bin/mozilla/io.pl";
-require "bin/mozilla/arap.pl";
require "bin/mozilla/reportgenerator.pl";
use strict;
-our %TMPL_VAR;
-
1;
# end of main
@@ -84,6 +90,16 @@ sub check_oe_access {
$main::auth->assert($right);
}
+sub check_oe_conversion_to_sales_invoice_allowed {
+ return 1 if $::form->{type} !~ m/^sales/;
+ return 1 if ($::form->{type} =~ m/quotation/) && $::instance_conf->get_allow_sales_invoice_from_sales_quotation;
+ return 1 if ($::form->{type} =~ m/order/) && $::instance_conf->get_allow_sales_invoice_from_sales_order;
+
+ $::form->show_generic_error($::locale->text("You do not have the permissions to access this function."));
+
+ return 0;
+}
+
sub set_headings {
$main::lxdebug->enter_sub();
@@ -139,6 +155,8 @@ sub add {
"$form->{script}?action=add&type=$form->{type}&vc=$form->{vc}"
unless $form->{callback};
+ $form->{show_details} = $::myconfig{show_form_details};
+
&order_links;
&prepare_order;
&display_form;
@@ -153,6 +171,9 @@ sub edit {
check_oe_access();
+ $form->{show_details} = $::myconfig{show_form_details};
+ $form->{taxincluded_changed_by_user} = 1;
+
# show history button
$form->{javascript} = qq||;
#/show hhistory button
@@ -181,7 +202,8 @@ sub edit {
my ($language_id, $printer_id);
if ($form->{print_and_save}) {
- $form->{action} = "print";
+ $form->{action} = "dispatcher";
+ $form->{action_print} = "1";
$form->{resubmit} = 1;
$language_id = $form->{language_id};
$printer_id = $form->{printer_id};
@@ -218,13 +240,7 @@ sub order_links {
check_oe_access();
- # get customer/vendor
- $form->all_vc(\%myconfig, $form->{vc}, ($form->{vc} eq 'customer') ? "AR" : "AP");
-
# retrieve order/quotation
- $form->{webdav} = $::lx_office_conf{features}->{webdav};
- $form->{jsscript} = 1;
-
my $editing = $form->{id};
OE->retrieve(\%myconfig, \%$form);
@@ -236,33 +252,19 @@ sub order_links {
if $form->{rowcount} && $form->{type} eq 'sales_order'
&& defined $form->{customer} && $form->{customer} eq '';
- $form->{"$form->{vc}_id"} ||= $form->{"all_$form->{vc}"}->[0]->{id} if $form->{"all_$form->{vc}"};
-
- $form->backup_vars(qw(payment_id language_id taxzone_id salesman_id taxincluded cp_id intnotes));
- $form->{shipto} = 1 if $form->{id};
+ $form->backup_vars(qw(payment_id language_id taxzone_id salesman_id taxincluded cp_id intnotes shipto_id delivery_term_id currency));
# get customer / vendor
IR->get_vendor(\%myconfig, \%$form) if $form->{type} =~ /(purchase_order|request_quotation)/;
IS->get_customer(\%myconfig, \%$form) if $form->{type} =~ /sales_(order|quotation)/;
- $form->restore_vars(qw(payment_id language_id taxzone_id intnotes cp_id));
+ $form->restore_vars(qw(payment_id language_id taxzone_id intnotes cp_id shipto_id delivery_term_id));
+ $form->restore_vars(qw(currency)) if $form->{id};
$form->restore_vars(qw(taxincluded)) if $form->{id};
$form->restore_vars(qw(salesman_id)) if $editing;
$form->{forex} = $form->{exchangerate};
$form->{employee} = "$form->{employee}--$form->{employee_id}";
- # build vendor/customer drop down comatibility... don't ask
- if (@{ $form->{"all_$form->{vc}"} || [] }) {
- $form->{"select$form->{vc}"} = 1;
- $form->{$form->{vc}} = qq|$form->{$form->{vc}}--$form->{"$form->{vc}_id"}|;
- }
-
- $form->{"old$form->{vc}"} = $form->{$form->{vc}};
-
- if ($form->{"old$form->{vc}"} !~ m/--\d+$/ && $form->{"$form->{vc}_id"}) {
- $form->{"old$form->{vc}"} .= qq|--$form->{"$form->{vc}_id"}|
- }
-
$main::lxdebug->leave_sub();
}
@@ -290,6 +292,185 @@ sub prepare_order {
$main::lxdebug->leave_sub();
}
+sub setup_oe_action_bar {
+ my %params = @_;
+ my $form = $::form;
+
+ my $has_active_periodic_invoice;
+ if ($params{obj}) {
+ $has_active_periodic_invoice =
+ $params{obj}->is_type('sales_order')
+ && $params{obj}->periodic_invoices_config
+ && $params{obj}->periodic_invoices_config->active
+ && ( !$params{obj}->periodic_invoices_config->end_date
+ || ($params{obj}->periodic_invoices_config->end_date > DateTime->today_local))
+ && $params{obj}->periodic_invoices_config->get_previous_billed_period_start_date;
+ }
+
+ my $allow_invoice = $params{is_req_quo}
+ || $params{is_pur_ord}
+ || ($params{is_sales_quo} && $::instance_conf->get_allow_sales_invoice_from_sales_quotation)
+ || ($params{is_sales_ord} && $::instance_conf->get_allow_sales_invoice_from_sales_order);
+ my @req_trans_cost_art = qw(kivi.SalesPurchase.check_transport_cost_article_presence) x!!$::instance_conf->get_transport_cost_reminder_article_number_id;
+ my @warn_p_invoice = qw(kivi.SalesPurchase.oe_warn_save_active_periodic_invoice) x!!$has_active_periodic_invoice;
+
+ for my $bar ($::request->layout->get('actionbar')) {
+ $bar->add(
+ action => [
+ t8('Update'),
+ submit => [ '#form', { action => "update" } ],
+ id => 'update_button',
+ checks => [ 'kivi.validate_form' ],
+ accesskey => 'enter',
+ ],
+
+ combobox => [
+ action => [
+ t8('Save'),
+ submit => [ '#form', { action => "save" } ],
+ checks => [ 'kivi.validate_form', @req_trans_cost_art, @warn_p_invoice ],
+ ],
+ action => [
+ t8('Save as new'),
+ submit => [ '#form', { action => "save_as_new" } ],
+ checks => [ 'kivi.validate_form', @req_trans_cost_art ],
+ disabled => !$form->{id} ? t8('This record has not been saved yet.') : undef,
+ ],
+ action => [
+ t8('Save and Close'),
+ submit => [ '#form', { action => "save_and_close" } ],
+ checks => [ 'kivi.validate_form', @req_trans_cost_art, @warn_p_invoice ],
+ ],
+ action => [
+ t8('Delete'),
+ submit => [ '#form', { action => "delete" } ],
+ confirm => t8('Do you really want to delete this object?'),
+ disabled => !$form->{id} ? t8('This record has not been saved yet.')
+ : ( ($params{is_sales_ord} && !$::instance_conf->get_sales_order_show_delete)
+ || ($params{is_pur_ord} && !$::instance_conf->get_purchase_order_show_delete)) ? t8('Deleting this type of record has been disabled in the configuration.')
+ : undef,
+ ],
+ ], # end of combobox "Save"
+
+ 'separator',
+
+ combobox => [
+ action => [ t8('Workflow') ],
+ action => [
+ t8('Sales Order'),
+ submit => [ '#form', { action => "sales_order" } ],
+ disabled => !$form->{id} ? t8('This record has not been saved yet.') : undef,
+ checks => [ 'kivi.validate_form' ],
+ only_if => $params{is_sales_quo} || $params{is_pur_ord},
+ ],
+ action => [
+ t8('Purchase Order'),
+ submit => [ '#form', { action => "purchase_order" } ],
+ disabled => !$form->{id} ? t8('This record has not been saved yet.') : undef,
+ checks => [ 'kivi.validate_form' ],
+ only_if => $params{is_sales_ord} || $params{is_req_quo},
+ ],
+ action => [
+ t8('Delivery Order'),
+ submit => [ '#form', { action => "delivery_order" } ],
+ disabled => !$form->{id} ? t8('This record has not been saved yet.') : undef,
+ checks => [ 'kivi.validate_form' ],
+ only_if => $params{is_sales_ord} || $params{is_pur_ord},
+ ],
+ action => [
+ t8('Invoice'),
+ submit => [ '#form', { action => "invoice" } ],
+ disabled => !$form->{id} ? t8('This record has not been saved yet.') : undef,
+ checks => [ 'kivi.validate_form' ],
+ only_if => $allow_invoice,
+ ],
+ action => [
+ t8('Quotation'),
+ submit => [ '#form', { action => "quotation" } ],
+ disabled => !$form->{id} ? t8('This record has not been saved yet.') : undef,
+ checks => [ 'kivi.validate_form' ],
+ only_if => $params{is_sales_ord},
+ ],
+ action => [
+ t8('Request for Quotation'),
+ submit => [ '#form', { action => "request_for_quotation" } ],
+ disabled => !$form->{id} ? t8('This record has not been saved yet.') : undef,
+ checks => [ 'kivi.validate_form' ],
+ only_if => $params{is_pur_ord},
+ ],
+ ], # end of combobox "Workflow"
+
+ combobox => [
+ action => [ t8('Export') ],
+ action => [
+ t8('Print'),
+ call => [ 'kivi.SalesPurchase.show_print_dialog' ],
+ checks => [ 'kivi.validate_form' ],
+ ],
+ action => [
+ t8('E Mail'),
+ call => [ 'kivi.SalesPurchase.show_email_dialog' ],
+ checks => [ 'kivi.validate_form' ],
+ ],
+ action => [
+ t8('Download attachments of all parts'),
+ call => [ 'kivi.File.downloadOrderitemsFiles', $::form->{type}, $::form->{id} ],
+ disabled => !$form->{id} ? t8('This record has not been saved yet.') : undef,
+ only_if => $::instance_conf->get_doc_storage,
+ ],
+ ], #end of combobox "Export"
+
+ combobox => [
+ action => [ t8('more') ],
+ action => [
+ t8('History'),
+ call => [ 'set_history_window', $form->{id} * 1, 'id' ],
+ disabled => !$form->{id} ? t8('This record has not been saved yet.') : undef,
+ ],
+ action => [
+ t8('Follow-Up'),
+ call => [ 'follow_up_window' ],
+ disabled => !$form->{id} ? t8('This record has not been saved yet.') : undef,
+ ],
+ ], # end of combobox "more"
+ );
+ }
+ $::request->layout->add_javascripts('kivi.Validator.js');
+}
+
+sub setup_oe_search_action_bar {
+ my %params = @_;
+
+ for my $bar ($::request->layout->get('actionbar')) {
+ $bar->add(
+ action => [
+ t8('Search'),
+ submit => [ '#form' ],
+ accesskey => 'enter',
+ checks => [ 'kivi.validate_form' ],
+ ],
+ );
+ }
+ $::request->layout->add_javascripts('kivi.Validator.js');
+}
+
+sub setup_oe_orders_action_bar {
+ my %params = @_;
+
+ return unless $::form->{type} eq 'sales_order';
+
+ for my $bar ($::request->layout->get('actionbar')) {
+ $bar->add(
+ action => [
+ t8('New sales order'),
+ submit => [ '#form', { action => 'edit' } ],
+ checks => [ [ 'kivi.check_if_entries_selected', '[name^=multi_id_]' ] ],
+ accesskey => 'enter',
+ ],
+ );
+ }
+}
+
sub form_header {
$main::lxdebug->enter_sub();
my @custom_hiddens;
@@ -297,105 +478,126 @@ sub form_header {
my $form = $main::form;
my %myconfig = %main::myconfig;
my $locale = $main::locale;
- my $cgi = $main::cgi;
+ my $cgi = $::request->{cgi};
check_oe_access();
# Container for template variables. Unfortunately this has to be
# visible in form_footer too, so package local level and not my here.
- %TMPL_VAR = ();
+ my $TMPL_VAR = $::request->cache('tmpl_var', {});
+ if ($form->{id}) {
+ $TMPL_VAR->{oe_obj} = SL::DB::Order->new(id => $form->{id})->load;
+ }
+ $TMPL_VAR->{vc_obj} = SL::DB::Customer->new(id => $form->{customer_id})->load if $form->{customer_id};
+ $TMPL_VAR->{vc_obj} = SL::DB::Vendor->new(id => $form->{vendor_id})->load if $form->{vendor_id};
$form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
- $form->{employee_id} = $form->{old_employee_id} if $form->{old_employee_id};
- $form->{salesman_id} = $form->{old_salesman_id} if $form->{old_salesman_id};
-
- # use JavaScript Calendar or not
- $form->{jsscript} = 1;
+ my $current_employee = SL::DB::Manager::Employee->current;
+ $form->{employee_id} = $form->{old_employee_id} if $form->{old_employee_id};
+ $form->{salesman_id} = $form->{old_salesman_id} if $form->{old_salesman_id};
+ $form->{employee_id} ||= $current_employee->id;
+ $form->{salesman_id} ||= $current_employee->id;
# openclosed checkboxes
my @tmp;
push @tmp, sprintf qq||,
- $form->{"delivered"} ? "checked" : "", $locale->text('Delivered') if $form->{"type"} =~ /_order$/;
+ $form->{"delivered"} ? "checked" : "", $locale->text('Delivery Order(s) for full qty created') if $form->{"type"} =~ /_order$/;
push @tmp, sprintf qq||,
$form->{"closed"} ? "checked" : "", $locale->text('Closed') if $form->{id};
- $TMPL_VAR{openclosed} = sprintf qq|
%s |
\n|, 2 * scalar @tmp, join "\n", @tmp if @tmp;
-
- # project ids
- my @old_project_ids = ($form->{"globalproject_id"}, grep { $_ } map { $form->{"project_id_$_"} } 1..$form->{"rowcount"});
+ $TMPL_VAR->{openclosed} = sprintf qq|%s |
\n|, 2 * scalar @tmp, join "\n", @tmp if @tmp;
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",
+
+ $form->get_lists("taxzones" => ($form->{id} ? "ALL_TAXZONES" : "ALL_ACTIVE_TAXZONES"),
"currencies" => "ALL_CURRENCIES",
- "departments" => "ALL_DEPARTMENTS",
- $vc => { key => "ALL_" . uc($vc),
- limit => $myconfig{vclimit} + 1 },
"price_factors" => "ALL_PRICE_FACTORS");
+ $form->{ALL_PAYMENTS} = SL::DB::Manager::PaymentTerm->get_all( where => [ or => [ obsolete => 0, id => $form->{payment_id} || undef ] ]);
+
+ $form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all;
+
+ # Projects
+ my @old_project_ids = uniq grep { $_ } map { $_ * 1 } ($form->{"globalproject_id"}, map { $form->{"project_id_$_"} } 1..$form->{"rowcount"});
+ my @old_ids_cond = @old_project_ids ? (id => \@old_project_ids) : ();
+ my @customer_cond;
+ if (($vc eq 'customers') && $::instance_conf->get_customer_projects_only_in_sales) {
+ @customer_cond = (
+ or => [
+ customer_id => $::form->{customer_id},
+ billable_customer_id => $::form->{customer_id},
+ ]);
+ }
+ my @conditions = (
+ or => [
+ and => [ active => 1, @customer_cond ],
+ @old_ids_cond,
+ ]);
+
+ $TMPL_VAR->{ALL_PROJECTS} = SL::DB::Manager::Project->get_all_sorted(query => \@conditions);
+ $form->{ALL_PROJECTS} = $TMPL_VAR->{ALL_PROJECTS}; # make projects available for second row drop-down in io.pl
# label subs
- $TMPL_VAR{sales_employee_labels} = sub { $_[0]->{name} || $_[0]->{login} };
- $TMPL_VAR{shipto_labels} = sub { join "; ", grep { $_ } map { $_[0]->{"shipto${_}" } } qw(name department_1 street city) };
- $TMPL_VAR{contact_labels} = sub { join(', ', $_[0]->{"cp_name"}, $_[0]->{"cp_givenname"}) . ($_[0]->{cp_abteilung} ? " ($_[0]->{cp_abteilung})" : "") };
- $TMPL_VAR{department_labels} = sub { "$_[0]->{description}--$_[0]->{id}" };
-
- # vendor/customer
- $TMPL_VAR{vc_keys} = sub { "$_[0]->{name}--$_[0]->{id}" };
- $TMPL_VAR{vclimit} = $myconfig{vclimit};
- $TMPL_VAR{vc_select} = "customer_or_vendor_selection_window('$form->{vc}', '', @{[ $form->{vc} eq 'vendor' ? 1 : 0 ]}, 0)";
- push @custom_hiddens, "$form->{vc}_id";
- push @custom_hiddens, "old$form->{vc}";
- push @custom_hiddens, "select$form->{vc}";
+ my $employee_list_query_gen = sub { $::form->{$_[0]} ? [ or => [ id => $::form->{$_[0]}, deleted => 0 ] ] : [ deleted => 0 ] };
+ $TMPL_VAR->{ALL_EMPLOYEES} = SL::DB::Manager::Employee->get_all_sorted(query => $employee_list_query_gen->('employee_id'));
+ $TMPL_VAR->{ALL_SALESMEN} = SL::DB::Manager::Employee->get_all_sorted(query => $employee_list_query_gen->('salesman_id'));
+ $TMPL_VAR->{ALL_SHIPTO} = SL::DB::Manager::Shipto->get_all_sorted(query => [
+ or => [ trans_id => $::form->{"$::form->{vc}_id"} * 1, and => [ shipto_id => $::form->{shipto_id} * 1, trans_id => undef ] ]
+ ]);
+ $TMPL_VAR->{ALL_CONTACTS} = SL::DB::Manager::Contact->get_all_sorted(query => [
+ or => [
+ cp_cv_id => $::form->{"$::form->{vc}_id"} * 1,
+ and => [
+ cp_cv_id => undef,
+ cp_id => $::form->{cp_id} * 1
+ ]
+ ]
+ ]);
+ $TMPL_VAR->{sales_employee_labels} = sub { $_[0]->{name} || $_[0]->{login} };
# currencies and exchangerate
- my @values = map { $_ } @{ $form->{ALL_CURRENCIES} };
- my %labels = map { $_ => $_ } @{ $form->{ALL_CURRENCIES} };
$form->{currency} = $form->{defaultcurrency} unless $form->{currency};
- $TMPL_VAR{show_exchangerate} = $form->{currency} ne $form->{defaultcurrency};
- $TMPL_VAR{currencies} = NTI($cgi->popup_menu('-name' => 'currency', '-default' => $form->{"currency"},
- '-values' => \@values, '-labels' => \%labels)) if scalar @values;
+ $TMPL_VAR->{show_exchangerate} = $form->{currency} ne $form->{defaultcurrency};
push @custom_hiddens, "forex";
push @custom_hiddens, "exchangerate" if $form->{forex};
# credit remaining
my $creditwarning = (($form->{creditlimit} != 0) && ($form->{creditremaining} < 0) && !$form->{update}) ? 1 : 0;
- $TMPL_VAR{is_credit_remaining_negativ} = ($form->{creditremaining} =~ /-/) ? "0" : "1";
+ $TMPL_VAR->{is_credit_remaining_negativ} = ($form->{creditremaining} =~ /-/) ? "0" : "1";
# business
- $TMPL_VAR{business_label} = ($form->{vc} eq "customer" ? $locale->text('Customer type') : $locale->text('Vendor type'));
+ $TMPL_VAR->{business_label} = ($form->{vc} eq "customer" ? $locale->text('Customer type') : $locale->text('Vendor type'));
- push @custom_hiddens, "customer_klass" if $form->{vc} eq 'customer';
+ push @custom_hiddens, "customer_pricegroup_id" if $form->{vc} eq 'customer';
my $credittext = $locale->text('Credit Limit exceeded!!!');
my $follow_up_vc = $form->{ $form->{vc} eq 'customer' ? 'customer' : 'vendor' };
$follow_up_vc =~ s/--\d*\s*$//;
- $TMPL_VAR{follow_up_trans_info} = ($form->{type} =~ /_quotation$/ ? $form->{quonumber} : $form->{ordnumber}) . " ($follow_up_vc)";
+ $TMPL_VAR->{follow_up_trans_info} = ($form->{type} =~ /_quotation$/ ? $form->{quonumber} : $form->{ordnumber}) . " ($follow_up_vc)";
if ($form->{id}) {
- my $follow_ups = FU->follow_ups('trans_id' => $form->{id});
+ my $follow_ups = FU->follow_ups('trans_id' => $form->{id}, 'not_done' => 1);
if (scalar @{ $follow_ups }) {
- $TMPL_VAR{num_follow_ups} = scalar @{ $follow_ups };
- $TMPL_VAR{num_due_follow_ups} = sum map { $_->{due} * 1 } @{ $follow_ups };
+ $TMPL_VAR->{num_follow_ups} = scalar @{ $follow_ups };
+ $TMPL_VAR->{num_due_follow_ups} = sum map { $_->{due} * 1 } @{ $follow_ups };
}
}
- my $onload = ($form->{resubmit} && ($form->{format} eq "html")) ? "window.open('about:blank','Beleg'); document.oe.target = 'Beleg';document.oe.submit()"
- : ($form->{resubmit}) ? "document.oe.submit()"
- : ($creditwarning) ? "alert('$credittext')"
- : "";
+ my $dispatch_to_popup = '';
+ if ($form->{resubmit} && ($form->{format} eq "html")) {
+ $dispatch_to_popup = "window.open('about:blank','Beleg'); document.oe.target = 'Beleg';";
+ $dispatch_to_popup .= "document.do.submit();";
+ } elsif ($form->{resubmit} && $form->{action_print}) {
+ # emulate click for resubmitting actions
+ $dispatch_to_popup = "kivi.SalesPurchase.show_print_dialog(); kivi.SalesPurchase.print_record();";
+ } elsif ($creditwarning) {
+ $::request->{layout}->add_javascripts_inline("alert('$credittext');");
+ }
- $onload .= qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|;
- $onload .= qq|;setupPoints('|. $myconfig{numberformat} .qq|', '|. $locale->text("wrongformat") .qq|')|;
- $TMPL_VAR{onload} = $onload;
+ $::request->{layout}->add_javascripts_inline("\$(function(){$dispatch_to_popup});");
+ $TMPL_VAR->{dateformat} = $myconfig{dateformat};
+ $TMPL_VAR->{numberformat} = $myconfig{numberformat};
if ($form->{type} eq 'sales_order') {
if (!$form->{periodic_invoices_config}) {
@@ -407,33 +609,50 @@ sub form_header {
}
}
- $form->{javascript} .= qq||;
- $form->{javascript} .= qq||;
- $form->{javascript} .= qq||;
+ $::request->{layout}->use_javascript(map { "${_}.js" } qw(kivi.SalesPurchase kivi.File kivi.Part kivi.CustomerVendor kivi.Validator show_form_details show_history show_vc_details ckeditor/ckeditor ckeditor/adapters/jquery kivi.io));
+
+
+ # original snippets:
+ my %type_check_vars = (
+ is_sales => scalar($form->{type} =~ /^sales_/),
+ is_order => scalar($form->{type} =~ /_order$/),
+ is_sales_quo => scalar($form->{type} =~ /sales_quotation$/),
+ is_req_quo => scalar($form->{type} =~ /request_quotation$/),
+ is_sales_ord => scalar($form->{type} =~ /sales_order$/),
+ is_pur_ord => scalar($form->{type} =~ /purchase_order$/),
+ );
+
+ setup_oe_action_bar(%type_check_vars);
$form->header;
+ if ($form->{CFDD_shipto} && $form->{CFDD_shipto_id} ) {
+ $form->{shipto_id} = $form->{CFDD_shipto_id};
+ }
+
+ push @custom_hiddens, map { "shiptocvar_" . $_->name } @{ SL::DB::Manager::CustomVariableConfig->get_all(where => [ module => 'ShipTo' ]) };
- $TMPL_VAR{HIDDENS} = [ map { name => $_, value => $form->{$_} },
- qw(id action type vc formname media format proforma queued printed emailed
+ $TMPL_VAR->{HIDDENS} = [ map { name => $_, value => $form->{$_} },
+ qw(id type vc proforma queued printed emailed
title creditlimit creditremaining tradediscount business
- max_dunning_level dunning_amount shiptoname shiptostreet shiptozipcode
- shiptocity shiptocountry shiptocontact shiptophone shiptofax
- shiptodepartment_1 shiptodepartment_2 shiptoemail
- message email subject cc bcc taxpart taxservice taxaccounts cursor_fokus),
+ max_dunning_level dunning_amount
+ CFDD_shipto CFDD_shipto_id
+ taxpart taxservice taxaccounts cursor_fokus
+ show_details useasnew),
@custom_hiddens,
- map { $_.'_rate', $_.'_description' } split / /, $form->{taxaccounts} ]; # deleted: discount
+ map { $_.'_rate', $_.'_description', $_.'_taxnumber' } split / /, $form->{taxaccounts} ]; # deleted: discount
- %TMPL_VAR = (
- %TMPL_VAR,
- is_sales => scalar ($form->{type} =~ /^sales_/), # these vars are exported, so that the template
- is_order => scalar ($form->{type} =~ /_order$/), # may determine what to show
- is_sales_quo => scalar ($form->{type} =~ /sales_quotation$/),
- is_req_quo => scalar ($form->{type} =~ /request_quotation$/),
- is_sales_ord => scalar ($form->{type} =~ /sales_order$/),
- is_pur_ord => scalar ($form->{type} =~ /purchase_order$/),
- );
+ $TMPL_VAR->{$_} = $type_check_vars{$_} for keys %type_check_vars;
- print $form->parse_html_template("oe/form_header", { %TMPL_VAR });
+ $TMPL_VAR->{ORDER_PROBABILITIES} = [ map { { title => ($_ * 10) . '%', id => $_ * 10 } } (0..10) ];
+
+ if ($type_check_vars{is_sales} && $::instance_conf->get_transport_cost_reminder_article_number_id) {
+ $TMPL_VAR->{transport_cost_reminder_article} = SL::DB::Part->new(id => $::instance_conf->get_transport_cost_reminder_article_number_id)->load;
+ }
+
+ print $form->parse_html_template("oe/form_header", {
+ %$TMPL_VAR,
+ %type_check_vars,
+ });
$main::lxdebug->leave_sub();
}
@@ -449,12 +668,17 @@ sub form_footer {
$form->{invtotal} = $form->{invsubtotal};
- my $rows = max 2, $form->numtextrows($form->{notes}, 25, 8);
- my $introws = max 2, $form->numtextrows($form->{intnotes}, 35, 8);
- $rows = max $rows, $introws;
+ my $introws = max 5, $form->numtextrows($form->{intnotes}, 35, 8);
- $TMPL_VAR{notes} = qq||;
- $TMPL_VAR{intnotes} = qq||;
+ my $TMPL_VAR = $::request->cache('tmpl_var', {});
+
+ $TMPL_VAR->{notes} = qq||;
+ $TMPL_VAR->{intnotes} = qq||;
+
+ if( $form->{customer_id} && !$form->{taxincluded_changed_by_user} ) {
+ my $customer = SL::DB::Customer->new(id => $form->{customer_id})->load();
+ $form->{taxincluded} = defined($customer->taxincluded_checked) ? $customer->taxincluded_checked : $myconfig{taxincluded_checked};
+ }
if (!$form->{taxincluded}) {
@@ -463,16 +687,13 @@ sub form_footer {
$form->{invtotal} += $form->{"${item}_total"} = $form->round_amount( $form->{"${item}_base"} * $form->{"${item}_rate"}, 2);
$form->{"${item}_total"} = $form->format_amount(\%myconfig, $form->{"${item}_total"}, 2);
- $TMPL_VAR{tax} .= qq|
+ $TMPL_VAR->{tax} .= qq|
$form->{"${item}_description"} | . $form->{"${item}_rate"} * 100 .qq|% |
$form->{"${item}_total"} |
|;
}
}
-
-# $form->{invsubtotal} = $form->format_amount(\%myconfig, $form->{invsubtotal}, 2, 0); # template does this
-
} else {
foreach my $item (split / /, $form->{taxaccounts}) {
if ($form->{"${item}_base"}) {
@@ -481,7 +702,7 @@ sub form_footer {
$form->{"${item}_total"} = $form->format_amount(\%myconfig, $form->{"${item}_total"}, 2);
$form->{"${item}_netto"} = $form->format_amount(\%myconfig, $form->{"${item}_netto"}, 2);
- $TMPL_VAR{tax} .= qq|
+ $TMPL_VAR->{tax} .= qq|
Enthaltene $form->{"${item}_description"} | . $form->{"${item}_rate"} * 100 .qq|% |
$form->{"${item}_total"} |
@@ -494,14 +715,21 @@ sub form_footer {
}
}
+ my $grossamount = $form->{invtotal};
+ $form->{invtotal} = $form->round_amount( $form->{invtotal}, 2, 1);
+ $form->{rounding} = $form->round_amount(
+ $form->{invtotal} - $form->round_amount($grossamount, 2),
+ 2
+ );
$form->{oldinvtotal} = $form->{invtotal};
+ $TMPL_VAR->{ALL_DELIVERY_TERMS} = SL::DB::Manager::DeliveryTerm->get_all_sorted();
+
+ my $print_options_html = setup_sales_purchase_print_options();
+
print $form->parse_html_template("oe/form_footer", {
- %TMPL_VAR,
- webdav => $::lx_office_conf{features}->{webdav},
- print_options => print_options(inline => 1),
- label_edit => $locale->text("Edit the $form->{type}"),
- label_workflow => $locale->text("Workflow $form->{type}"),
+ %$TMPL_VAR,
+ print_options => $print_options_html,
is_sales => scalar ($form->{type} =~ /^sales_/), # these vars are exported, so that the template
is_order => scalar ($form->{type} =~ /_order$/), # may determine what to show
is_sales_quo => scalar ($form->{type} =~ /sales_quotation$/),
@@ -523,15 +751,21 @@ sub update {
check_oe_access();
-# $main::lxdebug->message(0, Dumper($form));
-
set_headings($form->{"id"} ? "edit" : "add");
- map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } qw(exchangerate) unless $recursive_call;
$form->{update} = 1;
- &check_name($form->{vc});
+ my $vc = $form->{vc};
+ if (($form->{"previous_${vc}_id"} || $form->{"${vc}_id"}) != $form->{"${vc}_id"}) {
+ $::form->{salesman_id} = SL::DB::Manager::Employee->current->id if exists $::form->{salesman_id};
+
+ IS->get_customer(\%myconfig, $form) if $vc eq 'customer';
+ IR->get_vendor(\%myconfig, $form) if $vc eq 'vendor';
+ }
+ if (!$form->{forex}) { # read exchangerate from input field (not hidden)
+ map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } qw(exchangerate) unless $recursive_call;
+ }
my $buysell = 'buy';
$buysell = 'sell' if ($form->{vc} eq 'vendor');
$form->{forex} = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{transdate}, $buysell);
@@ -551,29 +785,33 @@ sub update {
&check_form;
} else {
+ my $mode;
if ($form->{type} =~ /^sales/) {
IS->retrieve_item(\%myconfig, \%$form);
+ $mode = 'IS';
} else {
IR->retrieve_item(\%myconfig, \%$form);
+ $mode = 'IR';
}
my $rows = scalar @{ $form->{item_list} };
- # hier ist das problem fuer bug 817 $form->{discount} wird nicht durchgeschliffen
- # ferner fallunterscheidung fuer verkauf oder einkauf s.a. bug 736 jb 04.05.2009
- # select discount as vendor_discount from vendor ||
- # select discount as customer_discount from customer
- $form->{"discount_$i"} = $form->format_amount(\%myconfig, $form->{"$form->{vc}_discount"} * 100);
+ $form->{"discount_$i"} = $form->parse_amount(\%myconfig, $form->{"discount_$i"}) / 100.0;
+ $form->{"discount_$i"} ||= $form->{"$form->{vc}_discount"};
$form->{"lastcost_$i"} = $form->parse_amount(\%myconfig, $form->{"lastcost_$i"});
if ($rows) {
- $form->{"qty_$i"} = 1 unless ($form->parse_amount(\%myconfig, $form->{"qty_$i"}));
+
+ $form->{"qty_$i"} = $form->parse_amount(\%myconfig, $form->{"qty_$i"});
+ if( !$form->{"qty_$i"} ) {
+ $form->{"qty_$i"} = 1;
+ }
if ($rows > 1) {
- &select_item;
- ::end_of_request();
+ select_item(mode => $mode, pre_entered_qty => $form->{"qty_$i"});
+ $::dispatcher->end_request;
} else {
@@ -600,11 +838,24 @@ sub update {
if ($sellprice) {
$form->{"sellprice_$i"} = $sellprice;
} else {
- $form->{"sellprice_$i"} *= (1 - $form->{tradediscount});
+ my $record = _make_record();
+ my $price_source = SL::PriceSource->new(record_item => $record->items->[$i-1], record => $record);
+ my $best_price = $price_source->best_price;
+ my $best_discount = $price_source->best_discount;
+
+ if ($best_price) {
+ $::form->{"sellprice_$i"} = $best_price->price;
+ $::form->{"active_price_source_$i"} = $best_price->source;
+ }
+ if ($best_discount) {
+ $::form->{"discount_$i"} = $best_discount->discount;
+ $::form->{"active_discount_source_$i"} = $best_discount->source;
+ }
+
$form->{"sellprice_$i"} /= $exchangerate; # if there is an exchange rate adjust sellprice
}
- my $amount = $form->{"sellprice_$i"} * $form->{"qty_$i"} * (1 - $form->{"discount_$i"} / 100);
+ my $amount = $form->{"sellprice_$i"} * $form->{"qty_$i"} * (1 - $form->{"discount_$i"});
map { $form->{"${_}_base"} = 0 } split / /, $form->{taxaccounts};
map { $form->{"${_}_base"} += $amount } split / /, $form->{"taxaccounts_$i"};
map { $amount += ($form->{"${_}_base"} * $form->{"${_}_rate"}) } split / /, $form->{taxaccounts} if !$form->{taxincluded};
@@ -614,12 +865,7 @@ sub update {
$form->{"sellprice_$i"} = $form->format_amount(\%myconfig, $form->{"sellprice_$i"}, $decimalplaces);
$form->{"lastcost_$i"} = $form->format_amount(\%myconfig, $form->{"lastcost_$i"}, $decimalplaces);
$form->{"qty_$i"} = $form->format_amount(\%myconfig, $form->{"qty_$i"}, $dec_qty);
-
- # get pricegroups for parts
- IS->get_pricegroups_for_parts(\%myconfig, \%$form);
-
- # build up html code for prices_$i
- &set_pricegroup($i);
+ $form->{"discount_$i"} = $form->format_amount(\%myconfig, $form->{"discount_$i"} * 100.0);
}
display_form();
@@ -681,28 +927,35 @@ sub search {
$form->{ordlabel} = $locale->text('Quotation Number');
} else {
- $form->show_generic_error($locale->text('oe.pl::search called with unknown type'), back_button => 1);
+ $form->show_generic_error($locale->text('oe.pl::search called with unknown type'));
}
# setup vendor / customer data
- $form->all_vc(\%myconfig, $form->{vc}, ($form->{vc} eq 'customer') ? "AR" : "AP");
$form->get_lists("projects" => { "key" => "ALL_PROJECTS", "all" => 1 },
- "employees" => "ALL_EMPLOYEES",
- "salesmen" => "ALL_SALESMEN",
- "departments" => "ALL_DEPARTMENTS",
- "$form->{vc}s" => "ALL_VC");
+ "taxzones" => "ALL_TAXZONES",
+ "business_types" => "ALL_BUSINESS_TYPES",);
+ $form->{ALL_EMPLOYEES} = SL::DB::Manager::Employee->get_all_sorted(query => [ deleted => 0 ]);
+ $form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all;
+
+ $form->{CT_CUSTOM_VARIABLES} = CVar->get_configs('module' => 'CT');
+ ($form->{CT_CUSTOM_VARIABLES_FILTER_CODE},
+ $form->{CT_CUSTOM_VARIABLES_INCLUSION_CODE}) = CVar->render_search_options('variables' => $form->{CT_CUSTOM_VARIABLES},
+ 'include_prefix' => 'l_',
+ 'include_value' => 'Y');
# constants and subs for template
- $form->{jsscript} = 1;
- $form->{employee_labels} = sub { $_[0]->{"name"} || $_[0]->{"login"} };
$form->{vc_keys} = sub { "$_[0]->{name}--$_[0]->{id}" };
- $form->{salesman_labels} = $form->{employee_labels};
+
+ $form->{ORDER_PROBABILITIES} = [ map { { title => ($_ * 10) . '%', id => $_ * 10 } } (0..10) ];
+
+ $::request->{layout}->use_javascript(map { "${_}.js" } qw(autocomplete_project));
+
+ setup_oe_search_action_bar();
$form->header();
print $form->parse_html_template('oe/search', {
- %myconfig,
- is_order => $form->{type} =~ /_order/,
+ is_order => scalar($form->{type} =~ /_order/),
});
$main::lxdebug->leave_sub();
@@ -735,7 +988,7 @@ sub orders {
my $form = $main::form;
my %myconfig = %main::myconfig;
my $locale = $main::locale;
- my $cgi = $main::cgi;
+ my $cgi = $::request->{cgi};
check_oe_access();
@@ -751,9 +1004,11 @@ sub orders {
my @columns = (
"transdate", "reqdate",
- "id", $ordnumber,
+ "id", $ordnumber, "edit_exp",
+ "cusordnumber", "customernumber",
"name", "netamount",
"tax", "amount",
+ "remaining_netamount", "remaining_amount",
"curr", "employee",
"salesman",
"shipvia", "globalprojectnumber",
@@ -761,7 +1016,10 @@ sub orders {
"delivered", "periodic_invoices",
"marge_total", "marge_percent",
"vcnumber", "ustid",
- "country",
+ "country", "shippingpoint",
+ "taxzone", "insertdate",
+ "order_probability", "expected_billing_date", "expected_netamount",
+ "payment_terms",
);
# only show checkboxes if gotten here via sales_order form.
@@ -773,6 +1031,8 @@ sub orders {
$form->{l_open} = $form->{l_closed} = "Y" if ($form->{open} && $form->{closed});
$form->{l_delivered} = "Y" if ($form->{delivered} && $form->{notdelivered});
$form->{l_periodic_invoices} = "Y" if ($form->{periodic_invoices_active} && $form->{periodic_invoices_inactive});
+ $form->{l_edit_exp} = "Y" if $::instance_conf->get_feature_experimental && (any { $form->{type} eq $_ } qw(sales_order purchase_order));
+ map { $form->{"l_${_}"} = 'Y' } qw(order_probability expected_billing_date expected_netamount) if $form->{l_order_probability_expected_billing_date};
my $attachment_basename;
if ($form->{vc} eq 'vendor') {
@@ -796,12 +1056,26 @@ sub orders {
my $report = SL::ReportGenerator->new(\%myconfig, $form);
+ my $ct_cvar_configs = CVar->get_configs('module' => 'CT');
+ my @ct_includeable_custom_variables = grep { $_->{includeable} } @{ $ct_cvar_configs };
+ my @ct_searchable_custom_variables = grep { $_->{searchable} } @{ $ct_cvar_configs };
+
+ my %column_defs_cvars = map { +"cvar_$_->{name}" => { 'text' => $_->{description} } } @ct_includeable_custom_variables;
+ push @columns, map { "cvar_$_->{name}" } @ct_includeable_custom_variables;
+
my @hidden_variables = map { "l_${_}" } @columns;
- push @hidden_variables, "l_subtotal", $form->{vc}, qw(l_closed l_notdelivered open closed delivered notdelivered ordnumber quonumber
+ push @hidden_variables, "l_subtotal", $form->{vc}, qw(l_closed l_notdelivered open closed delivered notdelivered ordnumber quonumber cusordnumber
transaction_description transdatefrom transdateto type vc employee_id salesman_id
- reqdatefrom reqdateto projectnumber project_id periodic_invoices_active periodic_invoices_inactive);
+ reqdatefrom reqdateto projectnumber project_id periodic_invoices_active periodic_invoices_inactive
+ business_id shippingpoint taxzone_id reqdate_unset_or_old insertdatefrom insertdateto
+ order_probability_op order_probability_value expected_billing_date_from expected_billing_date_to
+ parts_partnumber parts_description all department_id);
+ push @hidden_variables, map { "cvar_$_->{name}" } @ct_searchable_custom_variables;
+
+ my @keys_for_url = grep { $form->{$_} } @hidden_variables;
+ push @keys_for_url, 'taxzone_id' if $form->{taxzone_id} ne ''; # taxzone_id could be 0
- my $href = build_std_url('action=orders', grep { $form->{$_} } @hidden_variables);
+ my $href = build_std_url('action=orders', @keys_for_url);
my %column_defs = (
'ids' => { 'text' => '', },
@@ -810,10 +1084,14 @@ sub orders {
'id' => { 'text' => $locale->text('ID'), },
'ordnumber' => { 'text' => $locale->text('Order'), },
'quonumber' => { 'text' => $form->{type} eq "request_quotation" ? $locale->text('RFQ') : $locale->text('Quotation'), },
+ 'cusordnumber' => { 'text' => $locale->text('Customer Order Number'), },
'name' => { 'text' => $form->{vc} eq 'customer' ? $locale->text('Customer') : $locale->text('Vendor'), },
+ 'customernumber' => { 'text' => $locale->text('Customer Number'), },
'netamount' => { 'text' => $locale->text('Amount'), },
'tax' => { 'text' => $locale->text('Tax'), },
'amount' => { 'text' => $locale->text('Total'), },
+ 'remaining_amount' => { 'text' => $locale->text('Remaining Amount'), },
+ 'remaining_netamount' => { 'text' => $locale->text('Remaining Net Amount'), },
'curr' => { 'text' => $locale->text('Curr'), },
'employee' => { 'text' => $locale->text('Employee'), },
'salesman' => { 'text' => $locale->text('Salesman'), },
@@ -821,21 +1099,30 @@ sub orders {
'globalprojectnumber' => { 'text' => $locale->text('Project Number'), },
'transaction_description' => { 'text' => $locale->text('Transaction description'), },
'open' => { 'text' => $locale->text('Open'), },
- 'delivered' => { 'text' => $locale->text('Delivered'), },
+ 'delivered' => { 'text' => $locale->text('Delivery Order created'), },
'marge_total' => { 'text' => $locale->text('Ertrag'), },
'marge_percent' => { 'text' => $locale->text('Ertrag prozentual'), },
'vcnumber' => { 'text' => $form->{vc} eq 'customer' ? $locale->text('Customer Number') : $locale->text('Vendor Number'), },
'country' => { 'text' => $locale->text('Country'), },
'ustid' => { 'text' => $locale->text('USt-IdNr.'), },
'periodic_invoices' => { 'text' => $locale->text('Per. Inv.'), },
+ 'shippingpoint' => { 'text' => $locale->text('Shipping Point'), },
+ 'taxzone' => { 'text' => $locale->text('Steuersatz'), },
+ 'insertdate' => { 'text' => $locale->text('Insert Date'), },
+ 'order_probability' => { 'text' => $locale->text('Order probability'), },
+ 'expected_billing_date' => { 'text' => $locale->text('Exp. bill. date'), },
+ 'expected_netamount' => { 'text' => $locale->text('Exp. netamount'), },
+ 'payment_terms' => { 'text' => $locale->text('Payment Terms'), },
+ 'edit_exp' => { 'text' => $locale->text('Edit (experimental)'), },
+ %column_defs_cvars,
);
- foreach my $name (qw(id transdate reqdate quonumber ordnumber name employee salesman shipvia transaction_description)) {
+ foreach my $name (qw(id transdate reqdate quonumber ordnumber cusordnumber name employee salesman shipvia transaction_description shippingpoint taxzone insertdate payment_terms)) {
my $sortdir = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir};
$column_defs{$name}->{link} = $href . "&sort=$name&sortdir=$sortdir";
}
- my %column_alignment = map { $_ => 'right' } qw(netamount tax amount curr);
+ my %column_alignment = map { $_ => 'right' } qw(netamount tax amount curr remaining_amount remaining_netamount order_probability expected_billing_date expected_netamount);
$form->{"l_type"} = "Y";
map { $column_defs{$_}->{visible} = $form->{"l_${_}"} ? 1 : 0 } @columns;
@@ -846,15 +1133,26 @@ sub orders {
$report->set_export_options('orders', @hidden_variables, qw(sort sortdir));
$report->set_sort_indicator($form->{sort}, $form->{sortdir});
+ CVar->add_custom_variables_to_report('module' => 'CT',
+ 'trans_id_field' => "$form->{vc}_id",
+ 'configs' => $ct_cvar_configs,
+ 'column_defs' => \%column_defs,
+ 'data' => $form->{OE});
+
my @options;
- my ($department) = split m/--/, $form->{department};
push @options, $locale->text('Customer') . " : $form->{customer}" if $form->{customer};
push @options, $locale->text('Vendor') . " : $form->{vendor}" if $form->{vendor};
- push @options, $locale->text('Department') . " : $department" if $form->{department};
+ push @options, $locale->text('Contact Person') . " : $form->{cp_name}" if $form->{cp_name};
+ push @options, $locale->text('Department') . " : $form->{department}" if $form->{department};
push @options, $locale->text('Order Number') . " : $form->{ordnumber}" if $form->{ordnumber};
+ push @options, $locale->text('Customer Order Number') . " : $form->{cusordnumber}" if $form->{cusordnumber};
push @options, $locale->text('Notes') . " : $form->{notes}" if $form->{notes};
push @options, $locale->text('Transaction description') . " : $form->{transaction_description}" if $form->{transaction_description};
+ push @options, $locale->text('Quick Search') . " : $form->{all}" if $form->{all};
+ push @options, $locale->text('Shipping Point') . " : $form->{shippingpoint}" if $form->{shippingpoint};
+ push @options, $locale->text('Part Description') . " : $form->{parts_description}" if $form->{parts_description};
+ push @options, $locale->text('Part Number') . " : $form->{parts_partnumber}" if $form->{parts_partnumber};
if ( $form->{transdatefrom} or $form->{transdateto} ) {
push @options, $locale->text('Order Date');
push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{transdatefrom}, 1) if $form->{transdatefrom};
@@ -865,15 +1163,43 @@ sub orders {
push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{reqdatefrom}, 1) if $form->{reqdatefrom};
push @options, $locale->text('Bis') . " " . $locale->date(\%myconfig, $form->{reqdateto}, 1) if $form->{reqdateto};
};
+ if ( $form->{insertdatefrom} or $form->{insertdateto} ) {
+ push @options, $locale->text('Insert Date');
+ push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{insertdatefrom}, 1) if $form->{insertdatefrom};
+ push @options, $locale->text('Bis') . " " . $locale->date(\%myconfig, $form->{insertdateto}, 1) if $form->{insertdateto};
+ };
push @options, $locale->text('Open') if $form->{open};
push @options, $locale->text('Closed') if $form->{closed};
- push @options, $locale->text('Delivered') if $form->{delivered};
+ push @options, $locale->text('Delivery Order created') if $form->{delivered};
push @options, $locale->text('Not delivered') if $form->{notdelivered};
- push @options, $locale->text('Periodic invoices active') if $form->{periodic_invoices_actibe};
+ push @options, $locale->text('Periodic invoices active') if $form->{periodic_invoices_active};
+ push @options, $locale->text('Reqdate not set or before current month') if $form->{reqdate_unset_or_old};
+
+ if ($form->{business_id}) {
+ my $vc_type_label = $form->{vc} eq 'customer' ? $locale->text('Customer type') : $locale->text('Vendor type');
+ push @options, $vc_type_label . " : " . SL::DB::Business->new(id => $form->{business_id})->load->description;
+ }
+ if ($form->{taxzone_id} ne '') { # taxzone_id could be 0
+ push @options, $locale->text('Steuersatz') . " : " . SL::DB::TaxZone->new(id => $form->{taxzone_id})->load->description;
+ }
+
+ if ($form->{department_id}) {
+ push @options, $locale->text('Department') . " : " . SL::DB::Department->new(id => $form->{department_id})->load->description;
+ }
+
+ if (($form->{order_probability_value} || '') ne '') {
+ push @options, $::locale->text('Order probability') . ' ' . ($form->{order_probability_op} eq 'le' ? '<=' : '>=') . ' ' . $form->{order_probability_value} . '%';
+ }
+
+ if ($form->{expected_billing_date_from} or $form->{expected_billing_date_to}) {
+ push @options, $locale->text('Expected billing date');
+ push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{expected_billing_date_from}, 1) if $form->{expected_billing_date_from};
+ push @options, $locale->text('Bis') . " " . $locale->date(\%myconfig, $form->{expected_billing_date_to}, 1) if $form->{expected_billing_date_to};
+ }
$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 }),
+ 'raw_bottom_info_text' => $form->parse_html_template('oe/orders_bottom'),
'output_format' => 'HTML',
'title' => $form->{title},
'attachment_basename' => $attachment_basename . strftime('_%Y%m%d', localtime time),
@@ -887,12 +1213,13 @@ sub orders {
# escape callback for href
my $callback = $form->escape($href);
- my @subtotal_columns = qw(netamount amount marge_total marge_percent);
+ my @subtotal_columns = qw(netamount amount marge_total marge_percent remaining_amount remaining_netamount);
+ push @subtotal_columns, 'expected_netamount' if $form->{l_order_probability_expected_billing_date};
my %totals = map { $_ => 0 } @subtotal_columns;
my %subtotals = map { $_ => 0 } @subtotal_columns;
- my $idx = 0;
+ my $idx = 1;
my $edit_url = build_std_url('action=edit', 'type', 'vc');
@@ -910,12 +1237,15 @@ sub orders {
$subtotals{marge_percent} = $subtotals{netamount} ? ($subtotals{marge_total} * 100 / $subtotals{netamount}) : 0;
$totals{marge_percent} = $totals{netamount} ? ($totals{marge_total} * 100 / $totals{netamount} ) : 0;
- map { $oe->{$_} = $form->format_amount(\%myconfig, $oe->{$_}, 2) } qw(netamount tax amount marge_total marge_percent);
+ map { $oe->{$_} = $form->format_amount(\%myconfig, $oe->{$_}, 2) } qw(netamount tax amount marge_total marge_percent remaining_amount remaining_netamount expected_netamount);
+
+ $oe->{order_probability} = ($oe->{order_probability} || 0) . '%';
my $row = { };
foreach my $column (@columns) {
next if ($column eq 'ids');
+ next if ($column eq 'edit_exp');
$row->{$column} = {
'data' => $oe->{$column},
'align' => $column_alignment{$column},
@@ -931,11 +1261,14 @@ sub orders {
$row->{$ordnumber}->{link} = $edit_url . "&id=" . E($oe->{id}) . "&callback=${callback}";
+ $row->{edit_exp}->{data} = $oe->{ordnumber};
+ $row->{edit_exp}->{link} = build_std_url('script=controller.pl', 'action=Order/edit', "type=$form->{type}", 'id=' . E($oe->{id}));
+
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} }))) {
+ && (($idx == (scalar @{ $form->{OE} }))
+ || ($oe->{ $form->{sort} } ne $form->{OE}->[$idx]->{ $form->{sort} }))) {
push @{ $row_set }, create_subtotal_row(\%subtotals, \@columns, \%column_alignment, \@subtotal_columns, 'listsubtotal');
}
@@ -947,6 +1280,7 @@ sub orders {
$report->add_separator();
$report->add_data(create_subtotal_row(\%totals, \@columns, \%column_alignment, \@subtotal_columns, 'listtotal'));
+ setup_oe_orders_action_bar();
$report->generate_with_headers();
$main::lxdebug->leave_sub();
@@ -969,6 +1303,8 @@ sub check_delivered_flag {
foreach my $i (1 .. $form->{rowcount}) {
next if (!$form->{"id_$i"});
+ $form->{"ship_$i"} = 0 if $form->{saveasnew};
+
if ($form->parse_amount(\%myconfig, $form->{"qty_$i"}) == $form->parse_amount(\%myconfig, $form->{"ship_$i"})) {
$all_delivered = 1;
next;
@@ -979,6 +1315,7 @@ sub check_delivered_flag {
}
$form->{delivered} = 1 if $all_delivered;
+ $form->{delivered} = 0 if $form->{saveasnew};
$main::lxdebug->leave_sub();
}
@@ -991,6 +1328,7 @@ sub save_and_close {
my $locale = $main::locale;
check_oe_access();
+ $form->mtime_ischanged('oe');
$form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
@@ -1005,7 +1343,7 @@ sub save_and_close {
$form->{$idx} =~ s/\s*$//g;
my $msg = ucfirst $form->{vc};
- $form->isblank($form->{vc}, $locale->text($msg . " missing!"));
+ $form->isblank($form->{vc} . '_id', $locale->text($msg . " missing!"));
# $locale->text('Customer missing!');
# $locale->text('Vendor missing!');
@@ -1015,18 +1353,15 @@ sub save_and_close {
&validate_items;
- my $payment_id;
- if($form->{payment_id}) {
- $payment_id = $form->{payment_id};
- }
+ my $vc = $form->{vc};
+ if (($form->{"previous_${vc}_id"} || $form->{"${vc}_id"}) != $form->{"${vc}_id"}) {
+ $::form->{salesman_id} = SL::DB::Manager::Employee->current->id if exists $::form->{salesman_id};
- # if the name changed get new values
- if (&check_name($form->{vc})) {
- if($form->{payment_id} eq "") {
- $form->{payment_id} = $payment_id;
- }
- &update;
- ::end_of_request();
+ IS->get_customer(\%myconfig, $form) if $vc eq 'customer';
+ IR->get_vendor(\%myconfig, $form) if $vc eq 'vendor';
+
+ update();
+ $::dispatcher->end_request;
}
$form->{id} = 0 if $form->{saveasnew};
@@ -1067,10 +1402,8 @@ sub save_and_close {
}
- # 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);
- }
+ # get new number in sequence if saveasnew was requested
+ delete $form->{$ordnumber} if $form->{saveasnew};
relink_accounts();
@@ -1099,6 +1432,7 @@ sub save {
check_oe_access();
+ $form->mtime_ischanged('oe');
$form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
@@ -1113,7 +1447,7 @@ sub save {
$form->{$idx} =~ s/\s*$//g;
my $msg = ucfirst $form->{vc};
- $form->isblank($form->{vc}, $locale->text($msg . " missing!"));
+ $form->isblank($form->{vc} . '_id', $locale->text($msg . " missing!"));
# $locale->text('Customer missing!');
# $locale->text('Vendor missing!');
@@ -1124,18 +1458,15 @@ sub save {
remove_emptied_rows();
&validate_items;
- my $payment_id;
- if($form->{payment_id}) {
- $payment_id = $form->{payment_id};
- }
+ my $vc = $form->{vc};
+ if (($form->{"previous_${vc}_id"} || $form->{"${vc}_id"}) != $form->{"${vc}_id"}) {
+ $::form->{salesman_id} = SL::DB::Manager::Employee->current->id if exists $::form->{salesman_id};
- # if the name changed get new values
- if (&check_name($form->{vc})) {
- if($form->{payment_id} eq "") {
- $form->{payment_id} = $payment_id;
- }
- &update;
- ::end_of_request();
+ IS->get_customer(\%myconfig, $form) if $vc eq 'customer';
+ IR->get_vendor(\%myconfig, $form) if $vc eq 'vendor';
+
+ update();
+ $::dispatcher->end_request;
}
$form->{id} = 0 if $form->{saveasnew};
@@ -1177,16 +1508,18 @@ sub save {
}
- $form->{$ordnumber} = $form->update_defaults(\%myconfig, $numberfld)
- unless $form->{$ordnumber};
-
relink_accounts();
OE->save(\%myconfig, \%$form);
# saving the history
if(!exists $form->{addition}) {
- $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
+ if ( $form->{formname} eq 'sales_quotation' or $form->{formname} eq 'request_quotation' ) {
+ $form->{snumbers} = qq|quonumber_| . $form->{quonumber};
+ } elsif ( $form->{formname} eq 'sales_order' or $form->{formname} eq 'purchase_order') {
+ $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
+ };
+ $form->{what_done} = $form->{formname};
$form->{addition} = "SAVED";
$form->save_history;
}
@@ -1194,9 +1527,9 @@ sub save {
$form->{simple_save} = 1;
if(!$form->{print_and_save}) {
- delete @{$form}{ary_diff([keys %{ $form }], [qw(login stylesheet id script type cursor_fokus)])};
+ delete @{$form}{ary_diff([keys %{ $form }], [qw(login id script type cursor_fokus)])};
edit();
- ::end_of_request();
+ $::dispatcher->end_request;
}
$main::lxdebug->leave_sub();
}
@@ -1204,59 +1537,6 @@ sub save {
sub delete {
$main::lxdebug->enter_sub();
- my $form = $main::form;
- my $locale = $main::locale;
-
- check_oe_access();
-
- $form->header;
-
- my ($msg, $ordnumber);
- if ($form->{type} =~ /_order$/) {
- $msg = $locale->text('Are you sure you want to delete Order Number');
- $ordnumber = 'ordnumber';
- } else {
- $msg = $locale->text('Are you sure you want to delete Quotation Number');
- $ordnumber = 'quonumber';
- }
-
- print qq|
-
-
-
-
-
-