X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fic.pl;h=3a97c8ecf730c80fe74a0217c695ffa9bd8a12c2;hb=766f5705ecb9cd56adfbffd94c871959bb64c6fd;hp=c68fef0cafc023a01b90db371b4ea7614cf77f1a;hpb=0c404f20f1f066a1e6fc9c4bacf4bd70eec719e4;p=kivitendo-erp.git diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl index c68fef0ca..3a97c8ecf 100644 --- a/bin/mozilla/ic.pl +++ b/bin/mozilla/ic.pl @@ -39,6 +39,7 @@ use SL::AM; use SL::CVar; use SL::IC; use SL::Helper::Flash; +use SL::HTML::Util; use SL::ReportGenerator; #use SL::PE; @@ -94,7 +95,7 @@ sub add { sub search { $lxdebug->enter_sub(); - $auth->assert('part_service_assembly_edit'); + $auth->assert('part_service_assembly_details'); $form->{revers} = 0; # switch for backward sorting $form->{lastsort} = ""; # memory for which table was sort at last time @@ -1009,7 +1010,7 @@ sub addtop100 { sub generate_report { $lxdebug->enter_sub(); - $auth->assert('part_service_assembly_edit'); + $auth->assert('part_service_assembly_details'); my ($revers, $lastsort, $description); @@ -1194,14 +1195,22 @@ sub generate_report { # soldtotal doesn't make sense with more than one bsooqr option. # so reset it to sold (the most common option), and issue a warning + # ... + # also it doesn't make sense without bsooqr. disable and issue a warning too my @bsooqr = qw(sold bought onorder ordered rfq quoted); - if ($form->{l_subtotal} && 1 < grep { $form->{$_} } @bsooqr) { + my $bsooqr_mode = grep { $form->{$_} } @bsooqr; + if ($form->{l_subtotal} && 1 < $bsooqr_mode) { my $enabled = first { $form->{$_} } @bsooqr; $form->{$_} = '' for @bsooqr; $form->{$enabled} = 'Y'; push @options, $::locale->text('Subtotal cannot distinguish betweens record types. Only one of the selected record types will be displayed: #1', $optiontexts{$enabled}); } + if ($form->{l_soldtotal} && !$bsooqr_mode) { + delete $form->{l_soldtotal}; + + flash('warning', $::locale->text('Soldtotal does not make sense without any bsooqr options')); + } IC->all_parts(\%myconfig, \%$form); @@ -1266,7 +1275,7 @@ sub generate_report { 'assembly' => $locale->text('assembly_list'), ); - $report->set_options('top_info_text' => $locale->text('Options') . ': ' . join(', ', grep $_, @options), + $report->set_options('raw_top_info_text' => $form->parse_html_template('ic/generate_report_top', { options => \@options }), 'raw_bottom_info_text' => $form->parse_html_template('ic/generate_report_bottom'), 'output_format' => 'HTML', 'title' => $form->{title}, @@ -1316,7 +1325,7 @@ sub generate_report { $ref->{lastcost} *= $ref->{exchangerate} / $ref->{price_factor}; # use this for assemblies - my $soldtotal = $ref->{soldtotal}; + my $soldtotal = $bsooqr_mode ? $ref->{soldtotal} : $ref->{onhand}; if ($ref->{assemblyitem}) { $row->{partnumber}{align} = 'right'; @@ -1354,8 +1363,8 @@ sub generate_report { if ($ref->{module} eq 'oe') { # für oe gibt es vier fälle, jeweils nach kunde oder lieferant unterschiedlich: # - # | ist bestellt | Vom Kunde bestellt | -> edit_oe_ord_link - # | Anfrage | Angebot | -> edit_oe_quo_link + # | ist bestellt | Von Kunden bestellt | -> edit_oe_ord_link + # | Anfrage | Angebot | -> edit_oe_quo_link my $edit_oe_ord_link = build_std_url("script=oe.pl", 'action=edit', 'type=' . E($ref->{cv} eq 'vendor' ? 'purchase_order' : 'sales_order'), 'id=' . E($ref->{trans_id}), 'callback'); my $edit_oe_quo_link = build_std_url("script=oe.pl", 'action=edit', 'type=' . E($ref->{cv} eq 'vendor' ? 'request_quotation' : 'sales_quotation'), 'id=' . E($ref->{trans_id}), 'callback'); @@ -1374,6 +1383,8 @@ sub generate_report { } map { $row->{$_}{link} = $ref->{$_} } qw(drawing microfiche); + $row->{notes}{data} = SL::HTML::Util->strip($ref->{notes}); + $report->add_data($row); my $next_ref = $form->{parts}[$idx + 1]; @@ -1461,7 +1472,7 @@ sub parts_subtotal { sub edit { $lxdebug->enter_sub(); - $auth->assert('part_service_assembly_edit'); + $auth->assert('part_service_assembly_details'); # show history button $form->{javascript} = qq||; @@ -1482,7 +1493,7 @@ sub edit { sub link_part { $lxdebug->enter_sub(); - $auth->assert('part_service_assembly_edit'); + $auth->assert('part_service_assembly_details'); IC->create_links("IC", \%myconfig, \%$form); @@ -1572,7 +1583,7 @@ sub link_part { sub form_header { $lxdebug->enter_sub(); - $auth->assert('part_service_assembly_edit'); + $auth->assert('part_service_assembly_details'); $form->{pg_keys} = sub { "$_[0]->{partsgroup}--$_[0]->{id}" }; $form->{description_area} = ($form->{rows} = $form->numtextrows($form->{description}, 40)) > 1; @@ -1593,13 +1604,15 @@ sub form_header { if (my $max = scalar @{ $form->{WAREHOUSES} }) { my ($default_warehouse_id, $default_bin_id); if ($form->{action} eq 'add') { # default only for new entries - $default_warehouse_id = $::instance_conf->get_default_warehouse_id; - $default_bin_id = $::instance_conf->get_default_bin_id; + $default_warehouse_id = $::instance_conf->get_warehouse_id; + $default_bin_id = $::instance_conf->get_bin_id; } $form->{warehouse_id} ||= $default_warehouse_id || $form->{WAREHOUSES}->[$max -1]->{id}; $form->{bin_id} ||= $default_bin_id || $form->{WAREHOUSES}->[$max -1]->{BINS}->[0]->{id}; } + $form->{LANGUAGES} = SL::DB::Manager::Language->get_all_sorted; + $form->{translations_map} = { map { ($_->{language_id} => $_) } @{ $form->{translations} || [] } }; IC->retrieve_buchungsgruppen(\%myconfig, $form); @{ $form->{BUCHUNGSGRUPPEN} } = grep { $_->{id} eq $form->{buchungsgruppen_id} || ($form->{id} && $form->{orphaned}) || !$form->{id} } @{ $form->{BUCHUNGSGRUPPEN} }; @@ -1618,12 +1631,16 @@ sub form_header { CVar->render_inputs('variables' => $form->{CUSTOM_VARIABLES}, show_disabled_message => 1) if (scalar @{ $form->{CUSTOM_VARIABLES} }); + $::request->layout->use_javascript("${_}.js") for qw(ckeditor/ckeditor ckeditor/adapters/jquery); $form->header; #print $form->parse_html_template('ic/form_header', { ALL_PRICE_FACTORS => $form->{ALL_PRICE_FACTORS}, # ALL_UNITS => $form->{ALL_UNITS}, # BUCHUNGSGRUPPEN => $form->{BUCHUNGSGRUPPEN}, # payment_terms => $form->{payment_terms}, # all_partsgroup => $form->{all_partsgroup}}); + + $form->{show_edit_buttons} = $main::auth->check_right($form->{login}, 'part_service_assembly_edit'); + print $form->parse_html_template('ic/form_header'); $lxdebug->leave_sub(); } @@ -1631,7 +1648,7 @@ sub form_header { sub form_footer { $lxdebug->enter_sub(); - $auth->assert('part_service_assembly_edit'); + $auth->assert('part_service_assembly_details'); print $form->parse_html_template('ic/form_footer'); @@ -1766,16 +1783,22 @@ sub assembly_row { sub update { $lxdebug->enter_sub(); + $auth->assert('part_service_assembly_edit'); + # parse pricegroups. and no, don't rely on check_form for this... map { $form->{"price_$_"} = $form->parse_amount(\%myconfig, $form->{"price_$_"}) } 1 .. $form->{price_rows}; - $form->{sellprice} = $form->parse_amount(\%myconfig, $form->{sellprice}); + $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) for qw(sellprice listprice ve gv); + + if ($form->{item} eq 'part') { + $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) for qw(weight rop); + } # same for makemodel lastcosts # but parse_amount not necessary for assembly component lastcosts unless ($form->{item} eq "assembly") { map { $form->{"lastcost_$_"} = $form->parse_amount(\%myconfig, $form->{"lastcost_$_"}) } 1 .. $form->{"makemodel_rows"}; - }; - $form->{listprice} = $form->parse_amount(\%myconfig, $form->{listprice}); + $form->{lastcost} = $form->parse_amount(\%myconfig, $form->{lastcost}); + } if ($form->{item} eq "assembly") { my $i = $form->{assembly_rows}; @@ -1901,7 +1924,7 @@ sub save { } else { $i = $form->{assembly_rows}; } - $form->{"qty_$i"} = 1 unless ($form->{"qty_$i"}); + $form->{"qty_$i"} = 1 unless ($form->{"qty_$i"} > 0); $form->{sellprice} -= $form->{"sellprice_$i"} * $form->{"qty_$i"}; $form->{weight} -= $form->{"weight_$i"} * $form->{"qty_$i"}; @@ -1918,7 +1941,7 @@ sub save { # set values for last invoice/order item $i = $form->{rowcount}; - $form->{"qty_$i"} = 1 unless ($form->{"qty_$i"}); + $form->{"qty_$i"} = 1 unless ($form->{"qty_$i"} > 0); map { $form->{"${_}_$i"} = $newform{$_} } qw(partnumber description bin unit listprice inventory_accno income_accno expense_accno sellprice lastcost price_factor_id); map { $form->{"ic_${_}_$i"} = $newform{$_} } @ic_cvar_fields; @@ -2031,7 +2054,7 @@ sub delete { sub price_row { $lxdebug->enter_sub(); - $auth->assert('part_service_assembly_edit'); + $auth->assert('part_service_assembly_details'); my ($numrows) = @_; @@ -2046,50 +2069,6 @@ sub price_row { $lxdebug->leave_sub(); } -sub parts_language_selection { - $lxdebug->enter_sub(); - - $auth->assert('part_service_assembly_edit'); - - my $languages = IC->retrieve_languages(\%myconfig, $form); - - if ($form->{language_values} ne "") { - foreach my $item (split(/---\+\+\+---/, $form->{language_values})) { - my ($language_id, $translation, $longdescription) = split(/--\+\+--/, $item); - - foreach my $language (@{ $languages }) { - next unless ($language->{id} == $language_id); - - $language->{translation} = $translation; - $language->{longdescription} = $longdescription; - - $language->{translation_area} = ($language->{translation_rows} = $form->numtextrows($language->{translation}, 40)) > 1; - $language->{longdescription_rows} = max 4, $form->numtextrows($language->{longdescription}, 40); - - last; - } - } - } - - my @header_sort = qw(name longdescription); - my %header_title = ( "name" => $locale->text("Name"), - "longdescription" => $locale->text("Long Description"), - ); - - my @header = - map(+{ "column_title" => $header_title{$_}, - "column" => $_, - }, - @header_sort); - - $form->{"title"} = $locale->text("Language Values"); - $form->header(); - print $form->parse_html_template("ic/parts_language_selection", { "HEADER" => \@header, - "LANGUAGES" => $languages, }); - - $lxdebug->leave_sub(); -} - sub ajax_autocomplete { $main::lxdebug->enter_sub();