X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fdo.pl;h=25020a09cc595253f659d5253b69c7691ec1efbd;hb=540c0b5e9a38158e6f7a6efacd20b2477efad7ac;hp=99a2cc751eeb51a6b67ac521a08493a87f141756;hpb=915e943a8fa8ab2a32576d4609632d598898cf20;p=kivitendo-erp.git
diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl
index 99a2cc751..25020a09c 100644
--- a/bin/mozilla/do.pl
+++ b/bin/mozilla/do.pl
@@ -34,12 +34,12 @@ use List::Util qw(max sum);
use POSIX qw(strftime);
use YAML;
+use SL::DB::DeliveryOrder;
use SL::DO;
use SL::IR;
use SL::IS;
use SL::ReportGenerator;
use SL::WH;
-
require "bin/mozilla/arap.pl";
require "bin/mozilla/common.pl";
require "bin/mozilla/invoice_io.pl";
@@ -173,8 +173,8 @@ sub order_links {
DO->retrieve('vc' => $form->{vc},
'ids' => $form->{id});
- $form->backup_vars(qw(payment_id language_id taxzone_id salesman_id taxincluded cp_id intnotes));
- $form->{shipto} = 1 if $form->{id};
+ $form->backup_vars(qw(payment_id language_id taxzone_id salesman_id taxincluded cp_id intnotes currency));
+ $form->{shipto} = 1 if $form->{id} || $form->{convert_from_oe_ids};
# get customer / vendor
if ($form->{vc} eq 'vendor') {
@@ -186,6 +186,7 @@ sub order_links {
}
$form->restore_vars(qw(payment_id language_id taxzone_id intnotes cp_id));
+ $form->restore_vars(qw(currency)) if ($form->{id} || $form->{convert_from_oe_ids});
$form->restore_vars(qw(taxincluded)) if $form->{id};
$form->restore_vars(qw(salesman_id)) if $editing;
@@ -257,29 +258,37 @@ sub form_header {
# use JavaScript Calendar or not
$form->{jsscript} = 1;
- #write Trigger
- my $jsscript = Form->write_trigger(\%myconfig, "2", "transdate", "BL", "trigger1", "reqdate", "BL", "trigger2");
-
my @old_project_ids = ($form->{"globalproject_id"});
map({ push(@old_project_ids, $form->{"project_id_$_"})
if ($form->{"project_id_$_"}); } (1..$form->{"rowcount"}));
my $vc = $form->{vc} eq "customer" ? "customers" : "vendors";
- $form->get_lists("contacts" => "ALL_CONTACTS",
- "shipto" => "ALL_SHIPTO",
- "projects" => {
+ $form->get_lists("projects" => {
"key" => "ALL_PROJECTS",
"all" => 0,
"old_id" => \@old_project_ids
},
- "employees" => "ALL_EMPLOYEES",
- "salesmen" => "ALL_SALESMEN",
$vc => "ALL_VC",
"price_factors" => "ALL_PRICE_FACTORS",
"departments" => "ALL_DEPARTMENTS",
"business_types" => "ALL_BUSINESS_TYPES",
);
+ $::form->{ALL_EMPLOYEES} = SL::DB::Manager::Employee->get_all(query => [ or => [ id => $::form->{employee_id}, deleted => 0 ] ]);
+ $::form->{ALL_SALESMEN} = SL::DB::Manager::Employee->get_all(query => [ or => [ id => $::form->{salesman_id}, deleted => 0 ] ]);
+ $::form->{ALL_SHIPTO} = SL::DB::Manager::Shipto->get_all(query => [
+ or => [ trans_id => $::form->{"$::form->{vc}_id"} * 1, and => [ shipto_id => $::form->{shipto_id} * 1, trans_id => undef ] ]
+ ]);
+ $::form->{ALL_CONTACTS} = SL::DB::Manager::Contact->get_all(query => [
+ or => [
+ cp_cv_id => $::form->{"$::form->{vc}_id"} * 1,
+ and => [
+ cp_cv_id => undef,
+ cp_id => $::form->{cp_id} * 1
+ ]
+ ]
+ ]);
+
map { $_->{value} = "$_->{description}--$_->{id}" } @{ $form->{ALL_DEPARTMENTS} };
map { $_->{value} = "$_->{name}--$_->{id}" } @{ $form->{ALL_VC} };
@@ -300,8 +309,17 @@ sub form_header {
$form->header();
# Fix für Bug 1082 Erwartet wird: 'abteilungsNAME--abteilungsID'
- $form->{department} .= '--' . $form->{department_id};
-
+ # und Erweiterung für Bug 1760:
+ # Das war leider nur ein Teil-Fix, da das Verhalten den 'Erneuern'-Knopf
+ # nicht überlebt. Konsequent jetzt auf L umgestellt
+ # $ perldoc SL::Template::Plugin::L
+ # Daher entsprechend nur die Anpassung in form_header
+ # und in DO.pm gemacht. 4 Testfälle:
+ # department_id speichern | i.O.
+ # department_id lesen | i.O.
+ # department leer überlebt erneuern | i.O.
+ # department nicht leer überlebt erneuern | i.O.
+ # $main::lxdebug->message(0, 'ABTEILUNGS ID in form?' . $form->{department_id});
print $form->parse_html_template('do/form_header');
$main::lxdebug->leave_sub();
@@ -363,10 +381,13 @@ sub update_delivery_order {
} else {
+ my $mode;
if ($form->{type} eq 'purchase_delivery_order') {
IR->retrieve_item(\%myconfig, $form);
+ $mode = 'IR';
} else {
IS->retrieve_item(\%myconfig, $form);
+ $mode = 'IS';
}
my $rows = scalar @{ $form->{item_list} };
@@ -376,7 +397,7 @@ sub update_delivery_order {
if ($rows > 1) {
- select_item();
+ select_item(mode => $mode);
::end_of_request();
} else {
@@ -427,9 +448,8 @@ sub search {
$form->get_lists("projects" => { "key" => "ALL_PROJECTS",
"all" => 1 },
- "employees" => "ALL_EMPLOYEES",
- "salesmen" => "ALL_SALESMEN",
"$form->{vc}s" => "ALL_VC");
+ $form->{ALL_EMPLOYEES} = SL::DB::Manager::Employee->get_all(query => [ deleted => 0 ]);
$form->{SHOW_VC_DROP_DOWN} = $myconfig{vclimit} > scalar @{ $form->{ALL_VC} };
$form->{jsscript} = 1;
@@ -450,7 +470,7 @@ sub orders {
my $form = $main::form;
my %myconfig = %main::myconfig;
my $locale = $main::locale;
- my $cgi = $main::cgi;
+ my $cgi = $::request->{cgi};
($form->{ $form->{vc} }, $form->{"$form->{vc}_id"}) = split(/--/, $form->{ $form->{vc} });
@@ -464,7 +484,7 @@ sub orders {
ids transdate
id donumber
ordnumber
- name employee
+ name employee salesman
shipvia globalprojectnumber
transaction_description
open delivered
@@ -493,6 +513,7 @@ sub orders {
'ordnumber' => { 'text' => $locale->text('Order'), },
'name' => { 'text' => $form->{vc} eq 'customer' ? $locale->text('Customer') : $locale->text('Vendor'), },
'employee' => { 'text' => $locale->text('Employee'), },
+ 'salesman' => { 'text' => $locale->text('Salesman'), },
'shipvia' => { 'text' => $locale->text('Ship via'), },
'globalprojectnumber' => { 'text' => $locale->text('Project Number'), },
'transaction_description' => { 'text' => $locale->text('Transaction description'), },
@@ -500,7 +521,7 @@ sub orders {
'delivered' => { 'text' => $locale->text('Delivered'), },
);
- foreach my $name (qw(id transdate donumber ordnumber name employee shipvia transaction_description)) {
+ foreach my $name (qw(id transdate donumber ordnumber name employee salesman shipvia transaction_description)) {
my $sortdir = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir};
$column_defs{$name}->{link} = $href . "&sort=$name&sortdir=$sortdir";
}
@@ -591,8 +612,7 @@ sub orders {
};
$row->{donumber}->{link} = $edit_url . "&id=" . E($dord->{id}) . "&callback=${callback}";
- $row->{ordnumber}->{link} = $edit_order_url . "&id=" . E($dord->{oe_id}) . "&callback=${callback}";
-
+ $row->{ordnumber}->{link} = $edit_order_url . "&id=" . E($dord->{oe_id}) . "&callback=${callback}" if $dord->{oe_id};
$report->add_data($row);
$idx++;
@@ -606,6 +626,8 @@ sub orders {
sub save {
$main::lxdebug->enter_sub();
+ my (%params) = @_;
+
check_do_access();
my $form = $main::form;
@@ -656,7 +678,7 @@ sub save {
# /saving the history
$form->{simple_save} = 1;
- if(!$form->{print_and_save}) {
+ if (!$params{no_redirect} && !$form->{print_and_save}) {
set_headings("edit");
update();
::end_of_request();
@@ -766,6 +788,7 @@ sub invoice {
require "bin/mozilla/$form->{script}";
my $currency = $form->{currency};
+ $form->{shipto} = 1 if $form->{convert_from_do_ids};
invoice_links();
if ($form->{ordnumber}) {
@@ -812,6 +835,13 @@ sub invoice {
}
+ # show pricegroup in newly loaded invoice when creating invoice from delivery order
+ for my $i (1 .. $form->{rowcount}) {
+ $form->{"sellprice_pg_$i"} = join '--', $form->{"sellprice_$i"}, $form->{"pricegroup_id_$i"};
+ }
+ IS->get_pricegroups_for_parts(\%myconfig, \%$form);
+ set_pricegroup($_) for 1 .. $form->{rowcount};
+
display_form();
$main::lxdebug->leave_sub();
@@ -880,7 +910,7 @@ sub invoice_multi {
$vc_discount = $form->{vendor_discount};
} else {
IS->get_customer(\%myconfig, \%$form);
- $vc_discount = $form->parse_amount(\%myconfig, $form->{customer_discount});
+ $vc_discount = $form->{customer_discount};
}
restore_form($saved_form);
@@ -910,6 +940,14 @@ sub invoice_multi {
invoice_links();
prepare_invoice();
+
+ # show pricegroup in newly loaded invoice when creating invoice from delivery order
+ for my $i (1 .. $form->{rowcount}) {
+ $form->{"sellprice_pg_$i"} = join '--', $form->{"sellprice_$i"}, $form->{"pricegroup_id_$i"};
+ }
+ IS->get_pricegroups_for_parts(\%myconfig, \%$form);
+ set_pricegroup($_) for 1 .. $form->{rowcount};
+
display_form();
$main::lxdebug->leave_sub();
@@ -978,14 +1016,16 @@ sub calculate_stock_in_out {
my $in_out = $form->{type} =~ /^sales/ ? 'out' : 'in';
my $sinfo = DO->unpack_stock_information('packed' => $form->{"stock_${in_out}_${i}"});
+ my $do_qty = AM->sum_with_unit($::form->{"qty_$i"}, $::form->{"unit_$i"});
my $sum = AM->sum_with_unit(map { $_->{qty}, $_->{unit} } @{ $sinfo });
+ my $matches = $do_qty == $sum;
my $content = $form->format_amount_units('amount' => $sum * 1,
'part_unit' => $form->{"partunit_$i"},
'amount_unit' => $all_units->{$form->{"partunit_$i"}}->{base_unit},
'conv_units' => 'convertible_not_smaller',
'max_places' => 2);
- $content = qq|${content} |;
+ $content = qq|${content} |;
$main::lxdebug->leave_sub();
@@ -1140,8 +1180,13 @@ sub set_stock_in {
_stock_in_out_set_qty_display($stock_info);
+ my $do_qty = AM->sum_with_unit($::form->parse_amount(\%::myconfig, $::form->{do_qty}), $::form->{do_unit});
+ my $transfer_qty = AM->sum_with_unit(map { $_->{qty}, $_->{unit} } @{ $stock_info });
+
$form->header();
- print $form->parse_html_template('do/set_stock_in_out');
+ print $form->parse_html_template('do/set_stock_in_out', {
+ qty_matches => $do_qty == $transfer_qty,
+ });
$main::lxdebug->leave_sub();
}
@@ -1235,8 +1280,13 @@ sub set_stock_out {
} else {
_stock_in_out_set_qty_display($stock_info);
+ my $do_qty = AM->sum_with_unit($::form->parse_amount(\%::myconfig, $::form->{do_qty}), $::form->{do_unit});
+ my $transfer_qty = AM->sum_with_unit(map { $_->{qty}, $_->{unit} } @{ $stock_info });
+
$form->header();
- print $form->parse_html_template('do/set_stock_in_out');
+ print $form->parse_html_template('do/set_stock_in_out', {
+ qty_matches => $do_qty == $transfer_qty,
+ });
}
$main::lxdebug->leave_sub();
@@ -1249,10 +1299,12 @@ sub transfer_in {
my %myconfig = %main::myconfig;
my $locale = $main::locale;
- if (DO->is_marked_as_delivered('id' => $form->{id})) {
+ if ($form->{id} && DO->is_marked_as_delivered(id => $form->{id})) {
$form->show_generic_error($locale->text('The parts for this delivery order have already been transferred in.'), 'back_button' => 1);
}
+ save(no_redirect => 1);
+
my @part_ids = map { $form->{"id_${_}"} } grep { $form->{"id_${_}"} && $form->{"stock_in_${_}"} } (1 .. $form->{rowcount});
my @all_requests;
@@ -1289,6 +1341,7 @@ sub transfer_in {
if (@{ $form->{ERRORS} }) {
push @{ $form->{ERRORS} }, $locale->text('The delivery order has not been marked as delivered. The warehouse contents have not changed.');
+ set_headings('edit');
update();
$main::lxdebug->leave_sub();
@@ -1299,9 +1352,10 @@ sub transfer_in {
DO->transfer_in_out('direction' => 'in',
'requests' => \@all_requests);
- $form->{delivered} = 1;
+ SL::DB::DeliveryOrder->new(id => $form->{id})->load->update_attributes(delivered => 1);
- save();
+ $form->{callback} = 'do.pl?action=edit&type=purchase_delivery_order&id=' . $form->escape($form->{id});
+ $form->redirect;
$main::lxdebug->leave_sub();
}
@@ -1313,10 +1367,12 @@ sub transfer_out {
my %myconfig = %main::myconfig;
my $locale = $main::locale;
- if (DO->is_marked_as_delivered('id' => $form->{id})) {
+ if ($form->{id} && DO->is_marked_as_delivered(id => $form->{id})) {
$form->show_generic_error($locale->text('The parts for this delivery order have already been transferred out.'), 'back_button' => 1);
}
+ save(no_redirect => 1);
+
my @part_ids = map { $form->{"id_${_}"} } grep { $form->{"id_${_}"} && $form->{"stock_out_${_}"} } (1 .. $form->{rowcount});
my @all_requests;
@@ -1350,7 +1406,7 @@ sub transfer_out {
next if (0 == $row_sum_base_qty);
- my $do_base_qty = $form->parse_amount(\%myconfig, $form->{"qty_$i"}) * $units->{$form->{"unit_$i"}}->{factor} / $base_unit_factor;
+ my $do_base_qty = $form->{"qty_$i"} * $units->{$form->{"unit_$i"}}->{factor} / $base_unit_factor;
# if ($do_base_qty != $row_sum_base_qty) {
# push @{ $form->{ERRORS} }, $locale->text('Error in position #1: You must either assign no transfer at all or the full quantity of #2 #3.',
@@ -1404,6 +1460,7 @@ sub transfer_out {
if (@{ $form->{ERRORS} }) {
push @{ $form->{ERRORS} }, $locale->text('The delivery order has not been marked as delivered. The warehouse contents have not changed.');
+ set_headings('edit');
update();
$main::lxdebug->leave_sub();
@@ -1413,9 +1470,10 @@ sub transfer_out {
DO->transfer_in_out('direction' => 'out',
'requests' => \@all_requests);
- $form->{delivered} = 1;
+ SL::DB::DeliveryOrder->new(id => $form->{id})->load->update_attributes(delivered => 1);
- save();
+ $form->{callback} = 'do.pl?action=edit&type=sales_delivery_order&id=' . $form->escape($form->{id});
+ $form->redirect;
$main::lxdebug->leave_sub();
}