projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Schnellsuche für Verkaufs- & Einkaufslieferscheine
[kivitendo-erp.git]
/
bin
/
mozilla
/
oe.pl
diff --git
a/bin/mozilla/oe.pl
b/bin/mozilla/oe.pl
index
940d076
..
1d358d9
100644
(file)
--- a/
bin/mozilla/oe.pl
+++ b/
bin/mozilla/oe.pl
@@
-48,6
+48,8
@@
use List::MoreUtils qw(uniq any none);
use List::Util qw(min max reduce sum);
use Data::Dumper;
use List::Util qw(min max reduce sum);
use Data::Dumper;
+use SL::Controller::Order;
+
use SL::DB::Customer;
use SL::DB::TaxZone;
use SL::DB::PaymentTerm;
use SL::DB::Customer;
use SL::DB::TaxZone;
use SL::DB::PaymentTerm;
@@
-184,6
+186,14
@@
sub edit {
# editing without stuff to edit? try adding it first
if ($form->{rowcount} && !$form->{print_and_save}) {
# editing without stuff to edit? try adding it first
if ($form->{rowcount} && !$form->{print_and_save}) {
+ if ($::instance_conf->get_feature_experimental_order) {
+ my $c = SL::Controller::Order->new;
+ $c->action_edit_collective();
+
+ $main::lxdebug->leave_sub();
+ $::dispatcher->end_request;
+ }
+
my $id;
map { $id++ if $form->{"multi_id_$_"} } (1 .. $form->{rowcount});
if (!$id) {
my $id;
map { $id++ if $form->{"multi_id_$_"} } (1 .. $form->{rowcount});
if (!$id) {
@@
-633,8
+643,6
@@
sub form_header {
$form->{shipto_id} = $form->{CFDD_shipto_id};
}
$form->{shipto_id} = $form->{CFDD_shipto_id};
}
- push @custom_hiddens, map { "shiptocvar_" . $_->name } @{ SL::DB::Manager::CustomVariableConfig->get_all(where => [ module => 'ShipTo' ]) };
-
$TMPL_VAR->{HIDDENS} = [ map { name => $_, value => $form->{$_} },
qw(id type vc proforma queued printed emailed
title creditlimit creditremaining tradediscount business
$TMPL_VAR->{HIDDENS} = [ map { name => $_, value => $form->{$_} },
qw(id type vc proforma queued printed emailed
title creditlimit creditremaining tradediscount business
@@
-731,6
+739,12
@@
sub form_footer {
my $print_options_html = setup_sales_purchase_print_options();
my $print_options_html = setup_sales_purchase_print_options();
+ my $shipto_cvars = SL::DB::Shipto->new->cvars_by_config;
+ foreach my $var (@{ $shipto_cvars }) {
+ my $name = "shiptocvar_" . $var->config->name;
+ $var->value($form->{$name}) if exists $form->{$name};
+ }
+
print $form->parse_html_template("oe/form_footer", {
%$TMPL_VAR,
print_options => $print_options_html,
print $form->parse_html_template("oe/form_footer", {
%$TMPL_VAR,
print_options => $print_options_html,
@@
-740,6
+754,7
@@
sub form_footer {
is_req_quo => scalar ($form->{type} =~ /request_quotation$/),
is_sales_ord => scalar ($form->{type} =~ /sales_order$/),
is_pur_ord => scalar ($form->{type} =~ /purchase_order$/),
is_req_quo => scalar ($form->{type} =~ /request_quotation$/),
is_sales_ord => scalar ($form->{type} =~ /sales_order$/),
is_pur_ord => scalar ($form->{type} =~ /purchase_order$/),
+ shipto_cvars => $shipto_cvars,
});
$main::lxdebug->leave_sub();
});
$main::lxdebug->leave_sub();
@@
-1223,7
+1238,7
@@
sub orders {
my $idx = 1;
my $idx = 1;
- my $edit_url = ($::instance_conf->get_feature_experimental)
+ my $edit_url = ($::instance_conf->get_feature_experimental
_order
)
? build_std_url('script=controller.pl', 'action=Order/edit', 'type')
: build_std_url('action=edit', 'type', 'vc');
? build_std_url('script=controller.pl', 'action=Order/edit', 'type')
: build_std_url('action=edit', 'type', 'vc');
@@
-1764,7
+1779,8
@@
sub save_as_new {
if ( $form->{reqdate} && $form->{id} ) {
my $saved_order = OE->retrieve_simple(id => $form->{id});
if ( $saved_order && $saved_order->{reqdate} eq $form->{reqdate} && $saved_order->{transdate} eq $form->{transdate} ) {
if ( $form->{reqdate} && $form->{id} ) {
my $saved_order = OE->retrieve_simple(id => $form->{id});
if ( $saved_order && $saved_order->{reqdate} eq $form->{reqdate} && $saved_order->{transdate} eq $form->{transdate} ) {
- my $extra_days = $form->{type} eq 'sales_quotation' ? $::instance_conf->get_reqdate_interval : 1;
+ my $extra_days = $form->{type} eq 'sales_quotation' ? $::instance_conf->get_reqdate_interval :
+ $form->{type} eq 'sales_order' ? $::instance_conf->get_delivery_date_interval : 1;
$form->{reqdate} = DateTime->today_local->next_workday(extra_days => $extra_days)->to_kivitendo;
$form->{transdate} = DateTime->today_local->to_kivitendo;
}
$form->{reqdate} = DateTime->today_local->next_workday(extra_days => $extra_days)->to_kivitendo;
$form->{transdate} = DateTime->today_local->to_kivitendo;
}
@@
-1937,7
+1953,8
@@
sub poso {
$form->{old_salesman_id} = $form->{salesman_id};
# reset
$form->{old_salesman_id} = $form->{salesman_id};
# reset
- map { delete $form->{$_} } qw(id subject message cc bcc printed emailed queued customer vendor creditlimit creditremaining discount tradediscount oldinvtotal delivered ordnumber);
+ map { delete $form->{$_} } qw(id subject message cc bcc printed emailed queued customer vendor creditlimit creditremaining discount tradediscount oldinvtotal delivered ordnumber
+ taxzone_id currency);
# this converted variable is also used for sales_order to purchase order and vice versa
$form->{"converted_from_orderitems_id_$_"} = delete $form->{"orderitems_id_$_"} for 1 .. $form->{"rowcount"};
# this converted variable is also used for sales_order to purchase order and vice versa
$form->{"converted_from_orderitems_id_$_"} = delete $form->{"orderitems_id_$_"} for 1 .. $form->{"rowcount"};
@@
-2133,7
+2150,7
@@
sub report_for_todo_list {
my $content;
if (@{ $quotations }) {
my $content;
if (@{ $quotations }) {
- my $edit_url = ($::instance_conf->get_feature_experimental)
+ my $edit_url = ($::instance_conf->get_feature_experimental
_order
)
? build_std_url('script=controller.pl', 'action=Order/edit')
: build_std_url('script=oe.pl', 'action=edit');
? build_std_url('script=controller.pl', 'action=Order/edit')
: build_std_url('script=oe.pl', 'action=edit');