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;
# 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) {
my $form = $::form;
my $has_active_periodic_invoice;
- if ($params{obj}) {
+ if ($params{oe_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;
+ $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_desc = qw(kivi.SalesPurchase.check_transaction_description) x!!$::instance_conf->get_require_transaction_description_ps;
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;
t8('Update'),
submit => [ '#form', { action => "update" } ],
id => 'update_button',
+ checks => [ 'kivi.validate_form' ],
accesskey => 'enter',
],
action => [
t8('Save'),
submit => [ '#form', { action => "save" } ],
- checks => [ @req_trans_desc, @req_trans_cost_art, @warn_p_invoice ],
+ checks => [ 'kivi.validate_form', @req_trans_cost_art, @warn_p_invoice ],
],
action => [
t8('Save as new'),
submit => [ '#form', { action => "save_as_new" } ],
- checks => [ @req_trans_desc, @req_trans_cost_art ],
+ 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 => [ @req_trans_desc, @req_trans_cost_art, @warn_p_invoice ],
+ checks => [ 'kivi.validate_form', @req_trans_cost_art, @warn_p_invoice ],
],
action => [
t8('Delete'),
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"
action => [
t8('Print'),
call => [ 'kivi.SalesPurchase.show_print_dialog' ],
- checks => [ @req_trans_desc ],
+ checks => [ 'kivi.validate_form' ],
],
action => [
t8('E Mail'),
call => [ 'kivi.SalesPurchase.show_email_dialog' ],
- checks => [ @req_trans_desc ],
+ checks => [ 'kivi.validate_form' ],
],
action => [
t8('Download attachments of all parts'),
], # end of combobox "more"
);
}
+ $::request->layout->add_javascripts('kivi.Validator.js');
}
sub setup_oe_search_action_bar {
t8('Search'),
submit => [ '#form' ],
accesskey => 'enter',
+ checks => [ 'kivi.validate_form' ],
],
);
}
+ $::request->layout->add_javascripts('kivi.Validator.js');
}
sub setup_oe_orders_action_bar {
is_pur_ord => scalar($form->{type} =~ /purchase_order$/),
);
- setup_oe_action_bar(%type_check_vars);
+ 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};
}
- push @custom_hiddens, map { "shiptocvar_" . $_->name } @{ SL::DB::Manager::CustomVariableConfig->get_all(where => [ module => 'ShipTo' ]) };
-
$TMPL_VAR->{HIDDENS} = [ map { name => $_, value => $form->{$_} },
qw(id type vc proforma queued printed emailed
title creditlimit creditremaining tradediscount business
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};
+ }
+
print $form->parse_html_template("oe/form_footer", {
%$TMPL_VAR,
print_options => $print_options_html,
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();
my @columns = (
"transdate", "reqdate",
- "id", $ordnumber, "edit_exp",
+ "id", $ordnumber,
"cusordnumber", "customernumber",
"name", "netamount",
"tax", "amount",
$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;
'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,
);
my $idx = 1;
- my $edit_url = build_std_url('action=edit', 'type', 'vc');
+ my $edit_url = ($::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;
foreach my $column (@columns) {
next if ($column eq 'ids');
- next if ($column eq 'edit_exp');
$row->{$column} = {
'data' => $oe->{$column},
'align' => $column_alignment{$column},
$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')
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;
$form->{reqdate} = DateTime->today_local->next_workday(extra_days => $extra_days)->to_kivitendo;
$form->{transdate} = DateTime->today_local->to_kivitendo;
}
$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"};
my $order = SL::DB::Order->new(id => $::form->{id})->load;
$order->flatten_to_form($::form, format_amounts => 1);
+ # 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};
+
# fake last empty row
$::form->{rowcount}++;
+ _update_ship();
delivery_order();
}
+sub oe_invoice_from_order {
+
+ return if !$::form->{id};
+
+ my $order = SL::DB::Order->new(id => $::form->{id})->load;
+ $order->flatten_to_form($::form, format_amounts => 1);
+
+ # 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};
+
+ # fake last empty row
+ $::form->{rowcount}++;
+
+ _update_ship();
+ invoice();
+}
+
sub yes {
call_sub($main::form->{yes_nextsub});
}
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 });
}
$::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();
}
projects / kivitendo-erp.git / blobdiff