From df41380a9c1150938985322c48ef20fe7f2cd98b Mon Sep 17 00:00:00 2001 From: "G. Richardson" Date: Wed, 7 Dec 2016 11:33:28 +0100 Subject: [PATCH] Group nach Partsgroup (Warengruppe) umbenannt --- SL/DB/Manager/PriceRuleItem.pm | 2 +- SL/DB/PriceRuleItem.pm | 2 +- bin/mozilla/ic.pl | 6 +++--- bin/mozilla/vk.pl | 4 ++-- locale/de/all | 4 +--- locale/en/all | 1 - templates/webpages/ic/search.html | 4 ++-- templates/webpages/ic/search_update_prices.html | 2 +- templates/webpages/part/_assembly.html | 2 +- templates/webpages/part/_assortment.html | 2 +- templates/webpages/part/_basic_data.html | 2 +- templates/webpages/part/_multi_items_result.html | 2 +- templates/webpages/pe/partsgroup_form.html | 2 +- templates/webpages/pe/partsgroup_report.html | 2 +- templates/webpages/pe/search.html | 2 +- templates/webpages/price_rule/_filter.html | 2 +- templates/webpages/price_rule/item.html | 2 +- templates/webpages/vk/search_invoice.html | 8 ++++---- 18 files changed, 24 insertions(+), 27 deletions(-) diff --git a/SL/DB/Manager/PriceRuleItem.pm b/SL/DB/Manager/PriceRuleItem.pm index 83a4bf169..28f4d6f51 100644 --- a/SL/DB/Manager/PriceRuleItem.pm +++ b/SL/DB/Manager/PriceRuleItem.pm @@ -31,7 +31,7 @@ my %types = ( 'transdate' => { description => t8('Transdate'), customer => 1, vendor => 1, data_type => 'date', data => sub { $_[0]->transdate }, ops => 'date' }, 'part' => { description => t8('Part'), customer => 1, vendor => 1, data_type => 'int', data => sub { $_[1]->part->id }, }, 'pricegroup' => { description => t8('Pricegroup'), customer => 1, vendor => 1, data_type => 'int', data => sub { $_[1]->pricegroup_id }, exclude_nulls => 1 }, - 'partsgroup' => { description => t8('Group'), customer => 1, vendor => 1, data_type => 'int', data => sub { $_[1]->part->partsgroup_id }, exclude_nulls => 1 }, + 'partsgroup' => { description => t8('Partsgroup'), customer => 1, vendor => 1, data_type => 'int', data => sub { $_[1]->part->partsgroup_id }, exclude_nulls => 1 }, 'qty' => { description => t8('Qty'), customer => 1, vendor => 1, data_type => 'num', data => sub { $_[1]->qty }, ops => 'num' }, ); diff --git a/SL/DB/PriceRuleItem.pm b/SL/DB/PriceRuleItem.pm index 77d0fe571..006556d4c 100644 --- a/SL/DB/PriceRuleItem.pm +++ b/SL/DB/PriceRuleItem.pm @@ -108,7 +108,7 @@ sub full_description { $type eq 'customer' ? t8('Customer') . ' ' . $self->customer->displayable_name : $type eq 'vendor' ? t8('Vendor') . ' ' . $self->vendor->displayable_name : $type eq 'business' ? t8('Type of Business') . ' ' . $self->business->displayable_name - : $type eq 'partsgroup' ? t8('Group') . ' ' . $self->partsgroup->displayable_name + : $type eq 'partsgroup' ? t8('Partsgroup') . ' ' . $self->partsgroup->displayable_name : $type eq 'pricegroup' ? t8('Pricegroup') . ' ' . $self->pricegroup->displayable_name : $type eq 'part' ? t8('Part') . ' ' . $self->part->displayable_name : $type eq 'qty' ? ( diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl index daa2a62bc..e6b1ff33f 100644 --- a/bin/mozilla/ic.pl +++ b/bin/mozilla/ic.pl @@ -272,7 +272,7 @@ sub generate_report { 'onhand' => { 'text' => $locale->text('Stocked Qty'), }, 'ordnumber' => { 'text' => $locale->text('Order Number'), }, 'partnumber' => { 'text' => $locale->text('Part Number'), }, - 'partsgroup' => { 'text' => $locale->text('Group'), }, + 'partsgroup' => { 'text' => $locale->text('Partsgroup'), }, 'priceupdate' => { 'text' => $locale->text('Updated'), }, 'quonumber' => { 'text' => $locale->text('Quotation'), }, 'rop' => { 'text' => $locale->text('ROP'), }, @@ -358,8 +358,8 @@ sub generate_report { transdatefrom => $locale->text('From') . " " . $locale->date(\%myconfig, $form->{transdatefrom}, 1), transdateto => $locale->text('To (time)') . " " . $locale->date(\%myconfig, $form->{transdateto}, 1), partnumber => $locale->text('Part Number') . ": '$form->{partnumber}'", - partsgroup => $locale->text('Group') . ": '$form->{partsgroup}'", - partsgroup_id => $locale->text('Group') . ": '$pg_name'", + partsgroup => $locale->text('Partsgroup') . ": '$form->{partsgroup}'", + partsgroup_id => $locale->text('Partsgroup') . ": '$pg_name'", serialnumber => $locale->text('Serial Number') . ": '$form->{serialnumber}'", description => $locale->text('Part Description') . ": '$form->{description}'", make => $locale->text('Make') . ": '$form->{make}'", diff --git a/bin/mozilla/vk.pl b/bin/mozilla/vk.pl index 993dfc603..59ba7b420 100644 --- a/bin/mozilla/vk.pl +++ b/bin/mozilla/vk.pl @@ -169,7 +169,7 @@ sub invoice_transactions { my %column_defs = ( 'description' => { 'text' => $locale->text('Description'), }, 'partnumber' => { 'text' => $locale->text('Part Number'), }, - 'partsgroup' => { 'text' => $locale->text('Group'), }, + 'partsgroup' => { 'text' => $locale->text('Partsgroup'), }, 'country' => { 'text' => $locale->text('Country'), }, 'business' => { 'text' => $locale->text('Customer type'), }, 'employee' => { 'text' => $locale->text('Employee'), }, @@ -215,7 +215,7 @@ sub invoice_transactions { 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('Part Number') . " : $form->{partnumber}" if $form->{partnumber}; - push @options, $locale->text('Group') . " : " . SL::DB::PartsGroup->new(id => $form->{partsgroup_id})->load->partsgroup if $form->{partsgroup_id}; + 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}; diff --git a/locale/de/all b/locale/de/all index 9c31ec1e2..952912898 100755 --- a/locale/de/all +++ b/locale/de/all @@ -159,7 +159,6 @@ $self->{texts} = { 'Add Follow-Up' => 'Wiedervorlage erstellen', 'Add Follow-Up for #1' => 'Wiedervorlage für #1 erstellen', 'Add General Ledger Transaction' => 'Dialogbuchen', - 'Add Group' => 'Warengruppe erfassen', 'Add Language' => 'Sprache hinzufügen', 'Add Lead' => 'Kundenquelle erfassen', 'Add Letter' => 'Brief hinzufügen', @@ -1070,7 +1069,6 @@ $self->{texts} = { 'Edit Follow-Up' => 'Wiedervorlage bearbeiten', 'Edit Follow-Up for #1' => 'Wiedervorlage für #1 bearbeiten', 'Edit General Ledger Transaction' => 'Buchung im Hauptbuch bearbeiten', - 'Edit Group' => 'Warengruppe editieren', 'Edit Language' => 'Sprache bearbeiten', 'Edit Lead' => 'Kundenquelle bearbeiten', 'Edit Letter' => 'Brief bearbeiten', @@ -1391,7 +1389,6 @@ $self->{texts} = { 'GoBD Export' => 'GoBD Export', 'Greeting' => 'Anrede', 'Greetings' => 'Anreden', - 'Group' => 'Warengruppe', 'Group Invoices' => 'Rechnungen zusammenfassen', 'Group Items' => 'Waren gruppieren', 'Group assignment' => 'Gruppenzuordnung', @@ -2041,6 +2038,7 @@ $self->{texts} = { 'Parts must have an entry type.' => 'Waren müssen eine Buchungsgruppe haben.', 'Parts with existing part numbers' => 'Artikel mit existierender Artikelnummer', 'Parts, services and assemblies' => 'Waren, Dienstleistungen und Erzeugnisse', + 'Partsgroup' => 'Warengruppe', 'Partsgroup (database ID)' => 'Warengruppe (Datenbank-ID)', 'Partsgroup (name)' => 'Warengruppe (Name)', 'Partsgroups' => 'Warengruppen', diff --git a/locale/en/all b/locale/en/all index 9ba415aef..10c54b08d 100644 --- a/locale/en/all +++ b/locale/en/all @@ -1388,7 +1388,6 @@ $self->{texts} = { 'GoBD Export' => '', 'Greeting' => '', 'Greetings' => '', - 'Group' => '', 'Group Invoices' => '', 'Group Items' => '', 'Group assignment' => '', diff --git a/templates/webpages/ic/search.html b/templates/webpages/ic/search.html index fafcacc26..e0df9472d 100644 --- a/templates/webpages/ic/search.html +++ b/templates/webpages/ic/search.html @@ -34,7 +34,7 @@ - [% 'Group' | $T8 %] + [% 'Partsgroup' | $T8 %] [%- INCLUDE generic/multibox.html name = 'partsgroup', @@ -198,7 +198,7 @@ [%- L.checkbox_tag('l_image', label=LxERP.t8('Image'), value='Y', checked=(INSTANCE_CONF.get_parts_listing_image ? 1 : 0)) %] [%- L.checkbox_tag('l_drawing', label=LxERP.t8('Drawing'), value='Y') %] [%- L.checkbox_tag('l_microfiche', label=LxERP.t8('Microfiche'), value='Y') %] - [%- L.checkbox_tag('l_partsgroup', label=LxERP.t8('Group'), value='Y') %] + [%- L.checkbox_tag('l_partsgroup', label=LxERP.t8('Partsgroup'), value='Y') %] diff --git a/templates/webpages/ic/search_update_prices.html b/templates/webpages/ic/search_update_prices.html index a2d9f9027..6c492202a 100644 --- a/templates/webpages/ic/search_update_prices.html +++ b/templates/webpages/ic/search_update_prices.html @@ -20,7 +20,7 @@ - [% 'Group' | $T8 %] + [% 'Partsgroup' | $T8 %] [% 'Serial Number' | $T8 %] diff --git a/templates/webpages/part/_assembly.html b/templates/webpages/part/_assembly.html index 1e2bbd16f..e594fc43b 100644 --- a/templates/webpages/part/_assembly.html +++ b/templates/webpages/part/_assembly.html @@ -28,7 +28,7 @@ [%- 'Line Total' | $T8 %] [%- 'Sellprice' | $T8 %] [%- 'Lastcost' | $T8 %] - [%- 'Group' | $T8 %] + [%- 'Partsgroup' | $T8 %] diff --git a/templates/webpages/part/_assortment.html b/templates/webpages/part/_assortment.html index d441c0681..d9dbefc44 100644 --- a/templates/webpages/part/_assortment.html +++ b/templates/webpages/part/_assortment.html @@ -28,7 +28,7 @@ [%- 'Line Total' | $T8 %] [%- 'Sellprice' | $T8 %] [%- 'Lastcost' | $T8 %] - [%- 'Group' | $T8 %] + [%- 'Partsgroup' | $T8 %] diff --git a/templates/webpages/part/_basic_data.html b/templates/webpages/part/_basic_data.html index 0fb2b3bf6..1b04cd94f 100644 --- a/templates/webpages/part/_basic_data.html +++ b/templates/webpages/part/_basic_data.html @@ -39,7 +39,7 @@ [%- IF SELF.all_partsgroups.size %] - [% 'Group' | $T8 %] + [% 'Partsgroup' | $T8 %] [%- L.select_tag('part.partsgroup_id', SELF.all_partsgroups, default=SELF.part.partsgroup_id, title_key='partsgroup', value_key='id', with_empty=1 style='width: 200px') %] [% END %] diff --git a/templates/webpages/part/_multi_items_result.html b/templates/webpages/part/_multi_items_result.html index 15ca30c6e..a5c838c5f 100644 --- a/templates/webpages/part/_multi_items_result.html +++ b/templates/webpages/part/_multi_items_result.html @@ -14,7 +14,7 @@ [% 'Unit' | $T8 %] [% 'Article' | $T8 %] [% 'Sellprice' | $T8 %] - [% 'Group' | $T8 %] + [% 'Partsgroup' | $T8 %] [%- FOREACH item = multi_items %] diff --git a/templates/webpages/pe/partsgroup_form.html b/templates/webpages/pe/partsgroup_form.html index 632cd7afa..6e5a08530 100644 --- a/templates/webpages/pe/partsgroup_form.html +++ b/templates/webpages/pe/partsgroup_form.html @@ -14,7 +14,7 @@ - +
[% 'Group' | $T8 %][% 'Partsgroup' | $T8 %]
diff --git a/templates/webpages/pe/partsgroup_report.html b/templates/webpages/pe/partsgroup_report.html index a9fc79e0d..e960b81af 100644 --- a/templates/webpages/pe/partsgroup_report.html +++ b/templates/webpages/pe/partsgroup_report.html @@ -10,7 +10,7 @@ - + [%- FOREACH row = item_list %] diff --git a/templates/webpages/pe/search.html b/templates/webpages/pe/search.html index 871eb34dc..db7e51df9 100644 --- a/templates/webpages/pe/search.html +++ b/templates/webpages/pe/search.html @@ -17,7 +17,7 @@ [%- ELSE %] - + [%- END %] diff --git a/templates/webpages/price_rule/_filter.html b/templates/webpages/price_rule/_filter.html index 93d18636e..02c66db22 100644 --- a/templates/webpages/price_rule/_filter.html +++ b/templates/webpages/price_rule/_filter.html @@ -35,7 +35,7 @@ - + diff --git a/templates/webpages/price_rule/item.html b/templates/webpages/price_rule/item.html index 04a7546fa..a6eaa5144 100644 --- a/templates/webpages/price_rule/item.html +++ b/templates/webpages/price_rule/item.html @@ -26,7 +26,7 @@ [% CASE 'business' %] [% 'Type of Business' | $T8 %] [% 'is' | $T8 %] [% L.select_tag('price_rule.items[].value_int', SELF.businesses, title_key='description', default=item.value_int) %] [% CASE 'partsgroup' %] - [% 'Group' | $T8 %] [% 'is' | $T8 %] [% L.select_tag('price_rule.items[].value_int', SELF.partsgroups, title_key='partsgroup', default=item.value_int) %] + [% 'Partsgroup' | $T8 %] [% 'is' | $T8 %] [% L.select_tag('price_rule.items[].value_int', SELF.partsgroups, title_key='partsgroup', default=item.value_int) %] [% CASE 'qty' %] [% 'Quantity' | $T8 %] [% L.select_tag('price_rule.items[].op', num_compare_ops, default=item.op) %] [% L.input_tag('price_rule.items[].value_num_as_number', item.value_num_as_number) %] [% CASE 'reqdate' %] diff --git a/templates/webpages/vk/search_invoice.html b/templates/webpages/vk/search_invoice.html index 87626463d..ee1875279 100644 --- a/templates/webpages/vk/search_invoice.html +++ b/templates/webpages/vk/search_invoice.html @@ -15,7 +15,7 @@ - + @@ -32,7 +32,7 @@ - + @@ -127,7 +127,7 @@ - + - + -- 2.20.1
[% 'Group' | $T8 %][% 'Partsgroup' | $T8 %]
[% 'Pricegroup' | $T8 %] [% 'Group' | $T8 %][% 'Partsgroup' | $T8 %]
[% L.select_tag('filter.item_type_matches[].business', SELF.businesses, title_key='description', default=FORM.filter.item_type_matches.0.business, with_empty=1, style='width: 300px') %]
[% 'Group' | $T8 %][% 'Partsgroup' | $T8 %] [% L.select_tag('filter.item_type_matches[].partsgroup', SELF.partsgroups, title_key='partsgroup', default=FORM.filter.item_type_matches.0.partsgroup, with_empty=1, style='width: 300px') %]
[% 'Group' | $T8 %][% 'Partsgroup' | $T8 %] [%- INCLUDE 'generic/multibox.html' name = 'partsgroup_id', @@ -288,7 +288,7 @@
[% 'Base unit' | $T8 %][% 'Group' | $T8 %][% 'Partsgroup' | $T8 %] [% 'Salesperson' | $T8 %] [% 'Employee' | $T8 %]