Revision 2134f89a
Von Moritz Bunkus vor mehr als 8 Jahren hinzugefügt
| SL/DO.pm | ||
|---|---|---|
|
$h_pg->finish();
|
||
|
$h_bin_wh->finish();
|
||
|
|
||
|
$form->{delivery_term} = SL::DB::Manager::DeliveryTerm->find_by(id => $form->{delivery_term_id} || undef);
|
||
|
if ($form->{delivery_term} && $form->{language_id}) {
|
||
|
$form->{delivery_term}->description_long( $form->{delivery_term}->translated_attribute('description_long', $form->{language_id}));
|
||
|
$form->{delivery_term}->description_long_invoice($form->{delivery_term}->translated_attribute('description_long_invoice', $form->{language_id}));
|
||
|
}
|
||
|
|
||
|
$form->{department} = SL::DB::Manager::Department->find_by(id => $form->{department_id})->description if $form->{department_id};
|
||
|
$form->{delivery_term} = SL::DB::Manager::DeliveryTerm->find_by(id => $form->{delivery_term_id} || undef);
|
||
|
$form->{delivery_term}->description_long($form->{delivery_term}->translated_attribute('description_long', $form->{language_id})) if $form->{delivery_term} && $form->{language_id};
|
||
|
|
||
|
$form->{username} = $myconfig->{name};
|
||
|
|
||
| SL/IS.pm | ||
|---|---|---|
|
|
||
|
$form->set_payment_options($myconfig, $form->{invdate}, 'sales_invoice');
|
||
|
|
||
|
$form->{delivery_term} = SL::DB::Manager::DeliveryTerm->find_by(id => $form->{delivery_term_id} || undef);
|
||
|
if ($form->{delivery_term} && $form->{language_id}) {
|
||
|
$form->{delivery_term}->description_long( $form->{delivery_term}->translated_attribute('description_long', $form->{language_id}));
|
||
|
$form->{delivery_term}->description_long_invoice($form->{delivery_term}->translated_attribute('description_long_invoice', $form->{language_id}));
|
||
|
}
|
||
|
|
||
|
$form->{department} = SL::DB::Manager::Department->find_by(id => $form->{department_id})->description if $form->{department_id};
|
||
|
$form->{delivery_term} = SL::DB::Manager::DeliveryTerm->find_by(id => $form->{delivery_term_id} || undef);
|
||
|
$form->{delivery_term}->description_long($form->{delivery_term}->translated_attribute('description_long', $form->{language_id})) if $form->{delivery_term} && $form->{language_id};
|
||
|
|
||
|
$form->{username} = $myconfig->{name};
|
||
|
|
||
| SL/OE.pm | ||
|---|---|---|
|
$dbh->disconnect;
|
||
|
|
||
|
$form->{delivery_term} = SL::DB::Manager::DeliveryTerm->find_by(id => $form->{delivery_term_id} || undef);
|
||
|
if ($form->{delivery_term} && $form->{language_id}) {
|
||
|
$form->{delivery_term}->description_long( $form->{delivery_term}->translated_attribute('description_long', $form->{language_id}));
|
||
|
$form->{delivery_term}->description_long_invoice($form->{delivery_term}->translated_attribute('description_long_invoice', $form->{language_id}));
|
||
|
}
|
||
|
$form->{delivery_term}->description_long($form->{delivery_term}->translated_attribute('description_long', $form->{language_id})) if $form->{delivery_term} && $form->{language_id};
|
||
|
|
||
|
$form->{order} = SL::DB::Manager::Order->find_by(id => $form->{id}) if $form->{id};
|
||
|
|
||
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.