Kosmetik für Feature Projektpflicht bei Verkaufsaufträgen

diff --git a/SL/Controller/ClientConfig.pm b/SL/Controller/ClientConfig.pm
index 521242da5e03455ea90432cd924181a2b70bf349..2346f15dad57a50cf001e0ce409125538319dd3a 100644 (file)
--- a/SL/Controller/ClientConfig.pm
+++ b/SL/Controller/ClientConfig.pm
@@ -144,11 +144,11 @@ sub init_defaults        { SL::DB::Default->get
 sub init_all_warehouses  { SL::DB::Manager::Warehouse->get_all_sorted                                                    }
 sub init_all_languages   { SL::DB::Manager::Language->get_all_sorted                                                     }
 sub init_all_currencies  { SL::DB::Manager::Currency->get_all_sorted                                                     }
 sub init_all_warehouses  { SL::DB::Manager::Warehouse->get_all_sorted                                                    }
 sub init_all_languages   { SL::DB::Manager::Language->get_all_sorted                                                     }
 sub init_all_currencies  { SL::DB::Manager::Currency->get_all_sorted                                                     }

-sub init_all_project_types    { SL::DB::Manager::ProjectType->get_all_sorted                                             }
-sub init_all_project_statuses { SL::DB::Manager::ProjectStatus->get_all_sorted                                           }

 sub init_all_weightunits { my $unit = SL::DB::Manager::Unit->find_by(name => 'kg'); $unit ? $unit->convertible_units : [] }
 sub init_all_templates   { +{ SL::Template->available_templates }                                                        }
 sub init_h_unit_name     { first { SL::DB::Manager::Unit->find_by(name => $_) } qw(Std h Stunde)                         };
 sub init_all_weightunits { my $unit = SL::DB::Manager::Unit->find_by(name => 'kg'); $unit ? $unit->convertible_units : [] }
 sub init_all_templates   { +{ SL::Template->available_templates }                                                        }
 sub init_h_unit_name     { first { SL::DB::Manager::Unit->find_by(name => $_) } qw(Std h Stunde)                         };

+sub init_all_project_types    { SL::DB::Manager::ProjectType->get_all_sorted                                             }
+sub init_all_project_statuses { SL::DB::Manager::ProjectStatus->get_all_sorted                                           }

 
 sub init_posting_options {
   [ { title => t8("never"),           value => 0           },
 
 sub init_posting_options {
   [ { title => t8("never"),           value => 0           },

diff --git a/SL/OE.pm b/SL/OE.pm
index ceca51a4f7e6d7e22cc5fb88e59bada8dbe1341b..5b7c16dba5902132e9adf46d22a6e07e40b225d9 100644 (file)
--- a/SL/OE.pm
+++ b/SL/OE.pm
@@ -535,14 +535,14 @@ sub save {
       $pricegroup_id *= 1;
       $pricegroup_id  = undef if !$pricegroup_id;
 
       $pricegroup_id *= 1;
       $pricegroup_id  = undef if !$pricegroup_id;
 

-      if ( $::instance_conf->get_order_always_project && !$form->{"globalproject_id"} && ( $form->{type} eq 'sales_order' ) ) {
+      # force new project, if not set yet
+      if ($::instance_conf->get_order_always_project && !$form->{"globalproject_id"} && ($form->{type} eq 'sales_order')) {

         my $new_project = SL::DB::Project->new(
         my $new_project = SL::DB::Project->new(

-          projectnumber => $form->{ordnumber},
-          description   => $form->{customer},
-          active        => 1,
-          project_type_id =>  $::instance_conf->get_project_type_id,
+          projectnumber     => $form->{ordnumber},
+          description       => $form->{customer},
+          active            => 1,
+          project_type_id   => $::instance_conf->get_project_type_id,

           project_status_id => $::instance_conf->get_project_status_id,
           project_status_id => $::instance_conf->get_project_status_id,

-          # id            => $form->{globalproject_id}

         );
         $new_project->save;
         $form->{"globalproject_id"} = $new_project->id;
         );
         $new_project->save;
         $form->{"globalproject_id"} = $new_project->id;

diff --git a/sql/Pg-upgrade2/project_defaults.sql b/sql/Pg-upgrade2/project_defaults.sql
index 1d65dc73c1c6517bafd7d01ba87ef5a85418ef82..f03ca931100800165234e0734b0b82672dd01dbf 100644 (file)
--- a/sql/Pg-upgrade2/project_defaults.sql
+++ b/sql/Pg-upgrade2/project_defaults.sql
@@ -1,6 +1,6 @@
--- @tag: add_project_defaults 
+-- @tag: add_project_defaults

 -- @description: Standardprojekttyp und Standardprojectstatus
 -- @description: Standardprojekttyp und Standardprojectstatus

--- @depends: release_3_2_0
+-- @depends: release_3_3_0

 ALTER TABLE defaults ADD COLUMN order_always_project boolean DEFAULT false;
 ALTER TABLE defaults ADD COLUMN project_status_id integer;
 ALTER TABLE defaults ADD COLUMN project_type_id integer;
 ALTER TABLE defaults ADD COLUMN order_always_project boolean DEFAULT false;
 ALTER TABLE defaults ADD COLUMN project_status_id integer;
 ALTER TABLE defaults ADD COLUMN project_type_id integer;