# 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.
#======================================================================
#
# Sales report
use POSIX qw(strftime);
use List::Util qw(sum first);
+use SL::AM;
+use SL::DB::Employee;
use SL::VK;
+use SL::IS;
use SL::ReportGenerator;
use Data::Dumper;
-require "bin/mozilla/arap.pl";
require "bin/mozilla/common.pl";
-require "bin/mozilla/drafts.pl";
require "bin/mozilla/reportgenerator.pl";
use strict;
-
sub search_invoice {
$main::lxdebug->enter_sub();
- $main::auth->assert('general_ledger | invoice_edit');
+ $main::auth->assert('ar_transactions | ap_transactions | invoice_edit');
my $form = $main::form;
my %myconfig = %main::myconfig;
my $locale = $main::locale;
- my $cgi = $main::cgi;
- my ($customer, $department);
+ my ($customer);
- # setup customer selection
- $form->all_vc(\%myconfig, "customer", "AR");
+ $::request->layout->add_javascripts("autocomplete_project.js");
$form->{title} = $locale->text('Sales Report');
- $form->{jsscript} = 1;
- $form->get_lists("projects" => { "key" => "ALL_PROJECTS", "all" => 1 },
- "departments" => "ALL_DEPARTMENTS",
- "customers" => "ALL_VC");
+ $form->get_lists("departments" => "ALL_DEPARTMENTS",
+ "business_types" => "ALL_BUSINESS_TYPES",
+ "salesmen" => "ALL_SALESMEN",
+ 'partsgroup' => 'ALL_PARTSGROUPS');
+
+ $form->{ALL_EMPLOYEES} = SL::DB::Manager::Employee->get_all_sorted;
- $form->{vc_keys} = sub { "$_[0]->{name}--$_[0]->{id}" };
+ $form->{CUSTOM_VARIABLES_IC} = CVar->get_configs('module' => 'IC');
+ ($form->{CUSTOM_VARIABLES_FILTER_CODE_IC},
+ $form->{CUSTOM_VARIABLES_INCLUSION_CODE_IC}) = CVar->render_search_options('variables' => $form->{CUSTOM_VARIABLES_IC},
+ 'include_prefix' => 'l_',
+ 'include_value' => 'Y');
+ $form->{CUSTOM_VARIABLES_CT} = CVar->get_configs('module' => 'CT');
+ ($form->{CUSTOM_VARIABLES_FILTER_CODE_CT},
+ $form->{CUSTOM_VARIABLES_INCLUSION_CODE_CT}) = CVar->render_search_options('variables' => $form->{CUSTOM_VARIABLES_CT},
+ 'include_prefix' => 'l_',
+ 'include_value' => 'Y');
$form->header;
print $form->parse_html_template('vk/search_invoice', { %myconfig });
sub invoice_transactions {
$main::lxdebug->enter_sub();
- $main::auth->assert('general_ledger | invoice_edit');
+ $main::auth->assert('ar_transactions | ap_transactions | invoice_edit');
my $form = $main::form;
my %myconfig = %main::myconfig;
my ($callback, $href, @columns);
- $form->{customer} = $form->unescape($form->{customer});
+ # can't currently be configured from report, empty line between main sortings
+ my $addemptylines = 1;
+
+ # don't add empty lines between mainsort subtotals when only subtotal_mainsort is selected
+ if ($form->{l_subtotal_mainsort} eq "Y" and not defined $form->{l_headers_mainsort} and not defined $form->{l_headers_subsort} and not defined $form->{l_subtotal_subsort} ) {
+ $addemptylines = 0
+ };
- ($form->{customername}, $form->{customer_id}) = split(/--/, $form->{customer});
+ if ( $form->{customer} =~ /--/ ) {
+ # Felddaten kommen aus Dropdownbox
+ my $dummy;
+ ($dummy, $form->{customer_id}) = split(/--/, $form->{customer});
+ }
+ # if $form->{customer} is empty nothing further happens here
- # decimalplaces überprüfen oder auf Default 2 setzen
+ # test for decimalplaces or set to default of 2
$form->{decimalplaces} = 2 unless $form->{decimalplaces} > 0 && $form->{decimalplaces} < 6;
+ my $cvar_configs_ct = CVar->get_configs('module' => 'CT');
+ my $cvar_configs_ic = CVar->get_configs('module' => 'IC');
+
# report_generator_set_default_sort('transdate', 1);
VK->invoice_transactions(\%myconfig, \%$form);
- # anhand von radio button die Sortierreihenfolge festlegen
- if ($form->{sortby} eq 'artikelsort') {
- $form->{'mainsort'} = 'parts_id';
- $form->{'subsort'} = 'name';
- } else {
- $form->{'mainsort'} = 'name';
- $form->{'subsort'} = 'parts_id';
+
+ if ( $form->{mainsort} eq 'month' or $form->{subsort} eq 'month' ) {
+
+ # Data already comes out of SELECT statement in correct month order, but
+ # remove whitespaces (month names are padded) and translate them as early
+ # as possible
+
+ foreach (@{ $form->{AR} }) {
+ $_->{month} =~ s/\s//g;
+ $_->{month} = $locale->text($_->{month});
+ };
};
$form->{title} = $locale->text('Sales Report');
@columns =
- qw(description invnumber partnumber parts_id transdate qty unit sellprice sellprice_total discount lastcost lastcost_total marge_total marge_percent);
+ qw(description invnumber transdate shipvia customernumber customername partnumber partsgroup country business transdate qty parts_unit weight sellprice sellprice_total discount lastcost lastcost_total marge_total marge_percent employee salesman);
+
+ my @includeable_custom_variables = grep { $_->{includeable} } @{ $cvar_configs_ic }, @{ $cvar_configs_ct };
+ my @searchable_custom_variables = grep { $_->{searchable} } @{ $cvar_configs_ic }, @{ $cvar_configs_ct };
+ my %column_defs_cvars = map { +"cvar_$_->{name}" => { 'text' => $_->{description} } } @includeable_custom_variables;
- # hidden variables für pdf/csv export übergeben
- # einmal mit l_ um zu bestimmen welche Spalten ausgegeben werden sollen
- # einmal optionen für die Überschrift (z.B. transdatefrom, partnumber, ...)
- my @hidden_variables = (qw(l_headers l_subtotal l_total transdatefrom transdateto decimalplaces customer customername customer_id department partnumber description project_id), "$form->{db}number", map { "l_$_" } @columns);
+ push @columns, map { "cvar_$_->{name}" } @includeable_custom_variables;
+
+
+ # pass hidden variables for pdf/csv export
+ # first with l_ to determine which columns to show
+ # then with the options for headings (such as transdatefrom, partnumber, ...)
+ my @hidden_variables = (qw(l_headers_mainsort l_headers_subsort l_subtotal_mainsort l_subtotal_subsort l_total l_parts l_customername l_customernumber transdatefrom transdateto decimalplaces customer customer_id department_id partnumber partsgroup country business description project_id customernumber salesman employee salesman_id employee_id business_id partsgroup_id mainsort subsort),
+ "$form->{db}number",
+ map({ "cvar_$_->{name}" } @searchable_custom_variables),
+ map { "l_$_" } @columns
+ );
my @hidden_nondefault = grep({ $form->{$_} } @hidden_variables);
- # Variablen werden dann als Hidden Variable mitgegeben, z.B.
+ # variables are passed as hiddens, e.g.
# <input type="hidden" name="report_generator_hidden_transdateto" value="21.05.2010">
$href = build_std_url('action=invoice_transactions', grep { $form->{$_} } @hidden_variables);
my %column_defs = (
'description' => { 'text' => $locale->text('Description'), },
'partnumber' => { 'text' => $locale->text('Part Number'), },
+ 'partsgroup' => { 'text' => $locale->text('Partsgroup'), },
+ 'country' => { 'text' => $locale->text('Country'), },
+ 'business' => { 'text' => $locale->text('Customer type'), },
+ 'employee' => { 'text' => $locale->text('Employee'), },
+ 'salesman' => { 'text' => $locale->text('Salesperson'), },
'invnumber' => { 'text' => $locale->text('Invoice Number'), },
'transdate' => { 'text' => $locale->text('Invoice Date'), },
+ 'shipvia' => { 'text' => $locale->text('Ship via'), },
'qty' => { 'text' => $locale->text('Quantity'), },
- 'unit' => { 'text' => $locale->text('Unit'), },
+ 'parts_unit' => { 'text' => $locale->text('Base unit'), },
+ 'weight' => { 'text' => $locale->text('Weight'), },
'sellprice' => { 'text' => $locale->text('Sales price'), },
'sellprice_total' => { 'text' => $locale->text('Sales net amount'), },
'lastcost_total' => { 'text' => $locale->text('Purchase net amount'), },
'lastcost' => { 'text' => $locale->text('Purchase price'), },
'marge_total' => { 'text' => $locale->text('Sales margin'), },
'marge_percent' => { 'text' => $locale->text('Sales margin %'), },
+ 'customernumber' => { 'text' => $locale->text('Customer Number'), },
+ 'customername' => { 'text' => $locale->text('Customer Name'), },
+# add 3 more column_defs so we have a translation for top_info_text
+ 'customer' => { 'text' => $locale->text('Customer'), },
+ 'part' => { 'text' => $locale->text('Part'), },
+ 'month' => { 'text' => $locale->text('Month'), },
+ %column_defs_cvars,
);
- my %column_alignment = map { $_ => 'right' } qw(lastcost sellprice sellprice_total lastcost_total unit discount marge_total marge_percent qty);
+ map { $column_defs{$_}->{visible} = $form->{"l_$_"} eq 'Y' } @columns;
- $form->{"l_type"} = "Y";
- map { $column_defs{$_}->{visible} = $form->{"l_${_}"} ? 1 : 0 } @columns;
+ my %column_alignment = map { $_ => 'right' } qw(lastcost sellprice sellprice_total lastcost_total parts_unit discount marge_total marge_percent qty weight);
+ # so now the check-box "Description" is only used as switch for part description in invoice-mode
+ # always fill the column "Description" if we are in Zwischensummenmode
+ $form->{"l_description"} = "Y" if not defined $form->{"l_parts"};;
+ map { $column_defs{$_}->{visible} = $form->{"l_${_}"} ? 1 : 0 } @columns;
+
my @options;
- if ($form->{description}) {
- push @options, $locale->text('Description') . " : $form->{description}";
- }
- if ($form->{customer}) {
- push @options, $locale->text('Customer') . " : $form->{customername}";
- }
- if ($form->{department}) {
- my ($department) = split /--/, $form->{department};
- push @options, $locale->text('Department') . " : $department";
- }
- if ($form->{invnumber}) {
- push @options, $locale->text('Invoice Number') . " : $form->{invnumber}";
- }
- if ($form->{invdate}) {
- push @options, $locale->text('Invoice Date') . " : $form->{invdate}";
- }
- if ($form->{partnumber}) {
- push @options, $locale->text('Part Number') . " : $form->{partnumber}";
- }
- if ($form->{ordnumber}) {
- push @options, $locale->text('Order Number') . " : $form->{ordnumber}";
- }
- if ($form->{notes}) {
- push @options, $locale->text('Notes') . " : $form->{notes}";
- }
- if ($form->{transaction_description}) {
- push @options, $locale->text('Transaction description') . " : $form->{transaction_description}";
- }
- if ($form->{transdatefrom}) {
- push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{transdatefrom}, 1);
- }
- if ($form->{transdateto}) {
- push @options, $locale->text('Bis') . " " . $locale->date(\%myconfig, $form->{transdateto}, 1);
- }
+
+ push @options, $locale->text('Description') . " : $form->{description}" if $form->{description};
+ push @options, $locale->text('Customer') . " : $form->{customer}" if $form->{customer};
+ push @options, $locale->text('Customer Number') . " : $form->{customernumber}" if $form->{customernumber};
+ # TODO: only customer id is passed
+ push @options, $locale->text('Department') . " : " . SL::DB::Department->new(id => $form->{department_id})->load->description if $form->{department_id};
+ push @options, $locale->text('Invoice Number') . " : $form->{invnumber}" if $form->{invnumber};
+ push @options, $locale->text('Invoice Date') . " : $form->{invdate}" if $form->{invdate};
+ push @options, $locale->text('Ship via') . " : $form->{shipvia}" if $form->{shipvia};
+ push @options, $locale->text('Part Number') . " : $form->{partnumber}" if $form->{partnumber};
+ push @options, $locale->text('Partsgroup') . " : " . SL::DB::PartsGroup->new(id => $form->{partsgroup_id})->load->partsgroup if $form->{partsgroup_id};
+ push @options, $locale->text('Country') . " : $form->{country}" if $form->{country};
+ push @options, $locale->text('Employee') . ' : ' . SL::DB::Employee->new(id => $form->{employee_id})->load->name if $form->{employee_id};
+ push @options, $locale->text('Salesman') . ' : ' . SL::DB::Employee->new(id => $form->{salesman_id})->load->name if $form->{salesman_id};
+ push @options, $locale->text('Customer type') . ' : ' . SL::DB::Business->new(id => $form->{business_id})->load->description if $form->{business_id};
+ push @options, $locale->text('Order Number') . " : $form->{ordnumber}" if $form->{ordnumber};
+ 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('From') . " " . $locale->date(\%myconfig, $form->{transdatefrom}, 1) if $form->{transdatefrom};
+ push @options, $locale->text('Bis') . " " . $locale->date(\%myconfig, $form->{transdateto}, 1) if $form->{transdateto};
my $report = SL::ReportGenerator->new(\%myconfig, $form);
- $report->set_options('top_info_text' => join("\n", @options),
+ $report->set_options('top_info_text' => join("\n", $locale->text('Main sorting') . ' : ' . $column_defs{$form->{mainsort}}->{text} , $locale->text('Secondary sorting') . ' : ' . $column_defs{$form->{'subsort'}}->{text}, @options),
'output_format' => 'HTML',
'title' => $form->{title},
'attachment_basename' => $locale->text('Sales Report') . strftime('_%Y%m%d', localtime time),
$report->set_sort_indicator($form->{mainsort}, $form->{sortdir});
+ CVar->add_custom_variables_to_report('module' => 'CT',
+ 'trans_id_field' => 'customerid',
+ 'configs' => $cvar_configs_ct,
+ 'column_defs' => \%column_defs,
+ 'data' => $form->{AR}
+ );
+
+ CVar->add_custom_variables_to_report('module' => 'IC',
+ 'trans_id_field' => 'parts_id',
+ 'configs' => $cvar_configs_ic,
+ 'column_defs' => \%column_defs,
+ 'data' => $form->{AR}
+ );
+
+ my $num_visible_columns = scalar $report->get_visible_columns;
+ my %empty_row = (
+ description => {
+ data => '',
+ class => 'listrowempty',
+ colspan => $num_visible_columns,
+ },
+ );
+
# add sort and escape callback, this one we use for the add sub
$form->{callback} = $href .= "&sort=$form->{mainsort}";
# escape callback for href
$callback = $form->escape($href);
- my @subtotal_columns = qw(qty sellprice sellprice_total lastcost lastcost_total marge_total marge_percent discount);
- # Gesamtsumme:
- # Summe von sellprice_total, lastcost_total und marge_total
- # Durchschnitt von marge_percent
+ my @subtotal_columns = qw(qty weight sellprice sellprice_total lastcost lastcost_total marge_total marge_percent discount);
+ # Total sum:
+ # sum of sellprice_total, lastcost_total and marge_total
+ # average of marge_percent
my @total_columns = qw(sellprice_total lastcost_total marge_total marge_percent );
- my %totals = map { $_ => 0 } @total_columns;
+ my %totals = map { $_ => 0 } @total_columns;
my %subtotals1 = map { $_ => 0 } @subtotal_columns;
my %subtotals2 = map { $_ => 0 } @subtotal_columns;
my $idx = 0;
+ my $basefactor;
+ my $all_units = AM->retrieve_all_units();
+
foreach my $ar (@{ $form->{AR} }) {
+ $basefactor = $all_units->{$ar->{unit}}->{factor} / $all_units->{$ar->{parts_unit}}->{factor};
+ $basefactor = 1 unless $basefactor;
$ar->{price_factor} = 1 unless $ar->{price_factor};
- # calculate individual sellprice
- # discount was already accounted for in db sellprice
- $ar->{sellprice} = $ar->{sellprice} / $ar->{price_factor};
- $ar->{lastcost} = $ar->{lastcost} / $ar->{price_factor};
- $ar->{sellprice_total} = $ar->{qty} * $ar->{sellprice};
- $ar->{lastcost_total} = $ar->{qty} * $ar->{lastcost};
- # marge_percent wird neu berechnet, da Wert in invoice leer ist (Bug)
- $ar->{marge_percent} = $ar->{sellprice_total} ? (($ar->{sellprice_total}-$ar->{lastcost_total}) / $ar->{sellprice_total}) : 0;
- # marge_total neu berechnen
+
+ # calculate individual sellprice, discount is already accounted for in column sellprice in db
+
+ # The sellprice total can be calculated from sellprice or fxsellprice (the
+ # value that was actually entered in the sellprice field and is always
+ # stored separately). However, for fxsellprice this method only works when
+ # the tax is not included, because otherwise fxsellprice includes the tax
+ # and there is no simple way to extract the tax rate of the article from
+ # the big query.
+ #
+ # Using fxsellprice is potentially more accurate (certainly for tax
+ # included), because we can use the same method as is used while the
+ # invoice is generated.
+ #
+ # sellprice however has already been converted to the net value (but
+ # rounded in the process, which leads to rounding errors when calculating
+ # the linetotal from the rounded sellprice in the report. These rounding
+ # errors can quickly amount to several cents when qty is large)
+ #
+ # For calculating sellprice_total from fxsellprice, you would use:
+ # sellprice_total_including_tax = qty * fxsellprice * (1-discount) / price_factor * exchangerate
+ # $ar->{sellprice_total_including_tax} = $form->round_amount( $ar->{qty} * ( $ar->{fxsellprice} * ( 1 - $ar->{discount} ) ) / $ar->{price_factor}, $form->{"decimalplaces"});
+
+ my $sellprice_orig = $ar->{sellprice};
+ my $qty_orig = $ar->{qty};
+ # adjust sellprice so it reflects the unit sellprice according to price_factor and basefactor
+ $ar->{sellprice} = $ar->{sellprice} / $ar->{price_factor} / $basefactor;
+ # for sellprice_total use the original amounts
+ $ar->{sellprice_total} = $form->round_amount( $qty_orig * $sellprice_orig / $ar->{price_factor}, $form->{"decimalplaces"});
+
+ my $lastcost_orig = $ar->{lastcost};
+ $ar->{lastcost} = $ar->{lastcost} / $ar->{price_factor} / $basefactor;
+ $ar->{lastcost_total} = $form->round_amount( $qty_orig * $lastcost_orig / $ar->{price_factor}, $form->{"decimalplaces"});
+
+ # marge_percent is recalculated, because the value in invoice used to be empty
+ $ar->{marge_percent} = $ar->{sellprice_total} ? (($ar->{sellprice_total}-$ar->{lastcost_total}) / $ar->{sellprice_total} * 100) : 0;
+ # also recalculate marge_total
$ar->{marge_total} = $ar->{sellprice_total} ? $ar->{sellprice_total}-$ar->{lastcost_total} : 0;
- $ar->{discount} *= 100; # für Ausgabe formatieren, 10% stored as 0.1 in db
-
- # Anfangshauptüberschrift
- if ( $form->{l_headers} eq "Y" && ( $idx == 0 or $ar->{ $form->{'mainsort'} } ne $form->{AR}->[$idx - 1]->{ $form->{'mainsort'} } )) {
- my $name;
- my $headerrow;
- if ( $form->{mainsort} eq 'parts_id' ) {
- $headerrow->{description}->{data} = "$ar->{description}";
- } else {
- $headerrow->{description}->{data} = "$ar->{name}";
+ $ar->{discount} *= 100; # format discount value for output, 10% is stored as 0.1 in db
+
+ # adjust qty to reflect the qty of the base unit
+ $ar->{qty} *= $basefactor;
+
+ # now $ar->{sellprice} * $ar->{qty} should be the same as $qty_orig * $ar->{qty}
+
+ # weight is the still the weight per part, but here we want the total weight
+ $ar->{weight} *= $ar->{qty};
+
+ # Main header
+ if ( $form->{l_headers_mainsort} eq "Y" && ( $idx == 1 or $ar->{ $form->{'mainsort'} } ne $form->{AR}->[$idx - 1]->{ $form->{'mainsort'} } )) {
+ my $headerrow = {
+ # use $emptyname for mainsort header if mainsort is empty
+ data => $ar->{$form->{'mainsort'}} || $locale->text('empty'),
+ class => "listmainsortheader",
+ colspan => $num_visible_columns,
};
- $headerrow->{description}->{class} = "listmainsortheader";
- my $headerrow_set = [ $headerrow ];
- $report->add_data($headerrow_set);
+ $report->add_data([ { description => $headerrow } ]);
# add empty row after main header
# my $emptyheaderrow->{description}->{data} = "";
# $report->add_data($emptyheaderrow_set) if $form->{l_headers} eq "Y";
};
- # subsort überschriften
- if ( $idx == 0
- or $ar->{ $form->{'subsort'} } ne $form->{AR}->[$idx - 1]->{ $form->{'subsort'} }
- or $ar->{ $form->{'mainsort'} } ne $form->{AR}->[$idx - 1]->{ $form->{'mainsort'} }
+ # subsort headers
+ # special case: subsort headers only makes (aesthetical) sense if we show individual parts
+ if (( $idx == 0
+ or $ar->{ $form->{'subsort'} } ne $form->{AR}->[$idx - 1]->{ $form->{'subsort'} }
+ or $ar->{ $form->{'mainsort'} } ne $form->{AR}->[$idx - 1]->{ $form->{'mainsort'} })
+ && ($form->{l_headers_subsort} eq "Y")
+ && $form->{l_parts}
) {
- my $headerrow;
- my $name;
- if ( $form->{subsort} eq 'parts_id' ) {
- $name = 'description';
- $headerrow->{description}->{data} = "$ar->{$name}";
- } else {
- $name = 'name';
- $headerrow->{description}->{data} = "$ar->{$name}";
+ my $headerrow = {
+ # if subsort name is defined, use that name in header, otherwise use $emptyname
+ data => $ar->{$form->{'subsort'}} || $locale->text('empty'),
+ class => "listsubsortheader",
+ colspan => $num_visible_columns,
};
- $headerrow->{description}->{class} = "listsubsortheader";
- my $headerrow_set = [ $headerrow ];
- $report->add_data($headerrow_set) if $form->{l_headers} eq "Y";
+ $report->add_data([ { description => $headerrow } ]);
};
map { $subtotals1{$_} += $ar->{$_};
map { $totals{$_} += $ar->{$_} } @total_columns;
- $subtotals2{sellprice} = $subtotals2{sellprice_total} / $subtotals2{qty} if $subtotals2{qty} != 0;
- $subtotals1{sellprice} = $subtotals1{sellprice_total} / $subtotals1{qty} if $subtotals1{qty} != 0;
- $subtotals2{lastcost} = $subtotals2{lastcost_total} / $subtotals2{qty} if $subtotals2{qty} != 0;
- $subtotals1{lastcost} = $subtotals1{lastcost_total} / $subtotals1{qty} if $subtotals1{qty} != 0;
+ if ( $subtotals1{qty} != 0 ) {
+ # calculate averages for subtotals1 and subtotals2
+ # credited positions reduce both total and qty and thus don't influence average prices
+ $subtotals1{sellprice} = $subtotals1{sellprice_total} / $subtotals1{qty};
+ $subtotals1{lastcost} = $subtotals1{lastcost_total} / $subtotals1{qty};
+ } else {
+ # qty is zero, so we have a special case where each position in subtotal
+ # group has a corresponding credit note so that the total qty is zero in
+ # this case we also want the total amounts to be zero, so overwrite them,
+ # rather than leaving the last value in sellprice/lastcost
+
+ $subtotals1{sellprice} = 0;
+ $subtotals1{lastcost} = 0;
+ };
- # Ertrag prozentual in den Summen: (summe VK - summe Ertrag) / summe VK
- $subtotals1{marge_percent} = $subtotals1{sellprice_total} ? (($subtotals1{sellprice_total} - $subtotals1{lastcost_total}) / $subtotals1{sellprice_total}) : 0;
- $subtotals2{marge_percent} = $subtotals2{sellprice_total} ? (($subtotals2{sellprice_total} - $subtotals2{lastcost_total}) / $subtotals2{sellprice_total}) : 0;
+ if ( $subtotals2{qty} != 0 ) {
+ $subtotals2{sellprice} = $subtotals2{sellprice_total} / $subtotals2{qty};
+ $subtotals2{lastcost} = $subtotals2{lastcost_total} / $subtotals2{qty};
+ } else {
+ $subtotals2{sellprice} = 0;
+ $subtotals2{lastcost} = 0;
+ };
- # Ertrag prozentual: (Summe VK betrag - Summe EK betrag) / Summe VK betrag
- # wird laufend bei jeder Position neu berechnet
- $totals{marge_percent} = $totals{sellprice_total} ? ( ($totals{sellprice_total} - $totals{lastcost_total}) / $totals{sellprice_total} ) : 0;
+ # marge percent as sums: (sum VK - sum Ertrag) / sum VK
+ $subtotals1{marge_percent} = $subtotals1{sellprice_total} ? (($subtotals1{sellprice_total} - $subtotals1{lastcost_total}) / $subtotals1{sellprice_total}) * 100 : 0;
+ $subtotals2{marge_percent} = $subtotals2{sellprice_total} ? (($subtotals2{sellprice_total} - $subtotals2{lastcost_total}) / $subtotals2{sellprice_total}) *100 : 0;
- map { $ar->{$_} = $form->format_amount(\%myconfig, $ar->{$_}, 2) } qw(marge_total marge_percent);
- map { $ar->{$_} = $form->format_amount(\%myconfig, $ar->{$_}, $form->{"decimalplaces"} )} qw(lastcost sellprice sellprice_total lastcost_total);
+ # total marge percent: (sum VK betrag - sum EK betrag) / sum VK betrag
+ # is recalculated after each position
+ $totals{marge_percent} = $totals{sellprice_total} ? ( ($totals{sellprice_total} - $totals{lastcost_total}) / $totals{sellprice_total} ) * 100 : 0;
- my $row = { };
+ map { $ar->{$_} = $form->format_amount(\%myconfig, $ar->{$_}, 2) } qw(marge_percent qty);
+ map { $ar->{$_} = $form->format_amount(\%myconfig, $ar->{$_}, 3) } qw(weight);
+ map { $ar->{$_} = $form->format_amount(\%myconfig, $ar->{$_}, $form->{"decimalplaces"} )} qw(lastcost sellprice sellprice_total lastcost_total marge_total);
- foreach my $column (@columns) {
- $row->{$column} = {
- 'data' => $ar->{$column},
- 'align' => $column_alignment{$column},
- };
- }
+ # only show individual lines when l_parts is set, this is useful, if you
+ # only want to see subtotals and totals
- $row->{description}->{class} = 'listsortdescription';
+ if ($form->{l_parts}) {
+ my %row = (
+ map { ($_ => { data => $ar->{$_}, align => $column_alignment{$_} }) } @columns
+ );
- $row->{invnumber}->{link} = build_std_url("script=is.pl", 'action=edit')
- . "&id=" . E($ar->{id}) . "&callback=${callback}";
+ $row{invnumber}->{link} = build_std_url("script=is.pl", 'action=edit') . "&id=" . E($ar->{id}) . "&callback=${callback}";
- my $row_set = [ $row ];
+ # use partdescription according to invoice in article mode
+ $row{description}->{data} = $ar->{invoice_description};
- if (($form->{l_subtotal} eq 'Y')
+ $report->add_data(\%row);
+ }
+
+ # choosing l_subtotal doesn't make a distinction between mainsort and subsort
+ # if l_subtotal_mainsort is not selected l_subtotal_subsort isn't run either
+ if ( ($form->{l_subtotal_mainsort} eq 'Y')
+ && ($form->{l_subtotal_subsort} eq 'Y')
&& (($idx == (scalar @{ $form->{AR} } - 1)) # last element always has a subtotal
|| ($ar->{ $form->{'subsort'} } ne $form->{AR}->[$idx + 1]->{ $form->{'subsort'} })
|| ($ar->{ $form->{'mainsort'} } ne $form->{AR}->[$idx + 1]->{ $form->{'mainsort'} })
)) { # if value that is sorted by changes, print subtotal
- my $name;
- if ( $form->{subsort} eq 'parts_id' ) {
- $name = 'description';
- } else {
- $name = 'name';
- };
- if ($form->{l_subtotal} eq 'Y' ) {
- push @{ $row_set }, create_subtotal_row_invoice(\%subtotals2, \@columns, \%column_alignment, \@subtotal_columns, 'listsubsortsubtotal', $ar->{$name}) ;
- push @{ $row_set }, insert_empty_row();
- };
+ $report->add_data(create_subtotal_row_invoice(\%subtotals2, \@columns, \%column_alignment, \@subtotal_columns, $form->{l_parts} ? 'listsubtotal' : undef, $ar->{ $form->{'subsort'} }));
+ $report->add_data({ %empty_row }) if $form->{l_parts} and $addemptylines;
}
- # if mainsort has changed, add mainsort subtotal and empty row
- if (($form->{l_subtotal} eq 'Y')
+ # if last mainsort is reached or mainsort has changed, add mainsort subtotal and empty row
+ if ( ($form->{l_subtotal_mainsort} eq 'Y')
+ && ($form->{l_subtotal_mainsort} eq 'Y')
+ && ($form->{mainsort} ne $form->{subsort})
&& (($idx == (scalar @{ $form->{AR} } - 1)) # last element always has a subtotal
|| ($ar->{ $form->{'mainsort'} } ne $form->{AR}->[$idx + 1]->{ $form->{'mainsort'} })
)) { # if value that is sorted by changes, print subtotal
- my $name;
- if ( $form->{mainsort} eq 'parts_id' ) {
- $name = 'description';
- } else {
- $name = 'name';
- };
- if ($form->{l_subtotal} eq 'Y' ) {
- push @{ $row_set }, create_subtotal_row_invoice(\%subtotals1, \@columns, \%column_alignment, \@subtotal_columns, 'listmainsortsubtotal', $ar->{$name});
- push @{ $row_set }, insert_empty_row();
- };
+ # subtotal is overridden if mainsort and subsort are equal, don't print
+ # subtotal line even if it is selected
+ $report->add_data(create_subtotal_row_invoice(\%subtotals1, \@columns, \%column_alignment, \@subtotal_columns, 'listsubtotal', $ar->{$form->{mainsort}}));
+ $report->add_data({ %empty_row }) if $addemptylines; # insert empty row after mainsort
}
- $report->add_data($row_set);
-
$idx++;
}
if ( $form->{l_total} eq "Y" ) {
$report->add_separator();
- $report->add_data(create_subtotal_row_invoice(\%totals, \@columns, \%column_alignment, \@total_columns, 'listtotal'))
+ $report->add_data(create_subtotal_row_invoice(\%totals, \@columns, \%column_alignment, \@total_columns, 'listtotal', 'l_total'))
};
$report->generate_with_headers();
$main::lxdebug->leave_sub();
}
-
-sub insert_empty_row {
- my $dummyrow;
- $dummyrow->{description}->{data} = "";
- my $dummyrowset = [ $dummyrow ];
- return $dummyrow;
-};
-
-
-
sub create_subtotal_row_invoice {
$main::lxdebug->enter_sub();
my $form = $main::form;
my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
- my $row = { map { $_ => { 'data' => '', 'class' => $class, 'align' => $column_alignment->{$_}, } } @{ $columns } };
+ my $row = { map { $_ => { data => '', class => $class, align => $column_alignment->{$_}, } } @{ $columns } };
- $row->{description}->{data} = "Summe " . $name;
+ # set name as "empty" if no value is given, except if we are dealing with the
+ # absolute total, then just write "Total sum"
+ # here we assume that no name will be called 'l_total'
+ $name = $locale->text('empty') unless $name;
+ if ( $name eq 'l_total' ) {
+ $row->{description}->{data} = $locale->text('Total sum');
+ } else {
+ $row->{description}->{data} = $locale->text('Total') . ' ' . $name;
+ };
- map { $row->{$_}->{data} = $form->format_amount(\%myconfig, $totals->{$_}, 2) } qw(marge_total marge_percent);
- map { $row->{$_}->{data} = $form->format_amount(\%myconfig, $totals->{$_}, 0) } qw(qty);
+ map { $row->{$_}->{data} = $form->format_amount(\%myconfig, $totals->{$_}, 2) } qw(marge_total marge_percent qty);
+ map { $row->{$_}->{data} = $form->format_amount(\%myconfig, $totals->{$_}, 3) } qw(weight);
map { $row->{$_}->{data} = $form->format_amount(\%myconfig, $totals->{$_}, $form->{decimalplaces}) } qw(lastcost sellprice sellprice_total lastcost_total);
}
1;
-
projects / kivitendo-erp.git / blobdiff