From: Wulf Date: Tue, 10 Jan 2012 09:42:13 +0000 (+0100) Subject: Merge branch 'master' of vc.linet-services.de:public/lx-office-erp X-Git-Tag: release-2.7.0beta1~75^2 X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/e0c425bf0dcac2eb02c817b6670b260e60035674?hp=4ccf28988d68fe46330e19f1b64bfdca183de8e5 Merge branch 'master' of vc.linet-services.de:public/lx-office-erp --- diff --git a/SL/DN.pm b/SL/DN.pm index f51e211e2..797588adf 100644 --- a/SL/DN.pm +++ b/SL/DN.pm @@ -747,11 +747,13 @@ sub print_dunning { c.country, c.department_1, c.department_2, c.email, c.customernumber, c.greeting, c.contact, c.phone, c.fax, c.homepage, c.email, c.taxincluded, c.business_id, c.taxnumber, c.iban, + c,ustid, e.name as salesman_name, co.* FROM dunning d LEFT JOIN ar ON (d.trans_id = ar.id) LEFT JOIN customer c ON (ar.customer_id = c.id) LEFT JOIN contacts co ON (ar.cp_id = co.cp_id) + LEFT JOIN employee e ON (ar.salesman_id = e.id) WHERE (d.dunning_id = ?) LIMIT 1|; my $ref = selectfirst_hashref_query($form, $dbh, $query, $dunning_id); diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl index 1522339b8..a6e122067 100644 --- a/bin/mozilla/ar.pl +++ b/bin/mozilla/ar.pl @@ -1046,13 +1046,12 @@ sub update { $form->{invdate} = $form->{transdate}; - my %saved_variables = map +( $_ => $form->{$_} ), qw(AR AR_amount_1 taxchart_1 oldcustomer); + my %saved_variables = map +( $_ => $form->{$_} ), qw(AR AR_amount_1 taxchart_1 customer_id); &check_name("customer"); - # check_name ruft get_customer auf, oldcustomer wird überschrieben, daher wird dies vorher gemerkt - # get_customer holt Bemerkungen als intnotes, für Debitorenbuchungen gibt es aber nur das Feld notes - $form->{notes} = $form->{intnotes} if $saved_variables{oldcustomer} ne $form->{customer}; + # check_name loads customer notes into notes, but ar only knows intnotes, so copy them + $form->{notes} = $form->{intnotes} if $saved_variables{customer_id} != $form->{customer_id}; $form->{AR} = $saved_variables{AR}; if ($saved_variables{AR_amount_1} =~ m/.--./) { diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl index 7924b05a2..cc04f5789 100644 --- a/bin/mozilla/do.pl +++ b/bin/mozilla/do.pl @@ -984,14 +984,16 @@ sub calculate_stock_in_out { my $in_out = $form->{type} =~ /^sales/ ? 'out' : 'in'; my $sinfo = DO->unpack_stock_information('packed' => $form->{"stock_${in_out}_${i}"}); + my $do_qty = AM->sum_with_unit($::form->{"qty_$i"}, $::form->{"unit_$i"}); my $sum = AM->sum_with_unit(map { $_->{qty}, $_->{unit} } @{ $sinfo }); + my $matches = $do_qty == $sum; my $content = $form->format_amount_units('amount' => $sum * 1, 'part_unit' => $form->{"partunit_$i"}, 'amount_unit' => $all_units->{$form->{"partunit_$i"}}->{base_unit}, 'conv_units' => 'convertible_not_smaller', 'max_places' => 2); - $content = qq|${content} |; + $content = qq|${content} |; $main::lxdebug->leave_sub(); @@ -1146,8 +1148,13 @@ sub set_stock_in { _stock_in_out_set_qty_display($stock_info); + my $do_qty = AM->sum_with_unit($::form->parse_amount(\%::myconfig, $::form->{do_qty}), $::form->{do_unit}); + my $transfer_qty = AM->sum_with_unit(map { $_->{qty}, $_->{unit} } @{ $stock_info }); + $form->header(); - print $form->parse_html_template('do/set_stock_in_out'); + print $form->parse_html_template('do/set_stock_in_out', { + qty_matches => $do_qty == $transfer_qty, + }); $main::lxdebug->leave_sub(); } @@ -1241,8 +1248,13 @@ sub set_stock_out { } else { _stock_in_out_set_qty_display($stock_info); + my $do_qty = AM->sum_with_unit($::form->parse_amount(\%::myconfig, $::form->{do_qty}), $::form->{do_unit}); + my $transfer_qty = AM->sum_with_unit(map { $_->{qty}, $_->{unit} } @{ $stock_info }); + $form->header(); - print $form->parse_html_template('do/set_stock_in_out'); + print $form->parse_html_template('do/set_stock_in_out', { + qty_matches => $do_qty == $transfer_qty, + }); } $main::lxdebug->leave_sub(); diff --git a/doc/changelog b/doc/changelog index 038b002b5..78df107cc 100644 --- a/doc/changelog +++ b/doc/changelog @@ -79,6 +79,11 @@ - Bugfix 1773: SQL Fehler bei Anzeige von Angeboten - Bugfix 1725: In Mahnungen steht currency nicht als Variable zur Verfügung? - Bugfix 1771: Zahlungsausgang: Lieferant wird nicht ausgewählt, wenn Name 2 Leerzeichen hintereinander enthält + - Bugfix 1566: Variablen für Verkäufer und USTID in Mahnungsdruck hinzugefügt + - Bugfix 1588: Einzelteile eines Erzeugnisses von Verkaufsbericht ausnehmen + - Bugfix 1756: Ertrag in Bruttorechnungen korrekt berechnen + + 2011-06-15 - Release 2.6.3 diff --git a/doc/dokumentenvorlagen-und-variablen.html b/doc/dokumentenvorlagen-und-variablen.html index fa483c691..1009f31ff 100644 --- a/doc/dokumentenvorlagen-und-variablen.html +++ b/doc/dokumentenvorlagen-und-variablen.html @@ -598,7 +598,7 @@ td { ustid - Usatzsteuer-Identifikationsnummer + Umsatzsteuer-Identifikationsnummer diff --git a/locale/de/all b/locale/de/all index 2599b7c90..e8b538bfd 100644 --- a/locale/de/all +++ b/locale/de/all @@ -1879,6 +1879,7 @@ $self->{texts} = { 'There are no items in stock.' => 'Dieser Artikel ist nicht eingelagert.', 'There are no items on your TODO list at the moment.' => 'Ihre Aufgabenliste enthält momentan keine Einträge.', 'There are still entries in the database for which no unit has been assigned.' => 'Es gibt noch Einträge in der Datenbank, für die keine Einheit zugeordnet ist.', + 'There are still transfers not matching the qty of the delivery order. Stock operations can not be changed later. Do you really want to proceed?' => 'Einige der Lagerbewegungen sind nicht vollständig und Lagerbewegungen können nachträglich nicht mehr verändert werden. Wollen Sie wirklich fortfahren?', 'There are usually three ways to install Perl modules.' => 'Es gibt normalerweise drei Arten, ein Perlmodul zu installieren.', 'There is at least one sales or purchase invoice for which Lx-Office recorded an inventory transaction with taxkeys even though no tax was recorded.' => 'Es gibt mindestens eine Einkaufs- oder Verkaufsrechnung, für die Lx-Office einen Steuerschlüssel ungleich 0 verzeichnet hat, obwohl für Warenbestandsbuchugen bei Rechnungen nie Steuern gebucht werden.', 'There is at least one transaction for which the user has chosen a logically wrong taxkey.' => 'Es gibt mindestens eine Buchung, bei der ein logisch nicht passender Steuerschlüssel ausgewählt wurde.', diff --git a/templates/webpages/admin/create_dataset.html b/templates/webpages/admin/create_dataset.html index 00768f1d8..ba2d72414 100644 --- a/templates/webpages/admin/create_dataset.html +++ b/templates/webpages/admin/create_dataset.html @@ -58,7 +58,9 @@ + * für die Bestandsmethode gibt es Einschränkungen, siehe Bemerkungen in EUR Umstellung in Mandant. + diff --git a/templates/webpages/do/form_footer.html b/templates/webpages/do/form_footer.html index b81ce8cfe..a6a51299e 100644 --- a/templates/webpages/do/form_footer.html +++ b/templates/webpages/do/form_footer.html @@ -68,9 +68,9 @@ [%- UNLESS delivered %] [%- IF vc == 'customer' %] - + [%- ELSE %] - + [%- END %] [%- END %] [%- IF id %] @@ -96,6 +96,22 @@ - + diff --git a/templates/webpages/do/set_stock_in_out.html b/templates/webpages/do/set_stock_in_out.html index 07e084d4d..811059444 100644 --- a/templates/webpages/do/set_stock_in_out.html +++ b/templates/webpages/do/set_stock_in_out.html @@ -9,6 +9,7 @@ var row = $('#row').attr('value'); window.opener.document.getElementsByName("stock_" + $('#in_out').attr('value') + "_" + row)[0].value = $('#stock').attr('value'); $(window.opener.document.getElementById("stock_in_out_qty_display_" + row)).html($('#qty_display').attr('value')); + $(window.opener.document.getElementById("stock_in_out_qty_matches_" + row)).val([% qty_matches %]); window.close(); }