Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision df41380a

Von Kivitendo Admin vor fast 8 Jahren hinzugefügt

  • ID df41380a9c1150938985322c48ef20fe7f2cd98b
  • Vorgänger 19fb04d1
  • Nachfolger 94f55685

Group nach Partsgroup (Warengruppe) umbenannt

Unterschiede anzeigen:

SL/DB/Manager/PriceRuleItem.pm
31 31
  'transdate'           => { description => t8('Transdate'),          customer => 1, vendor => 1, data_type => 'date', data => sub { $_[0]->transdate }, ops => 'date' },
32 32
  'part'                => { description => t8('Part'),               customer => 1, vendor => 1, data_type => 'int',  data => sub { $_[1]->part->id }, },
33 33
  'pricegroup'          => { description => t8('Pricegroup'),         customer => 1, vendor => 1, data_type => 'int',  data => sub { $_[1]->pricegroup_id }, exclude_nulls => 1 },
34
  'partsgroup'          => { description => t8('Group'),              customer => 1, vendor => 1, data_type => 'int',  data => sub { $_[1]->part->partsgroup_id }, exclude_nulls => 1 },
34
  'partsgroup'          => { description => t8('Partsgroup'),         customer => 1, vendor => 1, data_type => 'int',  data => sub { $_[1]->part->partsgroup_id }, exclude_nulls => 1 },
35 35
  'qty'                 => { description => t8('Qty'),                customer => 1, vendor => 1, data_type => 'num',  data => sub { $_[1]->qty }, ops => 'num' },
36 36
);
37 37

  
SL/DB/PriceRuleItem.pm
108 108
    $type eq 'customer'   ? t8('Customer')         . ' ' . $self->customer->displayable_name
109 109
  : $type eq 'vendor'     ? t8('Vendor')           . ' ' . $self->vendor->displayable_name
110 110
  : $type eq 'business'   ? t8('Type of Business') . ' ' . $self->business->displayable_name
111
  : $type eq 'partsgroup' ? t8('Group')            . ' ' . $self->partsgroup->displayable_name
111
  : $type eq 'partsgroup' ? t8('Partsgroup')       . ' ' . $self->partsgroup->displayable_name
112 112
  : $type eq 'pricegroup' ? t8('Pricegroup')       . ' ' . $self->pricegroup->displayable_name
113 113
  : $type eq 'part'       ? t8('Part')             . ' ' . $self->part->displayable_name
114 114
  : $type eq 'qty' ? (
bin/mozilla/ic.pl
272 272
    'onhand'             => { 'text' => $locale->text('Stocked Qty'), },
273 273
    'ordnumber'          => { 'text' => $locale->text('Order Number'), },
274 274
    'partnumber'         => { 'text' => $locale->text('Part Number'), },
275
    'partsgroup'         => { 'text' => $locale->text('Group'), },
275
    'partsgroup'         => { 'text' => $locale->text('Partsgroup'), },
276 276
    'priceupdate'        => { 'text' => $locale->text('Updated'), },
277 277
    'quonumber'          => { 'text' => $locale->text('Quotation'), },
278 278
    'rop'                => { 'text' => $locale->text('ROP'), },
......
358 358
    transdatefrom => $locale->text('From')       . " " . $locale->date(\%myconfig, $form->{transdatefrom}, 1),
359 359
    transdateto   => $locale->text('To (time)')  . " " . $locale->date(\%myconfig, $form->{transdateto}, 1),
360 360
    partnumber    => $locale->text('Part Number')      . ": '$form->{partnumber}'",
361
    partsgroup    => $locale->text('Group')            . ": '$form->{partsgroup}'",
362
    partsgroup_id => $locale->text('Group')            . ": '$pg_name'",
361
    partsgroup    => $locale->text('Partsgroup')       . ": '$form->{partsgroup}'",
362
    partsgroup_id => $locale->text('Partsgroup')       . ": '$pg_name'",
363 363
    serialnumber  => $locale->text('Serial Number')    . ": '$form->{serialnumber}'",
364 364
    description   => $locale->text('Part Description') . ": '$form->{description}'",
365 365
    make          => $locale->text('Make')             . ": '$form->{make}'",
bin/mozilla/vk.pl
169 169
  my %column_defs = (
170 170
    'description'             => { 'text' => $locale->text('Description'), },
171 171
    'partnumber'              => { 'text' => $locale->text('Part Number'), },
172
    'partsgroup'              => { 'text' => $locale->text('Group'), },
172
    'partsgroup'              => { 'text' => $locale->text('Partsgroup'), },
173 173
    'country'                 => { 'text' => $locale->text('Country'), },
174 174
    'business'                => { 'text' => $locale->text('Customer type'), },
175 175
    'employee'                => { 'text' => $locale->text('Employee'), },
......
215 215
  push @options, $locale->text('Invoice Number')          . " : $form->{invnumber}"                                                         if $form->{invnumber};
216 216
  push @options, $locale->text('Invoice Date')            . " : $form->{invdate}"                                                           if $form->{invdate};
217 217
  push @options, $locale->text('Part Number')             . " : $form->{partnumber}"                                                        if $form->{partnumber};
218
  push @options, $locale->text('Group')                   . " : " . SL::DB::PartsGroup->new(id => $form->{partsgroup_id})->load->partsgroup if $form->{partsgroup_id};
218
  push @options, $locale->text('Partsgroup')              . " : " . SL::DB::PartsGroup->new(id => $form->{partsgroup_id})->load->partsgroup if $form->{partsgroup_id};
219 219
  push @options, $locale->text('Country')                 . " : $form->{country}"                                                           if $form->{country};
220 220
  push @options, $locale->text('Employee')                . ' : ' . SL::DB::Employee->new(id => $form->{employee_id})->load->name           if $form->{employee_id};
221 221
  push @options, $locale->text('Salesman')                . ' : ' . SL::DB::Employee->new(id => $form->{salesman_id})->load->name           if $form->{salesman_id};
locale/de/all
159 159
  'Add Follow-Up'               => 'Wiedervorlage erstellen',
160 160
  'Add Follow-Up for #1'        => 'Wiedervorlage für #1 erstellen',
161 161
  'Add General Ledger Transaction' => 'Dialogbuchen',
162
  'Add Group'                   => 'Warengruppe erfassen',
163 162
  'Add Language'                => 'Sprache hinzufügen',
164 163
  'Add Lead'                    => 'Kundenquelle erfassen',
165 164
  'Add Letter'                  => 'Brief hinzufügen',
......
1070 1069
  'Edit Follow-Up'              => 'Wiedervorlage bearbeiten',
1071 1070
  'Edit Follow-Up for #1'       => 'Wiedervorlage für #1 bearbeiten',
1072 1071
  'Edit General Ledger Transaction' => 'Buchung im Hauptbuch bearbeiten',
1073
  'Edit Group'                  => 'Warengruppe editieren',
1074 1072
  'Edit Language'               => 'Sprache bearbeiten',
1075 1073
  'Edit Lead'                   => 'Kundenquelle bearbeiten',
1076 1074
  'Edit Letter'                 => 'Brief bearbeiten',
......
1391 1389
  'GoBD Export'                 => 'GoBD Export',
1392 1390
  'Greeting'                    => 'Anrede',
1393 1391
  'Greetings'                   => 'Anreden',
1394
  'Group'                       => 'Warengruppe',
1395 1392
  'Group Invoices'              => 'Rechnungen zusammenfassen',
1396 1393
  'Group Items'                 => 'Waren gruppieren',
1397 1394
  'Group assignment'            => 'Gruppenzuordnung',
......
2041 2038
  'Parts must have an entry type.' => 'Waren müssen eine Buchungsgruppe haben.',
2042 2039
  'Parts with existing part numbers' => 'Artikel mit existierender Artikelnummer',
2043 2040
  'Parts, services and assemblies' => 'Waren, Dienstleistungen und Erzeugnisse',
2041
  'Partsgroup'                  => 'Warengruppe',
2044 2042
  'Partsgroup (database ID)'    => 'Warengruppe (Datenbank-ID)',
2045 2043
  'Partsgroup (name)'           => 'Warengruppe (Name)',
2046 2044
  'Partsgroups'                 => 'Warengruppen',
locale/en/all
1388 1388
  'GoBD Export'                 => '',
1389 1389
  'Greeting'                    => '',
1390 1390
  'Greetings'                   => '',
1391
  'Group'                       => '',
1392 1391
  'Group Invoices'              => '',
1393 1392
  'Group Items'                 => '',
1394 1393
  'Group assignment'            => '',
templates/webpages/ic/search.html
34 34
      </tr>
35 35

  
36 36
      <tr>
37
       <th align="right" nowrap>[% 'Group' | $T8 %]</th>
37
       <th align="right" nowrap>[% 'Partsgroup' | $T8 %]</th>
38 38
       <td>
39 39
         [%- INCLUDE generic/multibox.html
40 40
           name          = 'partsgroup',
......
198 198
          <td>[%- L.checkbox_tag('l_image', label=LxERP.t8('Image'), value='Y', checked=(INSTANCE_CONF.get_parts_listing_image ? 1 : 0)) %]</td>
199 199
          <td>[%- L.checkbox_tag('l_drawing', label=LxERP.t8('Drawing'), value='Y') %]</td>
200 200
          <td>[%- L.checkbox_tag('l_microfiche', label=LxERP.t8('Microfiche'), value='Y') %]</td>
201
          <td>[%- L.checkbox_tag('l_partsgroup', label=LxERP.t8('Group'), value='Y') %]</td>
201
          <td>[%- L.checkbox_tag('l_partsgroup', label=LxERP.t8('Partsgroup'), value='Y') %]</td>
202 202
          </td>
203 203
         </tr>
204 204

  
templates/webpages/ic/search_update_prices.html
20 20
    </tr>
21 21

  
22 22
    <tr>
23
     <th align="right" nowrap>[% 'Group' | $T8 %]</th>
23
     <th align="right" nowrap>[% 'Partsgroup' | $T8 %]</th>
24 24
     <td><input name="partsgroup" size="20"></td>
25 25
     <th align="right" nowrap>[% 'Serial Number' | $T8 %]</th>
26 26
     <td><input name="serialnumber" size="20"></td>
templates/webpages/part/_assembly.html
28 28
     <th class="listheading" nowrap width="5" >[%- 'Line Total'   | $T8 %] </th>
29 29
     <th id="sellprice_header_id"   class="listheading" nowrap width="10" ><a href='#' onClick='javascript:kivi.Part.reorder_items("sellprice")' >[%- 'Sellprice'       | $T8 %]</a></th>
30 30
     <th id="lastcost_header_id"   class="listheading" nowrap width="10" ><a href='#' onClick='javascript:kivi.Part.reorder_items("lastcost")'   >[%- 'Lastcost'       | $T8 %]</a></th>
31
     <th id="_header_id"   class="listheading" nowrap width="15" ><a href='#' onClick='javascript:kivi.Part.reorder_items("partsgroup")'         >[%- 'Group'       | $T8 %]</a></th>
31
     <th id="_header_id"   class="listheading" nowrap width="15" ><a href='#' onClick='javascript:kivi.Part.reorder_items("partsgroup")'         >[%- 'Partsgroup'       | $T8 %]</a></th>
32 32
   </tr>
33 33
 </thead>
34 34
<tbody id="assembly_rows">
templates/webpages/part/_assortment.html
28 28
     <th class="listheading" nowrap width="5" >[%- 'Line Total'   | $T8 %] </th>
29 29
     <th id="sellprice_header_id"   class="listheading" nowrap width="10" ><a href='#' onClick='javascript:kivi.Part.reorder_items("sellprice")'> [%- 'Sellprice'   | $T8 %]</a></th>
30 30
     <th id="lastcost_header_id"   class="listheading" nowrap width="10" ><a href='#' onClick='javascript:kivi.Part.reorder_items("lastcost")'> [%- 'Lastcost'      | $T8 %]</a></th>
31
     <th id="_header_id"   class="listheading" nowrap width="15" ><a href='#' onClick='javascript:kivi.Part.reorder_items("partsgroup")'> [%- 'Group'       | $T8 %]</a></th>
31
     <th id="_header_id"   class="listheading" nowrap width="15" ><a href='#' onClick='javascript:kivi.Part.reorder_items("partsgroup")'> [%- 'Partsgroup'       | $T8 %]</a></th>
32 32
   </tr>
33 33
 </thead>
34 34
<tbody id="assortment_rows">
templates/webpages/part/_basic_data.html
39 39
             </tr>
40 40
             <tr>
41 41
              [%- IF SELF.all_partsgroups.size %]
42
              <th align="right">[% 'Group' | $T8 %]</th>
42
              <th align="right">[% 'Partsgroup' | $T8 %]</th>
43 43
              <td>[%- 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') %]</td>
44 44
              [% END %]
45 45
             </tr>
templates/webpages/part/_multi_items_result.html
14 14
      <th>[% 'Unit'      | $T8 %]</th>
15 15
      <th>[% 'Article'   | $T8 %]</th>
16 16
      <th>[% 'Sellprice' | $T8 %]</th>
17
      <th>[% 'Group'     | $T8 %]</th>
17
      <th>[% 'Partsgroup' | $T8 %]</th>
18 18
    </tr>
19 19
  [%- FOREACH item = multi_items %]
20 20
    <tr>
templates/webpages/pe/partsgroup_form.html
14 14
    <td>
15 15
      <table width=100%>
16 16
        <tr>
17
          <th align=right>[% 'Group' | $T8 %]</th>
17
          <th align=right>[% 'Partsgroup' | $T8 %]</th>
18 18
          <td><input name=partsgroup size=30 value="[% partsgroup | html %]"></td>
19 19
        </tr>
20 20
      </table>
templates/webpages/pe/partsgroup_report.html
10 10
    <td>
11 11
      <table width=100%>
12 12
        <tr class=listheading>
13
          <th class=listheading width=90%>[% 'Group' | $T8 %]</th>
13
          <th class=listheading width=90%>[% 'Partsgroup' | $T8 %]</th>
14 14
        </tr>
15 15
[%- FOREACH row = item_list %]
16 16
        <tr valign=top class="listrow[% loop.count % 2 %]">
templates/webpages/pe/search.html
17 17
          <th align=right width=1%>[% 'Pricegroup' | $T8 %]</th>
18 18
          <td><input name=pricegroup size=20></td>
19 19
[%- ELSE %]
20
          <th align=right width=1%>[% 'Group' | $T8 %]</th>
20
          <th align=right width=1%>[% 'Partsgroup' | $T8 %]</th>
21 21
          <td><input name=partsgroup size=20></td>
22 22
[%- END %]
23 23
        </tr>
templates/webpages/price_rule/_filter.html
35 35
   <td>[% 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') %]</td>
36 36
  </tr>
37 37
  <tr>
38
   <th align="right">[% 'Group' | $T8 %]</th>
38
   <th align="right">[% 'Partsgroup' | $T8 %]</th>
39 39
   <td>[% 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') %]</td>
40 40
  </tr>
41 41
  <tr>
templates/webpages/price_rule/item.html
26 26
  [% CASE 'business' %]
27 27
    [% 'Type of Business' | $T8 %] [% 'is' | $T8 %] [% L.select_tag('price_rule.items[].value_int', SELF.businesses, title_key='description', default=item.value_int) %]
28 28
  [% CASE 'partsgroup' %]
29
    [% 'Group' | $T8 %] [% 'is' | $T8 %] [% L.select_tag('price_rule.items[].value_int', SELF.partsgroups, title_key='partsgroup', default=item.value_int) %]
29
    [% 'Partsgroup' | $T8 %] [% 'is' | $T8 %] [% L.select_tag('price_rule.items[].value_int', SELF.partsgroups, title_key='partsgroup', default=item.value_int) %]
30 30
  [% CASE 'qty' %]
31 31
    [% '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) %]
32 32
  [% CASE 'reqdate' %]
templates/webpages/vk/search_invoice.html
15 15
          <option value="description">[% 'Part' | $T8 %]</option>
16 16
          <option value="customername">[% 'Customer' | $T8 %]</option>
17 17
          <option value="country">[% 'Country' | $T8 %]</option>
18
          <option value="partsgroup">[% 'Group' | $T8 %]</option>
18
          <option value="partsgroup">[% 'Partsgroup' | $T8 %]</option>
19 19
          <option value="business">[% 'Customer type' | $T8 %]</option>
20 20
          <option value="salesman" selected="selected">[% 'Salesman' | $T8 %]</option>
21 21
          <option value="month">[% 'Month' | $T8 %]</option>
......
32 32
          <option value="description">[% 'Part' | $T8 %]</option>
33 33
          <option value="customername">[% 'Customer' | $T8 %]</option>
34 34
          <option value="country">[% 'Country' | $T8 %]</option>
35
          <option value="partsgroup">[% 'Group' | $T8 %]</option>
35
          <option value="partsgroup">[% 'Partsgroup' | $T8 %]</option>
36 36
          <option value="business">[% 'Customer type' | $T8 %]</option>
37 37
          <option value="salesman">[% 'Salesman' | $T8 %]</option>
38 38
          <option value="month" selected="selected">[% 'Month' | $T8 %]</option>
......
127 127
    </tr>
128 128

  
129 129
    <tr>
130
      <th align="right">[% 'Group' | $T8 %]</th>
130
      <th align="right">[% 'Partsgroup' | $T8 %]</th>
131 131
      <td>
132 132
        [%- INCLUDE 'generic/multibox.html'
133 133
          name          = 'partsgroup_id',
......
288 288

  
289 289
          <tr>
290 290
            <td align=left><input name="l_parts_unit" class=checkbox type=checkbox value=Y>[% 'Base unit' | $T8 %]</td>
291
            <td align=left><input name="l_partsgroup" class=checkbox type=checkbox value=Y>[% 'Group' | $T8 %]</td>
291
            <td align=left><input name="l_partsgroup" class=checkbox type=checkbox value=Y>[% 'Partsgroup' | $T8 %]</td>
292 292
            <td align=left><input name="l_salesman" class=checkbox type=checkbox value=Y>[% 'Salesperson' | $T8 %]</td>
293 293
            <td align=left><input name="l_employee" class=checkbox type=checkbox value=Y>[% 'Employee' | $T8 %]</td>
294 294
          </tr>

Auch abrufbar als: Unified diff