Revision 4791d8a3
Von Bernd Blessmann vor fast 13 Jahren hinzugefügt
| SL/DO.pm | ||
|---|---|---|
| 252 | 252 |
id, delivery_order_id, parts_id, description, longdescription, qty, base_qty, |
| 253 | 253 |
sellprice, discount, unit, reqdate, project_id, serialnumber, |
| 254 | 254 |
ordnumber, transdate, cusordnumber, |
| 255 |
lastcost, price_factor_id, price_factor, marge_price_factor) |
|
| 255 |
lastcost, price_factor_id, price_factor, marge_price_factor, pricegroup_id)
|
|
| 256 | 256 |
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, |
| 257 |
(SELECT factor FROM price_factors WHERE id = ?), ?)|; |
|
| 257 |
(SELECT factor FROM price_factors WHERE id = ?), ?, ?)|;
|
|
| 258 | 258 |
my $h_item = prepare_query($form, $dbh, $q_item); |
| 259 | 259 |
|
| 260 | 260 |
my $q_item_stock = |
| ... | ... | |
| 301 | 301 |
$form->{"cusordnumber_$i"},
|
| 302 | 302 |
$form->{"lastcost_$i"},
|
| 303 | 303 |
conv_i($form->{"price_factor_id_$i"}), conv_i($form->{"price_factor_id_$i"}),
|
| 304 |
conv_i($form->{"marge_price_factor_$i"}));
|
|
| 304 |
conv_i($form->{"marge_price_factor_$i"}),
|
|
| 305 |
conv_i($form->{"pricegroup_id_$i"}));
|
|
| 305 | 306 |
do_statement($form, $h_item, $q_item, @values); |
| 306 | 307 |
|
| 307 | 308 |
my $stock_info = DO->unpack_stock_information('packed' => $form->{"stock_${in_out}_$i"});
|
| ... | ... | |
| 670 | 671 |
doi.sellprice, doi.parts_id AS id, doi.unit, doi.discount, p.bin, p.notes AS partnotes, |
| 671 | 672 |
doi.reqdate, doi.project_id, doi.serialnumber, doi.lastcost, |
| 672 | 673 |
doi.ordnumber, doi.transdate, doi.cusordnumber, doi.longdescription, |
| 673 |
doi.price_factor_id, doi.price_factor, doi.marge_price_factor, |
|
| 674 |
doi.price_factor_id, doi.price_factor, doi.marge_price_factor, doi.pricegroup_id,
|
|
| 674 | 675 |
pr.projectnumber, dord.transdate AS dord_transdate, |
| 675 | 676 |
pg.partsgroup |
| 676 | 677 |
FROM delivery_order_items doi |
| bin/mozilla/do.pl | ||
|---|---|---|
| 818 | 818 |
|
| 819 | 819 |
} |
| 820 | 820 |
|
| 821 |
# show pricegroup in newly loaded invoice when creating invoice from delivery order |
|
| 822 |
for my $i (1 .. $form->{rowcount}) {
|
|
| 823 |
$form->{"sellprice_pg_$i"} = join /--/, $form->{"sellprice_$i"}, $form->{"pricegroup_id_$i"};
|
|
| 824 |
} |
|
| 825 |
IS->get_pricegroups_for_parts(\%myconfig, \%$form); |
|
| 826 |
set_pricegroup($_) for 1 .. $form->{rowcount};
|
|
| 827 |
|
|
| 821 | 828 |
display_form(); |
| 822 | 829 |
|
| 823 | 830 |
$main::lxdebug->leave_sub(); |
| ... | ... | |
| 916 | 923 |
|
| 917 | 924 |
invoice_links(); |
| 918 | 925 |
prepare_invoice(); |
| 926 |
|
|
| 927 |
# show pricegroup in newly loaded invoice when creating invoice from delivery order |
|
| 928 |
for my $i (1 .. $form->{rowcount}) {
|
|
| 929 |
$form->{"sellprice_pg_$i"} = join /--/, $form->{"sellprice_$i"}, $form->{"pricegroup_id_$i"};
|
|
| 930 |
} |
|
| 931 |
IS->get_pricegroups_for_parts(\%myconfig, \%$form); |
|
| 932 |
set_pricegroup($_) for 1 .. $form->{rowcount};
|
|
| 933 |
|
|
| 919 | 934 |
display_form(); |
| 920 | 935 |
|
| 921 | 936 |
$main::lxdebug->leave_sub(); |
| bin/mozilla/io.pl | ||
|---|---|---|
| 400 | 400 |
|
| 401 | 401 |
if ($is_delivery_order) {
|
| 402 | 402 |
map { $form->{"${_}_${i}"} = $form->format_amount(\%myconfig, $form->{"${_}_${i}"}) } qw(sellprice discount lastcost);
|
| 403 |
push @hidden_vars, qw(sellprice discount not_discountable price_factor_id lastcost); |
|
| 403 |
push @hidden_vars, qw(sellprice discount not_discountable price_factor_id lastcost pricegroup_id);
|
|
| 404 | 404 |
push @hidden_vars, "stock_${stock_in_out}_sum_qty", "stock_${stock_in_out}";
|
| 405 | 405 |
} |
| 406 | 406 |
|
| bin/mozilla/oe.pl | ||
|---|---|---|
| 1849 | 1849 |
|
| 1850 | 1850 |
map { $form->{$_} = $old_values{$_} if ($old_values{$_}) } keys %old_values;
|
| 1851 | 1851 |
|
| 1852 |
for my $i (1 .. $form->{rowcount}) {
|
|
| 1853 |
(my $dummy, $form->{"pricegroup_id_$i"}) = split /--/, $form->{"sellprice_pg_$i"};
|
|
| 1854 |
} |
|
| 1852 | 1855 |
update(); |
| 1853 | 1856 |
|
| 1854 | 1857 |
$main::lxdebug->leave_sub(); |
| doc/changelog | ||
|---|---|---|
| 76 | 76 |
- Bugfix 1738: Entwürfe können nicht gelöscht werden |
| 77 | 77 |
- Bugfix 1759: Währung bei Kunden / Lieferanten vorbelegen |
| 78 | 78 |
- Bugfix 1770: Währung / currency überlebt Workflow über Lieferschein nicht |
| 79 |
- Bugfix 1770: (zweiter Teil) Preisgruppen überleben Workflow nicht |
|
| 79 | 80 |
- Bugfix 1773: SQL Fehler bei Anzeige von Angeboten |
| 80 | 81 |
- Bugfix 1725: In Mahnungen steht currency nicht als Variable zur Verfügung? |
| 81 | 82 |
- Bugfix 1771: Zahlungsausgang: Lieferant wird nicht ausgewählt, wenn Name 2 Leerzeichen hintereinander enthält |
| sql/Pg-upgrade2/delivery_order_items_add_pricegroup_id.sql | ||
|---|---|---|
| 1 |
-- @tag: delivery_order_items_add_pricegroup_id |
|
| 2 |
-- @description: Spalten für Preisgruppen-Id für Lieferscheine |
|
| 3 |
-- @depends: release_2_6_3 |
|
| 4 |
-- @charset: utf-8 |
|
| 5 |
ALTER TABLE delivery_order_items ADD COLUMN pricegroup_id integer; |
|
Auch abrufbar als: Unified diff
Bugfix für Bug 1770 (zweiter Teil):
Preisgruppen überleben jetzt Workflow über Lieferschein.