Revision ebd668c1
Von Tamino Steinert vor mehr als 1 Jahr hinzugefügt
| SL/DB/MetaSetup/DeliveryOrderItem.pm | ||
|---|---|---|
|
longdescription => { type => 'text' },
|
||
|
marge_price_factor => { type => 'numeric', default => 1, precision => 15, scale => 5 },
|
||
|
mtime => { type => 'timestamp' },
|
||
|
orderer_id => { type => 'integer' },
|
||
|
ordnumber => { type => 'text' },
|
||
|
parts_id => { type => 'integer', not_null => 1 },
|
||
|
position => { type => 'integer', not_null => 1 },
|
||
| ... | ... | |
|
key_columns => { delivery_order_id => 'id' },
|
||
|
},
|
||
|
|
||
|
orderer => {
|
||
|
class => 'SL::DB::Employee',
|
||
|
key_columns => { orderer_id => 'id' },
|
||
|
},
|
||
|
|
||
|
part => {
|
||
|
class => 'SL::DB::Part',
|
||
|
key_columns => { parts_id => 'id' },
|
||
| SL/DB/MetaSetup/OrderItem.pm | ||
|---|---|---|
|
marge_total => { type => 'numeric', precision => 15, scale => 5 },
|
||
|
mtime => { type => 'timestamp' },
|
||
|
optional => { type => 'boolean', default => 'false' },
|
||
|
orderer_id => { type => 'integer' },
|
||
|
ordnumber => { type => 'text' },
|
||
|
parts_id => { type => 'integer' },
|
||
|
position => { type => 'integer', not_null => 1 },
|
||
| ... | ... | |
|
key_columns => { trans_id => 'id' },
|
||
|
},
|
||
|
|
||
|
orderer => {
|
||
|
class => 'SL::DB::Employee',
|
||
|
key_columns => { orderer_id => 'id' },
|
||
|
},
|
||
|
|
||
|
part => {
|
||
|
class => 'SL::DB::Part',
|
||
|
key_columns => { parts_id => 'id' },
|
||
| SL/OE.pm | ||
|---|---|---|
|
o.ordnumber, o.transdate, o.cusordnumber, o.subtotal, o.recurring_billing_mode, o.longdescription,
|
||
|
o.price_factor_id, o.price_factor, o.marge_price_factor, o.active_price_source, o.active_discount_source,
|
||
|
pr.projectnumber, p.formel,
|
||
|
pg.partsgroup, o.pricegroup_id, (SELECT pricegroup FROM pricegroup WHERE id=o.pricegroup_id) as pricegroup
|
||
|
pg.partsgroup, o.pricegroup_id, (SELECT pricegroup FROM pricegroup WHERE id=o.pricegroup_id) as pricegroup,
|
||
|
e.name as orderer, e.id as orderer_id
|
||
|
FROM orderitems o
|
||
|
JOIN parts p ON (o.parts_id = p.id)
|
||
|
JOIN oe ON (o.trans_id = oe.id)
|
||
| ... | ... | |
|
LEFT JOIN chart c2 ON ((SELECT tc.income_accno_id FROM taxzone_charts tc WHERE tc.taxzone_id = ? and tc.buchungsgruppen_id = p.buchungsgruppen_id) = c2.id)
|
||
|
LEFT JOIN chart c3 ON ((SELECT tc.expense_accno_id FROM taxzone_charts tc WHERE tc.taxzone_id = ? and tc.buchungsgruppen_id = p.buchungsgruppen_id) = c3.id)
|
||
|
LEFT JOIN project pr ON (o.project_id = pr.id)
|
||
|
LEFT JOIN partsgroup pg ON (p.partsgroup_id = pg.id) | .
|
||
|
LEFT JOIN partsgroup pg ON (p.partsgroup_id = pg.id)
|
||
|
LEFT JOIN employee e ON (o.orderer_id = e.id) | .
|
||
|
($form->{id}
|
||
|
? qq|WHERE o.trans_id = ?|
|
||
|
: qq|WHERE o.trans_id IN (| . join(", ", map("?", @ids)) . qq|)|) .
|
||
| ... | ... | |
|
my @arrays =
|
||
|
qw(runningnumber number description longdescription qty qty_nofmt ship ship_nofmt unit bin
|
||
|
partnotes serialnumber reqdate sellprice sellprice_nofmt listprice listprice_nofmt netprice netprice_nofmt
|
||
|
orderer
|
||
|
discount discount_nofmt p_discount discount_sub discount_sub_nofmt nodiscount_sub nodiscount_sub_nofmt
|
||
|
linetotal linetotal_nofmt nodiscount_linetotal nodiscount_linetotal_nofmt tax_rate projectnumber projectdescription
|
||
|
price_factor price_factor_name partsgroup weight weight_nofmt lineweight lineweight_nofmt optional);
|
||
| bin/mozilla/io.pl | ||
|---|---|---|
|
# position of serialnr is used below!
|
||
|
my @row2_sort = qw(
|
||
|
tax_chart tax serialnr projectnr reqdate subtotal recurring_billing_mode marge listprice lastcost onhand
|
||
|
orderer
|
||
|
);
|
||
|
# serialnr is important for delivery_orders
|
||
|
if ($form->{type} eq 'sales_delivery_order') {
|
||
| ... | ... | |
|
vendor_partnumber => { width => 8, value => $locale->text('Vendor Part Number'), display => $is_delivery_order && $is_purchase, },
|
||
|
tax_chart => { value => "", display => $is_purchase && $is_invoice },
|
||
|
tax => { value => $locale->text('Tax'), display => $is_purchase && $is_invoice },
|
||
|
orderer => { width => 10, value => $locale->text('Orderer'), display => 1, },
|
||
|
);
|
||
|
my @HEADER = map { $column_def{$_} } @header_sort;
|
||
|
|
||
| ... | ... | |
|
default => $::form->{"recurring_billing_mode_$i"} || 'always',
|
||
|
);
|
||
|
|
||
|
# Orderer
|
||
|
$column_data{orderer} = qq|: $form->{"orderer_$i"}|;
|
||
|
|
||
|
# begin marge calculations
|
||
|
$form->{"lastcost_$i"} *= 1;
|
||
|
$form->{"marge_percent_$i"} = 0;
|
||
| ... | ... | |
|
$cgi->hidden("-name" => "price_new_$i", "-value" => $form->format_amount(\%myconfig, $form->{"price_new_$i"})),
|
||
|
map { ($cgi->hidden("-name" => $_, "-id" => $_, "-value" => $form->{$_})); } map { $_."_$i" }
|
||
|
(qw(bo price_old id inventory_accno bin partsgroup partnotes active_price_source active_discount_source
|
||
|
orderer_id
|
||
|
income_accno expense_accno listprice part_type taxaccounts ordnumber donumber transdate cusordnumber
|
||
|
longdescription basefactor marge_absolut marge_percent marge_price_factor weight), @hidden_vars)
|
||
|
);
|
||
| locale/de/all | ||
|---|---|---|
|
'Order/RFQ Number' => 'Belegnummer',
|
||
|
'OrderItem' => 'Position',
|
||
|
'Ordered' => 'Von Kunden bestellt',
|
||
|
'Orderer' => 'BestellerIn',
|
||
|
'Orders' => 'Aufträge',
|
||
|
'Orders / Delivery Orders deleteable' => 'Aufträge / Lieferscheine löschbar',
|
||
|
'Orders in Webshop' => 'Bestellungen in Webshop',
|
||
| locale/en/all | ||
|---|---|---|
|
'Order/RFQ Number' => '',
|
||
|
'OrderItem' => '',
|
||
|
'Ordered' => '',
|
||
|
'Orderer' => '',
|
||
|
'Orders' => '',
|
||
|
'Orders / Delivery Orders deleteable' => '',
|
||
|
'Orders in Webshop' => '',
|
||
| sql/Pg-upgrade2/add_orderer.sql | ||
|---|---|---|
|
-- @tag: add_orderer
|
||
|
-- @description: Neue Spalte Besteller in Angebots- und Lieferscheinpositionen
|
||
|
-- @depends: release_3_8_0
|
||
|
-- @ignore: 0
|
||
|
|
||
|
ALTER TABLE orderitems ADD COLUMN orderer_id INTEGER REFERENCES employee(id);
|
||
|
ALTER TABLE delivery_order_items ADD COLUMN orderer_id INTEGER REFERENCES employee(id);
|
||
| t/workflow/delivery_order_reclamation.t | ||
|---|---|---|
|
);
|
||
|
my @different_record_item_values = qw(
|
||
|
id delivery_order_id reclamation_id itime mtime
|
||
|
cusordnumber marge_price_factor ordnumber transdate
|
||
|
cusordnumber marge_price_factor ordnumber transdate orderer_id
|
||
|
description reason_description_ext reason_description_int reason_id
|
||
|
);
|
||
|
|
||
| t/workflow/order_reclamation.t | ||
|---|---|---|
|
);
|
||
|
my @different_record_item_values = qw(
|
||
|
id trans_id reclamation_id itime mtime
|
||
|
cusordnumber marge_percent marge_price_factor marge_total optional ordnumber ship subtotal transdate
|
||
|
cusordnumber marge_percent marge_price_factor marge_total optional ordnumber ship subtotal transdate orderer_id
|
||
|
reason_description_ext reason_description_int reason_id
|
||
|
recurring_billing_mode recurring_billing_invoice_id
|
||
|
);
|
||
Auch abrufbar als: Unified diff
Besteller zu Auftrags- und Lieferscheinpositionen hinzugefügt