Revision 2134f89a
Von Moritz Bunkus vor mehr als 8 Jahren hinzugefügt
| SL/DO.pm | ||
|---|---|---|
| 1055 | 1055 |
$h_pg->finish(); |
| 1056 | 1056 |
$h_bin_wh->finish(); |
| 1057 | 1057 |
|
| 1058 |
$form->{delivery_term} = SL::DB::Manager::DeliveryTerm->find_by(id => $form->{delivery_term_id} || undef);
|
|
| 1059 |
if ($form->{delivery_term} && $form->{language_id}) {
|
|
| 1060 |
$form->{delivery_term}->description_long( $form->{delivery_term}->translated_attribute('description_long', $form->{language_id}));
|
|
| 1061 |
$form->{delivery_term}->description_long_invoice($form->{delivery_term}->translated_attribute('description_long_invoice', $form->{language_id}));
|
|
| 1062 |
} |
|
| 1063 |
|
|
| 1064 | 1058 |
$form->{department} = SL::DB::Manager::Department->find_by(id => $form->{department_id})->description if $form->{department_id};
|
| 1059 |
$form->{delivery_term} = SL::DB::Manager::DeliveryTerm->find_by(id => $form->{delivery_term_id} || undef);
|
|
| 1060 |
$form->{delivery_term}->description_long($form->{delivery_term}->translated_attribute('description_long', $form->{language_id})) if $form->{delivery_term} && $form->{language_id};
|
|
| 1065 | 1061 |
|
| 1066 | 1062 |
$form->{username} = $myconfig->{name};
|
| 1067 | 1063 |
|
| SL/IS.pm | ||
|---|---|---|
| 533 | 533 |
|
| 534 | 534 |
$form->set_payment_options($myconfig, $form->{invdate}, 'sales_invoice');
|
| 535 | 535 |
|
| 536 |
$form->{delivery_term} = SL::DB::Manager::DeliveryTerm->find_by(id => $form->{delivery_term_id} || undef);
|
|
| 537 |
if ($form->{delivery_term} && $form->{language_id}) {
|
|
| 538 |
$form->{delivery_term}->description_long( $form->{delivery_term}->translated_attribute('description_long', $form->{language_id}));
|
|
| 539 |
$form->{delivery_term}->description_long_invoice($form->{delivery_term}->translated_attribute('description_long_invoice', $form->{language_id}));
|
|
| 540 |
} |
|
| 541 |
|
|
| 542 | 536 |
$form->{department} = SL::DB::Manager::Department->find_by(id => $form->{department_id})->description if $form->{department_id};
|
| 537 |
$form->{delivery_term} = SL::DB::Manager::DeliveryTerm->find_by(id => $form->{delivery_term_id} || undef);
|
|
| 538 |
$form->{delivery_term}->description_long($form->{delivery_term}->translated_attribute('description_long', $form->{language_id})) if $form->{delivery_term} && $form->{language_id};
|
|
| 543 | 539 |
|
| 544 | 540 |
$form->{username} = $myconfig->{name};
|
| 545 | 541 |
|
| SL/OE.pm | ||
|---|---|---|
| 1594 | 1594 |
$dbh->disconnect; |
| 1595 | 1595 |
|
| 1596 | 1596 |
$form->{delivery_term} = SL::DB::Manager::DeliveryTerm->find_by(id => $form->{delivery_term_id} || undef);
|
| 1597 |
if ($form->{delivery_term} && $form->{language_id}) {
|
|
| 1598 |
$form->{delivery_term}->description_long( $form->{delivery_term}->translated_attribute('description_long', $form->{language_id}));
|
|
| 1599 |
$form->{delivery_term}->description_long_invoice($form->{delivery_term}->translated_attribute('description_long_invoice', $form->{language_id}));
|
|
| 1600 |
} |
|
| 1597 |
$form->{delivery_term}->description_long($form->{delivery_term}->translated_attribute('description_long', $form->{language_id})) if $form->{delivery_term} && $form->{language_id};
|
|
| 1601 | 1598 |
|
| 1602 | 1599 |
$form->{order} = SL::DB::Manager::Order->find_by(id => $form->{id}) if $form->{id};
|
| 1603 | 1600 |
|
Auch abrufbar als: Unified diff
Lieferbedingungen haben kein Attribut description_long_invoice
Im Commit de009a3fee7e0471c3e095ce92d8708ff2b42597 »Zahlungsbedingungen:
Unterscheidung zwischen Angeboten/Aufträgen und Rechnungen« wurden
in den Druckroutinen fälschlicherweise auch für die Lieferbedingungen
das Setzen von »description_long_invoice« implementiert, obwohl die
Lieferbedingungen keine Unterscheidung zwischen Angeboten/Aufträgen und
Rechnungen bekommen haben.
Daher revertet der jetzige Commit diejenigen Hunks aus
de009a3fee7e0471c3e095ce92d8708ff2b42597, die die Lieferbedigungen
angefasst haben.