X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Foe.pl;h=254d016eea61ecbbb8905384239fe176797cac8b;hb=3b955bea1639c5202f4fc26c2903a22c0b3d5db6;hp=012914d036dbc7fd0876a6dbce11050ca7cdf6b8;hpb=cea7e7c53f1005f6143edbddb5832b6c48b5dc8e;p=kivitendo-erp.git diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl index 012914d03..254d016ee 100644 --- a/bin/mozilla/oe.pl +++ b/bin/mozilla/oe.pl @@ -525,7 +525,8 @@ sub form_header { "price_factors" => "ALL_PRICE_FACTORS"); $form->{ALL_PAYMENTS} = SL::DB::Manager::PaymentTerm->get_all( where => [ or => [ obsolete => 0, id => $form->{payment_id} || undef ] ]); - $form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all; + $form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all_sorted; + $form->{ALL_LANGUAGES} = SL::DB::Manager::Language->get_all_sorted; # Projects my @old_project_ids = uniq grep { $_ } map { $_ * 1 } ($form->{"globalproject_id"}, map { $form->{"project_id_$_"} } 1..$form->{"rowcount"}); @@ -1034,7 +1035,7 @@ sub orders { "country", "shippingpoint", "taxzone", "insertdate", "order_probability", "expected_billing_date", "expected_netamount", - "payment_terms", + "payment_terms", "intnotes", ); # only show checkboxes if gotten here via sales_order form. @@ -1083,7 +1084,7 @@ sub orders { reqdatefrom reqdateto projectnumber project_id periodic_invoices_active periodic_invoices_inactive business_id shippingpoint taxzone_id reqdate_unset_or_old insertdatefrom insertdateto order_probability_op order_probability_value expected_billing_date_from expected_billing_date_to - parts_partnumber parts_description all department_id); + parts_partnumber parts_description all department_id intnotes); push @hidden_variables, map { "cvar_$_->{name}" } @ct_searchable_custom_variables; my @keys_for_url = grep { $form->{$_} } @hidden_variables; @@ -1128,10 +1129,11 @@ sub orders { 'expected_billing_date' => { 'text' => $locale->text('Exp. bill. date'), }, 'expected_netamount' => { 'text' => $locale->text('Exp. netamount'), }, 'payment_terms' => { 'text' => $locale->text('Payment Terms'), }, + 'intnotes' => { 'text' => $locale->text('Internal Notes'), }, %column_defs_cvars, ); - foreach my $name (qw(id transdate reqdate quonumber ordnumber cusordnumber name employee salesman shipvia transaction_description shippingpoint taxzone insertdate payment_terms department)) { + foreach my $name (qw(id transdate reqdate quonumber ordnumber cusordnumber name employee salesman shipvia transaction_description shippingpoint taxzone insertdate payment_terms department intnotes)) { my $sortdir = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir}; $column_defs{$name}->{link} = $href . "&sort=$name&sortdir=$sortdir"; } @@ -1162,6 +1164,7 @@ sub orders { push @options, $locale->text('Order Number') . " : $form->{ordnumber}" if $form->{ordnumber}; push @options, $locale->text('Customer Order Number') . " : $form->{cusordnumber}" if $form->{cusordnumber}; push @options, $locale->text('Notes') . " : $form->{notes}" if $form->{notes}; + push @options, $locale->text('Internal Notes') . " : $form->{intnotes}" if $form->{intnotes}; push @options, $locale->text('Transaction description') . " : $form->{transaction_description}" if $form->{transaction_description}; push @options, $locale->text('Quick Search') . " : $form->{all}" if $form->{all}; push @options, $locale->text('Shipping Point') . " : $form->{shippingpoint}" if $form->{shippingpoint}; @@ -1778,11 +1781,16 @@ sub save_as_new { 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 : $form->{type} eq 'sales_order' ? $::instance_conf->get_delivery_date_interval : 1; + + if ( ($form->{type} eq 'sales_order' && !$::instance_conf->get_deliverydate_on) + || ($form->{type} eq 'sales_quotation' && !$::instance_conf->get_reqdate_on)) { + $form->{reqdate} = ''; + } else { $form->{reqdate} = DateTime->today_local->next_workday(extra_days => $extra_days)->to_kivitendo; + } $form->{transdate} = DateTime->today_local->to_kivitendo; } } - # update employee $form->get_employee(); @@ -2049,8 +2057,7 @@ sub delivery_order { $main::lxdebug->leave_sub(); } -sub oe_delivery_order_from_order { - +sub oe_prepare_xyz_from_order { return if !$::form->{id}; my $order = SL::DB::Order->new(id => $::form->{id})->load; @@ -2067,27 +2074,15 @@ sub oe_delivery_order_from_order { $::form->{rowcount}++; _update_ship(); +} + +sub oe_delivery_order_from_order { + oe_prepare_xyz_from_order(); delivery_order(); } sub oe_invoice_from_order { - - return if !$::form->{id}; - - my $order = SL::DB::Order->new(id => $::form->{id})->load; - $order->flatten_to_form($::form, format_amounts => 1); - - # hack: add partsgroup for first row if it does not exists, - # because _remove_billed_or_delivered_rows and _remove_full_delivered_rows - # determine fields to handled by existing fields for the first row. If partsgroup - # is missing there, for deleted rows the partsgroup_field is not emptied and in - # update_delivery_order it will not considered an empty row ... - $::form->{partsgroup_1} = '' if !exists $::form->{partsgroup_1}; - - # fake last empty row - $::form->{rowcount}++; - - _update_ship(); + oe_prepare_xyz_from_order(); invoice(); } @@ -2179,10 +2174,12 @@ sub edit_periodic_invoices_config { }; } # 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->{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 => "salutation_general") + . GenericTranslations->get(language_id => $::form->{lanuage_id}, translation_type => "salutation_punctuation_mark") + . "\n\n" + . GenericTranslations->get(language_id => $::form->{lanuage_id}, translation_type => "preset_text_periodic_invoices_email_body"); + $config->{email_body} =~ s{\A[ \n\r]+|[ \n\r]+\Z}{}g; $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); @@ -2256,7 +2253,7 @@ sub _remove_full_delivered_rows { next unless $::form->{"id_$row"}; my $base_factor = SL::DB::Manager::Unit->find_by(name => $::form->{"unit_$row"})->base_factor; my $base_qty = $::form->parse_amount(\%::myconfig, $::form->{"qty_$row"}) * $base_factor; - my $ship_qty = $::form->parse_amount(\%::myconfig, $::form->{"ship_$row"}) * $base_factor; + my $ship_qty = $::form->{"ship_$row"} * $base_factor; #$main::lxdebug->message(LXDebug->DEBUG2(),"shipto=".$ship_qty." qty=".$base_qty); if (!$ship_qty || ($ship_qty < $base_qty)) {