Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 07d71c33

Von Stephan Köhler vor fast 19 Jahren hinzugefügt

  • ID 07d71c33315605fcfc450d3b9abf0fd10e92bed5
  • Vorgänger becc49b1
  • Nachfolger ee583bd5

Merge von 599-602,605,614,615 aus unstable: Preisgruppen Teil 1
--Preisgruppenerweiterung auf Basis von Andres Patch - Thanks
-Preisgruppenverwaltung
-Preiseingabe der Preisgruppen in Masken Waren,etc.
-Auswahl der Preisgruppen in den Verkaufsmasken
-Erweiterung Datenbankschema
-Übersetzungen für Preisgruppen
-Bugfix Preisgruppen, in der Warenmaske zeigte er eine Preisgruppe a
"Gruppe 1" als "Gruppe" an
-Anpassung locale
--Fehler bei negativen Umsaetzen behoben
--Fehler beim Speichern von Rechnungen und Angeboten/Auftraegen wenn keine Preisgruppen vorhanden
--Fehler bei Drucken und Buchen und Preisgruppen behoben, Preisgruppen Quelltext ein wenig modifiziert

Unterschiede anzeigen:

bin/mozilla/ic.pl
32 32
#======================================================================
33 33

  
34 34
use SL::IC;
35
#use SL::PE;
35 36

  
36 37
require "$form->{path}/io.pl";
37 38

  
......
50 51

  
51 52
  $form->{unit} =
52 53
    ($form->{item} eq 'service') ? $locale->text('hr') : $locale->text('ea');
53

  
54
  IC->get_pricegroups(\%myconfig, \%$form);
54 55
  &link_part;
55 56
  &display_form;
56 57

  
......
84 85
    $button1 = qq|
85 86
       <td><input name=transdatefrom id=transdatefrom size=11 title="$myconfig{dateformat}"></td>
86 87
       <td><input type=button name=transdatefrom id="trigger1" value=|
87
      . $locale->text('button')
88
      . qq|></td>
88
      . $locale->text('button') . qq|></td>
89 89
      |;
90 90
    $button2 = qq|
91 91
       <td><input name=transdateto id=transdateto size=11 title="$myconfig{dateformat}"></td>
92 92
       <td><input type=button name=transdateto name=transdateto id="trigger2" value=|
93
      . $locale->text('button')
94
      . qq|></td>
93
      . $locale->text('button') . qq|></td>
95 94
     |;
96 95

  
97 96
    #write Trigger
......
132 131

  
133 132
    $l_serialnumber = qq|
134 133
        <td><input name=l_serialnumber class=checkbox type=checkbox value=Y>&nbsp;|
135
      . $locale->text('Serial Number')
136
      . qq|</td>
134
      . $locale->text('Serial Number') . qq|</td>
137 135
|;
138 136

  
139 137
  }
......
272 270
        </tr>
273 271
        <tr>
274 272
          <th align=right nowrap>|
275
    . $locale->text('Part Description')
276
    . qq|</th>
273
    . $locale->text('Part Description') . qq|</th>
277 274
          <td colspan=3><input name=description size=40></td>
278 275
        </tr>
279 276
	<tr>
......
310 307
	</tr>
311 308
	<tr>
312 309
          <th align=right nowrap>|
313
    . $locale->text('Include in Report')
314
    . qq|</th>
310
    . $locale->text('Include in Report') . qq|</th>
315 311
          <td colspan=3>
316 312
            <table>
317 313
              <tr>
318 314
                <td><input name=l_partnumber class=checkbox type=checkbox value=Y checked>&nbsp;|
319
    . $locale->text('Part Number')
320
    . qq|</td>
315
    . $locale->text('Part Number') . qq|</td>
321 316
		<td><input name=l_description class=checkbox type=checkbox value=Y checked>&nbsp;|
322
    . $locale->text('Part Description')
323
    . qq|</td>
317
    . $locale->text('Part Description') . qq|</td>
324 318
		$l_serialnumber
325 319
		<td><input name=l_unit class=checkbox type=checkbox value=Y checked>&nbsp;|
326
    . $locale->text('Unit of measure')
327
    . qq|</td>
320
    . $locale->text('Unit of measure') . qq|</td>
328 321
	      </tr>
329 322
	      <tr>
330 323
                <td><input name=l_listprice class=checkbox type=checkbox value=Y>&nbsp;|
331
    . $locale->text('List Price')
332
    . qq|</td>
324
    . $locale->text('List Price') . qq|</td>
333 325
		<td><input name=l_sellprice class=checkbox type=checkbox value=Y checked>&nbsp;|
334
    . $locale->text('Sell Price')
335
    . qq|</td>
326
    . $locale->text('Sell Price') . qq|</td>
336 327
		<td><input name=l_lastcost class=checkbox type=checkbox value=Y>&nbsp;|
337
    . $locale->text('Last Cost')
338
    . qq|</td>
328
    . $locale->text('Last Cost') . qq|</td>
339 329
		<td><input name=l_linetotal class=checkbox type=checkbox value=Y checked>&nbsp;|
340
    . $locale->text('Line Total')
341
    . qq|</td>
330
    . $locale->text('Line Total') . qq|</td>
342 331
	      </tr>
343 332
	      <tr>
344 333
                <td><input name=l_priceupdate class=checkbox type=checkbox value=Y>&nbsp;|
345
    . $locale->text('Updated')
346
    . qq|</td>
334
    . $locale->text('Updated') . qq|</td>
347 335
		<td><input name=l_bin class=checkbox type=checkbox value=Y>&nbsp;|
348
    . $locale->text('Bin')
349
    . qq|</td>
336
    . $locale->text('Bin') . qq|</td>
350 337
		<td><input name=l_rop class=checkbox type=checkbox value=Y>&nbsp;|
351
    . $locale->text('ROP')
352
    . qq|</td>
338
    . $locale->text('ROP') . qq|</td>
353 339
		<td><input name=l_weight class=checkbox type=checkbox value=Y>&nbsp;|
354
    . $locale->text('Weight')
355
    . qq|</td>
340
    . $locale->text('Weight') . qq|</td>
356 341
              </tr>
357 342
	      <tr>
358 343
                <td><input name=l_image class=checkbox type=checkbox value=Y>&nbsp;|
359
    . $locale->text('Image')
360
    . qq|</td>
344
    . $locale->text('Image') . qq|</td>
361 345
		<td><input name=l_drawing class=checkbox type=checkbox value=Y>&nbsp;|
362
    . $locale->text('Drawing')
363
    . qq|</td>
346
    . $locale->text('Drawing') . qq|</td>
364 347
		<td><input name=l_microfiche class=checkbox type=checkbox value=Y>&nbsp;|
365
    . $locale->text('Microfiche')
366
    . qq|</td>
348
    . $locale->text('Microfiche') . qq|</td>
367 349
		<td><input name=l_partsgroup class=checkbox type=checkbox value=Y>&nbsp;|
368
    . $locale->text('Group')
369
    . qq|</td>
350
    . $locale->text('Group') . qq|</td>
370 351
              </tr>
371 352
	      <tr>
372 353
                <td><input name=l_subtotal class=checkbox type=checkbox value=Y>&nbsp;|
373
    . $locale->text('Subtotal')
374
    . qq|</td>
354
    . $locale->text('Subtotal') . qq|</td>
375 355
		<td><input name=l_soldtotal class=checkbox type=checkbox value=Y>&nbsp;|
376
    . $locale->text('soldtotal')
377
    . qq|</td>
356
    . $locale->text('soldtotal') . qq|</td>
378 357
	      </tr>
379 358
            </table>
380 359
          </td>
......
433 412
      <table>
434 413
	<tr class=listheading>
435 414
         <th class=listheading nowrap>|
436
    . $locale->text('Part Number')
437
    . qq|</th>
415
    . $locale->text('Part Number') . qq|</th>
438 416
         <th class=listheading nowrap>|
439
    . $locale->text('Part Description')
440
    . qq|</th>
417
    . $locale->text('Part Description') . qq|</th>
441 418
        </tr>
442 419
        <tr valign=top>
443 420
         <td><input type=text name=partnumber size=20 value=></td>
......
858 835
    $option   .= $locale->text('soldtotal') . qq| : $form->{soldtotal}<br>|;
859 836
  }
860 837

  
861
  @columns =
862
    $form->sort_columns(
838
  @columns = $form->sort_columns(
863 839
    qw(number partnumber description partsgroup bin onhand rop unit listprice linetotallistprice sellprice linetotalsellprice lastcost linetotallastcost priceupdate weight image drawing microfiche invnumber ordnumber quonumber name serialnumber soldtotal)
864
    );
840
  );
865 841

  
866 842
  if ($form->{l_linetotal}) {
867 843
    $form->{l_onhand} = "Y";
......
1441 1417
    $option   .= $locale->text('soldtotal') . qq| : $form->{soldtotal}<br>|;
1442 1418
  }
1443 1419

  
1444
  @columns =
1445
    $form->sort_columns(
1420
  @columns = $form->sort_columns(
1446 1421
    qw(partnumber description partsgroup bin onhand rop unit listprice linetotallistprice sellprice linetotalsellprice lastcost linetotallastcost priceupdate weight image drawing microfiche invnumber ordnumber quonumber name serialnumber soldtotal)
1447
    );
1422
  );
1448 1423

  
1449 1424
  if ($form->{l_linetotal}) {
1450 1425
    $form->{l_onhand} = "Y";
......
1921 1896
  delete $form->{amount};
1922 1897

  
1923 1898
  $form->get_partsgroup(\%myconfig, { all => 1 });
1899

  
1924 1900
  $form->{partsgroup} = "$form->{partsgroup}--$form->{partsgroup_id}";
1901

  
1925 1902
  if (@{ $form->{all_partsgroup} }) {
1926 1903
    $form->{selectpartsgroup} = qq|<option>\n|;
1927 1904
    map {
......
2018 1995
      }
2019 1996
    }
2020 1997
  }
1998

  
2021 1999
  if ($form->{selectpartsgroup}) {
2022 2000
    $form->{selectpartsgroup} = $form->unescape($form->{selectpartsgroup});
2023 2001
    $partsgroup =
......
2044 2022
  $lastcost = qq|
2045 2023
 	      <tr>
2046 2024
                <th align="right" nowrap="true">|
2047
    . $locale->text('Last Cost')
2048
    . qq|</th>
2025
    . $locale->text('Last Cost') . qq|</th>
2049 2026
                <td><input name=lastcost size=11 value=$form->{lastcost}></td>
2050 2027
              </tr>
2051 2028
|;
......
2153 2130
	      <tr>
2154 2131
		<th align="right" nowrap>| . $locale->text('On Hand') . qq|</th>
2155 2132
		<th align=left nowrap class="plus$n">&nbsp;|
2156
      . $form->format_amount(\%myconfig, $form->{onhand})
2157
      . qq|</th>
2133
      . $form->format_amount(\%myconfig, $form->{onhand}) . qq|</th>
2158 2134
	      </tr>
2159 2135
|;
2160 2136

  
......
2183 2159
    $vegv = qq|
2184 2160
 	      <tr>
2185 2161
		<th align="right" nowrap="true">|
2186
      . $locale->text('Verrechnungseinheit')
2187
      . qq|</th>
2162
      . $locale->text('Verrechnungseinheit') . qq|</th>
2188 2163
		<td><input name=ve size=10 value=$form->{ve}></td>
2189 2164
	      </tr>
2190 2165
              <tr>
2191 2166
		<th align="right" nowrap="true">|
2192
      . $locale->text('Gesch?ftsvolumen')
2193
      . qq|</th>
2167
      . $locale->text('Gesch?ftsvolumen') . qq|</th>
2194 2168
		<td><input name=gv size=10 value=$form->{gv}></td>
2195 2169
	      </tr>
2196 2170
|;
......
2227 2201
  $obsolete .= qq|
2228 2202
              <tr>
2229 2203
                <th align=right nowrap>|
2230
    . $locale->text('Shopartikel')
2231
    . qq|</th>
2204
    . $locale->text('Shopartikel') . qq|</th>
2232 2205
                <td><input class=checkbox type=checkbox name=shop value=1 $shopok></td>
2233 2206
             </tr>
2234 2207
|;
......
2249 2222
    $button1 = qq|
2250 2223
       <td width="13"><input name=priceupdate id=priceupdate size=11  title="$myconfig{dateformat}" value="$form->{priceupdate}"></td>
2251 2224
       <td width="4" align="left"><input type=button name=priceupdate id="trigger1" value=|
2252
      . $locale->text('button')
2253
      . qq|></td>
2225
      . $locale->text('button') . qq|></td>
2254 2226
      |;
2255 2227

  
2256 2228
    #write Trigger
......
2314 2286
            <table width="100%" height="100%">
2315 2287
              <tr class="listheading">
2316 2288
                <th class="listheading" align="center" colspan=2>|
2317
    . $locale->text('Link Accounts')
2318
    . qq|</th>
2289
    . $locale->text('Link Accounts') . qq|</th>
2319 2290
              </tr>
2320 2291
              $linkaccounts
2321 2292
              <tr>
......
2332 2303
	    <table width="100%">
2333 2304
	      <tr>
2334 2305
                <th align="right" nowrap="true">|
2335
    . $locale->text('Updated')
2336
    . qq|</th>
2306
    . $locale->text('Updated') . qq|</th>
2337 2307
                $button1
2338 2308
              </tr>
2339 2309
	      <tr>
......
2378 2348
            <table width="100%">
2379 2349
              <tr>
2380 2350
                <th colspan=2 align=right>|
2381
      . $locale->text('Total')
2382
      . qq|&nbsp;</th>
2351
      . $locale->text('Total') . qq|&nbsp;</th>
2383 2352
                <th align=right>|
2384
      . $form->format_amount(\%myconfig, $form->{assemblytotal}, 2)
2385
      . qq|</th>
2353
      . $form->format_amount(\%myconfig, $form->{assemblytotal}, 2) . qq|</th>
2386 2354
              </tr>
2387 2355
            </table>
2388 2356
          </td>
......
2415 2383
    |;
2416 2384
  }
2417 2385

  
2386
  print qq|
2387
     <input type=hidden name=price_rows value=$form->{price_rows}>|;
2388

  
2418 2389
  print qq|
2419 2390
      <input class=submit type=submit name=action value="|
2420 2391
    . $locale->text('Save') . qq|">|;
......
2718 2689
  if ($form->{item} eq 'service') {
2719 2690
    map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) }
2720 2691
      qw(sellprice listprice);
2721

  
2722 2692
    &form_header;
2723 2693
    &form_footer;
2724 2694
  }
......
2898 2868
      <table>
2899 2869
        <tr>
2900 2870
          <th align="right" nowrap="true">|
2901
    . $locale->text('Part Number')
2902
    . qq|</th>
2871
    . $locale->text('Part Number') . qq|</th>
2903 2872
          <td><input name=partnumber size=20></td>
2904 2873
          <td>&nbsp;</td>
2905 2874
        </tr>
2906 2875
        <tr>
2907 2876
          <th align="right" nowrap="true">|
2908
    . $locale->text('Part Description')
2909
    . qq|</th>
2877
    . $locale->text('Part Description') . qq|</th>
2910 2878
          <td><input name=description size=40></td>
2911 2879
        </tr>
2912 2880
      </table>
......
3053 3021
  $lxdebug->leave_sub();
3054 3022
}
3055 3023

  
3024
sub price_row {
3025
  $lxdebug->enter_sub();
3026

  
3027
  my ($numrows) = @_;
3028

  
3029
  print qq|
3030
  <tr>
3031
    <td>
3032
      <table width=100%>
3033
        <tr>
3034
          <th class="listheading">| . $locale->text('Preisklasse') . qq|</th>
3035
          <th class="listheading">| . $locale->text('Preis') . qq|</th>
3036
        </tr>
3037
|;
3038
  for $i (1 .. $numrows) {
3039
    print qq|
3040
        <tr>
3041
          <td width=50%><input type=hidden name="pricegroup_$i" size=30  value=$form->{"pricegroup_$i"}>$form->{"pricegroup_$i"}</td>
3042
          <td width=50%><input name="price_$i" size=11 value="$form->{"price_$i"}"></td>
3043
          <input type=hidden name="pricegroup_id_$i" value="$form->{"pricegroup_id_$i"}">
3044
        </tr>
3045
|;
3046
  }
3047

  
3048
  print qq|
3049
      </table>
3050
    </td>
3051
  </tr>
3052
|;
3053

  
3054
  $lxdebug->leave_sub();
3055
}
3056

  
3056 3057
sub continue { &{ $form->{nextsub} } }

Auch abrufbar als: Unified diff