use Carp;
use POSIX qw(strftime);
+use SL::DB::Order;
use SL::DO;
use SL::FU;
use SL::OE;
use Data::Dumper;
use SL::DB::Customer;
+use SL::DB::TaxZone;
require "bin/mozilla/io.pl";
require "bin/mozilla/arap.pl";
$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();
$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 currency));
+ $form->backup_vars(qw(payment_id language_id taxzone_id salesman_id taxincluded cp_id intnotes shipto_id delivery_term_id currency));
$form->{shipto} = 1 if $form->{id} || $form->{convert_from_oe_ids};
# 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 shipto_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;
# Container for template variables. Unfortunately this has to be
# visible in form_footer too, so package local level and not my here.
%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;
+ }
$form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
# 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(query => $employee_list_query_gen->('employee_id'));
- $TMPL_VAR{ALL_SALESMEN} = SL::DB::Manager::Employee->get_all(query => $employee_list_query_gen->('salesman_id'));
- $TMPL_VAR{ALL_SHIPTO} = SL::DB::Manager::Shipto->get_all(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(query => [
+ $TMPL_VAR{ALL_CONTACTS} = SL::DB::Manager::Contact->get_all_sorted(query => [
or => [
cp_cv_id => $::form->{"$::form->{vc}_id"} * 1,
and => [
$::request->{layout}->add_javascripts_inline("alert('$credittext');");
}
- $::request->{layout}->add_javascripts_inline("\$(function(){$dispatch_to_popup})");
+ $::request->{layout}->add_javascripts_inline("\$(function(){$dispatch_to_popup});");
$TMPL_VAR{dateformat} = $myconfig{dateformat};
$TMPL_VAR{numberformat} = $myconfig{numberformat};
}
}
- $form->{javascript} .= qq|<script type="text/javascript" src="js/show_form_details.js"></script>|;
- $form->{javascript} .= qq|<script type="text/javascript" src="js/show_history.js"></script>|;
- $form->{javascript} .= qq|<script type="text/javascript" src="js/show_vc_details.js"></script>|;
+ $::request->{layout}->use_javascript(map { "${_}.js" } qw(kivi.SalesPurchase show_form_details show_history show_vc_details ckeditor/ckeditor ckeditor/adapters/jquery));
$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
title creditlimit creditremaining tradediscount business
max_dunning_level dunning_amount shiptoname shiptostreet shiptozipcode
- shiptocity shiptocountry shiptocontact shiptophone shiptofax
+ 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),
+ message email subject cc bcc taxpart taxservice taxaccounts cursor_fokus
+ show_details),
@custom_hiddens,
map { $_.'_rate', $_.'_description', $_.'_taxnumber' } split / /, $form->{taxaccounts} ]; # deleted: discount
is_pur_ord => scalar ($form->{type} =~ /purchase_order$/),
);
+ $TMPL_VAR{ORDER_PROBABILITIES} = [ map { { title => ($_ * 10) . '%', id => $_ * 10 } } (0..10) ];
+
print $form->parse_html_template("oe/form_header", { %TMPL_VAR });
$main::lxdebug->leave_sub();
$form->{oldinvtotal} = $form->{invtotal};
+ $TMPL_VAR{ALL_DELIVERY_TERMS} = SL::DB::Manager::DeliveryTerm->get_all_sorted();
+
print $form->parse_html_template("oe/form_footer", {
%TMPL_VAR,
webdav => $::instance_conf->get_webdav,
$form->get_lists("projects" => { "key" => "ALL_PROJECTS", "all" => 1 },
"departments" => "ALL_DEPARTMENTS",
"$form->{vc}s" => "ALL_VC",
- "business_types" => "ALL_BUSINESS_TYPES");
- $form->{ALL_EMPLOYEES} = SL::DB::Manager::Employee->get_all(query => [ deleted => 0 ]);
+ "taxzones" => "ALL_TAXZONES",
+ "business_types" => "ALL_BUSINESS_TYPES",);
+ $form->{ALL_EMPLOYEES} = SL::DB::Manager::Employee->get_all_sorted(query => [ deleted => 0 ]);
# constants and subs for template
$form->{vc_keys} = sub { "$_[0]->{name}--$_[0]->{id}" };
+ $form->{ORDER_PROBABILITIES} = [ map { { title => ($_ * 10) . '%', id => $_ * 10 } } (0..10) ];
+
$form->header();
print $form->parse_html_template('oe/search', {
my @columns = (
"transdate", "reqdate",
"id", $ordnumber,
- "customernumber",
+ "cusordnumber", "customernumber",
"name", "netamount",
"tax", "amount",
+ "remaining_netamount", "remaining_amount",
"curr", "employee",
"salesman",
"shipvia", "globalprojectnumber",
"delivered", "periodic_invoices",
"marge_total", "marge_percent",
"vcnumber", "ustid",
- "country",
+ "country", "shippingpoint",
+ "taxzone",
+ "order_probability", "expected_billing_date", "expected_netamount",
);
# only show checkboxes if gotten here via sales_order form.
$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;
if ($form->{vc} eq 'vendor') {
if ($form->{type} eq 'purchase_order') {
my $report = SL::ReportGenerator->new(\%myconfig, $form);
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
- business_id);
+ business_id shippingpoint taxzone_id
+ order_probability_op order_probability_value expected_billing_date_from expected_billing_date_to);
+
+ 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' => '', },
'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'), },
'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'), },
+ 'order_probability' => { 'text' => $locale->text('Order probability'), },
+ 'expected_billing_date' => { 'text' => $locale->text('Exp. bill. date'), },
+ 'expected_netamount' => { 'text' => $locale->text('Exp. netamount'), },
);
- 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)) {
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;
push @options, $locale->text('Vendor') . " : $form->{vendor}" if $form->{vendor};
push @options, $locale->text('Department') . " : $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('Shipping Point') . " : $form->{shippingpoint}" if $form->{shippingpoint};
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};
push @options, $locale->text('Closed') if $form->{closed};
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};
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->{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'),
# 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;
$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 = { };
}
- # 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();
}
- # value of $ordnumber is ordnumber or quonumber
- $form->{$ordnumber} = $form->update_defaults(\%myconfig, $numberfld)
- unless $form->{$ordnumber};
-
relink_accounts();
OE->save(\%myconfig, \%$form);
my $locale = $main::locale;
check_oe_access();
+ check_oe_conversion_to_sales_invoice_allowed();
$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};
$exchangerate = $form->check_exchangerate(\%myconfig, $form->{currency}, $orddate, $buysell);
if (!$exchangerate) {
- &backorder_exchangerate($orddate, $buysell);
- ::end_of_request();
+ $exchangerate = 0;
}
}
$main::lxdebug->leave_sub();
}
-sub backorder_exchangerate {
- $main::lxdebug->enter_sub();
-
- my $form = $main::form;
- my $locale = $main::locale;
-
- check_oe_access();
-
- my ($orddate, $buysell) = @_;
-
- $form->header;
-
- print qq|
-<form method=post action=$form->{script}>
-|;
-
- # delete action variable
- map { delete $form->{$_} } qw(action header exchangerate);
-
- foreach my $key (keys %$form) {
- next if (($key eq 'login') || ($key eq 'password') || ('' ne ref $form->{$key}));
- $form->{$key} =~ s/\"/"/g;
- print qq|<input type=hidden name=$key value="$form->{$key}">\n|;
- }
-
- $form->{title} = $locale->text('Add Exchangerate');
-
- print qq|
-
-<input type=hidden name=exchangeratedate value=$orddate>
-<input type=hidden name=buysell value=$buysell>
-
-<table width=100%>
- <tr><th class=listtop>$form->{title}</th></tr>
- <tr height="5"></tr>
- <tr>
- <td>
- <table>
- <tr>
- <th align=right>| . $locale->text('Currency') . qq|</th>
- <td>$form->{currency}</td>
- </tr>
- <tr>
- <th align=right>| . $locale->text('Date') . qq|</th>
- <td>$orddate</td>
- </tr>
- <tr>
- <th align=right>| . $locale->text('Exchangerate') . qq|</th>
- <td><input name=exchangerate size=11></td>
- </tr>
- </table>
- </td>
- </tr>
-</table>
-
-<hr size=3 noshade>
-
-<br>
-<input type=hidden name=nextsub value=save_exchangerate>
-
-<input name=action class=submit type=submit value="|
- . $locale->text('Continue') . qq|">
-
-</form>
-|;
-
- $main::lxdebug->leave_sub();
-}
-
sub save_exchangerate {
$main::lxdebug->enter_sub();
delete @{$form}{grep /^shipto/, keys %{ $form }};
map { s/^CFDD_//; $form->{$_} = $form->{"CFDD_${_}"} } grep /^CFDD_/, keys %{ $form };
$form->{shipto} = 1;
+ $form->{CFDD_shipto} = 1;
purchase_order();
$main::lxdebug->leave_sub();
}
$form->{direct_delivery_checked} = 1;
delete @{$form}{grep /^shipto/, keys %{ $form }};
+ $form->{CFDD_shipto} = 0;
purchase_order();
$main::lxdebug->leave_sub();
if ('HASH' ne ref $config) {
$config = { periodicity => 'y',
- start_date_as_date => $::form->{transdate},
+ start_date_as_date => $::form->{transdate} || $::form->current_date,
extend_automatically_by => 12,
active => 1,
};
}
- $config->{periodicity} = 'm' if none { $_ eq $config->{periodicity} } qw(m q y);
+ $config->{periodicity} = 'm' if none { $_ eq $config->{periodicity} } qw(m q b y);
$::form->get_lists(printers => "ALL_PRINTERS",
charts => { key => 'ALL_CHARTS',
my $config = { active => $::form->{active} ? 1 : 0,
terminated => $::form->{terminated} ? 1 : 0,
- periodicity => (any { $_ eq $::form->{periodicity} } qw(m q y)) ? $::form->{periodicity} : 'm',
+ periodicity => (any { $_ eq $::form->{periodicity} } qw(m q b y)) ? $::form->{periodicity} : 'm',
start_date_as_date => $::form->{start_date_as_date},
end_date_as_date => $::form->{end_date_as_date},
+ first_billing_date_as_date => $::form->{first_billing_date_as_date},
print => $::form->{print} ? 1 : 0,
printer_id => $::form->{print} ? $::form->{printer_id} * 1 : undef,
copies => $::form->{copies} * 1 ? $::form->{copies} : 1,
my %handled_base_qtys;
foreach my $record (@{ $ord_quot->linked_records(%args) }) {
next if $ord_quot->is_sales != $record->is_sales;
+ next if $record->type eq 'invoice' && $record->storno;
foreach my $item (@{ $record->items }) {
- $handled_base_qtys{ $item->parts_id } += $item->qty * $item->unit_obj->base_factor;
+ my $key = $item->parts_id;
+ $key .= ':' . $item->serialnumber if $item->serialnumber;
+ $handled_base_qtys{$key} += $item->qty * $item->unit_obj->base_factor;
}
}