Revision a6161998
Von Moritz Bunkus vor mehr als 15 Jahren hinzugefügt
| SL/DO.pm | ||
|---|---|---|
| 316 | 316 |
shippingpoint = ?, shipvia = ?, notes = ?, intnotes = ?, closed = ?, |
| 317 | 317 |
delivered = ?, department_id = ?, language_id = ?, shipto_id = ?, |
| 318 | 318 |
globalproject_id = ?, employee_id = ?, salesman_id = ?, cp_id = ?, transaction_description = ?, |
| 319 |
is_sales = ? |
|
| 319 |
is_sales = ?, taxzone_id = ?, taxincluded = ?, terms = ?, curr = ?
|
|
| 320 | 320 |
WHERE id = ?|; |
| 321 | 321 |
|
| 322 | 322 |
@values = ($form->{donumber}, $form->{ordnumber},
|
| ... | ... | |
| 330 | 330 |
conv_i($form->{salesman_id}), conv_i($form->{cp_id}),
|
| 331 | 331 |
$form->{transaction_description},
|
| 332 | 332 |
$form->{type} =~ /^sales/ ? 't' : 'f',
|
| 333 |
conv_i($form->{taxzone_id}), $form->{taxincluded} ? 't' : 'f', conv_i($form->{terms}), $form->{curr},
|
|
| 333 | 334 |
conv_i($form->{id}));
|
| 334 | 335 |
do_query($form, $dbh, $query, @values); |
| 335 | 336 |
|
| ... | ... | |
| 575 | 576 |
dord.closed, dord.reqdate, dord.department_id, dord.cusordnumber, |
| 576 | 577 |
d.description AS department, dord.language_id, |
| 577 | 578 |
dord.shipto_id, |
| 578 |
dord.globalproject_id, dord.delivered, dord.transaction_description |
|
| 579 |
dord.globalproject_id, dord.delivered, dord.transaction_description, |
|
| 580 |
dort.taxzone_id, dord.taxincluded, dord.terms, dord.curr |
|
| 579 | 581 |
FROM delivery_orders dord |
| 580 | 582 |
JOIN ${vc} cv ON (dord.${vc}_id = cv.id)
|
| 581 | 583 |
LEFT JOIN employee e ON (dord.employee_id = e.id) |
| bin/mozilla/do.pl | ||
|---|---|---|
| 182 | 182 |
($form->{ $form->{vc} }) = split /--/, $form->{ $form->{vc} };
|
| 183 | 183 |
$form->{"old$form->{vc}"} = qq|$form->{$form->{vc}}--$form->{"$form->{vc}_id"}|;
|
| 184 | 184 |
|
| 185 |
$form->{taxincluded} = $taxincluded if ($form->{id});
|
|
| 186 |
|
|
| 187 | 185 |
$form->{employee} = "$form->{employee}--$form->{employee_id}";
|
| 188 | 186 |
|
| 189 | 187 |
$form->{salesman_id} = $salesman_id if ($editing);
|
| sql/Pg-upgrade2/delivery_orders_fields_for_invoices.sql | ||
|---|---|---|
| 1 |
-- @tag: delivery_orders_fields_for_invoices |
|
| 2 |
-- @description: Spalten in Lieferscheintabellen, um einige Werte von Auftr?gen zu Rechnungen zu ?bernehmen |
|
| 3 |
-- @depends: release_2_6_0 |
|
| 4 |
ALTER TABLE delivery_orders ADD COLUMN taxzone_id integer; |
|
| 5 |
ALTER TABLE delivery_orders ADD COLUMN taxincluded boolean; |
|
| 6 |
ALTER TABLE delivery_orders ADD COLUMN terms integer; |
|
| 7 |
ALTER TABLE delivery_orders ADD COLUMN curr char(3); |
|
| 8 |
|
|
| 9 |
UPDATE delivery_orders SET taxincluded = FALSE; |
|
| 10 |
|
|
| templates/webpages/do/form_header_de.html | ||
|---|---|---|
| 61 | 61 |
<input type="hidden" name="cc" value="[% HTML.escape(cc) %]"> |
| 62 | 62 |
<input type="hidden" name="closed" value="[% HTML.escape(closed) %]"> |
| 63 | 63 |
<input type="hidden" name="convert_from_oe_ids" value="[% HTML.escape(convert_from_oe_ids) %]"> |
| 64 |
<input type="hidden" name="curr" value="[% HTML.escape(curr) %]"> |
|
| 64 | 65 |
<input type="hidden" name="customer_klass" value="[% HTML.escape(customer_klass) %]"> |
| 65 | 66 |
<input type="hidden" name="discount" value="[% HTML.escape(discount) %]"> |
| 66 | 67 |
<input type="hidden" name="dunning_amount" value="[% HTML.escape(dunning_amount) %]"> |
| ... | ... | |
| 88 | 89 |
<input type="hidden" name="shiptostreet" value="[% HTML.escape(shiptostreet) %]"> |
| 89 | 90 |
<input type="hidden" name="shiptozipcode" value="[% HTML.escape(shiptozipcode) %]"> |
| 90 | 91 |
<input type="hidden" name="subject" value="[% HTML.escape(subject) %]"> |
| 92 |
<input type="hidden" name="taxincluded" value="[% HTML.escape(taxincluded) %]"> |
|
| 93 |
<input type="hidden" name="taxzone_id" value="[% HTML.escape(taxzone_id) %]"> |
|
| 94 |
<input type="hidden" name="terms" value="[% HTML.escape(terms) %]"> |
|
| 91 | 95 |
<input type="hidden" name="title" value="[% HTML.escape(title) %]"> |
| 92 | 96 |
<input type="hidden" name="type" value="[% HTML.escape(type) %]"> |
| 93 | 97 |
<input type="hidden" name="vc" value="[% HTML.escape(vc) %]"> |
| templates/webpages/do/form_header_master.html | ||
|---|---|---|
| 61 | 61 |
<input type="hidden" name="cc" value="[% HTML.escape(cc) %]"> |
| 62 | 62 |
<input type="hidden" name="closed" value="[% HTML.escape(closed) %]"> |
| 63 | 63 |
<input type="hidden" name="convert_from_oe_ids" value="[% HTML.escape(convert_from_oe_ids) %]"> |
| 64 |
<input type="hidden" name="curr" value="[% HTML.escape(curr) %]"> |
|
| 64 | 65 |
<input type="hidden" name="customer_klass" value="[% HTML.escape(customer_klass) %]"> |
| 65 | 66 |
<input type="hidden" name="discount" value="[% HTML.escape(discount) %]"> |
| 66 | 67 |
<input type="hidden" name="dunning_amount" value="[% HTML.escape(dunning_amount) %]"> |
| ... | ... | |
| 88 | 89 |
<input type="hidden" name="shiptostreet" value="[% HTML.escape(shiptostreet) %]"> |
| 89 | 90 |
<input type="hidden" name="shiptozipcode" value="[% HTML.escape(shiptozipcode) %]"> |
| 90 | 91 |
<input type="hidden" name="subject" value="[% HTML.escape(subject) %]"> |
| 92 |
<input type="hidden" name="taxincluded" value="[% HTML.escape(taxincluded) %]"> |
|
| 93 |
<input type="hidden" name="taxzone_id" value="[% HTML.escape(taxzone_id) %]"> |
|
| 94 |
<input type="hidden" name="terms" value="[% HTML.escape(terms) %]"> |
|
| 91 | 95 |
<input type="hidden" name="title" value="[% HTML.escape(title) %]"> |
| 92 | 96 |
<input type="hidden" name="type" value="[% HTML.escape(type) %]"> |
| 93 | 97 |
<input type="hidden" name="vc" value="[% HTML.escape(vc) %]"> |
Auch abrufbar als: Unified diff
Übernahme einiger weiterer Felder aus Aufträgen in Lieferscheinen und von dort in Rechnungen.
Einige Felder wie "Steuer im Preis inbegriffen", "Steuersatz",
"Zahlungsbedingungen" und "Währung" wurden bei Lieferscheinen nicht
gespeichert. Dementsprechend gingen sie bei der Umwandlung von Auftrag
in Lieferschein und daraus in Rechnungen verloren.
Fix für Bug 1035.