From 61421f4d0f5e4282691b58d3ba28828123e3aa19 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20B=C3=BCren?= Date: Thu, 4 Sep 2014 14:46:34 +0200 Subject: [PATCH] =?utf8?q?all=5Fparts=20um=20Namensoption=20des=20Kunden?= =?utf8?q?=20oder=20Lieferanten=20erweitert=20Der=20Name=20wurde=20im=20Ba?= =?utf8?q?ckend=20IC.pm=20schon=20richtig=20=C3=BCbergeben,=20es=20scheint?= =?utf8?q?=20aber,=20dass=20dieser=20dann=20nicht=20mehr=20als=20Option=20?= =?utf8?q?angehakt=20war.=20Entsprechend=20auch=20eine=20Flash-Warnung=20a?= =?utf8?q?uch=20ausgegeben,=20falls=20=C3=BCberhaupt=20keine=20Belegoption?= =?utf8?q?=20angew=C3=A4hlt=20wurde.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- bin/mozilla/ic.pl | 5 +++++ locale/de/all | 2 ++ templates/webpages/ic/search.html | 3 +-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl index c9317ab87..d6ecf671f 100644 --- a/bin/mozilla/ic.pl +++ b/bin/mozilla/ic.pl @@ -1046,6 +1046,7 @@ sub generate_report { 'sellprice' => { 'text' => $locale->text('Sell Price'), }, 'serialnumber' => { 'text' => $locale->text('Serial Number'), }, 'soldtotal' => { 'text' => $locale->text('Qty in Selected Records'), }, + 'name' => { 'text' => $locale->text('Name in Selected Records'), }, 'transdate' => { 'text' => $locale->text('Transdate'), }, 'unit' => { 'text' => $locale->text('Unit'), }, 'weight' => { 'text' => $locale->text('Weight'), }, @@ -1211,7 +1212,11 @@ sub generate_report { flash('warning', $::locale->text('Soldtotal does not make sense without any bsooqr options')); } + if ($form->{l_name} && !$bsooqr_mode) { + delete $form->{l_name}; + flash('warning', $::locale->text('Name does not make sense without any bsooqr options')); + } IC->all_parts(\%myconfig, \%$form); my @columns = qw( diff --git a/locale/de/all b/locale/de/all index 98e54f613..a0ca961de 100755 --- a/locale/de/all +++ b/locale/de/all @@ -1492,6 +1492,8 @@ $self->{texts} = { 'MwSt. inkl.' => 'MwSt. inkl.', 'Name' => 'Name', 'Name and Street' => 'Name und Straße', + 'Name does not make sense without any bsooqr options' => 'Option "Name in gewählten Belegen" wird ignoriert.', + 'Name in Selected Records' => 'Name in gewählten Belegen', 'Neither sections nor function blocks have been created yet.' => 'Es wurden bisher weder Abschnitte noch Funktionsblöcke angelegt.', 'Net Income Statement' => 'Einnahmenüberschußrechnung', 'Net amount' => 'Nettobetrag', diff --git a/templates/webpages/ic/search.html b/templates/webpages/ic/search.html index bf52ae32b..8ed89a449 100644 --- a/templates/webpages/ic/search.html +++ b/templates/webpages/ic/search.html @@ -176,8 +176,6 @@ [%- L.checkbox_tag('l_priceupdate', label=LxERP.t8('Updated'), value='Y') %] - - [%- L.checkbox_tag('l_deliverydate', label=LxERP.t8('Delivery Date'), value='Y') %] [%- UNLESS is_service %] [%- L.checkbox_tag('l_rop', label=LxERP.t8('ROP'), value='Y') %] @@ -211,6 +209,7 @@ [%- L.checkbox_tag('l_notes', label=LxERP.t8('Notes'), value='Y') %] + [%- L.checkbox_tag('l_name', label=LxERP.t8('Name in Selected Records'), value='Y') %] [% CUSTOM_VARIABLES_INCLUSION_CODE %] -- 2.20.1