use SL::OE;
use SL::IR;
use SL::IS;
-use SL::MoreCommon qw(ary_diff);
+use SL::MoreCommon qw(ary_diff restore_form save_form);
use SL::PE;
use SL::ReportGenerator;
use List::MoreUtils qw(uniq any none);
"$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;
check_oe_access();
+ $form->{show_details} = $::myconfig{show_form_details};
$form->{taxincluded_changed_by_user} = 1;
# show history button
# 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);
]);
$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 ] };
# business
$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!!!');
$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 };
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
title creditlimit creditremaining tradediscount business
max_dunning_level dunning_amount shiptoname shiptostreet shiptozipcode
- CFDD_shipto CFDD_shipto_id shiptocity shiptocountry shiptocontact shiptophone shiptofax
+ CFDD_shipto CFDD_shipto_id shiptocity shiptocountry shiptogln shiptocontact shiptophone shiptofax
shiptodepartment_1 shiptodepartment_2 shiptoemail shiptocp_gender
message email subject cc bcc taxpart taxservice taxaccounts cursor_fokus
show_details useasnew),
</tr> |;
}
}
-
-# $form->{invsubtotal} = $form->format_amount(\%myconfig, $form->{invsubtotal}, 2, 0); # template does this
-
} else {
foreach my $item (split / /, $form->{taxaccounts}) {
if ($form->{"${item}_base"}) {
}
}
+ 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();
$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}"),
if ($rows > 1) {
select_item(mode => $mode, pre_entered_qty => $form->{"qty_$i"});
- ::end_of_request();
+ $::dispatcher->end_request;
} else {
$form->header();
print $form->parse_html_template('oe/search', {
- %myconfig,
is_order => scalar($form->{type} =~ /_order/),
});
my @columns = (
"transdate", "reqdate",
- "id", $ordnumber,
+ "id", $ordnumber, "edit_exp",
"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 (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;
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);
push @hidden_variables, map { "cvar_$_->{name}" } @ct_searchable_custom_variables;
my @keys_for_url = grep { $form->{$_} } @hidden_variables;
'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,
);
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};
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')
my $locale = $main::locale;
check_oe_access();
+ $form->mtime_ischanged('oe');
$form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
$form->{payment_id} = $payment_id;
}
&update;
- ::end_of_request();
+ $::dispatcher->end_request;
}
$form->{id} = 0 if $form->{saveasnew};
check_oe_access();
+ $form->mtime_ischanged('oe');
$form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
$form->{payment_id} = $payment_id;
}
&update;
- ::end_of_request();
+ $::dispatcher->end_request;
}
$form->{id} = 0 if $form->{saveasnew};
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();
}
}
# /saving the history
$form->info($msg);
- ::end_of_request();
+ $::dispatcher->end_request;
}
$form->error($err);
check_oe_access();
check_oe_conversion_to_sales_invoice_allowed();
+ $form->mtime_ischanged('oe');
+
$main::auth->assert($form->{type} eq 'purchase_order' || $form->{type} eq 'request_quotation' ? 'vendor_invoice_edit' : 'invoice_edit');
$form->{old_salesman_id} = $form->{salesman_id};
if (&check_name($form->{vc})) {
$form->{payment_id} = $payment_id if $form->{payment_id} eq "";
&update;
- ::end_of_request();
+ $::dispatcher->end_request;
}
_oe_remove_delivered_or_billed_rows(id => $form->{id}, type => 'billed');
$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"};
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') {
$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();
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 $next_workday = DateTime->today_local->add(days => $extra_days);
- my $day_of_week = $next_workday->day_of_week;
-
- $next_workday->add(days => (8 - $day_of_week)) if $day_of_week >= 6;
-
+ my $extra_days = $form->{type} eq 'sales_quotation' ? $::instance_conf->get_reqdate_interval : 1;
+ $form->{reqdate} = DateTime->today_local->next_workday(extra_days => $extra_days)->to_kivitendo;
$form->{transdate} = DateTime->today_local->to_kivitendo;
- $form->{reqdate} = $next_workday->to_kivitendo;
}
}
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_");
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 {
my $locale = $main::locale;
check_oe_access();
+ $form->mtime_ischanged('oe');
+
$main::auth->assert('purchase_order_edit');
$form->{sales_order_to_purchase_order} = 0;
check_oe_access();
$main::auth->assert('sales_order_edit');
+ $form->mtime_ischanged('oe');
if ($form->{type} eq "purchase_order") {
delete($form->{ordnumber});
my $form = $main::form;
my %myconfig = %main::myconfig;
+ $form->mtime_ischanged('oe');
+
if ($form->{type} =~ /^sales/) {
$main::auth->assert('sales_delivery_order_edit');
$main::lxdebug->leave_sub();
}
+sub oe_delivery_order_from_order {
+
+ return if !$::form->{id};
+
+ my $order = SL::DB::Order->new(id => $::form->{id})->load;
+ $order->flatten_to_form($::form, format_amounts => 1);
+
+ # fake last empty row
+ $::form->{rowcount}++;
+
+ delivery_order();
+}
+
sub e_mail {
$main::lxdebug->enter_sub();
check_oe_access();
+ $form->mtime_ischanged('oe','mail');
$form->{print_and_save} = 1;
my $saved_form = save_form();
$::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->header(no_layout => 1);
print $::form->parse_html_template('oe/edit_periodic_invoices_config', $config);
my $config = { active => $::form->{active} ? 1 : 0,
terminated => $::form->{terminated} ? 1 : 0,
+ direct_debit => $::form->{direct_debit} ? 1 : 0,
periodicity => (any { $_ eq $::form->{periodicity} } @SL::DB::PeriodicInvoicesConfig::PERIODICITIES) ? $::form->{periodicity} : 'm',
order_value_periodicity => (any { $_ eq $::form->{order_value_periodicity} } ('p', @SL::DB::PeriodicInvoicesConfig::ORDER_VALUE_PERIODICITIES)) ? $::form->{order_value_periodicity} : 'p',
start_date_as_date => $::form->{start_date_as_date},
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);
$::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->parse_amount(\%::myconfig, $::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) = @_;
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',
$::form->error($::locale->text('No action defined.'));
}
-