Revision d4bddbd1
Von Jan Büren vor fast 16 Jahren hinzugefügt
| SL/IS.pm | ||
|---|---|---|
| 951 | 951 |
$amount = $netamount + $tax; |
| 952 | 952 |
|
| 953 | 953 |
# save AR record |
| 954 |
#erweiterung fuer lieferscheinnummer (donumber) 12.02.09 jb |
|
| 955 |
|
|
| 954 | 956 |
$query = qq|UPDATE ar set |
| 955 | 957 |
invnumber = ?, ordnumber = ?, quonumber = ?, cusordnumber = ?, |
| 956 | 958 |
transdate = ?, orddate = ?, quodate = ?, customer_id = ?, |
| ... | ... | |
| 962 | 964 |
employee_id = ?, salesman_id = ?, storno_id = ?, storno = ?, |
| 963 | 965 |
cp_id = ?, marge_total = ?, marge_percent = ?, |
| 964 | 966 |
globalproject_id = ?, delivery_customer_id = ?, |
| 965 |
transaction_description = ?, delivery_vendor_id = ? |
|
| 967 |
transaction_description = ?, delivery_vendor_id = ?, |
|
| 968 |
donumber = ? |
|
| 966 | 969 |
WHERE id = ?|; |
| 967 | 970 |
@values = ( $form->{"invnumber"}, $form->{"ordnumber"}, $form->{"quonumber"}, $form->{"cusordnumber"},
|
| 968 | 971 |
conv_date($form->{"invdate"}), conv_date($form->{"orddate"}), conv_date($form->{"quodate"}), conv_i($form->{"customer_id"}),
|
| ... | ... | |
| 975 | 978 |
conv_i($form->{"cp_id"}), 1 * $form->{marge_total} , 1 * $form->{marge_percent},
|
| 976 | 979 |
conv_i($form->{"globalproject_id"}), conv_i($form->{"delivery_customer_id"}),
|
| 977 | 980 |
$form->{transaction_description}, conv_i($form->{"delivery_vendor_id"}),
|
| 981 |
$form->{"donumber"}, #das entsprechende feld lieferscheinnummer aus der html-form 12.02.09 jb
|
|
| 978 | 982 |
conv_i($form->{"id"}));
|
| 979 | 983 |
do_query($form, $dbh, $query, @values); |
| 980 | 984 |
|
| ... | ... | |
| 1385 | 1389 |
my $id = conv_i($form->{id});
|
| 1386 | 1390 |
|
| 1387 | 1391 |
# retrieve invoice |
| 1392 |
#erweiterung um das entsprechende feld lieferscheinnummer (a.donumber) in der html-maske anzuzeigen 12.02.2009 jb |
|
| 1393 |
|
|
| 1388 | 1394 |
$query = |
| 1389 | 1395 |
qq|SELECT |
| 1390 | 1396 |
a.invnumber, a.ordnumber, a.quonumber, a.cusordnumber, |
| ... | ... | |
| 1396 | 1402 |
a.language_id, a.delivery_customer_id, a.delivery_vendor_id, a.type, |
| 1397 | 1403 |
a.transaction_description, |
| 1398 | 1404 |
a.marge_total, a.marge_percent, |
| 1399 |
e.name AS employee |
|
| 1405 |
e.name AS employee, a.donumber
|
|
| 1400 | 1406 |
FROM ar a |
| 1401 | 1407 |
LEFT JOIN employee e ON (e.id = a.employee_id) |
| 1402 | 1408 |
WHERE a.id = ?|; |
| bin/mozilla/is.pl | ||
|---|---|---|
| 241 | 241 |
if ($form->{id}) {
|
| 242 | 242 |
|
| 243 | 243 |
map { $form->{$_} =~ s/\"/"/g }
|
| 244 |
qw(invnumber ordnumber quonumber shippingpoint shipvia notes intnotes);
|
|
| 244 |
qw(invnumber ordnumber quonumber shippingpoint shipvia notes intnotes donumber); #frage: muss hier donumber angegeben werden? hier werden doch nur die alten quots wieder ausgemerzt, ist das noch nötig? 12.02.2009 jb
|
|
| 245 | 245 |
|
| 246 | 246 |
# # get pricegroups for parts |
| 247 | 247 |
# IS->get_pricegroups_for_parts(\%myconfig, \%$form); |
| ... | ... | |
| 695 | 695 |
$employees |
| 696 | 696 |
$salesman |
| 697 | 697 |
|; |
| 698 |
|
|
| 699 |
#ergänzung in der maske um das feld Lieferscheinnummer (Delivery Order Number), meiner meinung nach sinnvoll ueber dem feld lieferscheindatum 12.02.2009 jb |
|
| 698 | 700 |
if ($form->{type} eq "credit_note") {
|
| 699 | 701 |
print qq| <tr> |
| 700 | 702 |
<th align="right" nowrap>| . $locale->text('Credit Note Number') . qq|</th>
|
| ... | ... | |
| 717 | 719 |
<th align="right">| . $locale->text('Due Date') . qq|</th>
|
| 718 | 720 |
$button2 |
| 719 | 721 |
</tr> |
| 722 |
<tr> |
|
| 723 |
<th align="right" nowrap>| . $locale->text('Delivery Order Number') . qq|</th>
|
|
| 724 |
<td><input name="donumber" size="11" value="$form->{donumber}"></td>
|
|
| 725 |
</tr> |
|
| 720 | 726 |
<tr> |
| 721 | 727 |
<th align="right">| . $locale->text('Delivery Date') . qq|</th>
|
| 722 | 728 |
$button3 |
| locale/de/is | ||
|---|---|---|
| 104 | 104 |
'Delivered' => 'Geliefert', |
| 105 | 105 |
'Delivery Date' => 'Lieferdatum', |
| 106 | 106 |
'Delivery Order' => 'Lieferschein', |
| 107 |
'Delivery Order Number' => 'Lieferscheinnummer', |
|
| 107 | 108 |
'Department' => 'Abteilung', |
| 108 | 109 |
'Dependency loop detected:' => 'Schleife in den Abhängigkeiten entdeckt:', |
| 109 | 110 |
'Description' => 'Beschreibung', |
| ... | ... | |
| 246 | 247 |
'Quotation Number' => 'Angebotsnummer', |
| 247 | 248 |
'Quotation Number missing!' => 'Angebotsnummer fehlt!', |
| 248 | 249 |
'RFQ' => 'Anfrage', |
| 250 |
'ROP' => 'Mindestlagerbestand', |
|
| 249 | 251 |
'Receipt, payment, reconciliation' => 'Zahlungseingang, Zahlungsausgang, Kontenabgleich', |
| 250 | 252 |
'Record in' => 'Buchen auf', |
| 251 | 253 |
'Release From Stock' => 'Lagerausgang', |
| sql/Pg-upgrade2/ar_add_donumber.sql | ||
|---|---|---|
| 1 |
-- @tag: ar_add_donumber |
|
| 2 |
-- @description: Die Lieferscheinnummer wird bei Rechnungen bisher nicht uebernommen. Das aendert sich mit diesem Update. Hierfuer muss allerdings die Rechnungstabelle ar um einen entsprechenden Eintrag erweitert werden. (donumber in ar) |
|
| 3 |
-- @depends: COA_Account_Settings001 USTVA_abstraction COA_Account_Settings002 chart_category_to_sgn employee_no_limits dunning_invoices_per_dunning_level gl_storno oe_is_salesman transaction_description tax_description_without_percentage_skr04 dunning_dunning_id ar_ap_storno_id dunning_config_interest_rate invalid_taxkeys_2 chart_names2 history_erp_snumbers marge_initial USTVA_at tax_report_table_name |
|
| 4 |
alter table ar add column donumber text; |
|
| 5 |
|
|
Auch abrufbar als: Unified diff
Lieferscheinnummer (donumber) auch in Rechnungen übergeben und als Druckvariable zu Verfügung stellen. OFFEN: Lieferscheinnummern fuer Rechnungen bestehend aus mehreren Lieferscheinen