projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
TODO: single-dbh
[kivitendo-erp.git]
/
bin
/
mozilla
/
do.pl
diff --git
a/bin/mozilla/do.pl
b/bin/mozilla/do.pl
index
e0a40f3
..
89d012e
100644
(file)
--- a/
bin/mozilla/do.pl
+++ b/
bin/mozilla/do.pl
@@
-40,7
+40,7
@@
use SL::DB::DeliveryOrder;
use SL::DO;
use SL::IR;
use SL::IS;
use SL::DO;
use SL::IR;
use SL::IS;
-use SL::MoreCommon qw(ary_diff);
+use SL::MoreCommon qw(ary_diff
restore_form save_form
);
use SL::ReportGenerator;
use SL::WH;
use Sort::Naturally ();
use SL::ReportGenerator;
use SL::WH;
use Sort::Naturally ();
@@
-95,6
+95,7
@@
sub add {
set_headings("add");
set_headings("add");
+ $form->{show_details} = $::myconfig{show_form_details};
$form->{callback} = build_std_url('action=add', 'type', 'vc') unless ($form->{callback});
order_links();
$form->{callback} = build_std_url('action=add', 'type', 'vc') unless ($form->{callback});
order_links();
@@
-111,6
+112,8
@@
sub edit {
my $form = $main::form;
my $form = $main::form;
+ $form->{show_details} = $::myconfig{show_form_details};
+
# show history button
$form->{javascript} = qq|<script type="text/javascript" src="js/show_history.js"></script>|;
#/show hhistory button
# show history button
$form->{javascript} = qq|<script type="text/javascript" src="js/show_history.js"></script>|;
#/show hhistory button
@@
-324,6
+327,11
@@
sub form_header {
$::request->{layout}->use_javascript(map { "${_}.js" } qw(kivi.SalesPurchase ckeditor/ckeditor ckeditor/adapters/jquery kivi.io autocomplete_customer autocomplete_part));
$::request->{layout}->use_javascript(map { "${_}.js" } qw(kivi.SalesPurchase ckeditor/ckeditor ckeditor/adapters/jquery kivi.io autocomplete_customer autocomplete_part));
+ my @custom_hidden;
+ push @custom_hidden, map { "shiptocvar_" . $_->name } @{ SL::DB::Manager::CustomVariableConfig->get_all(where => [ module => 'ShipTo' ]) };
+
+ $::form->{HIDDENS} = [ map { +{ name => $_, value => $::form->{$_} } } (@custom_hidden) ];
+
$form->header();
# Fix für Bug 1082 Erwartet wird: 'abteilungsNAME--abteilungsID'
# und Erweiterung für Bug 1760:
$form->header();
# Fix für Bug 1082 Erwartet wird: 'abteilungsNAME--abteilungsID'
# und Erweiterung für Bug 1760:
@@
-421,7
+429,7
@@
sub update_delivery_order {
if ($rows > 1) {
select_item(mode => $mode, pre_entered_qty => $form->{"qty_$i"});
if ($rows > 1) {
select_item(mode => $mode, pre_entered_qty => $form->{"qty_$i"});
-
::end_of_request()
;
+
$::dispatcher->end_request
;
} else {
} else {
@@
-550,7
+558,7
@@
sub orders {
my @hidden_variables = map { "l_${_}" } @columns;
push @hidden_variables, $form->{vc}, qw(l_closed l_notdelivered open closed delivered notdelivered donumber ordnumber serialnumber cusordnumber
transaction_description transdatefrom transdateto reqdatefrom reqdateto
my @hidden_variables = map { "l_${_}" } @columns;
push @hidden_variables, $form->{vc}, qw(l_closed l_notdelivered open closed delivered notdelivered donumber ordnumber serialnumber cusordnumber
transaction_description transdatefrom transdateto reqdatefrom reqdateto
- type vc employee_id salesman_id project_id
+ type vc employee_id salesman_id project_id
parts_partnumber parts_description
insertdatefrom insertdateto business_id);
my $href = build_std_url('action=orders', grep { $form->{$_} } @hidden_variables);
insertdatefrom insertdateto business_id);
my $href = build_std_url('action=orders', grep { $form->{$_} } @hidden_variables);
@@
-621,6
+629,12
@@
sub orders {
if ($form->{transaction_description}) {
push @options, $locale->text('Transaction description') . " : $form->{transaction_description}";
}
if ($form->{transaction_description}) {
push @options, $locale->text('Transaction description') . " : $form->{transaction_description}";
}
+ if ($form->{parts_description}) {
+ push @options, $locale->text('Part Description') . " : $form->{parts_description}";
+ }
+ if ($form->{parts_partnumber}) {
+ push @options, $locale->text('Part Number') . " : $form->{parts_partnumber}";
+ }
if ( $form->{transdatefrom} or $form->{transdateto} ) {
push @options, $locale->text('Delivery Order Date');
push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{transdatefrom}, 1) if $form->{transdatefrom};
if ( $form->{transdatefrom} or $form->{transdateto} ) {
push @options, $locale->text('Delivery Order Date');
push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{transdatefrom}, 1) if $form->{transdatefrom};
@@
-727,7
+741,7
@@
sub save {
# if the name changed get new values
if (check_name($form->{vc})) {
update();
# if the name changed get new values
if (check_name($form->{vc})) {
update();
-
::end_of_request()
;
+
$::dispatcher->end_request
;
}
$form->{id} = 0 if $form->{saveasnew};
}
$form->{id} = 0 if $form->{saveasnew};
@@
-745,7
+759,7
@@
sub save {
if (!$params{no_redirect} && !$form->{print_and_save}) {
delete @{$form}{ary_diff([keys %{ $form }], [qw(login id script type cursor_fokus)])};
edit();
if (!$params{no_redirect} && !$form->{print_and_save}) {
delete @{$form}{ary_diff([keys %{ $form }], [qw(login id script type cursor_fokus)])};
edit();
-
::end_of_request()
;
+
$::dispatcher->end_request
;
}
$main::lxdebug->leave_sub();
}
}
$main::lxdebug->leave_sub();
}
@@
-769,7
+783,7
@@
sub delete {
# /saving the history
$form->info($locale->text('Delivery Order deleted!'));
# /saving the history
$form->info($locale->text('Delivery Order deleted!'));
-
::end_of_request()
;
+
$::dispatcher->end_request
;
}
$form->error($locale->text('Cannot delete delivery order!'));
}
$form->error($locale->text('Cannot delete delivery order!'));
@@
-814,7
+828,10
@@
sub invoice {
}
for my $i (1 .. $form->{rowcount}) {
}
for my $i (1 .. $form->{rowcount}) {
+ map { $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig, $form->{"${_}_${i}"}) if $form->{"${_}_${i}"} } qw(ship qty sellprice lastcost basefactor discount);
# für bug 1284
# für bug 1284
+ # adds a customer/vendor discount, unless we have a workflow case
+ # CAVEAT: has to be done, after the above parse_amount
unless ($form->{"ordnumber"}) {
if ($form->{discount}) { # Falls wir einen Lieferanten-/Kundenrabatt haben
# und rabattfähig sind, dann
unless ($form->{"ordnumber"}) {
if ($form->{discount}) { # Falls wir einen Lieferanten-/Kundenrabatt haben
# und rabattfähig sind, dann
@@
-823,7
+840,6
@@
sub invoice {
}
}
}
}
}
}
- map { $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig, $form->{"${_}_${i}"}) if $form->{"${_}_${i}"} } qw(ship qty sellprice lastcost basefactor);
$form->{"donumber_$i"} = $form->{donumber};
$form->{"converted_from_delivery_order_items_id_$i"} = delete $form->{"delivery_order_items_id_$i"};
}
$form->{"donumber_$i"} = $form->{donumber};
$form->{"converted_from_delivery_order_items_id_$i"} = delete $form->{"delivery_order_items_id_$i"};
}
@@
-955,7
+971,8
@@
sub invoice_multi {
IS->get_customer(\%myconfig, \%$form);
$vc_discount = $form->{customer_discount};
}
IS->get_customer(\%myconfig, \%$form);
$vc_discount = $form->{customer_discount};
}
- restore_form($saved_form);
+ # use payment terms from customer or vendor
+ restore_form($saved_form,0,qw(payment_id));
$form->{rowcount} = 0;
foreach my $ref (@{ $form->{form_details} }) {
$form->{rowcount} = 0;
foreach my $ref (@{ $form->{form_details} }) {
@@
-1390,7
+1407,7
@@
sub transfer_in {
update();
$main::lxdebug->leave_sub();
update();
$main::lxdebug->leave_sub();
-
::end_of_request()
;
+
$::dispatcher->end_request
;
}
}
}
}
@@
-1509,7
+1526,7
@@
sub transfer_out {
update();
$main::lxdebug->leave_sub();
update();
$main::lxdebug->leave_sub();
-
::end_of_request()
;
+
$::dispatcher->end_request
;
}
}
DO->transfer_in_out('direction' => 'out',
}
}
DO->transfer_in_out('direction' => 'out',
@@
-1776,11
+1793,16
@@
sub sort {
my $form = $main::form;
my %temp_hash;
my $form = $main::form;
my %temp_hash;
- croak ("Delivery Order needs to be saved") unless $form->{id};
+ save(no_redirect => 1); # has to be done, at least for newly added positions
# hashify partnumbers, positions. key is delivery_order_items_id
for my $i (1 .. ($form->{rowcount}) ) {
$temp_hash{$form->{"delivery_order_items_id_$i"}} = { runningnumber => $form->{"runningnumber_$i"}, partnumber => $form->{"partnumber_$i"} };
# hashify partnumbers, positions. key is delivery_order_items_id
for my $i (1 .. ($form->{rowcount}) ) {
$temp_hash{$form->{"delivery_order_items_id_$i"}} = { runningnumber => $form->{"runningnumber_$i"}, partnumber => $form->{"partnumber_$i"} };
+ if ($form->{id} && $form->{"discount_$i"}) {
+ # prepare_order assumes a db value if there is a form->id and multiplies *100
+ # We hope for new controller code (no more format_amount/parse_amount distinction)
+ $form->{"discount_$i"} /=100;
+ }
}
# naturally sort partnumbers and get a sorted array of doi_ids
my @sorted_doi_ids = sort { Sort::Naturally::ncmp($temp_hash{$a}->{"partnumber"}, $temp_hash{$b}->{"partnumber"}) } keys %temp_hash;
}
# naturally sort partnumbers and get a sorted array of doi_ids
my @sorted_doi_ids = sort { Sort::Naturally::ncmp($temp_hash{$a}->{"partnumber"}, $temp_hash{$b}->{"partnumber"}) } keys %temp_hash;
@@
-1792,6
+1814,12
@@
sub sort {
$form->{"runningnumber_$temp_hash{$_}->{runningnumber}"} = $new_number;
$new_number++;
}
$form->{"runningnumber_$temp_hash{$_}->{runningnumber}"} = $new_number;
$new_number++;
}
+ # all parse_amounts changes are in form (i.e. , to .) therefore we need
+ # another format_amount to change it back, for the next save ;-(
+ # works great except for row discounts (see above comment)
+ prepare_order();
+
+
$main::lxdebug->leave_sub();
save();
}
$main::lxdebug->leave_sub();
save();
}