Revision a325f1b7
Von Jan Büren vor fast 16 Jahren hinzugefügt
| SL/IR.pm | ||
|---|---|---|
|
}
|
||
|
my $query =
|
||
|
qq|SELECT
|
||
|
v.id AS vendor_id, v.name AS vendor, v.creditlimit, v.terms, v.notes AS intnotes,
|
||
|
v.id AS vendor_id, v.name AS vendor, v.discount as vendor_discount,
|
||
|
v.creditlimit, v.terms, v.notes AS intnotes,
|
||
|
v.email, v.cc, v.bcc, v.language_id, v.payment_id,
|
||
|
v.street, v.zipcode, v.city, v.country, v.taxzone_id,
|
||
|
$duedate + COALESCE(pt.terms_netto, 0) AS duedate,
|
||
| bin/mozilla/io.pl | ||
|---|---|---|
|
{ id => 'partnumber', width => 8, value => $locale->text('Number'), display => 1, },
|
||
|
{ id => 'description', width => 30, value => $locale->text('Part Description'), display => 1, },
|
||
|
{ id => 'ship', width => 5, value => $locale->text('Delivered'), display => $is_s_p_order, },
|
||
|
{ id => 'qty', width => 5, value => $locale->text('Qty'), display => 1, },
|
||
|
{ id => 'qty', width => 5, value => $locale->text('Wo bin ich'), display => 1, },
|
||
|
{ id => 'price_factor', width => 5, value => $locale->text('Price Factor'), display => !$is_delivery_order, },
|
||
|
{ id => 'unit', width => 5, value => $locale->text('Unit'), display => 1, },
|
||
|
{ id => 'license', width => 10, value => $locale->text('License'), display => 0, },
|
||
| ... | ... | |
|
{ id => 'projectnr', width => 10, value => $locale->text('Project'), display => 0, },
|
||
|
{ id => 'sellprice', width => 15, value => $locale->text('Price'), display => !$is_delivery_order, },
|
||
|
{ id => 'sellprice_pg', width => 8, value => $locale->text('Pricegroup'), display => ($form->{type} =~ /^sales_/) && !$is_delivery_order, },
|
||
|
{ id => 'discount', width => 5, value => $locale->text('Discount'), display => ($form->{vc} eq 'customer') && !$is_delivery_order, },
|
||
|
{ id => 'discount', width => 5, value => $locale->text('Discount'), display => !$is_delivery_order, },
|
||
|
{ id => 'linetotal', width => 10, value => $locale->text('Extended'), display => !$is_delivery_order, },
|
||
|
{ id => 'bin', width => 10, value => $locale->text('Bin'), display => 0, },
|
||
|
{ id => 'stock_in_out', width => 10, value => $stock_in_out_title, display => $is_delivery_order, },
|
||
| bin/mozilla/ir.pl | ||
|---|---|---|
|
}
|
||
|
|
||
|
print $form->write_trigger(\%myconfig, scalar(@triggers) / 3, @triggers);
|
||
|
$form->hide_form(qw(rowcount callback draft_id draft_description));
|
||
|
$form->hide_form(qw(rowcount callback draft_id draft_description vendor_discount));
|
||
|
|
||
|
# button for saving history
|
||
|
if($form->{id} ne "") {
|
||
| ... | ... | |
|
}
|
||
|
# /mark_as_paid button
|
||
|
print qq|</form>
|
||
|
|
||
|
</body>
|
||
|
</html>
|
||
|
|;
|
||
| ... | ... | |
|
# override sellprice if there is one entered
|
||
|
$sellprice = $form->parse_amount(\%myconfig, $form->{"sellprice_$i"});
|
||
|
|
||
|
# ergaenzung fuer bug 736 Lieferanten-Rabatt auch in Einkaufsrechnungen vorbelegen jb
|
||
|
$form->{"discount_$i"} = $form->format_amount(\%myconfig,
|
||
|
$form->{vendor_discount} * 100 );
|
||
|
map { $form->{item_list}[$i]{$_} =~ s/\"/"/g } qw(partnumber description unit);
|
||
|
map { $form->{"${_}_$i"} = $form->{item_list}[0]{$_} } keys %{ $form->{item_list}[0] };
|
||
|
|
||
| bin/mozilla/oe.pl | ||
|---|---|---|
|
}
|
||
|
|
||
|
my $rows = scalar @{ $form->{item_list} };
|
||
|
|
||
|
# hier ist das problem fuer bug 817 $form->{discount} wird nicht durchgeschliffen
|
||
|
$form->{"discount_$i"} = $form->format_amount(\%myconfig, $form->{customer_discount} * 100);
|
||
|
# ferner fallunterscheidung fuer verkauf oder einkauf s.a. bug 736 jb 04.05.2009
|
||
|
# select discount as vendor_discount from vendor ||
|
||
|
# select discount as customer_discount from customer
|
||
|
$form->{"discount_$i"} = $form->format_amount(\%myconfig, $form->{"$form->{vc}_discount"} * 100);
|
||
|
|
||
|
if ($rows) {
|
||
|
$form->{"qty_$i"} = 1 unless ($form->{"qty_$i"});
|
||
| templates/webpages/oe/form_footer_de.html | ||
|---|---|---|
|
[%- END %]
|
||
|
[%- END %]
|
||
|
[%- END %]
|
||
|
|
||
|
<input type="hidden" name="saved_xyznumber" value="[% HTML.escape(saved_xyznumber) %]">
|
||
|
<input type="hidden" name="rowcount" value="[% HTML.escape(rowcount) %]">
|
||
|
<input type="hidden" name="customer_discount" value="[% HTML.escape(customer_discount) %]">
|
||
|
<input type="hidden" name="callback" value="[% callback %]">
|
||
|
[% IF vc == 'customer' %]
|
||
|
<input type="hidden" name="customer_discount" value="[% HTML.escape(customer_discount) %]">
|
||
|
[% ELSE %]
|
||
|
<input type="hidden" name="vendor_discount" value="[% HTML.escape(vendor_discount) %]">
|
||
|
[% END %]
|
||
|
|
||
|
</form>
|
||
|
|
||
| templates/webpages/oe/form_footer_master.html | ||
|---|---|---|
|
[%- END %]
|
||
|
[%- END %]
|
||
|
[%- END %]
|
||
|
|
||
|
<input type="hidden" name="saved_xyznumber" value="[% HTML.escape(saved_xyznumber) %]">
|
||
|
<input type="hidden" name="rowcount" value="[% HTML.escape(rowcount) %]">
|
||
|
<input type="hidden" name="customer_discount" value="[% HTML.escape(customer_discount) %]">
|
||
|
<input type="hidden" name="callback" value="[% callback %]">
|
||
|
[% IF vc == 'customer' %]
|
||
|
<input type="hidden" name="customer_discount" value="[% HTML.escape(customer_discount) %]">
|
||
|
[% ELSE %]
|
||
|
<input type="hidden" name="vendor_discount" value="[% HTML.escape(vendor_discount) %]">
|
||
|
[% END %]
|
||
|
|
||
|
</form>
|
||
|
|
||
Auch abrufbar als: Unified diff
Fehlerbehebung fuer Bug 736 - Der beim Lieferanten hinterlegte Rabatt wird in dem Feld Rabatt zu den jeweiligen Positionen vorbelegt (Einkauf
> Anfrage/Auftrag und Einkauf -> Einkaufsrechnung erfassen) - Ferner ist der Variablenname jetzt auf form>vendor_discount umbenannt