X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Foe.pl;h=321bec31b3f3058ad6a033509874a96df8999696;hb=853991311bc6804da985219eb28d86114e359cc6;hp=940d076605a1ead495d2e6fcae97be0fc9d20a3c;hpb=f825d995db2667be33e98ced722ddf012b484642;p=kivitendo-erp.git
diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index 940d07660..321bec31b 100644
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -44,10 +44,13 @@ use SL::IR;
use SL::IS;
use SL::MoreCommon qw(ary_diff restore_form save_form);
use SL::ReportGenerator;
+use SL::YAML;
use List::MoreUtils qw(uniq any none);
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;
@@ -184,6 +187,14 @@ sub edit {
# 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) {
@@ -320,7 +331,6 @@ sub setup_oe_action_bar {
t8('Update'),
submit => [ '#form', { action => "update" } ],
id => 'update_button',
- checks => [ 'kivi.validate_form' ],
accesskey => 'enter',
],
@@ -409,8 +419,9 @@ sub setup_oe_action_bar {
],
action => [
t8('E Mail'),
- call => [ 'kivi.SalesPurchase.show_email_dialog' ],
- checks => [ 'kivi.validate_form' ],
+ call => [ 'kivi.SalesPurchase.show_email_dialog' ],
+ checks => [ 'kivi.validate_form' ],
+ disabled => !$form->{id} ? t8('This record has not been saved yet.') : undef,
],
action => [
t8('Download attachments of all parts'),
@@ -604,7 +615,7 @@ sub form_header {
$form->{periodic_invoices_status} = $locale->text('not configured');
} else {
- my $config = YAML::Load($form->{periodic_invoices_config});
+ my $config = SL::YAML::Load($form->{periodic_invoices_config});
$form->{periodic_invoices_status} = $config->{active} ? $locale->text('active') : $locale->text('inactive');
}
}
@@ -633,8 +644,6 @@ sub form_header {
$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
@@ -643,7 +652,7 @@ sub form_header {
taxpart taxservice taxaccounts cursor_fokus
show_details useasnew),
@custom_hiddens,
- map { $_.'_rate', $_.'_description', $_.'_taxnumber' } split / /, $form->{taxaccounts} ]; # deleted: discount
+ map { $_.'_rate', $_.'_description', $_.'_taxnumber', $_.'_tax_id' } split / /, $form->{taxaccounts} ]; # deleted: discount
$TMPL_VAR->{$_} = $type_check_vars{$_} for keys %type_check_vars;
@@ -672,13 +681,8 @@ sub form_footer {
$form->{invtotal} = $form->{invsubtotal};
- my $introws = max 5, $form->numtextrows($form->{intnotes}, 35, 8);
-
my $TMPL_VAR = $::request->cache('tmpl_var', {});
- $TMPL_VAR->{notes} = qq||;
- $TMPL_VAR->{intnotes} = qq||;
-
if( $form->{customer_id} && !$form->{taxincluded_changed_by_user} ) {
my $customer = SL::DB::Customer->new(id => $form->{customer_id})->load();
$form->{taxincluded} = defined($customer->taxincluded_checked) ? $customer->taxincluded_checked : $myconfig{taxincluded_checked};
@@ -731,6 +735,12 @@ sub form_footer {
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,
@@ -740,6 +750,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$/),
+ shipto_cvars => $shipto_cvars,
});
$main::lxdebug->leave_sub();
@@ -1016,7 +1027,7 @@ sub orders {
"curr", "employee",
"salesman",
"shipvia", "globalprojectnumber",
- "transaction_description", "open",
+ "transaction_description", "department", "open",
"delivered", "periodic_invoices",
"marge_total", "marge_percent",
"vcnumber", "ustid",
@@ -1101,6 +1112,7 @@ sub orders {
'shipvia' => { 'text' => $locale->text('Ship via'), },
'globalprojectnumber' => { 'text' => $locale->text('Project Number'), },
'transaction_description' => { 'text' => $locale->text('Transaction description'), },
+ 'department' => { 'text' => $locale->text('Department'), },
'open' => { 'text' => $locale->text('Open'), },
'delivered' => { 'text' => $locale->text('Delivery Order created'), },
'marge_total' => { 'text' => $locale->text('Ertrag'), },
@@ -1119,7 +1131,7 @@ sub orders {
%column_defs_cvars,
);
- foreach my $name (qw(id transdate reqdate quonumber ordnumber cusordnumber name employee salesman shipvia transaction_description shippingpoint taxzone insertdate payment_terms)) {
+ foreach my $name (qw(id transdate reqdate quonumber ordnumber cusordnumber name employee salesman shipvia transaction_description shippingpoint taxzone insertdate payment_terms department)) {
my $sortdir = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir};
$column_defs{$name}->{link} = $href . "&sort=$name&sortdir=$sortdir";
}
@@ -1223,7 +1235,7 @@ sub orders {
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');
@@ -1764,7 +1776,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} ) {
- 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;
}
@@ -1937,7 +1950,8 @@ sub poso {
$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"};
@@ -2133,7 +2147,7 @@ sub report_for_todo_list {
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');
@@ -2154,21 +2168,21 @@ sub edit_periodic_invoices_config {
check_oe_access();
my $config;
- $config = YAML::Load($::form->{periodic_invoices_config}) if $::form->{periodic_invoices_config};
+ $config = SL::YAML::Load($::form->{periodic_invoices_config}) if $::form->{periodic_invoices_config};
if ('HASH' ne ref $config) {
- my $lang_id = $::form->{language_id};
$config = { periodicity => 'm',
order_value_periodicity => 'p', # = same as periodicity
start_date_as_date => $::form->{transdate} || $::form->current_date,
extend_automatically_by => 12,
active => 1,
- email_subject => GenericTranslations->get(language_id => $lang_id,
- translation_type =>"preset_text_periodic_invoices_email_subject"),
- email_body => GenericTranslations->get(language_id => $lang_id,
- translation_type =>"preset_text_periodic_invoices_email_body"),
};
}
+ # for older configs, replace email preset text if not yet set.
+ $config->{email_subject} ||= GenericTranslations->get(language_id => $::form->{lanuage_id},
+ translation_type =>"preset_text_periodic_invoices_email_subject");
+ $config->{email_body} ||= GenericTranslations->get(language_id => $::form->{lanuage_id},
+ translation_type =>"preset_text_periodic_invoices_email_body");
$config->{periodicity} = 'm' if none { $_ eq $config->{periodicity} } @SL::DB::PeriodicInvoicesConfig::PERIODICITIES;
$config->{order_value_periodicity} = 'p' if none { $_ eq $config->{order_value_periodicity} } ('p', @SL::DB::PeriodicInvoicesConfig::ORDER_VALUE_PERIODICITIES);
@@ -2220,7 +2234,7 @@ sub save_periodic_invoices_config {
email_body => $::form->{email_body},
};
- $::form->{periodic_invoices_config} = YAML::Dump($config);
+ $::form->{periodic_invoices_config} = SL::YAML::Dump($config);
$::form->{title} = $::locale->text('Edit the configuration for periodic invoices');
$::form->header;