X-Git-Url: http://wagnertech.de/git?p=kivitendo-erp.git;a=blobdiff_plain;f=bin%2Fmozilla%2Foe.pl;fp=bin%2Fmozilla%2Foe.pl;h=d8593351b0347aa32bfa61643cf60036ff52a1d4;hp=7b33183097311819cfeaf575388e230b0c29ecaa;hb=53593baa211863fbf66540cf1bcc36c8fb37257f;hpb=deb4d2dbb676d7d6f69dfe7815d6e0cb09bd4a44
diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index 7b3318309..d8593351b 100644
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -24,7 +24,8 @@
# 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
@@ -41,24 +42,26 @@ use SL::FU;
use SL::OE;
use SL::IR;
use SL::IS;
-use SL::MoreCommon qw(ary_diff);
-use SL::PE;
+use SL::Helper::UserPreferences::DisplayPreferences;
+use SL::MoreCommon qw(ary_diff restore_form save_form);
use SL::ReportGenerator;
+use SL::YAML;
use List::MoreUtils qw(uniq any none);
use List::Util qw(min max reduce sum);
use Data::Dumper;
+use SL::Controller::Order;
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
@@ -81,10 +84,18 @@ my $oe_access_map = {
'sales_quotation' => 'sales_quotation_edit',
};
+my $oe_view_access_map = {
+ 'sales_order' => 'sales_order_edit | sales_order_view',
+ 'purchase_order' => 'purchase_order_edit | purchase_order_view',
+ 'request_quotation' => 'request_quotation_edit | request_quotation_view',
+ 'sales_quotation' => 'sales_quotation_edit | sales_quotation_view',
+};
+
sub check_oe_access {
+ my (%params) = @_;
my $form = $main::form;
- my $right = $oe_access_map->{$form->{type}};
+ my $right = ($params{with_view}) ? $oe_view_access_map->{$form->{type}} : $oe_access_map->{$form->{type}};
$right ||= 'DOES_NOT_EXIST';
$main::auth->assert($right);
@@ -155,7 +166,9 @@ sub add {
"$form->{script}?action=add&type=$form->{type}&vc=$form->{vc}"
unless $form->{callback};
- &order_links;
+ $form->{show_details} = $::myconfig{show_form_details};
+
+ order_links(is_new => 1);
&prepare_order;
&display_form;
@@ -169,6 +182,7 @@ sub edit {
check_oe_access();
+ $form->{show_details} = $::myconfig{show_form_details};
$form->{taxincluded_changed_by_user} = 1;
# show history button
@@ -181,6 +195,14 @@ sub edit {
# editing without stuff to edit? try adding it first
if ($form->{rowcount} && !$form->{print_and_save}) {
+ if ($::instance_conf->get_feature_experimental_order) {
+ my $c = SL::Controller::Order->new;
+ $c->action_edit_collective();
+
+ $main::lxdebug->leave_sub();
+ $::dispatcher->end_request;
+ }
+
my $id;
map { $id++ if $form->{"multi_id_$_"} } (1 .. $form->{rowcount});
if (!$id) {
@@ -231,18 +253,15 @@ sub edit {
sub order_links {
$main::lxdebug->enter_sub();
+ my (%params) = @_;
+
my $form = $main::form;
my %myconfig = %main::myconfig;
my $locale = $main::locale;
check_oe_access();
- # get customer/vendor
- $form->all_vc(\%myconfig, $form->{vc}, ($form->{vc} eq 'customer') ? "AR" : "AP");
-
- # retrieve order/quotation and webdav config
- $form->{webdav} = $::instance_conf->get_webdav;
-
+ # retrieve order/quotation
my $editing = $form->{id};
OE->retrieve(\%myconfig, \%$form);
@@ -254,13 +273,15 @@ 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 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)/;
+ if ($form->{type} =~ /(purchase_order|request_quotation)/) {
+ IR->get_vendor(\%myconfig, \%$form);
+ } else {
+ IS->get_customer(\%myconfig, \%$form);
+ $form->{billing_address_id} = $form->{default_billing_address_id} if $params{is_new};
+ }
$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};
@@ -269,18 +290,6 @@ sub order_links {
$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();
}
@@ -308,6 +317,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{oe_obj}) {
+ $has_active_periodic_invoice =
+ $params{oe_obj}->is_type('sales_order')
+ && $params{oe_obj}->periodic_invoices_config
+ && $params{oe_obj}->periodic_invoices_config->active
+ && ( !$params{oe_obj}->periodic_invoices_config->end_date
+ || ($params{oe_obj}->periodic_invoices_config->end_date > DateTime->today_local))
+ && $params{oe_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',
+ 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' ],
+ disabled => !$form->{id} ? t8('This record has not been saved yet.') : undef,
+ ],
+ 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;
@@ -321,24 +509,20 @@ sub form_header {
# 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}) {
- my $obj = SL::DB::Order->new(id => $form->{id})->load;
- $TMPL_VAR{warn_save_active_periodic_invoice} =
- $obj->is_type('sales_order')
- && $obj->periodic_invoices_config
- && $obj->periodic_invoices_config->active
- && ( !$obj->periodic_invoices_config->end_date
- || ($obj->periodic_invoices_config->end_date > DateTime->today_local))
- && $obj->periodic_invoices_config->get_previous_billed_period_start_date;
-
- $TMPL_VAR{oe_obj} = $obj;
+ $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};
+ 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;
@@ -346,17 +530,17 @@ sub form_header {
$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;
+ $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("taxzones" => ($form->{id} ? "ALL_TAXZONES" : "ALL_ACTIVE_TAXZONES"),
- "payments" => "ALL_PAYMENTS",
"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_sorted;
+ $form->{ALL_LANGUAGES} = SL::DB::Manager::Language->get_all_sorted;
# Projects
my @old_project_ids = uniq grep { $_ } map { $_ * 1 } ($form->{"globalproject_id"}, map { $form->{"project_id_$_"} } 1..$form->{"rowcount"});
@@ -375,17 +559,17 @@ sub form_header {
@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
+ $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
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 => [
+ $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 => [
+ $TMPL_VAR->{ALL_CONTACTS} = SL::DB::Manager::Contact->get_all_sorted(query => [
or => [
cp_cv_id => $::form->{"$::form->{vc}_id"} * 1,
and => [
@@ -394,50 +578,35 @@ sub form_header {
]
]
]);
- $TMPL_VAR{sales_employee_labels} = sub { $_[0]->{name} || $_[0]->{login} };
- $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}";
+ $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,
- '-onchange' => "document.getElementById('update_button').click();"
- )) 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 };
}
}
@@ -445,57 +614,74 @@ sub form_header {
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}) {
+ } elsif ($form->{resubmit} && $form->{action_print}) {
# emulate click for resubmitting actions
- $dispatch_to_popup = "document.oe.${_}.click(); " for grep { /^action_/ } keys %$form;
+ $dispatch_to_popup = "kivi.SalesPurchase.show_print_dialog(); kivi.SalesPurchase.print_record();";
} elsif ($creditwarning) {
$::request->{layout}->add_javascripts_inline("alert('$credittext');");
}
$::request->{layout}->add_javascripts_inline("\$(function(){$dispatch_to_popup});");
- $TMPL_VAR{dateformat} = $myconfig{dateformat};
- $TMPL_VAR{numberformat} = $myconfig{numberformat};
+ $TMPL_VAR->{dateformat} = $myconfig{dateformat};
+ $TMPL_VAR->{numberformat} = $myconfig{numberformat};
+ $TMPL_VAR->{longdescription_dialog_size_percentage} = SL::Helper::UserPreferences::DisplayPreferences->new()->get_longdescription_dialog_size_percentage();
if ($form->{type} eq 'sales_order') {
if (!$form->{periodic_invoices_config}) {
$form->{periodic_invoices_status} = $locale->text('not configured');
} else {
- my $config = YAML::Load($form->{periodic_invoices_config});
+ my $config = SL::YAML::Load($form->{periodic_invoices_config});
$form->{periodic_invoices_status} = $config->{active} ? $locale->text('active') : $locale->text('inactive');
}
}
- $::request->{layout}->use_javascript(map { "${_}.js" } qw(kivi.SalesPurchase show_form_details show_history show_vc_details ckeditor/ckeditor ckeditor/adapters/jquery kivi.io autocomplete_customer autocomplete_part));
+ $::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,
+ oe_obj => $TMPL_VAR->{oe_obj},
+ vc_obj => $TMPL_VAR->{vc_obj},
+ );
$form->header;
if ($form->{CFDD_shipto} && $form->{CFDD_shipto_id} ) {
$form->{shipto_id} = $form->{CFDD_shipto_id};
}
- $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
- CFDD_shipto CFDD_shipto_id shiptocity shiptocountry shiptocontact shiptophone shiptofax
- shiptodepartment_1 shiptodepartment_2 shiptoemail shiptocp_gender
- 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', $_.'_taxnumber' } split / /, $form->{taxaccounts} ]; # deleted: discount
+ map { $_.'_rate', $_.'_description', $_.'_taxnumber', $_.'_tax_id' } 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;
- $TMPL_VAR{ORDER_PROBABILITIES} = [ map { { title => ($_ * 10) . '%', id => $_ * 10 } } (0..10) ];
+ $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 });
+ print $form->parse_html_template("oe/form_header", {
+ %$TMPL_VAR,
+ %type_check_vars,
+ });
$main::lxdebug->leave_sub();
}
@@ -511,10 +697,7 @@ sub form_footer {
$form->{invtotal} = $form->{invsubtotal};
- 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', {});
if( $form->{customer_id} && !$form->{taxincluded_changed_by_user} ) {
my $customer = SL::DB::Customer->new(id => $form->{customer_id})->load();
@@ -528,16 +711,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"}) {
@@ -546,7 +726,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"} |
@@ -559,25 +739,34 @@ 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();
+ $TMPL_VAR->{ALL_DELIVERY_TERMS} = SL::DB::Manager::DeliveryTerm->get_all_sorted();
+
+ my $print_options_html = setup_sales_purchase_print_options();
+
+ my $shipto_cvars = SL::DB::Shipto->new->cvars_by_config;
+ foreach my $var (@{ $shipto_cvars }) {
+ my $name = "shiptocvar_" . $var->config->name;
+ $var->value($form->{$name}) if exists $form->{$name};
+ }
- my $tpca_reminder;
- $tpca_reminder = check_transport_cost_reminder_article_number() if $::instance_conf->get_transport_cost_reminder_article_number_id;
print $form->parse_html_template("oe/form_footer", {
- %TMPL_VAR,
- webdav => $::instance_conf->get_webdav,
- tpca_reminder => $tpca_reminder,
- 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$/),
is_req_quo => scalar ($form->{type} =~ /request_quotation$/),
is_sales_ord => scalar ($form->{type} =~ /sales_order$/),
is_pur_ord => scalar ($form->{type} =~ /purchase_order$/),
+ shipto_cvars => $shipto_cvars,
});
$main::lxdebug->leave_sub();
@@ -597,7 +786,17 @@ sub update {
$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};
+
+ if ($vc eq 'customer') {
+ IS->get_customer(\%myconfig, $form);
+ $::form->{billing_address_id} = $::form->{default_billing_address_id};
+ } else {
+ IR->get_vendor(\%myconfig, $form);
+ }
+ }
if (!$form->{forex}) { # read exchangerate from input field (not hidden)
map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } qw(exchangerate) unless $recursive_call;
@@ -647,7 +846,7 @@ sub update {
if ($rows > 1) {
select_item(mode => $mode, pre_entered_qty => $form->{"qty_$i"});
- ::end_of_request();
+ $::dispatcher->end_request;
} else {
@@ -736,7 +935,7 @@ sub search {
my %myconfig = %main::myconfig;
my $locale = $main::locale;
- check_oe_access();
+ check_oe_access(with_view => 1);
if ($form->{type} eq 'purchase_order') {
$form->{vc} = 'vendor';
@@ -763,17 +962,15 @@ 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 },
- "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},
@@ -786,10 +983,13 @@ sub search {
$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 => scalar($form->{type} =~ /_order/),
});
@@ -825,14 +1025,13 @@ sub orders {
my $locale = $main::locale;
my $cgi = $::request->{cgi};
- check_oe_access();
+ my %params = @_;
+ check_oe_access(with_view => 1);
my $ordnumber = ($form->{type} =~ /_order$/) ? "ordnumber" : "quonumber";
($form->{ $form->{vc} }, $form->{"$form->{vc}_id"}) = split(/--/, $form->{ $form->{vc} });
-
report_generator_set_default_sort('transdate', 1);
-
OE->transactions(\%myconfig, \%$form);
$form->{rowcount} = scalar @{ $form->{OE} };
@@ -847,14 +1046,14 @@ sub orders {
"curr", "employee",
"salesman",
"shipvia", "globalprojectnumber",
- "transaction_description", "open",
+ "transaction_description", "department", "open",
"delivered", "periodic_invoices",
"marge_total", "marge_percent",
"vcnumber", "ustid",
"country", "shippingpoint",
"taxzone", "insertdate",
"order_probability", "expected_billing_date", "expected_netamount",
- "payment_terms",
+ "payment_terms", "intnotes",
);
# only show checkboxes if gotten here via sales_order form.
@@ -866,7 +1065,6 @@ 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});
-
map { $form->{"l_${_}"} = 'Y' } qw(order_probability expected_billing_date expected_netamount) if $form->{l_order_probability_expected_billing_date};
my $attachment_basename;
@@ -903,13 +1101,14 @@ sub orders {
transaction_description transdatefrom transdateto type vc employee_id salesman_id
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);
+ order_probability_op order_probability_value expected_billing_date_from expected_billing_date_to
+ parts_partnumber parts_description all department_id intnotes phone_notes fulltext);
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', @keys_for_url);
+ my $href = $params{want_binary_pdf} ? '' : build_std_url('action=orders', @keys_for_url);
my %column_defs = (
'ids' => { 'text' => '', },
@@ -932,6 +1131,7 @@ sub orders {
'shipvia' => { 'text' => $locale->text('Ship via'), },
'globalprojectnumber' => { 'text' => $locale->text('Project Number'), },
'transaction_description' => { 'text' => $locale->text('Transaction description'), },
+ 'department' => { 'text' => $locale->text('Department'), },
'open' => { 'text' => $locale->text('Open'), },
'delivered' => { 'text' => $locale->text('Delivery Order created'), },
'marge_total' => { 'text' => $locale->text('Ertrag'), },
@@ -947,10 +1147,11 @@ sub orders {
'expected_billing_date' => { 'text' => $locale->text('Exp. bill. date'), },
'expected_netamount' => { 'text' => $locale->text('Exp. netamount'), },
'payment_terms' => { 'text' => $locale->text('Payment Terms'), },
+ 'intnotes' => { 'text' => $locale->text('Internal Notes'), },
%column_defs_cvars,
);
- foreach my $name (qw(id transdate reqdate quonumber ordnumber cusordnumber name employee salesman shipvia transaction_description shippingpoint taxzone insertdate payment_terms)) {
+ foreach my $name (qw(id transdate reqdate quonumber ordnumber cusordnumber name employee salesman shipvia transaction_description shippingpoint taxzone insertdate payment_terms department intnotes)) {
my $sortdir = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir};
$column_defs{$name}->{link} = $href . "&sort=$name&sortdir=$sortdir";
}
@@ -973,17 +1174,22 @@ sub orders {
'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('Contact Person') . " : $form->{cp_name}" if $form->{cp_name};
- push @options, $locale->text('Department') . " : $department" if $form->{department};
+ 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('Internal Notes') . " : $form->{intnotes}" if $form->{intnotes};
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};
+ push @options, $locale->text('Phone Notes') . " : $form->{phone_notes}" if $form->{phone_notes};
+ push @options, $locale->text('Full Text') . " : $form->{fulltext}" if $form->{fulltext};
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};
@@ -1014,6 +1220,10 @@ sub orders {
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} . '%';
}
@@ -1026,7 +1236,7 @@ sub orders {
$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),
@@ -1048,8 +1258,11 @@ sub orders {
my $idx = 1;
- my $edit_url = build_std_url('action=edit', 'type', 'vc');
-
+ my $edit_url = $params{want_binary_pdf}
+ ? ''
+ : ($::instance_conf->get_feature_experimental_order)
+ ? build_std_url('script=controller.pl', 'action=Order/edit', 'type')
+ : build_std_url('action=edit', 'type', 'vc');
foreach my $oe (@{ $form->{OE} }) {
map { $oe->{$_} *= $oe->{exchangerate} } @subtotal_columns;
@@ -1085,7 +1298,7 @@ sub orders {
'align' => 'center',
};
- $row->{$ordnumber}->{link} = $edit_url . "&id=" . E($oe->{id}) . "&callback=${callback}";
+ $row->{$ordnumber}->{link} = $edit_url . "&id=" . E($oe->{id}) . "&callback=${callback}" unless $params{want_binary_pdf};
my $row_set = [ $row ];
@@ -1102,7 +1315,11 @@ sub orders {
$report->add_separator();
$report->add_data(create_subtotal_row(\%totals, \@columns, \%column_alignment, \@subtotal_columns, 'listtotal'));
-
+ if ($params{want_binary_pdf}) {
+ $report->generate_with_headers();
+ return $report->generate_pdf_content(want_binary_pdf => 1);
+ }
+ setup_oe_orders_action_bar();
$report->generate_with_headers();
$main::lxdebug->leave_sub();
@@ -1125,6 +1342,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;
@@ -1135,6 +1354,7 @@ sub check_delivered_flag {
}
$form->{delivered} = 1 if $all_delivered;
+ $form->{delivered} = 0 if $form->{saveasnew};
$main::lxdebug->leave_sub();
}
@@ -1162,7 +1382,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!');
@@ -1172,18 +1392,17 @@ 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';
+
+ $::form->{billing_address_id} = $::form->{default_billing_address_id};
+
+ update();
+ $::dispatcher->end_request;
}
$form->{id} = 0 if $form->{saveasnew};
@@ -1269,7 +1488,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!');
@@ -1280,18 +1499,20 @@ 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;
+ if ($vc eq 'customer') {
+ IS->get_customer(\%myconfig, $form);
+ $::form->{billing_address_id} = $::form->{default_billing_address_id};
+
+ } else {
+ IR->get_vendor(\%myconfig, $form);
}
- &update;
- ::end_of_request();
+
+ update();
+ $::dispatcher->end_request;
}
$form->{id} = 0 if $form->{saveasnew};
@@ -1354,7 +1575,7 @@ sub save {
if(!$form->{print_and_save}) {
delete @{$form}{ary_diff([keys %{ $form }], [qw(login id script type cursor_fokus)])};
edit();
- ::end_of_request();
+ $::dispatcher->end_request;
}
$main::lxdebug->leave_sub();
}
@@ -1390,7 +1611,7 @@ sub delete {
}
# /saving the history
$form->info($msg);
- ::end_of_request();
+ $::dispatcher->end_request;
}
$form->error($err);
@@ -1433,24 +1654,23 @@ sub invoice {
$form->{quodate} = $form->{transdate};
}
- 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};
+
+ IS->get_customer(\%myconfig, $form) if $vc eq 'customer';
+ IR->get_vendor(\%myconfig, $form) if $vc eq 'vendor';
- # if the name changed get new values
- if (&check_name($form->{vc})) {
- $form->{payment_id} = $payment_id if $form->{payment_id} eq "";
- &update;
- ::end_of_request();
+ update();
+ $::dispatcher->end_request;
}
- _oe_remove_delivered_or_billed_rows(id => $form->{id}, type => 'billed');
+ _oe_remove_delivered_or_billed_rows(id => $form->{id}, type => 'billed') if $form->{new_invoice_type} ne 'final_invoice';
$form->{cp_id} *= 1;
for my $i (1 .. $form->{rowcount}) {
- for (qw(ship qty sellprice basefactor)) {
+ for (qw(ship qty sellprice basefactor discount)) {
$form->{"${_}_${i}"} = $form->parse_amount(\%myconfig, $form->{"${_}_${i}"}) if $form->{"${_}_${i}"};
}
$form->{"converted_from_orderitems_id_$i"} = delete $form->{"orderitems_id_$i"};
@@ -1479,11 +1699,6 @@ sub invoice {
delete @{$form}{qw(id closed)};
$form->{rowcount}--;
- if ($form->{type} =~ /_order$/) {
- $form->{exchangerate} = $exchangerate;
- &create_backorder;
- }
-
my ($script);
if ( $form->{type} eq 'purchase_order'
|| $form->{type} eq 'request_quotation') {
@@ -1495,7 +1710,9 @@ sub invoice {
if ( $form->{type} eq 'sales_order'
|| $form->{type} eq 'sales_quotation') {
- $form->{title} = $locale->text('Add Sales Invoice');
+ $form->{title} = ($form->{new_invoice_type} eq 'invoice_for_advance_payment') ? $locale->text('Add Invoice for Advance Payment')
+ : ($form->{new_invoice_type} eq 'final_invoice') ? $locale->text('Add Final Invoice')
+ : $locale->text('Add Sales Invoice');
$form->{script} = 'is.pl';
$script = "is";
$buysell = 'buy';
@@ -1504,7 +1721,7 @@ sub invoice {
# bo creates the id, reset it
map { delete $form->{$_} } qw(id subject message cc bcc printed emailed queued);
$form->{ $form->{vc} } =~ s/--.*//g;
- $form->{type} = "invoice";
+ $form->{type} = $form->{new_invoice_type} || "invoice";
# locale messages
$main::locale = Locale->new("$myconfig{countrycode}", "$script");
@@ -1512,8 +1729,6 @@ sub invoice {
require "bin/mozilla/$form->{script}";
- map { $form->{"select$_"} = "" } ($form->{vc}, "currency");
-
my $currency = $form->{currency};
&invoice_links;
@@ -1572,76 +1787,6 @@ sub save_exchangerate {
$main::lxdebug->leave_sub();
}
-sub create_backorder {
- $main::lxdebug->enter_sub();
-
- my $form = $main::form;
- my %myconfig = %main::myconfig;
-
- $form->{shipped} = 1;
-
- # figure out if we need to create a backorder
- # items aren't saved if qty != 0
-
- my ($totalqty, $totalship);
- for my $i (1 .. $form->{rowcount}) {
- my $qty = $form->{"qty_$i"};
- my $ship = $form->{"ship_$i"};
- $totalqty += $qty;
- $totalship += $ship;
-
- $form->{"qty_$i"} = $qty - $ship;
- }
-
- if ($totalship == 0) {
- map { $form->{"ship_$_"} = $form->{"qty_$_"} } (1 .. $form->{rowcount});
- $form->{ordtotal} = 0;
- $form->{shipped} = 0;
- return;
- }
-
- if ($totalqty == $totalship) {
- map { $form->{"qty_$_"} = $form->{"ship_$_"} } (1 .. $form->{rowcount});
- $form->{ordtotal} = 0;
- return;
- }
-
- my @flds = (
- qw(partnumber description qty ship unit sellprice discount id inventory_accno bin income_accno expense_accno listprice assembly taxaccounts partsgroup)
- );
-
- for my $i (1 .. $form->{rowcount}) {
- map {
- $form->{"${_}_$i"} =
- $form->format_amount(\%myconfig, $form->{"${_}_$i"})
- } qw(sellprice discount);
- }
-
- relink_accounts();
-
- OE->save(\%myconfig, \%$form);
-
- # rebuild rows for invoice
- my @a = ();
- my $count = 0;
-
- for my $i (1 .. $form->{rowcount}) {
- $form->{"qty_$i"} = $form->{"ship_$i"};
-
- if ($form->{"qty_$i"}) {
- push @a, {};
- my $j = $#a;
- map { $a[$j]->{$_} = $form->{"${_}_$i"} } @flds;
- $count++;
- }
- }
-
- $form->redo_rows(\@flds, \@a, $count, $form->{rowcount});
- $form->{rowcount} = $count;
-
- $main::lxdebug->leave_sub();
-}
-
sub save_as_new {
$main::lxdebug->enter_sub();
@@ -1667,12 +1812,18 @@ sub save_as_new {
if ( $form->{reqdate} && $form->{id} ) {
my $saved_order = OE->retrieve_simple(id => $form->{id});
if ( $saved_order && $saved_order->{reqdate} eq $form->{reqdate} && $saved_order->{transdate} eq $form->{transdate} ) {
- my $extra_days = $form->{type} eq 'sales_quotation' ? $::instance_conf->get_reqdate_interval : 1;
+ my $extra_days = $form->{type} eq 'sales_quotation' ? $::instance_conf->get_reqdate_interval :
+ $form->{type} eq 'sales_order' ? $::instance_conf->get_delivery_date_interval : 1;
+
+ if ( ($form->{type} eq 'sales_order' && !$::instance_conf->get_deliverydate_on)
+ || ($form->{type} eq 'sales_quotation' && !$::instance_conf->get_reqdate_on)) {
+ $form->{reqdate} = '';
+ } else {
$form->{reqdate} = DateTime->today_local->next_workday(extra_days => $extra_days)->to_kivitendo;
+ }
$form->{transdate} = DateTime->today_local->to_kivitendo;
}
}
-
# update employee
$form->get_employee();
@@ -1725,6 +1876,8 @@ sub check_for_direct_delivery {
return;
}
+ my $cvars = SL::DB::Shipto->new->cvars_by_config;
+
if ($form->{shipto_id}) {
Common->get_shipto_by_id(\%myconfig, $form, $form->{shipto_id}, "CFDD_");
@@ -1732,15 +1885,17 @@ sub check_for_direct_delivery {
map { $form->{"CFDD_${_}"} = $form->{$_ } } grep /^shipto/, keys %{ $form };
}
+ $_->value($::form->{"CFDD_shiptocvar_" . $_->config->name}) for @{ $cvars };
+
delete $form->{action};
$form->{VARIABLES} = [ map { { "key" => $_, "value" => $form->{$_} } } grep { ($_ ne 'login') && ($_ ne 'password') && (ref $_ eq "") } keys %{ $form } ];
$form->header();
- print $form->parse_html_template("oe/check_for_direct_delivery");
+ print $form->parse_html_template("oe/check_for_direct_delivery", { cvars => $cvars });
$main::lxdebug->leave_sub();
- ::end_of_request();
+ $::dispatcher->end_request;
}
sub purchase_order {
@@ -1836,7 +1991,8 @@ sub poso {
$form->{old_salesman_id} = $form->{salesman_id};
# reset
- map { delete $form->{$_} } qw(id subject message cc bcc printed emailed queued customer vendor creditlimit creditremaining discount tradediscount oldinvtotal delivered ordnumber);
+ map { delete $form->{$_} } qw(id subject message cc bcc printed emailed queued customer vendor creditlimit creditremaining discount tradediscount oldinvtotal delivered ordnumber
+ taxzone_id currency);
# this converted variable is also used for sales_order to purchase order and vice versa
$form->{"converted_from_orderitems_id_$_"} = delete $form->{"orderitems_id_$_"} for 1 .. $form->{"rowcount"};
@@ -1934,25 +2090,34 @@ sub delivery_order {
$main::lxdebug->leave_sub();
}
-sub e_mail {
- $main::lxdebug->enter_sub();
-
- my $form = $main::form;
-
- check_oe_access();
+sub oe_prepare_xyz_from_order {
+ return if !$::form->{id};
- $form->mtime_ischanged('oe','mail');
- $form->{print_and_save} = 1;
+ my $order = SL::DB::Order->new(id => $::form->{id})->load;
+ $order->flatten_to_form($::form, format_amounts => 1);
+ $::form->{taxincluded_changed_by_user} = 1;
- my $saved_form = save_form();
+ # hack: add partsgroup for first row if it does not exists,
+ # because _remove_billed_or_delivered_rows and _remove_full_delivered_rows
+ # determine fields to handled by existing fields for the first row. If partsgroup
+ # is missing there, for deleted rows the partsgroup_field is not emptied and in
+ # update_delivery_order it will not considered an empty row ...
+ $::form->{partsgroup_1} = '' if !exists $::form->{partsgroup_1};
- save();
+ # fake last empty row
+ $::form->{rowcount}++;
- restore_form($saved_form, 0, qw(id ordnumber quonumber));
+ _update_ship();
+}
- edit_e_mail();
+sub oe_delivery_order_from_order {
+ oe_prepare_xyz_from_order();
+ delivery_order();
+}
- $main::lxdebug->leave_sub();
+sub oe_invoice_from_order {
+ oe_prepare_xyz_from_order();
+ invoice();
}
sub yes {
@@ -2011,7 +2176,9 @@ sub report_for_todo_list {
my $content;
if (@{ $quotations }) {
- my $edit_url = build_std_url('script=oe.pl', 'action=edit');
+ my $edit_url = ($::instance_conf->get_feature_experimental_order)
+ ? build_std_url('script=controller.pl', 'action=Order/edit')
+ : build_std_url('script=oe.pl', 'action=edit');
$content = $form->parse_html_template('oe/report_for_todo_list', { 'QUOTATIONS' => $quotations,
'edit_url' => $edit_url });
@@ -2030,7 +2197,7 @@ sub edit_periodic_invoices_config {
check_oe_access();
my $config;
- $config = YAML::Load($::form->{periodic_invoices_config}) if $::form->{periodic_invoices_config};
+ $config = SL::YAML::Load($::form->{periodic_invoices_config}) if $::form->{periodic_invoices_config};
if ('HASH' ne ref $config) {
$config = { periodicity => 'm',
@@ -2040,6 +2207,13 @@ sub edit_periodic_invoices_config {
active => 1,
};
}
+ # for older configs, replace email preset text if not yet set.
+ $config->{email_subject} ||= GenericTranslations->get(language_id => $::form->{lanuage_id}, translation_type => "preset_text_periodic_invoices_email_subject");
+ $config->{email_body} ||= GenericTranslations->get(language_id => $::form->{lanuage_id}, translation_type => "salutation_general")
+ . GenericTranslations->get(language_id => $::form->{lanuage_id}, translation_type => "salutation_punctuation_mark")
+ . "\n\n"
+ . GenericTranslations->get(language_id => $::form->{lanuage_id}, translation_type => "preset_text_periodic_invoices_email_body");
+ $config->{email_body} =~ s{\A[ \n\r]+|[ \n\r]+\Z}{}g;
$config->{periodicity} = 'm' if none { $_ eq $config->{periodicity} } @SL::DB::PeriodicInvoicesConfig::PERIODICITIES;
$config->{order_value_periodicity} = 'p' if none { $_ eq $config->{order_value_periodicity} } ('p', @SL::DB::PeriodicInvoicesConfig::ORDER_VALUE_PERIODICITIES);
@@ -2051,8 +2225,13 @@ sub edit_periodic_invoices_config {
$::form->{AR} = [ grep { $_->{link} =~ m/(?:^|:)AR(?::|$)/ } @{ $::form->{ALL_CHARTS} } ];
$::form->{title} = $::locale->text('Edit the configuration for periodic invoices');
+ if ($::form->{customer_id}) {
+ $::form->{ALL_CONTACTS} = SL::DB::Manager::Contact->get_all_sorted(where => [ cp_cv_id => $::form->{customer_id} ]);
+ $::form->{email_recipient_invoice_address} = SL::DB::Manager::Customer->find_by(id => $::form->{customer_id})->invoice_mail;
+ }
+
$::form->header(no_layout => 1);
- print $::form->parse_html_template('oe/edit_periodic_invoices_config', $config);
+ print $::form->parse_html_template('oe/edit_periodic_invoices_config', {config => $config});
$::lxdebug->leave_sub();
}
@@ -2079,9 +2258,15 @@ sub save_periodic_invoices_config {
copies => $::form->{copies} * 1 ? $::form->{copies} : 1,
extend_automatically_by => $::form->{extend_automatically_by} * 1 || undef,
ar_chart_id => $::form->{ar_chart_id} * 1,
+ send_email => $::form->{send_email} ? 1 : 0,
+ email_recipient_contact_id => $::form->{email_recipient_contact_id} * 1 || undef,
+ email_recipient_address => $::form->{email_recipient_address},
+ email_sender => $::form->{email_sender},
+ email_subject => $::form->{email_subject},
+ email_body => $::form->{email_body},
};
- $::form->{periodic_invoices_config} = YAML::Dump($config);
+ $::form->{periodic_invoices_config} = SL::YAML::Dump($config);
$::form->{title} = $::locale->text('Edit the configuration for periodic invoices');
$::form->header;
@@ -2090,6 +2275,34 @@ sub save_periodic_invoices_config {
$::lxdebug->leave_sub();
}
+sub _remove_full_delivered_rows {
+
+ my @fields = map { s/_1$//; $_ } grep { m/_1$/ } keys %{ $::form };
+ my @new_rows;
+
+ my $removed_rows = 0;
+ my $row = 0;
+ while ($row < $::form->{rowcount}) {
+ $row++;
+ next unless $::form->{"id_$row"};
+ my $base_factor = SL::DB::Manager::Unit->find_by(name => $::form->{"unit_$row"})->base_factor;
+ my $base_qty = $::form->parse_amount(\%::myconfig, $::form->{"qty_$row"}) * $base_factor;
+ my $ship_qty = $::form->{"ship_$row"} * $base_factor;
+ #$main::lxdebug->message(LXDebug->DEBUG2(),"shipto=".$ship_qty." qty=".$base_qty);
+
+ if (!$ship_qty || ($ship_qty < $base_qty)) {
+ $::form->{"qty_$row"} = $::form->format_amount(\%::myconfig, ($base_qty - $ship_qty) / $base_factor );
+ $::form->{"ship_$row"} = 0;
+ push @new_rows, { map { $_ => $::form->{"${_}_${row}"} } @fields };
+
+ } else {
+ $removed_rows++;
+ }
+ }
+ $::form->redo_rows(\@fields, \@new_rows, scalar(@new_rows), $::form->{rowcount});
+ $::form->{rowcount} -= $removed_rows;
+}
+
sub _oe_remove_delivered_or_billed_rows {
my (%params) = @_;
@@ -2098,6 +2311,18 @@ sub _oe_remove_delivered_or_billed_rows {
my $ord_quot = SL::DB::Order->new(id => $params{id})->load;
return if !$ord_quot;
+ # Prüfung ob itemlinks existieren, falls ja dann neue Implementierung
+
+ if ( $params{type} eq 'delivered' ) {
+ my $orderitem = SL::DB::Manager::OrderItem->get_first( where => [trans_id => $ord_quot->id]);
+ if ( $orderitem) {
+ my @links = $orderitem->linked_records(to => 'SL::DB::DeliveryOrderItem');
+ if ( scalar(@links ) > 0 ) {
+ #$main::lxdebug->message(LXDebug->DEBUG2(),"item recordlinks vorhanden");
+ return _remove_full_delivered_rows();
+ }
+ }
+ }
my %args = (
direction => 'to',
to => $params{type} eq 'delivered' ? 'DeliveryOrder' : 'Invoice',
@@ -2119,26 +2344,8 @@ sub _oe_remove_delivered_or_billed_rows {
_remove_billed_or_delivered_rows(quantities => \%handled_base_qtys);
}
-# iterate all positions and match articlenumber
-sub check_transport_cost_reminder_article_number {
- $main::lxdebug->enter_sub();
-
- my $form = $main::form;
-
- check_oe_access();
-
- my $transport_article_id = $::instance_conf->get_transport_cost_reminder_article_number_id;
- for my $i (1 .. $form->{rowcount}) {
- return if $form->{"id_${i}"} eq $transport_article_id;
- }
-
- # simply return the name of the part
- return SL::DB::Part->new(id => $transport_article_id)->load()->partnumber;
-
- $main::lxdebug->leave_sub();
-}
sub dispatcher {
- foreach my $action (qw(delete delivery_order e_mail invoice print purchase_order quotation
+ foreach my $action (qw(delete delivery_order invoice print purchase_order quotation
request_for_quotation sales_order save save_and_close save_as_new ship_to update)) {
if ($::form->{"action_${action}"}) {
call_sub($action);
@@ -2148,4 +2355,3 @@ sub dispatcher {
$::form->error($::locale->text('No action defined.'));
}
-