From: Sven Schöling Date: Wed, 3 Mar 2010 13:19:12 +0000 (+0100) Subject: Merge branch 'master' of ssh://lx-office/~/lx-office-erp X-Git-Tag: release-2.6.1beta1~44^2~3 X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/f23f4aa25e53b6eaf15ab66a1482db046e7be127?hp=d65208f8841fe457911170dabeeaf859ddfdd1ae Merge branch 'master' of ssh://lx-office/~/lx-office-erp Conflicts: doc/changelog --- diff --git a/SL/IR.pm b/SL/IR.pm index a64869d45..7fefd4117 100644 --- a/SL/IR.pm +++ b/SL/IR.pm @@ -318,12 +318,12 @@ sub post_invoice { my ($invoice_id) = selectfirst_array_query($form, $dbh, qq|SELECT nextval('invoiceid')|); $query = - qq|INSERT INTO invoice (id, trans_id, parts_id, description, qty, base_qty, + qq|INSERT INTO invoice (id, trans_id, parts_id, description, longdescription, qty, base_qty, sellprice, fxsellprice, discount, allocated, unit, deliverydate, project_id, serialnumber, price_factor_id, price_factor, marge_price_factor) - VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, (SELECT factor FROM price_factors WHERE id = ?), ?)|; + VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, (SELECT factor FROM price_factors WHERE id = ?), ?)|; @values = ($invoice_id, conv_i($form->{id}), conv_i($form->{"id_$i"}), - $form->{"description_$i"}, $form->{"qty_$i"} * -1, + $form->{"description_$i"}, $form->{"longdescription_$i"}, $form->{"qty_$i"} * -1, $baseqty * -1, $form->{"sellprice_$i"}, $fxsellprice, $form->{"discount_$i"}, $allocated, $form->{"unit_$i"}, conv_date($form->{deliverydate}), conv_i($form->{"project_id_$i"}), $form->{"serialnumber_$i"}, @@ -799,7 +799,7 @@ sub retrieve_invoice { c3.accno AS expense_accno, c3.new_chart_id AS expense_new_chart, date($transdate) - c3.valid_from AS expense_valid, i.id AS invoice_id, - i.description, i.qty, i.fxsellprice AS sellprice, i.parts_id AS id, i.unit, i.deliverydate, i.project_id, i.serialnumber, + i.description, i.longdescription, i.qty, i.fxsellprice AS sellprice, i.parts_id AS id, i.unit, i.deliverydate, i.project_id, i.serialnumber, i.price_factor_id, i.price_factor, i.marge_price_factor, i.discount, p.partnumber, p.inventory_accno_id AS part_inventory_accno_id, p.bin, pr.projectnumber, pg.partsgroup diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl index b90209f94..6446cc787 100644 --- a/bin/mozilla/is.pl +++ b/bin/mozilla/is.pl @@ -898,6 +898,16 @@ sub credit_note { $form->{creditremaining} -= ($form->{oldinvtotal} - $form->{ordtotal}); + # bei Gutschriften werden Zahlungseingänge aus Rechnung nicht übernommen + for my $i (1 .. $form->{paidaccounts}) { + delete $form->{"paid_$i"}; + delete $form->{"source_$i"}; + delete $form->{"memo_$i"}; + delete $form->{"datepaid_$i"}; + delete $form->{"AR_paid_$i"}; + }; + $form->{paidaccounts} = 1; + &prepare_invoice; diff --git a/doc/changelog b/doc/changelog index bf2a4667d..00a0b9822 100644 --- a/doc/changelog +++ b/doc/changelog @@ -159,8 +159,9 @@ Liste gefixter Bugs aus dem Bugtracker: 922 940 1024 1025 1028 1030 1031 1034 1035 1037 1040 1043 1044 1046 1051 1055 - 1057 1058 1073 1077 1081 1082 1098 1100 1101 1108 1110 1118 1125 1127 1130 - 1133 1135 1136 1138 1146 1147 1150 1151 1155 1164 1186 1190 1191 1199 1201 + 1057 1058 1072 1073 1077 1081 1082 1095 1098 1100 1101 1108 1110 1118 1125 + 1127 1130 1133 1135 1136 1138 1146 1147 1150 1151 1155 1164 1177 1186 1190 + 1191 1199 1201 2009-06-02 - Version 2.6.0 diff --git a/doc/dokumentenvorlagen-und-variablen.html b/doc/dokumentenvorlagen-und-variablen.html index b2b90cdcb..5120d5b4b 100644 --- a/doc/dokumentenvorlagen-und-variablen.html +++ b/doc/dokumentenvorlagen-und-variablen.html @@ -1179,6 +1179,10 @@ td {

+ + + + diff --git a/locale/de/all b/locale/de/all index a3ad75493..d169fe5cb 100644 --- a/locale/de/all +++ b/locale/de/all @@ -1771,6 +1771,7 @@ $self->{texts} = { 'Vendor Invoice' => 'Einkaufsrechnung', 'Vendor Invoices' => 'Einkaufsrechnungen', 'Vendor Number' => 'Lieferantennummer', + 'Vendor Ordner Number' => 'Bestellnummer beim Lieferanten', 'Vendor deleted!' => 'Lieferant gelöscht!', 'Vendor details' => 'Lieferantendetails', 'Vendor missing!' => 'Lieferant fehlt!', diff --git a/templates/webpages/do/form_header_de.html b/templates/webpages/do/form_header_de.html index a29e0e969..372227855 100644 --- a/templates/webpages/do/form_header_de.html +++ b/templates/webpages/do/form_header_de.html @@ -318,7 +318,7 @@ - + diff --git a/templates/webpages/do/form_header_master.html b/templates/webpages/do/form_header_master.html index ce7f57a30..3e7c02dd5 100644 --- a/templates/webpages/do/form_header_master.html +++ b/templates/webpages/do/form_header_master.html @@ -318,7 +318,7 @@ - +
VariablennameBedeutung
cusordnumberBestellnummer des Kunden (im Verkauf) bzw. Bestellnummer des Lieferanten (im Einkauf)
donumber Lieferscheinnummer
Bestellnummer des Kunden[% IF is_customer %]Bestellnummer des Kunden[% ELSE %]Bestellnummer beim Lieferanten[% END %]
Customer Order Number[% IF is_customer %]Customer Order Number[% ELSE %]Vendor Ordner Number[% END %]