Revision 6923fcd4
Von Bernd Bleßmann vor fast 9 Jahren hinzugefügt
| SL/Controller/DeliveryPlan.pm | ||
|---|---|---|
| 208 | 208 |
my $vc = $self->vc; |
| 209 | 209 |
my $employee_id = SL::DB::Manager::Employee->current->id; |
| 210 | 210 |
my $oe_owner = $_[0]->all_edit_right ? '' : " oe.employee_id = $employee_id AND"; |
| 211 |
# check delivered state for delivery_orders (transferred out) if enabled |
|
| 212 |
my $filter_delivered = ($::instance_conf->get_delivery_plan_calculate_transferred_do) ? |
|
| 213 |
"AND (SELECT delivered from delivery_orders where id = doi.delivery_order_id)" : ''; |
|
| 211 |
|
|
| 214 | 212 |
[ |
| 215 | 213 |
"order.${vc}_id" => { gt => 0 },
|
| 216 | 214 |
'order.closed' => 0, |
| ... | ... | |
| 239 | 237 |
rl.to_table = 'delivery_orders' AND |
| 240 | 238 |
rl.to_id = doi.delivery_order_id AND |
| 241 | 239 |
oi.parts_id = doi.parts_id |
| 242 |
$filter_delivered |
|
| 243 | 240 |
) tuples GROUP BY parts_id, trans_id, qty |
| 244 | 241 |
) partials |
| 245 | 242 |
LEFT JOIN orderitems oi ON partials.parts_id = oi.parts_id AND partials.trans_id = oi.trans_id |
| ... | ... | |
| 292 | 289 |
(oe.quotation = 'f' OR oe.quotation IS NULL) AND NOT oe.closed |
| 293 | 290 |
) rl |
| 294 | 291 |
LEFT JOIN delivery_order_items doi ON (rl.to_id = doi.delivery_order_id) |
| 295 |
WHERE 1 = 1 |
|
| 296 |
$filter_delivered |
|
| 297 | 292 |
GROUP BY rl.from_id, doi.parts_id |
| 298 | 293 |
) agg ON (agg.oid = oi.trans_id AND agg.parts_id = oi.parts_id) |
| 299 | 294 |
LEFT JOIN oe ON oe.id = oi.trans_id |
| ... | ... | |
| 316 | 311 |
my $vc = $self->vc; |
| 317 | 312 |
my $employee_id = SL::DB::Manager::Employee->current->id; |
| 318 | 313 |
my $oe_owner = $_[0]->all_edit_right ? '' : " oe.employee_id = $employee_id AND"; |
| 319 |
# check delivered state for delivery_orders (transferred out) if enabled |
|
| 320 |
my $filter_delivered = ($::instance_conf->get_delivery_plan_calculate_transferred_do) ? |
|
| 321 |
"AND (SELECT delivered from delivery_orders where id = doi.delivery_order_id)" : ''; |
|
| 322 | 314 |
|
| 323 | 315 |
[ |
| 324 | 316 |
"order.${vc}_id" => { gt => 0 },
|
| ... | ... | |
| 340 | 332 |
rl.from_table = 'orderitems'AND |
| 341 | 333 |
rl.to_table = 'delivery_order_items' AND |
| 342 | 334 |
rl.from_id = oi.id |
| 343 |
$filter_delivered |
|
| 344 | 335 |
GROUP BY oi.id |
| 345 | 336 |
) linked |
| 346 | 337 |
WHERE qty > doi_qty |
| SL/DB/MetaSetup/Default.pm | ||
|---|---|---|
| 42 | 42 |
datev_check_on_gl_transaction => { type => 'boolean', default => 'true' },
|
| 43 | 43 |
datev_check_on_purchase_invoice => { type => 'boolean', default => 'true' },
|
| 44 | 44 |
datev_check_on_sales_invoice => { type => 'boolean', default => 'true' },
|
| 45 |
delivery_plan_calculate_transferred_do => { type => 'boolean', default => 'false', not_null => 1 },
|
|
| 46 | 45 |
disabled_price_sources => { type => 'array' },
|
| 47 | 46 |
dunning_ar => { type => 'integer' },
|
| 48 | 47 |
dunning_ar_amount_fee => { type => 'integer' },
|
| locale/de/all | ||
|---|---|---|
| 872 | 872 |
'Delivery Order(s) for full qty created' => 'Lieferschein(e) mit kompletter Menge erstellt', |
| 873 | 873 |
'Delivery Orders' => 'Lieferscheine', |
| 874 | 874 |
'Delivery Plan' => 'Lieferplan', |
| 875 |
'Delivery Plan check for transferred delivery orders' => 'Lieferplan berücksichtig den Status des Lieferscheins (ausgelagert / nicht ausgelagert)', |
|
| 876 | 875 |
'Delivery Plan for currently outstanding purchase orders' => 'Lieferplan für nicht vollständig gelieferte Einkaufs-Aufträge', |
| 877 | 876 |
'Delivery Plan for currently outstanding sales orders' => 'Lieferplan für nicht vollständig gelieferte Verkaufsaufträge', |
| 878 | 877 |
'Delivery Terms' => 'Lieferbedingungen', |
| ... | ... | |
| 2769 | 2768 |
'The dataset #1 has been created.' => 'Die Datenbank #1 wurde angelegt.', |
| 2770 | 2769 |
'The dataset #1 has been deleted.' => 'Die Datenbank #1 wurde gelöscht.', |
| 2771 | 2770 |
'The deductible amount' => 'Der abziehbare Skontobetrag', |
| 2772 |
'The default delivery value report only checks if all delivery orders have been created not if the goods are transferred. This feature will check if all the goods are transferred. Caveat: Only the state of the delivery orders are checked not partial transferred delivery orders (in technical terms: the table inventory is not checked' => 'Standardmässig wird beim Lieferwertbericht überprüft, ob es eine vollständige Liefermenge über alle Lieferscheine gibt. Dies ist dann die Statusbedingung für geliefert oder nicht geliefert. Mit dieser Erweiterung wird geprüft ob die Lieferbelege auch wirklich ausgelagert sind oder nicht. Teilausgelagerte Lieferscheine werden allerdings nicht berücksichtigt (Technischer Hintergrund: Keine Überprüfung der Lagertabelle inventory). ', |
|
| 2773 | 2771 |
'The default value depends on the variable type:' => 'Die Bedeutung des Standardwertes hängt vom Variablentypen ab:', |
| 2774 | 2772 |
'The delivery order has not been marked as delivered. The warehouse contents have not changed.' => 'Der Lieferschein wurde nicht als geliefert markiert. Der Lagerinhalt wurde nicht verändert.', |
| 2775 | 2773 |
'The delivery term has been created.' => 'Die Lieferbedingungen wurden angelegt.', |
| sql/Pg-upgrade2/defaults_drop_delivery_plan_calculate_transferred_do.sql | ||
|---|---|---|
| 1 |
-- @tag: defaults_drop_delivery_plan_calculate_transferred_do |
|
| 2 |
-- @description: Entferne Einstellung für Lieferplan, nur ausgelagerte Lieferscheine zu berücksichtigen |
|
| 3 |
-- @depends: defaults_add_delivery_plan_config |
|
| 4 |
-- @encoding: utf-8 |
|
| 5 |
|
|
| 6 |
ALTER TABLE defaults DROP COLUMN delivery_plan_calculate_transferred_do; |
|
| templates/webpages/client_config/_warehouse.html | ||
|---|---|---|
| 97 | 97 |
[% LxERP.t8('Any stock contents containing a best before date will be impossible to stock out otherwise.') %]
|
| 98 | 98 |
</td> |
| 99 | 99 |
</tr> |
| 100 |
<tr><td colspan="3"><hr /></td></tr> |
|
| 101 |
<tr> |
|
| 102 |
<td align="right">[% LxERP.t8('Delivery Plan check for transferred delivery orders') %]</td>
|
|
| 103 |
<td> |
|
| 104 |
[% L.yes_no_tag('defaults.delivery_plan_calculate_transferred_do', SELF.defaults.delivery_plan_calculate_transferred_do) %]
|
|
| 105 |
</td> |
|
| 106 |
<td> |
|
| 107 |
[% LxERP.t8('The default delivery value report only checks if all delivery orders have been created not if the goods are transferred. This feature will check if all the goods are transferred. Caveat: Only the state of the delivery orders are checked not partial transferred delivery orders (in technical terms: the table inventory is not checked') %]
|
|
| 108 |
</td> |
|
| 109 |
</tr> |
|
| 110 | 100 |
</table> |
| 111 | 101 |
</div> |
Auch abrufbar als: Unified diff
DeliveryPlan: Entfernt Einstellung, um nur ausgelagerte Lieferscheine zu berücksichtigen.
Diese Option lieferte hier ungenaue Ergebnisse, da dennoch auch Positionen
angezeigt wurden, für die überhaupt kein Lieferschein erstellt wurde.