Revision 07d71c33
Von Stephan Köhler vor fast 19 Jahren hinzugefügt
| bin/mozilla/oe.pl | ||
|---|---|---|
| 241 | 241 |
$button1 = qq| |
| 242 | 242 |
<td><input name=transdate id=transdate size=11 title="$myconfig{dateformat}" value=$form->{transdate}></td>
|
| 243 | 243 |
<td><input type=button name=transdate id="trigger1" value=| |
| 244 |
. $locale->text('button')
|
|
| 245 |
. qq|></td> |
|
| 244 |
. $locale->text('button') . qq|></td>
|
|
| 246 | 245 |
|; |
| 247 | 246 |
$button2 = qq| |
| 248 | 247 |
<td width="13"><input name=reqdate id=reqdate size=11 title="$myconfig{dateformat}" value=$form->{reqdate}></td>
|
| 249 | 248 |
<td width="4"><input type=button name=reqdate name=reqdate id="trigger2" value=| |
| 250 |
. $locale->text('button')
|
|
| 251 |
. qq|></td> |
|
| 249 |
. $locale->text('button') . qq|></td>
|
|
| 252 | 250 |
|; |
| 253 | 251 |
|
| 254 | 252 |
#write Trigger |
| ... | ... | |
| 272 | 270 |
<table> |
| 273 | 271 |
<tr> |
| 274 | 272 |
<th nowrap><input name=closed type=radio class=radio value=0 $checkedopen> | |
| 275 |
. $locale->text('Open')
|
|
| 276 |
. qq|</th> |
|
| 273 |
. $locale->text('Open') . qq|</th>
|
|
| 277 | 274 |
<th nowrap><input name=closed type=radio class=radio value=1 $checkedclosed> | |
| 278 |
. $locale->text('Closed')
|
|
| 279 |
. qq|</th> |
|
| 275 |
. $locale->text('Closed') . qq|</th>
|
|
| 280 | 276 |
</tr> |
| 281 | 277 |
</table> |
| 282 | 278 |
</td> |
| ... | ... | |
| 345 | 341 |
<tr> |
| 346 | 342 |
<th align=right nowrap>| . $locale->text('Terms: Net') . qq|</th>
|
| 347 | 343 |
<td nowrap><input name=terms size="3" maxlength="3" value=$form->{terms}> |
|
| 348 |
. $locale->text('days')
|
|
| 349 |
. qq|</td> |
|
| 344 |
. $locale->text('days') . qq|</td>
|
|
| 350 | 345 |
</tr> |
| 351 | 346 |
|; |
| 352 | 347 |
|
| ... | ... | |
| 371 | 366 |
</tr> |
| 372 | 367 |
<tr> |
| 373 | 368 |
<th width=70% align=right nowrap>| |
| 374 |
. $locale->text('Quotation Number')
|
|
| 375 |
. qq|</th> |
|
| 369 |
. $locale->text('Quotation Number') . qq|</th>
|
|
| 376 | 370 |
<td><input name=quonumber size=11 value="$form->{quonumber}"></td>
|
| 377 | 371 |
</tr> |
| 378 | 372 |
<tr> |
| 379 | 373 |
<th width=70% align=right nowrap>| |
| 380 |
. $locale->text('Customer Order Number')
|
|
| 381 |
. qq|</th> |
|
| 374 |
. $locale->text('Customer Order Number') . qq|</th>
|
|
| 382 | 375 |
<td><input name=cusordnumber size=11 value="$form->{cusordnumber}"></td>
|
| 383 | 376 |
</tr> |
| 384 | 377 |
<tr> |
| ... | ... | |
| 419 | 412 |
$ordnumber = qq| |
| 420 | 413 |
<tr> |
| 421 | 414 |
<th width=70% align=right nowrap>| |
| 422 |
. $locale->text('Quotation Number')
|
|
| 423 |
. qq|</th> |
|
| 415 |
. $locale->text('Quotation Number') . qq|</th>
|
|
| 424 | 416 |
<td><input name=quonumber size=11 value="$form->{quonumber}"></td>
|
| 425 | 417 |
<input type=hidden name=ordnumber value="$form->{ordnumber}">
|
| 426 | 418 |
</tr> |
| ... | ... | |
| 471 | 463 |
if ($form->{type} eq 'sales_order') {
|
| 472 | 464 |
if ($form->{selectemployee}) {
|
| 473 | 465 |
$employee = qq| |
| 466 |
<input type=hidden name=customer_klass value=$form->{customer_klass}>
|
|
| 474 | 467 |
<tr> |
| 475 | 468 |
<th align=right nowrap>| . $locale->text('Salesperson') . qq|</th>
|
| 476 | 469 |
<td colspan=2><select name=employee>$form->{selectemployee}</select></td>
|
| ... | ... | |
| 481 | 474 |
} |
| 482 | 475 |
} else {
|
| 483 | 476 |
$employee = qq| |
| 477 |
<input type=hidden name=customer_klass value=$form->{customer_klass}>
|
|
| 484 | 478 |
<tr> |
| 485 | 479 |
<th align=right nowrap>| . $locale->text('Employee') . qq|</th>
|
| 486 | 480 |
<td colspan=2><select name=employee>$form->{selectemployee}</select></td>
|
| ... | ... | |
| 537 | 531 |
<input type=hidden name=$form->{vc}_id value=$form->{"$form->{vc}_id"}>
|
| 538 | 532 |
<input type=hidden name="old$form->{vc}" value="$form->{"old$form->{vc}"}">
|
| 539 | 533 |
<th align=richt nowrap>| |
| 540 |
. $locale->text('Contact Person')
|
|
| 541 |
. qq|</th> |
|
| 534 |
. $locale->text('Contact Person') . qq|</th>
|
|
| 542 | 535 |
<td colspan=3>$contact</td> |
| 543 | 536 |
</tr> |
| 544 | 537 |
$creditremaining |
| ... | ... | |
| 633 | 626 |
if ($form->{taxaccounts}) {
|
| 634 | 627 |
$taxincluded = qq| |
| 635 | 628 |
<input name=taxincluded class=checkbox type=checkbox value=1 $form->{taxincluded}> <b>|
|
| 636 |
. $locale->text('Tax Included')
|
|
| 637 |
. qq|</b><br><br> |
|
| 629 |
. $locale->text('Tax Included') . qq|</b><br><br>
|
|
| 638 | 630 |
|; |
| 639 | 631 |
} |
| 640 | 632 |
|
| ... | ... | |
| 888 | 880 |
\%myconfig, $form->{currency}, $form->{transdate}, $buysell
|
| 889 | 881 |
))); |
| 890 | 882 |
|
| 891 |
my $i = $form->{rowcount};
|
|
| 883 |
# for pricegroups |
|
| 884 |
$i = $form->{rowcount};
|
|
| 885 |
|
|
| 892 | 886 |
$exchangerate = ($form->{exchangerate}) ? $form->{exchangerate} : 1;
|
| 893 | 887 |
|
| 894 | 888 |
if ( ($form->{"partnumber_$i"} eq "")
|
| ... | ... | |
| 940 | 934 |
$form->{"sellprice_$i"} = $sellprice;
|
| 941 | 935 |
} else {
|
| 942 | 936 |
|
| 937 |
$form->{"sellprice_$i"} *= (1 - $form->{tradediscount});
|
|
| 943 | 938 |
# if there is an exchange rate adjust sellprice |
| 944 | 939 |
$form->{"sellprice_$i"} /= $exchangerate;
|
| 945 | 940 |
} |
| ... | ... | |
| 961 | 956 |
$decimalplaces); |
| 962 | 957 |
$form->{"qty_$i"} =
|
| 963 | 958 |
$form->format_amount(\%myconfig, $form->{"qty_$i"});
|
| 959 |
|
|
| 960 |
# get pricegroups for parts |
|
| 961 |
IS->get_pricegroups_for_parts(\%myconfig, \%$form); |
|
| 962 |
|
|
| 963 |
# build up html code for prices_$i |
|
| 964 |
&set_pricegroup($i); |
|
| 964 | 965 |
} |
| 965 | 966 |
|
| 966 | 967 |
&display_form; |
| ... | ... | |
| 1046 | 1047 |
$form->{warehouse} = qq|$form->{warehouse}--$form->{warehouse_id}|;
|
| 1047 | 1048 |
|
| 1048 | 1049 |
map {
|
| 1049 |
$form->{selectwarehouse} .= "<option>$_->{description}--$_->{id}\n"
|
|
| 1050 |
$form->{selectwarehouse} .=
|
|
| 1051 |
"<option>$_->{description}--$_->{id}\n"
|
|
| 1050 | 1052 |
} (@{ $form->{all_warehouses} });
|
| 1051 | 1053 |
|
| 1052 | 1054 |
$warehouse = qq| |
| ... | ... | |
| 1099 | 1101 |
$openclosed = qq| |
| 1100 | 1102 |
<tr> |
| 1101 | 1103 |
<td><input name="open" class=checkbox type=checkbox value=1 checked> | |
| 1102 |
. $locale->text('Open')
|
|
| 1103 |
. qq|</td> |
|
| 1104 |
. $locale->text('Open') . qq|</td>
|
|
| 1104 | 1105 |
<td><input name="closed" class=checkbox type=checkbox value=1 $form->{closed}> |
|
| 1105 |
. $locale->text('Closed')
|
|
| 1106 |
. qq|</td> |
|
| 1106 |
. $locale->text('Closed') . qq|</td>
|
|
| 1107 | 1107 |
</tr> |
| 1108 | 1108 |
|; |
| 1109 | 1109 |
} else {
|
| ... | ... | |
| 1122 | 1122 |
$button1 = qq| |
| 1123 | 1123 |
<td><input name=transdatefrom id=transdatefrom size=11 title="$myconfig{dateformat}">
|
| 1124 | 1124 |
<input type=button name=transdatefrom id="trigger3" value=| |
| 1125 |
. $locale->text('button')
|
|
| 1126 |
. qq|></td> |
|
| 1125 |
. $locale->text('button') . qq|></td>
|
|
| 1127 | 1126 |
|; |
| 1128 | 1127 |
$button2 = qq| |
| 1129 | 1128 |
<td><input name=transdateto id=transdateto size=11 title="$myconfig{dateformat}">
|
| 1130 | 1129 |
<input type=button name=transdateto name=transdateto id="trigger4" value=| |
| 1131 |
. $locale->text('button')
|
|
| 1132 |
. qq|></td> |
|
| 1130 |
. $locale->text('button') . qq|></td>
|
|
| 1133 | 1131 |
|; |
| 1134 | 1132 |
|
| 1135 | 1133 |
#write Trigger |
| ... | ... | |
| 1187 | 1185 |
| . $locale->text('ID') . qq|</td>
|
| 1188 | 1186 |
<td><input name="l_$ordnumber" class=checkbox type=checkbox value=Y checked> $ordlabel</td> |
| 1189 | 1187 |
<td><input name="l_transdate" class=checkbox type=checkbox value=Y checked> | |
| 1190 |
. $locale->text('Date')
|
|
| 1191 |
. qq|</td> |
|
| 1188 |
. $locale->text('Date') . qq|</td>
|
|
| 1192 | 1189 |
<td><input name="l_reqdate" class=checkbox type=checkbox value=Y checked> | |
| 1193 |
. $locale->text('Required by')
|
|
| 1194 |
. qq|</td> |
|
| 1190 |
. $locale->text('Required by') . qq|</td>
|
|
| 1195 | 1191 |
</tr> |
| 1196 | 1192 |
<tr> |
| 1197 | 1193 |
<td><input name="l_name" class=checkbox type=checkbox value=Y checked> $vclabel</td> |
| 1198 | 1194 |
<td><input name="l_employee" class=checkbox type=checkbox value=Y checked> $employee</td> |
| 1199 | 1195 |
<td><input name="l_shipvia" class=checkbox type=checkbox value=Y> | |
| 1200 |
. $locale->text('Ship via')
|
|
| 1201 |
. qq|</td> |
|
| 1196 |
. $locale->text('Ship via') . qq|</td>
|
|
| 1202 | 1197 |
</tr> |
| 1203 | 1198 |
<tr> |
| 1204 | 1199 |
<td><input name="l_netamount" class=checkbox type=checkbox value=Y> | |
| 1205 |
. $locale->text('Amount')
|
|
| 1206 |
. qq|</td> |
|
| 1200 |
. $locale->text('Amount') . qq|</td>
|
|
| 1207 | 1201 |
<td><input name="l_tax" class=checkbox type=checkbox value=Y> | |
| 1208 |
. $locale->text('Tax')
|
|
| 1209 |
. qq|</td> |
|
| 1202 |
. $locale->text('Tax') . qq|</td>
|
|
| 1210 | 1203 |
<td><input name="l_amount" class=checkbox type=checkbox value=Y checked> | |
| 1211 |
. $locale->text('Total')
|
|
| 1212 |
. qq|</td> |
|
| 1204 |
. $locale->text('Total') . qq|</td>
|
|
| 1213 | 1205 |
</tr> |
| 1214 | 1206 |
<tr> |
| 1215 | 1207 |
<td><input name="l_subtotal" class=checkbox type=checkbox value=Y> | |
| 1216 |
. $locale->text('Subtotal')
|
|
| 1217 |
. qq|</td> |
|
| 1208 |
. $locale->text('Subtotal') . qq|</td>
|
|
| 1218 | 1209 |
</tr> |
| 1219 | 1210 |
</table> |
| 1220 | 1211 |
</td> |
| ... | ... | |
| 2119 | 2110 |
|
| 2120 | 2111 |
# undo formatting from prepare_order |
| 2121 | 2112 |
map {
|
| 2122 |
$form->{"${_}_$i"} = $form->parse_amount(\%myconfig, $form->{"${_}_$i"})
|
|
| 2113 |
$form->{"${_}_$i"} =
|
|
| 2114 |
$form->parse_amount(\%myconfig, $form->{"${_}_$i"})
|
|
| 2123 | 2115 |
} qw(qty ship); |
| 2124 | 2116 |
$n = ($form->{"qty_$i"} -= $form->{"ship_$i"});
|
| 2125 | 2117 |
if (abs($n) > 0 |
Auch abrufbar als: Unified diff
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