X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FRequirementSpecOrder.pm;h=8c33d6ffdbf9a8f4d681b6b04e0032f81d1fdda3;hb=afb8e14695ac06126fff2084b3b67d517663f9f6;hp=fc0fbea41924dd4ef822d205bc35c3b4c0b2626d;hpb=815cf361bd5ae8ae0e7002423be5d307993f69f5;p=kivitendo-erp.git diff --git a/SL/Controller/RequirementSpecOrder.pm b/SL/Controller/RequirementSpecOrder.pm index fc0fbea41..8c33d6ffd 100644 --- a/SL/Controller/RequirementSpecOrder.pm +++ b/SL/Controller/RequirementSpecOrder.pm @@ -17,7 +17,8 @@ use SL::DB::RequirementSpecOrder; use SL::Helper::Flash; use SL::Locale::String; -use constant TAB_ID => 'ui-tabs-4'; +use constant LIST_SELECTOR => '#quotations_and_orders'; +use constant FORMS_SELECTOR => '#quotations_and_orders_article_assignment,#quotations_and_orders_new,#quotations_and_orders_update'; use Rose::Object::MakeMethods::Generic ( @@ -44,35 +45,48 @@ sub action_new { return $self->js->flash('error', t8('This function requires the presence of articles with a time-based unit such as "h" or "min".'))->render($self); } - my $html = $self->render('requirement_spec_order/new', { output => 0 }, make_part_title => sub { $_[0]->partnumber . ' ' . $_[0]->description }); - $self->js->html('#' . TAB_ID(), $html) + my $html = $self->render('requirement_spec_order/new', { output => 0 }, make_part_title => sub { $_[0]->partnumber . ' ' . $_[0]->description }); + $self->js->hide(LIST_SELECTOR()) + ->after(LIST_SELECTOR(), $html) ->render($self); } sub action_create { my ($self) = @_; + if (!$::auth->assert($::form->{quotation} ? 'sales_quotation_edit' : 'sales_order_edit', 1)) { + return $self->js->flash('error', t8("You do not have the permissions to access this function."))->render($self); + } + # 1. Update sections with selected part IDs. my $section_attrs = $::form->{sections} || []; - my $sections = SL::DB::Manager::RequirementSpecItem->get_all(where => [ id => [ map { $_->{id} } @{ $section_attrs } ] ]); + my $sections = SL::DB::Manager::RequirementSpecItem->get_all_sorted(where => [ id => [ map { $_->{id} } @{ $section_attrs } ] ]); my %sections_by_id = map { ($_->{id} => $_) } @{ $sections }; $sections_by_id{ $_->{id} }->update_attributes(order_part_id => $_->{order_part_id}) for @{ $section_attrs }; # 2. Create actual quotation/order. my $order = $self->create_order(sections => $sections); - $order->save; + $order->db->with_transaction(sub { + $order->save; + + $self->requirement_spec->orders( + @{ $self->requirement_spec->orders }, + SL::DB::RequirementSpecOrder->new(order => $order, version => $self->requirement_spec->version) + ); + $self->requirement_spec->save; + + $self->requirement_spec->link_to_record($order); + }) or do { + $::lxdebug->message(LXDebug::WARN(), "Error creating the order object: $@"); + }; - $self->requirement_spec->orders( - @{ $self->requirement_spec->orders }, - SL::DB::RequirementSpecOrder->new(order => $order, version => $self->requirement_spec->version) - ); - $self->requirement_spec->save; $self->init_requirement_spec; # 3. Notify the user and return to list. my $html = $self->render('requirement_spec_order/list', { output => 0 }); - $self->js->html('#' . TAB_ID(), $html) + $self->js->replaceWith(LIST_SELECTOR(), $html) + ->remove(FORMS_SELECTOR()) ->flash('info', $::form->{quotation} ? t8('Sales quotation #1 has been created.', $order->quonumber) : t8('Sales order #1 has been created.', $order->ordnumber)) ->render($self); } @@ -83,6 +97,10 @@ sub action_update { my $order = $self->rs_order->order; my $sections = $self->requirement_spec->sections_sorted; + if (!$::auth->assert($order->quotation ? 'sales_quotation_edit' : 'sales_order_edit', 1)) { + return $self->js->flash('error', t8("You do not have the permissions to access this function."))->render($self); + } + my (@orderitems, %sections_seen); foreach my $item (@{ $order->items_sorted }) { my $section = first { my $num = $_->fb_number; $item->description =~ m{\b\Q${num}\E\b} && !$sections_seen{ $_->id } } @{ $sections }; @@ -99,7 +117,8 @@ sub action_update { make_section_title => sub { $_[0]->fb_number . ' ' . $_[0]->title }, ); - $self->js->html('#' . TAB_ID(), $html) + $self->js->hide(LIST_SELECTOR()) + ->after(LIST_SELECTOR(), $html) ->render($self); } @@ -111,6 +130,7 @@ sub action_do_update { my %orderitems_by_id = map { ($_->id => $_) } @{ $order->orderitems }; my %sections_by_id = map { ($_->id => $_) } @{ $sections }; $self->{parts} = { map { ($_->id => $_) } @{ SL::DB::Manager::Part->get_all(where => [ id => [ uniq map { $_->order_part_id } @{ $sections } ] ]) } }; + my $language_id = $self->requirement_spec->customer->language_id; my %sections_seen; @@ -119,23 +139,30 @@ sub action_do_update { my $section = $sections_by_id{ $attributes->{section_id} }; next unless $orderitem && $section; - $self->create_order_item(section => $section, item => $orderitem)->save; + $self->create_order_item(section => $section, item => $orderitem, language_id => $language_id)->save; $sections_seen{ $section->id } = 1; } - my @new_orderitems = map { $self->create_order_item(section => $_) } + my @new_orderitems = map { $self->create_order_item(section => $_, language_id => $language_id) } grep { !$sections_seen{ $_->id } } @{ $sections }; $order->orderitems([ @{ $order->orderitems }, @new_orderitems ]) if @new_orderitems; $order->calculate_prices_and_taxes; - $order->save; + + $order->db->with_transaction(sub { + $order->save; + $self->requirement_spec->link_to_record($order); + }) or do { + $::lxdebug->message(LXDebug::WARN(), "Error updating the order object: $@"); + }; $self->init_requirement_spec; my $html = $self->render('requirement_spec_order/list', { output => 0 }); - $self->js->html('#' . TAB_ID(), $html) + $self->js->replaceWith(LIST_SELECTOR(), $html) + ->remove(FORMS_SELECTOR()) ->flash('info', $::form->{quotation} ? t8('Sales quotation #1 has been updated.', $order->quonumber) : t8('Sales order #1 has been updated.', $order->ordnumber)) ->render($self); } @@ -148,7 +175,8 @@ sub action_edit_assignment { } my $html = $self->render('requirement_spec_order/edit_assignment', { output => 0 }, make_part_title => sub { $_[0]->partnumber . ' ' . $_[0]->description }); - $self->js->html('#' . TAB_ID(), $html) + $self->js->hide(LIST_SELECTOR()) + ->after(LIST_SELECTOR(), $html) ->render($self); } @@ -158,7 +186,8 @@ sub action_save_assignment { SL::DB::RequirementSpecItem->new(id => $_->{id})->load->update_attributes(order_part_id => ($_->{order_part_id} || undef)) for @{ $sections }; my $html = $self->render('requirement_spec_order/list', { output => 0 }); - $self->js->html('#' . TAB_ID(), $html) + $self->js->replaceWith(LIST_SELECTOR(), $html) + ->remove(FORMS_SELECTOR()) ->render($self); } @@ -171,19 +200,11 @@ sub action_delete { $self->init_requirement_spec; my $html = $self->render('requirement_spec_order/list', { output => 0 }); - $self->js->html('#' . TAB_ID(), $html) + $self->js->replaceWith(LIST_SELECTOR(), $html) ->flash('info', $order->quotation ? t8('Sales quotation #1 has been deleted.', $order->quonumber) : t8('Sales order #1 has been deleted.', $order->ordnumber)) ->render($self); } -sub action_cancel { - my ($self) = @_; - - my $html = $self->render('requirement_spec_order/list', { output => 0 }); - $self->js->html('#' . TAB_ID(), $html) - ->render($self); -} - # # filters # @@ -191,7 +212,7 @@ sub action_cancel { sub setup { my ($self) = @_; - $::auth->assert('sales_quotation_edit'); + $::auth->assert('requirement_spec_edit'); $::request->{layout}->use_stylesheet("${_}.css") for qw(jquery.contextMenu requirement_spec autocomplete_part); $::request->{layout}->use_javascript("${_}.js") for qw(jquery.jstree jquery/jquery.contextMenu client_js requirement_spec); @@ -237,22 +258,31 @@ sub create_order_item { my $section = $params{section}; my $item = $params{item} || SL::DB::OrderItem->new; my $part = $self->parts->{ $section->order_part_id }; - my $description = $section->{keep_description} ? $item->description : $part->description; + my $translation = $params{language_id} ? first { $params{language_id} == $_->language_id } @{ $part->translations } : {}; + my $description = $section->{keep_description} ? $item->description : ($translation->{translation} || $part->description); + my $longdescription = $translation->{longdescription} || $part->notes; if (!$section->{keep_description}) { - $description = '<%fb_number%> <%title%>' unless $description =~ m{<%}; - $description =~ s{<% (.+?) %>}{ $section->can($1) ? $section->$1 : '<' . t8('Invalid variable #1', $1) . '>' }egx; + $description = '<%fb_number%> <%title%>' unless $description =~ m{<%}; + $longdescription = '<%description%>' unless $longdescription =~ m{<%}; + + $description =~ s{<% (.+?) %>}{ $section->can($1) ? $section->$1 : '<' . t8('Invalid variable #1', $1) . '>' }egx; + $longdescription =~ s{\<\% description \%\>}{!!!!DESCRIPTION!!!!}gx; + $longdescription =~ s{<[pP]> !!!!DESCRIPTION!!!! }{!!!!DESCRIPTION!!!!}gx; + $longdescription =~ s{\<\% (.+?) \%\>}{ $section->can($1) ? $::locale->quote_special_chars('HTML', $section->$1 // '') : '<' . t8('Invalid variable #1', $1) . '>' }egx; + $longdescription =~ s{!!!!DESCRIPTION!!!!}{ $section->description // '' }egx; } $item->assign_attributes( - parts_id => $part->id, - description => $description, - qty => $section->time_estimation * 1, - unit => $self->h_unit_name, - sellprice => $::form->round_amount($self->requirement_spec->hourly_rate, 2), - lastcost => $part->lastcost, - discount => 0, - project_id => $self->requirement_spec->project_id, + parts_id => $part->id, + description => $description, + longdescription => $longdescription, + qty => $section->time_estimation * 1, + unit => $self->h_unit_name, + sellprice => $::form->round_amount($self->requirement_spec->hourly_rate, 2), + lastcost => $part->lastcost, + discount => 0, + project_id => $self->requirement_spec->project_id, ); return $item; @@ -263,9 +293,9 @@ sub create_order { $self->{parts} = { map { ($_->{id} => $_) } @{ SL::DB::Manager::Part->get_all(where => [ id => [ uniq map { $_->{order_part_id} } @{ $params{sections} } ] ]) } }; - my @orderitems = map { $self->create_order_item(section => $_) } @{ $params{sections} }; - my $employee = SL::DB::Manager::Employee->current; my $customer = SL::DB::Customer->new(id => $::form->{customer_id})->load; + my @orderitems = map { $self->create_order_item(section => $_, language_id => $customer->language_id) } @{ $params{sections} }; + my $employee = SL::DB::Manager::Employee->current; my $order = SL::DB::Order->new( globalproject_id => $self->requirement_spec->project_id, transdate => DateTime->today_local,