X-Git-Url: http://wagnertech.de/git?p=kivitendo-erp.git;a=blobdiff_plain;f=bin%2Fmozilla%2Foe.pl;fp=bin%2Fmozilla%2Foe.pl;h=d8593351b0347aa32bfa61643cf60036ff52a1d4;hp=2f3803b885fdb49a70be8c3812e275c5469f3623;hb=b293ff8ad52fc76ba0c44783e3982418114d6b08;hpb=d4925a8b60f04674885e30d9316dc0263f8b9a84 diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl index 2f3803b88..d8593351b 100644 --- a/bin/mozilla/oe.pl +++ b/bin/mozilla/oe.pl @@ -42,6 +42,7 @@ use SL::FU; use SL::OE; use SL::IR; use SL::IS; +use SL::Helper::UserPreferences::DisplayPreferences; use SL::MoreCommon qw(ary_diff restore_form save_form); use SL::ReportGenerator; use SL::YAML; @@ -50,7 +51,6 @@ 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; @@ -84,10 +84,18 @@ my $oe_access_map = { 'sales_quotation' => 'sales_quotation_edit', }; +my $oe_view_access_map = { + 'sales_order' => 'sales_order_edit | sales_order_view', + 'purchase_order' => 'purchase_order_edit | purchase_order_view', + 'request_quotation' => 'request_quotation_edit | request_quotation_view', + 'sales_quotation' => 'sales_quotation_edit | sales_quotation_view', +}; + sub check_oe_access { + my (%params) = @_; my $form = $main::form; - my $right = $oe_access_map->{$form->{type}}; + my $right = ($params{with_view}) ? $oe_view_access_map->{$form->{type}} : $oe_access_map->{$form->{type}}; $right ||= 'DOES_NOT_EXIST'; $main::auth->assert($right); @@ -160,7 +168,7 @@ sub add { $form->{show_details} = $::myconfig{show_form_details}; - &order_links; + order_links(is_new => 1); &prepare_order; &display_form; @@ -245,6 +253,8 @@ sub edit { sub order_links { $main::lxdebug->enter_sub(); + my (%params) = @_; + my $form = $main::form; my %myconfig = %main::myconfig; my $locale = $main::locale; @@ -266,8 +276,12 @@ sub order_links { $form->backup_vars(qw(payment_id language_id taxzone_id salesman_id taxincluded cp_id intnotes shipto_id delivery_term_id currency)); # get customer / vendor - IR->get_vendor(\%myconfig, \%$form) if $form->{type} =~ /(purchase_order|request_quotation)/; - IS->get_customer(\%myconfig, \%$form) if $form->{type} =~ /sales_(order|quotation)/; + if ($form->{type} =~ /(purchase_order|request_quotation)/) { + IR->get_vendor(\%myconfig, \%$form); + } else { + IS->get_customer(\%myconfig, \%$form); + $form->{billing_address_id} = $form->{default_billing_address_id} if $params{is_new}; + } $form->restore_vars(qw(payment_id language_id taxzone_id intnotes cp_id shipto_id delivery_term_id)); $form->restore_vars(qw(currency)) if $form->{id}; @@ -608,8 +622,9 @@ sub form_header { } $::request->{layout}->add_javascripts_inline("\$(function(){$dispatch_to_popup});"); - $TMPL_VAR->{dateformat} = $myconfig{dateformat}; - $TMPL_VAR->{numberformat} = $myconfig{numberformat}; + $TMPL_VAR->{dateformat} = $myconfig{dateformat}; + $TMPL_VAR->{numberformat} = $myconfig{numberformat}; + $TMPL_VAR->{longdescription_dialog_size_percentage} = SL::Helper::UserPreferences::DisplayPreferences->new()->get_longdescription_dialog_size_percentage(); if ($form->{type} eq 'sales_order') { if (!$form->{periodic_invoices_config}) { @@ -775,8 +790,12 @@ sub update { if (($form->{"previous_${vc}_id"} || $form->{"${vc}_id"}) != $form->{"${vc}_id"}) { $::form->{salesman_id} = SL::DB::Manager::Employee->current->id if exists $::form->{salesman_id}; - IS->get_customer(\%myconfig, $form) if $vc eq 'customer'; - IR->get_vendor(\%myconfig, $form) if $vc eq 'vendor'; + if ($vc eq 'customer') { + IS->get_customer(\%myconfig, $form); + $::form->{billing_address_id} = $::form->{default_billing_address_id}; + } else { + IR->get_vendor(\%myconfig, $form); + } } if (!$form->{forex}) { # read exchangerate from input field (not hidden) @@ -916,7 +935,7 @@ sub search { my %myconfig = %main::myconfig; my $locale = $main::locale; - check_oe_access(); + check_oe_access(with_view => 1); if ($form->{type} eq 'purchase_order') { $form->{vc} = 'vendor'; @@ -1007,7 +1026,7 @@ sub orders { my $cgi = $::request->{cgi}; my %params = @_; - check_oe_access(); + check_oe_access(with_view => 1); my $ordnumber = ($form->{type} =~ /_order$/) ? "ordnumber" : "quonumber"; @@ -1083,7 +1102,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 intnotes); + parts_partnumber parts_description all department_id intnotes phone_notes fulltext); push @hidden_variables, map { "cvar_$_->{name}" } @ct_searchable_custom_variables; my @keys_for_url = grep { $form->{$_} } @hidden_variables; @@ -1169,6 +1188,8 @@ sub orders { push @options, $locale->text('Shipping Point') . " : $form->{shippingpoint}" if $form->{shippingpoint}; push @options, $locale->text('Part Description') . " : $form->{parts_description}" if $form->{parts_description}; push @options, $locale->text('Part Number') . " : $form->{parts_partnumber}" if $form->{parts_partnumber}; + push @options, $locale->text('Phone Notes') . " : $form->{phone_notes}" if $form->{phone_notes}; + push @options, $locale->text('Full Text') . " : $form->{fulltext}" if $form->{fulltext}; if ( $form->{transdatefrom} or $form->{transdateto} ) { push @options, $locale->text('Order Date'); push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{transdatefrom}, 1) if $form->{transdatefrom}; @@ -1378,6 +1399,8 @@ sub save_and_close { IS->get_customer(\%myconfig, $form) if $vc eq 'customer'; IR->get_vendor(\%myconfig, $form) if $vc eq 'vendor'; + $::form->{billing_address_id} = $::form->{default_billing_address_id}; + update(); $::dispatcher->end_request; } @@ -1480,8 +1503,13 @@ sub save { if (($form->{"previous_${vc}_id"} || $form->{"${vc}_id"}) != $form->{"${vc}_id"}) { $::form->{salesman_id} = SL::DB::Manager::Employee->current->id if exists $::form->{salesman_id}; - IS->get_customer(\%myconfig, $form) if $vc eq 'customer'; - IR->get_vendor(\%myconfig, $form) if $vc eq 'vendor'; + if ($vc eq 'customer') { + IS->get_customer(\%myconfig, $form); + $::form->{billing_address_id} = $::form->{default_billing_address_id}; + + } else { + IR->get_vendor(\%myconfig, $form); + } update(); $::dispatcher->end_request; @@ -1637,7 +1665,7 @@ sub invoice { $::dispatcher->end_request; } - _oe_remove_delivered_or_billed_rows(id => $form->{id}, type => 'billed'); + _oe_remove_delivered_or_billed_rows(id => $form->{id}, type => 'billed') if $form->{new_invoice_type} ne 'final_invoice'; $form->{cp_id} *= 1; @@ -1682,7 +1710,9 @@ sub invoice { if ( $form->{type} eq 'sales_order' || $form->{type} eq 'sales_quotation') { - $form->{title} = $locale->text('Add Sales Invoice'); + $form->{title} = ($form->{new_invoice_type} eq 'invoice_for_advance_payment') ? $locale->text('Add Invoice for Advance Payment') + : ($form->{new_invoice_type} eq 'final_invoice') ? $locale->text('Add Final Invoice') + : $locale->text('Add Sales Invoice'); $form->{script} = 'is.pl'; $script = "is"; $buysell = 'buy'; @@ -1691,7 +1721,7 @@ sub invoice { # bo creates the id, reset it map { delete $form->{$_} } qw(id subject message cc bcc printed emailed queued); $form->{ $form->{vc} } =~ s/--.*//g; - $form->{type} = "invoice"; + $form->{type} = $form->{new_invoice_type} || "invoice"; # locale messages $main::locale = Locale->new("$myconfig{countrycode}", "$script");