From: Sven Schöling Date: Fri, 9 Nov 2012 15:07:07 +0000 (+0100) Subject: Merge branch 'master' of vc.linet-services.de:public/lx-office-erp X-Git-Tag: release-3.0.0beta1~12 X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/59d76a094e83bec189313ca712d945a9594aeb55?hp=67233506b5a94c4f7ea0165d64233c10cdd7bbf7 Merge branch 'master' of vc.linet-services.de:public/lx-office-erp --- diff --git a/bin/mozilla/cp.pl b/bin/mozilla/cp.pl index 5fbf7c0a2..a70c32eeb 100644 --- a/bin/mozilla/cp.pl +++ b/bin/mozilla/cp.pl @@ -464,14 +464,11 @@ sub check_form { $form->error($locale->text('Date missing!')) unless $form->{datepaid}; my $selected_check = 1; for my $i (1 .. $form->{rowcount}) { - if ($form->{"checked_$i"}) { - if ($form->parse_amount(\%myconfig, $form->{"paid_$i"}, 2) <= 0) { # negativen Betrag eingegeben - $form->error($locale->text('Amount has to be greater then zero! Wrong row number: ') . $i); - } - undef($selected_check); - # last; # ich muss doch über alle buchungen laufen, da ich noch - # die freitext-eingabe der werte prüfen will + next unless $form->{"checked_$i"}; + if (abs($form->parse_amount(\%myconfig, $form->{"paid_$i"}, 2)) < 0.01) { + $form->error($locale->text('Row #1: amount has to be different from zero.', $i)); } + undef $selected_check; } $form->error($locale->text('No transaction selected!')) if $selected_check; diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl index 3908f7435..5df518fc7 100644 --- a/bin/mozilla/oe.pl +++ b/bin/mozilla/oe.pl @@ -1735,13 +1735,14 @@ sub purchase_order { $form->{cp_id} *= 1; + my $source_type = $form->{type}; $form->{title} = $locale->text('Add Purchase Order'); $form->{vc} = "vendor"; $form->{type} = "purchase_order"; $form->get_employee(); - &poso; + poso(source_type => $form->{type}); delete $form->{sales_order_to_purchase_order}; @@ -1763,13 +1764,14 @@ sub sales_order { $form->{cp_id} *= 1; + my $source_type = $form->{type}; $form->{title} = $locale->text('Add Sales Order'); $form->{vc} = "customer"; $form->{type} = "sales_order"; $form->get_employee(); - &poso; + poso(source_type => $source_type); $main::lxdebug->leave_sub(); } @@ -1777,6 +1779,7 @@ sub sales_order { sub poso { $main::lxdebug->enter_sub(); + my %param = @_; my $form = $main::form; my %myconfig = %main::myconfig; @@ -1786,6 +1789,11 @@ sub poso { $form->{transdate} = $form->current_date(\%myconfig); delete $form->{duedate}; + # "reqdate" is the validity date for a quotation and the delivery + # date for an order. Therefore it makes no sense to keep the value + # when converting from one into the other. + delete $form->{reqdate} if ($param{source_type} =~ /_quotation$/) == ($form->{type} =~ /_quotation$/); + $form->{convert_from_oe_ids} = $form->{id}; $form->{closed} = 0; diff --git a/locale/de/all b/locale/de/all index 452225806..8d49add48 100644 --- a/locale/de/all +++ b/locale/de/all @@ -179,7 +179,6 @@ $self->{texts} = { 'Amended Advance Turnover Tax Return (Nr. 10)' => 'Ist dies eine berichtigte Anmeldung? (Nr. 10/Zeile 15 Steuererklärung)', 'Amount' => 'Betrag', 'Amount Due' => 'Betrag fällig', - 'Amount has to be greater then zero! Wrong row number: ' => 'Leere Eingabe oder Werte kleiner, gleich null eingegeben. Fehler in Reihe Nummer: ', 'Amount payable' => 'Noch zu bezahlender Betrag', 'Amount payable less discount' => 'Noch zu bezahlender Betrag abzüglich Skonto', 'An exception occurred during execution.' => 'Während der Ausführung trat eine Ausnahme auf.', @@ -1604,6 +1603,8 @@ $self->{texts} = { 'Revenues EU without UStId' => 'Erlöse EU o. UStId', 'Review of Aging list' => 'Altersstrukturliste', 'Right' => 'Rechts', + 'Row #1: amount has to be different from zero.' => 'Zeile #1: Der Wert darf nicht 0 sein.', + 'Row number' => 'Zeilennummer', 'Run at' => 'Ausgeführt um', 'SAVED' => 'Gespeichert', 'SAVED FOR DUNNING' => 'Gespeichert', diff --git a/templates/print/f-tex/default.tex b/templates/print/f-tex/default.tex index abca29a40..fb0f39b9e 100644 --- a/templates/print/f-tex/default.tex +++ b/templates/print/f-tex/default.tex @@ -357,7 +357,7 @@ %======Die eigentliche-Tabelle======================================== % temporaere Datei mit Tabelle anlegen -\begin{filecontents}{<%template_meta.tmpfile%>.table.tex} +\begin{filecontents}{<%template_meta.tmpfile NOESCAPE%>.table.tex} \mainfont \resetlaufsumme @@ -489,7 +489,7 @@ } \end{filecontents} % Ende der Hilfsdatei. -\LTXtable{\textwidth}{<%template_meta.tmpfile%>.table.tex} +\LTXtable{\textwidth}{<%template_meta.tmpfile NOESCAPE%>.table.tex} \rule{\textwidth}{0pt} % Ein (unsichtbarer) Strich quer ueber die Seite \vspace{ 5mm} diff --git a/templates/webpages/cp/invoices.html b/templates/webpages/cp/invoices.html index 4565f355e..d807322ab 100644 --- a/templates/webpages/cp/invoices.html +++ b/templates/webpages/cp/invoices.html @@ -4,9 +4,10 @@ [%- USE LxERP %] - + + @@ -16,6 +17,7 @@ [%- FOREACH row = invoices %] + @@ -25,6 +27,7 @@ [%- END %] +
[% 'Invoices' | $T8 %][% 'Invoices' | $T8 %]
[% 'Row number' | $T8 %] [% 'Invoice' | $T8 %] [% 'Date' | $T8 %] [% 'Amount' | $T8 %]
[% loop.count %] [% row.invnumber | html %][% L.hidden_tag('invnumber_' _ loop.count, row.invnumber); L.hidden_tag('id_' _ loop.count, row.id) %] [% row.transdate | html %][% L.hidden_tag('transdate_' _ loop.count, row.transdate) %] [% LxERP.format_amount(row.amount, 2) %][% L.hidden_tag('amount_' _ loop.count, LxERP.format_amount(row.amount, 2)) %]
      [% LxERP.format_amount(totals.amount, 2) %]