From: Sven Schöling Date: Mon, 16 Aug 2010 09:14:58 +0000 (+0200) Subject: Merge branch 'master' of ssh://lx-office/~/lx-office-erp X-Git-Tag: release-2.6.2beta1~181 X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/22b2ad7f224ef0a3e160ed9f302274d2f625f240?hp=847d924bbcaa4f6021d74c408f71319074103880 Merge branch 'master' of ssh://lx-office/~/lx-office-erp --- diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl index b6526b933..07a6d2ec8 100644 --- a/bin/mozilla/ct.pl +++ b/bin/mozilla/ct.pl @@ -289,7 +289,7 @@ sub form_header { taxzones => "ALL_TAXZONES"); $form->get_pricegroup(\%myconfig, { all => 1 }); - $form->get_lists(customers => { key => "ALL_SALESMAN_CUSTOMERS", business_is_salesman => 1, with_obsolete => 1 }) if $::vertreter; + $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" : ""; @@ -336,6 +336,29 @@ sub form_footer { $main::lxdebug->leave_sub(); } +sub _do_save { + $main::auth->assert('customer_vendor_edit & ' . + '(general_ledger | invoice_edit | vendor_invoice_edit | ' . + ' request_quotation_edit | sales_quotation_edit | sales_order_edit | purchase_order_edit)'); + + $::form->isblank("name", $::locale->text("Name missing!")); + + if ($::form->{new_salesman_id} && $::vertreter) { + $::form->{salesman_id} = $::form->{new_salesman_id}; + delete $::form->{new_salesman_id}; + } + + my $res = $::form->{db} eq 'customer' ? CT->save_customer(\%::myconfig, $::form) : CT->save_vendor(\%::myconfig, $::form); + + if (3 == $res) { + if ($::form->{"db"} eq "customer") { + $::form->error($::locale->text('This customer number is already in use.')); + } else { + $::form->error($::locale->text('This vendor number is already in use.')); + } + } +} + sub add_transaction { $main::lxdebug->enter_sub(); @@ -354,12 +377,7 @@ sub add_transaction { # } # # /saving the history - $form->isblank("name", $locale->text("Name missing!")); - if ($form->{"db"} eq "customer") { - CT->save_customer(\%myconfig, \%$form); - } else { - CT->save_vendor(\%myconfig, \%$form); - } + _do_save(); $form->{callback} = $form->escape($form->{callback}, 1); my $name = $form->escape("$form->{name}", 1); @@ -516,16 +534,8 @@ sub save_and_close { my $msg = ucfirst $form->{db}; $msg .= " saved!"; - $form->isblank("name", $locale->text("Name missing!")); - my $rc; - if ($form->{"db"} eq "customer") { - $rc = CT->save_customer(\%myconfig, \%$form); - } else { - $rc = CT->save_vendor(\%myconfig, \%$form); - } - if ($rc == 3) { - $form->error($locale->text('customernumber not unique!')); - } + _do_save(); + # saving the history if(!exists $form->{addition}) { $form->{snumbers} = ($form->{"db"} eq "customer" ? qq|customernumber_| . $form->{customernumber} : qq|vendornumber_| . $form->{vendornumber}); @@ -550,22 +560,8 @@ sub save { my $msg = ucfirst $form->{db}; $msg .= " saved!"; - $form->isblank("name", $locale->text("Name missing!")); - - my $res; - if ($form->{"db"} eq "customer") { - $res = CT->save_customer(\%myconfig, \%$form); - } else { - $res = CT->save_vendor(\%myconfig, \%$form); - } + _do_save(); - if (3 == $res) { - if ($form->{"db"} eq "customer") { - $form->error($locale->text('This customer number is already in use.')); - } else { - $form->error($locale->text('This vendor number is already in use.')); - } - } # saving the history if(!exists $form->{addition}) { $form->{snumbers} = ($form->{"db"} eq "customer" ? qq|customernumber_| . $form->{customernumber} : qq|vendornumber_| . $form->{vendornumber}); diff --git a/bin/mozilla/menu.pl b/bin/mozilla/menu.pl index 5ca98cf53..b53f132aa 100644 --- a/bin/mozilla/menu.pl +++ b/bin/mozilla/menu.pl @@ -218,7 +218,7 @@ sub section_menu { } else { my $ml_ = $form->escape($ml); print - qq| $label    \n|; + qq| $label    \n|; §ion_menu($menu, $item); #print qq|
\n|; diff --git a/locale/de/all b/locale/de/all index 1aacd89f7..05e058de7 100644 --- a/locale/de/all +++ b/locale/de/all @@ -1,4 +1,5 @@ #!/usr/bin/perl +# -*- coding: iso-8859-15; -*- # These are all the texts to build the translations files. # The file has the form of 'english text' => 'foreign text', @@ -343,6 +344,7 @@ $self->{texts} = { 'Cash' => 'Zahlungsverkehr', 'Cc' => 'Cc', 'Change Lx-Office installation settings (all menu entries beneath \'System\')' => 'Verändern der Lx-Office-Installationseinstellungen (Menüpunkte unterhalb von \'System\')', + 'Change representative to' => 'Vertreter ändern in', 'Charge Number' => 'Chargennummer', 'Charge number' => 'Chargennummer', 'Chart' => 'Buchungskonto', @@ -1254,7 +1256,7 @@ $self->{texts} = { 'Productivity' => 'Produktivität', 'Profit Center' => 'Erfolgsbereich', 'Proforma Invoice' => 'Proformarechnung', - 'Program' => 'Programm', + 'Program' => 'Programm', 'Project' => 'Projekt', 'Project Number' => 'Projektnummer', 'Project Number missing!' => 'Projektnummer fehlt!', @@ -1875,7 +1877,7 @@ $self->{texts} = { 'You have to chose which unit to save for each of them.' => 'Sie müssen für jeden Artikel die neue Einheit auswählen.', 'You have to create at least one group, grant it access to Lx-Office\'s functions and assign users to it.' => 'Sie müssen mindestens eine Benutzergruppe anlegen, ihr Zugriff auf die verschiedenen Funktionsbereiche von Lx-Office gewähren und Benutzer dieser Gruppe zuordnen.', 'You have to create new Buchungsgruppen for all the combinations of inventory, income and expense accounts that have been used already.' => 'Sie müssen neue Buchungsgruppen für alle Kombinationen aus Inventar-, Erlös- und Aufwandskonto, die bereits benutzt wurden.', - 'You have to enter a company name in your user preferences (see the "Program" menu, "Preferences").' => 'Sie müssen einen Firmennamen in Ihren Einstellungen angeben (siehe "Programm"-Menü, "Benuztereinstellungen).', + 'You have to enter a company name in your user preferences (see the "Program" menu, "Preferences").' => 'Sie müssen einen Firmennamen in Ihren Einstellungen angeben (siehe Menü "Programm", "Einstellungen").', 'You have to fill in at least an account number, the bank code, the IBAN and the BIC.' => 'Sie müssen zumindest die Kontonummer, die Bankleitzahl, die IBAN und den BIC angeben.', 'You have to specify a department.' => 'Sie müssen eine Abteilung wählen.', 'You have to specify an execution date for each antry.' => 'Sie müssen für jeden zu buchenden Eintrag ein Ausführungsdatum angeben.', @@ -1927,7 +1929,6 @@ $self->{texts} = { 'cp_greeting to cp_gender migration' => 'Datenumwandlung von Titel nach Geschlecht (cp_greeting to cp_gender)', 'customer' => 'Kunde', 'customer_list' => 'kundenliste', - 'customernumber not unique!' => 'Die Kundennummer ist schon vergeben', 'debug' => 'Debug', 'delete' => 'Löschen', 'deliverydate' => 'Lieferdatum', diff --git a/locale/en/all b/locale/en/all index 128c9dedf..c2f763fff 100644 --- a/locale/en/all +++ b/locale/en/all @@ -1253,7 +1253,7 @@ $self->{texts} = { 'Productivity' => '', 'Profit Center' => '', 'Proforma Invoice' => '', - 'Program' => '', + 'Program' => '', 'Project' => '', 'Project Number' => '', 'Project Number missing!' => '', diff --git a/scripts/locales.pl b/scripts/locales.pl index 692417fcd..2174c2d81 100755 --- a/scripts/locales.pl +++ b/scripts/locales.pl @@ -598,7 +598,7 @@ sub generate_file { open my $fh, '>', $file or die "$! : $file"; - print $fh "#!/usr/bin/perl\n\n"; + print $fh "#!/usr/bin/perl\n# -*- coding: iso-8859-15; -*-\n\n"; print $fh $header, "\n" if $header; print $fh "$data_name = $delim[0]\n" if $data_name; diff --git a/templates/webpages/ct/form_header.html b/templates/webpages/ct/form_header.html index 71a2a165b..2c95fac40 100644 --- a/templates/webpages/ct/form_header.html +++ b/templates/webpages/ct/form_header.html @@ -36,14 +36,30 @@ -%] + [%- IF id %] [% 'Representative' | $T8 %] + + + [%- HTML.escape(salesman) %] + + + [%- END %] + + + [%- IF !id %] + [% 'Representative' | $T8 %] + [%- ELSE %] + [% 'Change representative to' | $T8 %] + [%- END %] + [%- INCLUDE generic/multibox.html - name = 'salesman_id', - DATA = ALL_SALESMAN_CUSTOMERS, - id_key = 'id', - label_key = 'name', + name = 'new_salesman_id', + DATA = ALL_SALESMAN_CUSTOMERS, + id_key = 'id', + label_key = 'name', + show_empty = id, -%]