Revision 48452323
Von Niclas Zimmermann vor mehr als 11 Jahren hinzugefügt
| SL/User.pm | ||
|---|---|---|
| 137 | 137 |
|
| 138 | 138 |
if ($update_available) {
|
| 139 | 139 |
$form->{"title"} = $main::locale->text("Dataset upgrade");
|
| 140 |
$form->header(); |
|
| 140 |
$form->header(no_layout => $form->{no_layout});
|
|
| 141 | 141 |
print $form->parse_html_template("dbupgrade/header");
|
| 142 | 142 |
|
| 143 | 143 |
$form->{dbupdate} = "db$myconfig{dbname}";
|
| locale/de/all | ||
|---|---|---|
| 441 | 441 |
'Close Flash' => 'Schließen', |
| 442 | 442 |
'Close SEPA exports' => 'SEPA-Export abschließen', |
| 443 | 443 |
'Close Window' => 'Fenster Schließen', |
| 444 |
'Close window' => 'Fenster schließen', |
|
| 444 | 445 |
'Closed' => 'Geschlossen', |
| 445 | 446 |
'Collective Orders only work for orders from one customer!' => 'Sammelaufträge funktionieren nur für Aufträge von einem Kunden!', |
| 446 | 447 |
'Column name' => 'Spaltenname', |
| ... | ... | |
| 914 | 915 |
'Filter date by' => 'Datum filtern nach', |
| 915 | 916 |
'Filter for customer variables' => 'Filter für benutzerdefinierte Kundenvariablen', |
| 916 | 917 |
'Filter for item variables' => 'Filter für benutzerdefinierte Artikelvariablen', |
| 918 |
'Filter parts' => 'Artikel filtern', |
|
| 917 | 919 |
'Finish' => 'Abschließen', |
| 918 | 920 |
'First 20 Lines' => 'Nur erste 20 Datensätze', |
| 919 | 921 |
'Fix transaction' => 'Buchung korrigieren', |
| ... | ... | |
| 1432 | 1434 |
'Parts must have an entry type.' => 'Waren müssen eine Buchungsgruppe haben.', |
| 1433 | 1435 |
'Parts with existing part numbers' => 'Artikel mit existierender Artikelnummer', |
| 1434 | 1436 |
'Parts, services and assemblies' => 'Waren, Dienstleistungen und Erzeugnisse', |
| 1437 |
'Parts:' => 'Artikel:', |
|
| 1435 | 1438 |
'Partsgroup (database ID)' => 'Warengruppe (Datenbank-ID)', |
| 1436 | 1439 |
'Partsgroup (name)' => 'Warengruppe (Name)', |
| 1437 | 1440 |
'Password' => 'Passwort', |
| ... | ... | |
| 1776 | 1779 |
'Service unit' => 'Dienstleistungseinheit', |
| 1777 | 1780 |
'Service, assembly or part' => 'Dienstleistung, Erzeugnis oder Ware', |
| 1778 | 1781 |
'Services' => 'Dienstleistungen', |
| 1782 |
'Services, assemblies or parts' => 'Dienstleistungen, Erzeugnisse oder Waren', |
|
| 1779 | 1783 |
'Set Language Values' => 'Spracheinstellungen', |
| 1780 | 1784 |
'Set eMail text' => 'eMail Text eingeben', |
| 1781 | 1785 |
'Settings' => 'Einstellungen', |
| ... | ... | |
| 1811 | 1815 |
'Show TODO list' => 'Aufgabenliste anzeigen', |
| 1812 | 1816 |
'Show Transfer via default' => 'Ein- / Auslagern über Standardlagerplatz anzeigen', |
| 1813 | 1817 |
'Show administration link' => 'Link zur Administration anzeigen', |
| 1818 |
'Show all parts' => 'Alle Artikel anzeigen', |
|
| 1814 | 1819 |
'Show by default' => 'Standardmäßig anzeigen', |
| 1815 | 1820 |
'Show custom variable search inputs' => 'Suchoptionen für Benutzerdefinierte Variablen verstecken', |
| 1816 | 1821 |
'Show delete button in purchase delivery orders?' => 'Soll der "Löschen"-Knopf bei Einkaufslieferscheinen angezeigt werden?', |
| ... | ... | |
| 2298 | 2303 |
'Valid' => 'Gültig', |
| 2299 | 2304 |
'Valid from' => 'Gültig ab', |
| 2300 | 2305 |
'Valid until' => 'gültig bis', |
| 2306 |
'Valid/Obsolete' => 'Gültig/ungültig', |
|
| 2301 | 2307 |
'Value' => 'Wert', |
| 2302 | 2308 |
'Variable' => 'Variable', |
| 2303 | 2309 |
'Variable Description' => 'Datenfeldbezeichnung', |
| sql/Pg-upgrade2/erzeugnisnummern.pl | ||
|---|---|---|
| 13 | 13 |
sub run {
|
| 14 | 14 |
my ($self) = @_; |
| 15 | 15 |
|
| 16 |
if ($::form->{upgrade_action} eq 'filter_parts') {
|
|
| 17 |
return $self->filter_parts($self); |
|
| 18 |
} |
|
| 19 |
|
|
| 16 | 20 |
if ( $::form->{'continued'} ) {
|
| 17 | 21 |
my $update_query; |
| 18 | 22 |
foreach my $i (1 .. $::form->{rowcount}) {
|
| ... | ... | |
| 50 | 54 |
print $::form->parse_html_template("dbupgrade/erzeugnisnummern");
|
| 51 | 55 |
} |
| 52 | 56 |
|
| 57 |
sub filter_parts {
|
|
| 58 |
my $self = shift; |
|
| 59 |
|
|
| 60 |
my $where = 'TRUE'; |
|
| 61 |
my @values; |
|
| 62 |
|
|
| 63 |
if ( $::form->{filter_partnumber} ) {
|
|
| 64 |
$where .= ' AND partnumber ILIKE ?'; |
|
| 65 |
push(@values, $::form->like( $::form->{filter_partnumber} ));
|
|
| 66 |
} |
|
| 67 |
|
|
| 68 |
if ($::form->{filter_description}) {
|
|
| 69 |
$where .= ' AND description ILIKE ?'; |
|
| 70 |
push(@values, $::form->like($::form->{filter_description}));
|
|
| 71 |
} |
|
| 72 |
|
|
| 73 |
if ($::form->{filter_notes}) {
|
|
| 74 |
$where .= ' AND notes ILIKE ?'; |
|
| 75 |
push(@values, $::form->like($::form->{filter_notes}));
|
|
| 76 |
} |
|
| 77 |
|
|
| 78 |
if ($::form->{filter_ean}) {
|
|
| 79 |
$where .= ' AND ean ILIKE ?'; |
|
| 80 |
push(@values, $::form->like($::form->{filter_ean}));
|
|
| 81 |
} |
|
| 82 |
|
|
| 83 |
if ($::form->{filter_type} eq 'assembly') {
|
|
| 84 |
$where .= ' AND assembly'; |
|
| 85 |
} |
|
| 86 |
|
|
| 87 |
if ($::form->{filter_type} eq 'service') {
|
|
| 88 |
$where .= ' AND inventory_accno_id IS NULL AND NOT assembly'; |
|
| 89 |
} |
|
| 90 |
|
|
| 91 |
if ($::form->{filter_type} eq 'part') {
|
|
| 92 |
$where .= ' AND inventory_accno_id IS NOT NULL'; |
|
| 93 |
$where .= ' AND NOT assembly'; |
|
| 94 |
} |
|
| 95 |
|
|
| 96 |
if ($::form->{filter_obsolete} eq 'obsolete') {
|
|
| 97 |
$where .= ' AND obsolete'; |
|
| 98 |
} |
|
| 99 |
|
|
| 100 |
if ($::form->{filter_obsolete} eq 'valid') {
|
|
| 101 |
$where .= ' AND NOT obsolete'; |
|
| 102 |
} |
|
| 103 |
|
|
| 104 |
my $query = qq|SELECT id, partnumber, description, unit, notes, assembly, ean, inventory_accno_id, obsolete |
|
| 105 |
FROM parts |
|
| 106 |
WHERE $where |
|
| 107 |
ORDER BY partnumber|; |
|
| 108 |
|
|
| 109 |
$::form->{ALL_PARTS} = [ selectall_hashref_query($::form, $self->dbh, $query, @values) ];
|
|
| 110 |
|
|
| 111 |
print $::form->parse_html_template("dbupgrade/show_partlist");
|
|
| 112 |
return 2; |
|
| 113 |
} |
|
| 114 |
|
|
| 53 | 115 |
1; |
| templates/webpages/dbupgrade/erzeugnisnummern.html | ||
|---|---|---|
| 1 | 1 |
[%- USE T8 %] |
| 2 | 2 |
[% USE HTML %][%- USE LxERP -%]<div class="listtop">[% 'Double partnumbers' | $T8 %]</div> |
| 3 |
<script type="text/javascript"> |
|
| 4 |
<!-- |
|
| 5 |
function show_parts(vc) {
|
|
| 6 |
var width = 750; |
|
| 7 |
var height = 550; |
|
| 8 |
var parm = centerParms(width, height) + ",width=" + width + ",height=" + height + ",status=yes,scrollbars=yes"; |
|
| 9 |
url = "controller.pl?action=LoginScreen/login&upgrade_action=filter_parts&no_layout=1" |
|
| 10 |
//alert(url); |
|
| 11 |
window.open(url, "_new_generic", parm); |
|
| 12 |
} |
|
| 13 |
//--> |
|
| 14 |
</script> |
|
| 3 | 15 |
|
| 4 | 16 |
<form name="Form" method="post" action="login.pl"> |
| 5 | 17 |
<input type="hidden" name="action" value="login"> |
| ... | ... | |
| 38 | 50 |
<input type="hidden" name="rowcount" value="[% rowcount %]"> |
| 39 | 51 |
</table> |
| 40 | 52 |
|
| 53 |
<input type="button" value="[% 'Show all parts' | $T8 %]" onclick="show_parts('customer')">
|
|
| 54 |
<br> |
|
| 55 |
<br> |
|
| 41 | 56 |
<input type="submit" value="[% 'Continue' | $T8 %]"> |
| 42 | 57 |
|
| 43 | 58 |
</form> |
Auch abrufbar als: Unified diff
Popup-Button bei Upgrade
Beim Upgrade für eindeutige Artikelnummern, war es bisher nicht
möglich die bestehende Artikelliste zu durchsuchen. Jetzt kann man
durch Klick auf einen Button ein Popup-Fenster öffnen, um die
Artikelliste zu durchsuchen.
Fixed #2238.
Conflicts: