From: Sven Schöling Date: Thu, 4 Mar 2010 13:11:21 +0000 (+0100) Subject: Merge branch 'master' of ssh://lx-office/~/lx-office-erp X-Git-Tag: release-2.6.1beta1~33^2~4^2 X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/f42b8272a31219ff145eafb007874b520c1fc3eb?hp=4d9fde96e71e940ad0b6635dc4d70dde6d2a4c74 Merge branch 'master' of ssh://lx-office/~/lx-office-erp --- diff --git a/SL/Form.pm b/SL/Form.pm index 82f073ed7..956120568 100644 --- a/SL/Form.pm +++ b/SL/Form.pm @@ -2299,14 +2299,15 @@ $main::lxdebug->enter_sub(); sub _get_customers { $main::lxdebug->enter_sub(); - my ($self, $dbh, $key, $limit) = @_; - - $key = "all_customers" unless ($key); - my $limit_clause = "LIMIT $limit" if $limit; + my ($self, $dbh, $key) = @_; - my $query = qq|SELECT * FROM customer WHERE NOT obsolete ORDER BY name $limit_clause|; + my $options = ref $key eq 'HASH' ? $key : { key => $key }; + $options->{key} ||= "all_customers"; + my $limit_clause = "LIMIT $options->{limit}" if $options->{limit}; + my $where = $options->{business_is_salesman} ? qq| AND business_id IN (SELECT id FROM business WHERE salesman)| : ''; - $self->{$key} = selectall_hashref_query($self, $dbh, $query); + my $query = qq|SELECT * FROM customer WHERE NOT obsolete $where ORDER BY name $limit_clause|; + $self->{ $options->{key} } = selectall_hashref_query($self, $dbh, $query); $main::lxdebug->leave_sub(); } @@ -2473,11 +2474,7 @@ sub get_lists { } if($params{"customers"}) { - if (ref $params{"customers"} eq 'HASH') { - $self->_get_customers($dbh, $params{"customers"}{key}, $params{"customers"}{limit}); - } else { - $self->_get_customers($dbh, $params{"customers"}); - } + $self->_get_customers($dbh, $params{"customers"}); } if($params{"vendors"}) { diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl index c2d3b9069..7fe6afa64 100644 --- a/bin/mozilla/ct.pl +++ b/bin/mozilla/ct.pl @@ -285,11 +285,12 @@ sub form_header { my %myconfig = %main::myconfig; my $locale = $main::locale; - $form->get_lists(employees => "ALL_EMPLOYEES", - taxzones => "ALL_TAXZONES", - business_types => { key => 'ALL_SALESMAN_BUSINESSES', salesman => 1 }); + $form->get_lists(employees => "ALL_EMPLOYEES", + taxzones => "ALL_TAXZONES"); $form->get_pricegroup(\%myconfig, { all => 1 }); + $form->get_lists(customers => { key => "ALL_SALESMAN_CUSTOMERS", business_is_salesman => 1 }) if $::vertreter; + $form->{ALL_SALESMEN} = $form->{ALL_EMPLOYEES}; $form->{taxincluded} = ($form->{taxincluded}) ? "checked" : ""; $form->{is_admin} = $myconfig{role} eq 'admin'; diff --git a/locale/de/all b/locale/de/all index ea3162dc0..dcbea1566 100644 --- a/locale/de/all +++ b/locale/de/all @@ -1798,7 +1798,7 @@ $self->{texts} = { 'WHJournal' => 'Lagerbuchungen', 'Warehouse' => 'Lager', 'Warehouse From' => 'Quelllager', - 'Warehouse MIgration' => 'Lagermigration', + 'Warehouse Migration' => 'Lagermigration', 'Warehouse To' => 'Ziellager', 'Warehouse content' => 'Lagerbestand', 'Warehouse deleted.' => 'Lager gelöscht.', diff --git a/templates/webpages/ct/form_header_de.html b/templates/webpages/ct/form_header_de.html index 4113f0d77..2cf95adc9 100644 --- a/templates/webpages/ct/form_header_de.html +++ b/templates/webpages/ct/form_header_de.html @@ -39,11 +39,10 @@ Vertreter [%- INCLUDE generic/multibox.html - name = 'salesman_id', - DATA = ALL_SALESMAN_BUSINESSES, - show_empty = 1, - id_key = 'id', - label_key = 'description', + name = 'salesman_id', + DATA = ALL_SALESMAN_CUSTOMERS, + id_key = 'id', + label_key = 'name', -%] @@ -245,7 +244,7 @@ label_key = 'description', -%] - [%- IF is_customer && !use_vertreter %] + [%- IF is_customer && !conf_vertreter %] Verkäufer/in [%- INCLUDE generic/multibox.html diff --git a/templates/webpages/ct/form_header_master.html b/templates/webpages/ct/form_header_master.html index 33ecfef27..4c2db99d3 100644 --- a/templates/webpages/ct/form_header_master.html +++ b/templates/webpages/ct/form_header_master.html @@ -39,11 +39,10 @@ Representative [%- INCLUDE generic/multibox.html - name = 'salesman_id', - DATA = ALL_SALESMAN_BUSINESSES, - show_empty = 1, - id_key = 'id', - label_key = 'description', + name = 'salesman_id', + DATA = ALL_SALESMAN_CUSTOMERS, + id_key = 'id', + label_key = 'name', -%] @@ -245,7 +244,7 @@ label_key = 'description', -%] - [%- IF is_customer && !use_vertreter %] + [%- IF is_customer && !conf_vertreter %] Salesman [%- INCLUDE generic/multibox.html diff --git a/templates/webpages/dbupgrade/warehouse_form_de.html b/templates/webpages/dbupgrade/warehouse_form_de.html index 8bd75b0fb..77972fc25 100644 --- a/templates/webpages/dbupgrade/warehouse_form_de.html +++ b/templates/webpages/dbupgrade/warehouse_form_de.html @@ -1,19 +1,24 @@ -[% USE HTML %]
Lagermigration
+[% USE HTML %] +
Lagermigration
+

+ Lx-Office enthält jetzt auch echte Lagerverwaultung anstatt reiner Mengenzählung. + Dieses update ändert die Art und Weise wie Lagermengen gezält werden. + Als Konsequenz können die gespeicherten Mengen entweder in ein Lager überführt werden, oder für eine frische Lagerverwaltung resettet werden. +

-

Lx-Office enthält jetzt auch echte Lagerverwaultung anstatt reiner Mengenzählung. -Dieses update ändert die Art und Weise wie Lagermengen gezält werden. -Als Konsequenz können die gespeicherten Mengen entweder in ein Lager überführt werden, oder für eine frische Lagerverwaltung resettet werden.

+

Möchten Sie die vorhandenen Mengendaten in ein Lager übertragen?

-

Möchten Sie die vorhandenen Mengendaten in ein Lager übertragen?

-  -  +   +   -

Bitte geben Sie den Namen des Ziellagers für die übernommenen Daten ein.

- +

Bitte geben Sie den Namen des Ziellagers für die übernommenen Daten ein.

+ -

Da Lagerplätze kein Pflichtfeld sind, geben Sie bitte einen Lagerplatz an, in dem Waren ohne spezifizierten Lagerplatz eingelagert werden sollen.

- +

Da Lagerplätze kein Pflichtfeld sind, geben Sie bitte einen Lagerplatz an, in dem Waren ohne spezifizierten Lagerplatz eingelagert werden sollen.

-

+ + +

+
diff --git a/templates/webpages/dbupgrade/warehouse_form_master.html b/templates/webpages/dbupgrade/warehouse_form_master.html index 6e6b31289..3ad1adb5e 100644 --- a/templates/webpages/dbupgrade/warehouse_form_master.html +++ b/templates/webpages/dbupgrade/warehouse_form_master.html @@ -1,19 +1,24 @@ -[% USE HTML %]
Warehouse MIgration
+[% USE HTML %] +
Warehouse Migration
+

+ Lx-Office is now able to manage warehouses instead of just tracking the amount of goods in your system. + This update will change the nature the onhand of goods is tracked. + As a result, the saved onhand values of the present goods can be stored into a warehouse designated by you, or will be reset for a proper warehouse tracking +

-

Lx-Office is now able to manage warehouses instead of just tracking the amount of goods in your system. -This update will change the nature the onhand of goods is tracked. -As a result, the saved onhand values of the present goods can be stored into a warehouse designated by you, or will be reset for a proper warehouse tracking

+

Do you want to store the existing onhand values into a new warehouse?

-

Do you want to store the existing onhand values into a new warehouse?

-  -  +   +   -

Please specify a description for the warehouse designated for these goods.

- +

Please specify a description for the warehouse designated for these goods.

+ -

Since bin is not enforced in the parts data, please specify a bin where goods without a specified bin will be put.

- +

Since bin is not enforced in the parts data, please specify a bin where goods without a specified bin will be put.

-

+ + +

+