Merge branch 'linksbrowser_menu'

diff --git a/SL/IC.pm b/SL/IC.pm
index d5b0f53660691f47c6fe5ea9a70fd71e98e5737a..b9ad62c585a3b33d90792a3c9063bb085aae50e4 100644 (file)
--- a/SL/IC.pm
+++ b/SL/IC.pm
@@ -1633,7 +1633,7 @@ sub prepare_parts_for_printing {
   my $placeholders = join ', ', ('?') x scalar(@part_ids);
   my $query        = qq|SELECT mm.parts_id, mm.model, v.name AS make
                         FROM makemodel mm
-                        LEFT JOIN vendor v ON (mm.make = cast (v.id as text))
+                        LEFT JOIN vendor v ON (mm.make = v.id)
                         WHERE mm.parts_id IN ($placeholders)|;
 
   my %makemodel    = ();

diff --git a/SL/RP.pm b/SL/RP.pm
index 88f4ebe55de72d213780ec5ae35166ced9c30ac1..1ee39843c34fccd69b24e96940e47b2ce5c4d51f 100644 (file)
--- a/SL/RP.pm
+++ b/SL/RP.pm
@@ -233,8 +233,8 @@ sub get_accounts {
            AND ac.trans_id IN
              (
                SELECT trans_id
-               FROM acc_trans
-               JOIN chart ON (chart_id = id)
+               FROM acc_trans a
+               JOIN chart c ON (a.chart_id = c.id)
                WHERE (link LIKE '%AR_paid%')
                $subwhere
              )
@@ -254,8 +254,8 @@ sub get_accounts {
            AND ac.trans_id IN
              (
                SELECT trans_id
-               FROM acc_trans
-               JOIN chart ON (chart_id = id)
+               FROM acc_trans a
+               JOIN chart c ON (a.chart_id = c.id)
                WHERE (link LIKE '%AP_paid%')
                $subwhere
              )
@@ -296,8 +296,8 @@ sub get_accounts {
            AND ac.trans_id IN
              (
                SELECT trans_id
-               FROM acc_trans
-               JOIN chart ON (chart_id = id)
+               FROM acc_trans a
+               JOIN chart c ON (a.chart_id = c.id)
                WHERE (link LIKE '%AR_paid%')
                $subwhere
              )
@@ -318,8 +318,8 @@ sub get_accounts {
            AND ac.trans_id IN
              (
                SELECT trans_id
-               FROM acc_trans
-               JOIN chart ON (chart_id = id)
+               FROM acc_trans a
+               JOIN chart c ON (a.chart_id = c.id)
                WHERE link LIKE '%AP_paid%'
                $subwhere
              )
@@ -519,7 +519,7 @@ sub get_accounts_g {
          JOIN ar a ON (a.id = ac.trans_id)
          $dpt_join
          WHERE $where $dpt_where
-           AND ac.trans_id IN ( SELECT trans_id FROM acc_trans JOIN chart ON (chart_id = id) WHERE (link LIKE '%AR_paid%') $subwhere)
+           AND ac.trans_id IN ( SELECT trans_id FROM acc_trans a JOIN chart c ON (a.chart_id = c.id) WHERE (link LIKE '%AR_paid%') $subwhere)
            $project
          GROUP BY c.$category
 */
@@ -531,7 +531,7 @@ sub get_accounts_g {
          JOIN ap a ON (a.id = ac.trans_id)
          $dpt_join
          WHERE $where $dpt_where
-           AND ac.trans_id IN ( SELECT trans_id FROM acc_trans JOIN chart ON (chart_id = id) WHERE (link LIKE '%AP_paid%') $subwhere)
+           AND ac.trans_id IN ( SELECT trans_id FROM acc_trans a JOIN chart c ON (a.chart_id = c.id) WHERE (link LIKE '%AP_paid%') $subwhere)
            $project
          GROUP BY c.$category
 
@@ -559,7 +559,7 @@ sub get_accounts_g {
          JOIN chart c on (p.income_accno_id = c.id)
          $dpt_join
          WHERE (c.category = 'I') $prwhere $dpt_where
-           AND ac.trans_id IN ( SELECT trans_id FROM acc_trans JOIN chart ON (chart_id = id) WHERE (link LIKE '%AR_paid%') $subwhere)
+           AND ac.trans_id IN ( SELECT trans_id FROM acc_trans a JOIN chart c ON (a.chart_id = c.id) WHERE (link LIKE '%AR_paid%') $subwhere)
            $project
          GROUP BY c.$category
 
@@ -572,7 +572,7 @@ sub get_accounts_g {
          JOIN chart c on (p.expense_accno_id = c.id)
          $dpt_join
          WHERE (c.category = 'E') $prwhere $dpt_where
-           AND ac.trans_id IN ( SELECT trans_id FROM acc_trans JOIN chart ON (chart_id = id) WHERE (link LIKE '%AP_paid%') $subwhere)
+           AND ac.trans_id IN ( SELECT trans_id FROM acc_trans a JOIN chart c ON (a.chart_id = c.id) WHERE (link LIKE '%AP_paid%') $subwhere)
          $project
          GROUP BY c.$category
          |;
@@ -1334,8 +1334,8 @@ sub tax_report {
       AND ac.trans_id IN
         (
           SELECT trans_id
-          FROM acc_trans
-          JOIN chart ON (chart_id = id)
+          FROM acc_trans a
+          JOIN chart c ON (a.chart_id = c.id)
           WHERE (link LIKE '%${ARAP}_paid%')
           AND (transdate <= $todate)
         )

diff --git a/sql/Pg-upgrade2/schema_nomalization_1.sql b/sql/Pg-upgrade2/schema_nomalization_1.sql
deleted file mode 100644 (file)
index 2a54118..0000000
--- a/sql/Pg-upgrade2/schema_nomalization_1.sql
+++ /dev/null
@@ -1,38 +0,0 @@
--- @tag: schema_normalization_1
--- @description: Datenbankschema Normalisierungen
--- @depends: release_2_6_1
-
--- assembly-id
-CREATE SEQUENCE assembly_assembly_id_seq;
-ALTER TABLE assembly ADD COLUMN assembly_id INTEGER;
-UPDATE assembly SET assembly_id = nextval('assembly_assembly_id_seq');
-ALTER TABLE assembly ADD PRIMARY KEY( assembly_id );
-ALTER TABLE assembly ALTER assembly_id SET DEFAULT nextval('assembly_assembly_id_seq');
-
--- shipto_primary_key
-ALTER TABLE shipto ALTER COLUMN shipto_id SET NOT NULL;
-ALTER TABLE shipto ADD PRIMARY KEY (shipto_id);
-
--- oe_vc_foreign_keys
---ALTER TABLE oe ADD FOREIGN KEY (customer_id) REFERENCES customer (id);
---ALTER TABLE oe ADD FOREIGN KEY (vendor_id)   REFERENCES vendor   (id);
-
--- orderitems_primary_key
-ALTER TABLE orderitems ADD PRIMARY KEY (id);
-
--- part_unit_not_null
-UPDATE parts SET unit = 'Stck' WHERE unit IS NULL;
-ALTER TABLE parts ALTER COLUMN unit SET NOT NULL;
-
--- makemodel_id_column
-ALTER TABLE makemodel ADD COLUMN tmp integer;
-UPDATE makemodel SET tmp = make::integer WHERE COALESCE(make, '') <> '';
-ALTER TABLE makemodel DROP COLUMN make;
-ALTER TABLE makemodel RENAME COLUMN tmp TO make;
-
-CREATE SEQUENCE makemodel_id_seq;
-ALTER TABLE makemodel ADD COLUMN id integer;
-ALTER TABLE makemodel ALTER COLUMN id SET DEFAULT nextval('makemodel_id_seq');
-UPDATE makemodel SET id = nextval('makemodel_id_seq');
-ALTER TABLE makemodel ALTER COLUMN id SET NOT NULL;
-ALTER TABLE makemodel ADD PRIMARY KEY (id);

diff --git a/sql/Pg-upgrade2/schema_normalization_1.sql b/sql/Pg-upgrade2/schema_normalization_1.sql
new file mode 100644 (file)
index 0000000..2a54118
--- /dev/null
+++ b/sql/Pg-upgrade2/schema_normalization_1.sql
@@ -0,0 +1,38 @@
+-- @tag: schema_normalization_1
+-- @description: Datenbankschema Normalisierungen
+-- @depends: release_2_6_1
+
+-- assembly-id
+CREATE SEQUENCE assembly_assembly_id_seq;
+ALTER TABLE assembly ADD COLUMN assembly_id INTEGER;
+UPDATE assembly SET assembly_id = nextval('assembly_assembly_id_seq');
+ALTER TABLE assembly ADD PRIMARY KEY( assembly_id );
+ALTER TABLE assembly ALTER assembly_id SET DEFAULT nextval('assembly_assembly_id_seq');
+
+-- shipto_primary_key
+ALTER TABLE shipto ALTER COLUMN shipto_id SET NOT NULL;
+ALTER TABLE shipto ADD PRIMARY KEY (shipto_id);
+
+-- oe_vc_foreign_keys
+--ALTER TABLE oe ADD FOREIGN KEY (customer_id) REFERENCES customer (id);
+--ALTER TABLE oe ADD FOREIGN KEY (vendor_id)   REFERENCES vendor   (id);
+
+-- orderitems_primary_key
+ALTER TABLE orderitems ADD PRIMARY KEY (id);
+
+-- part_unit_not_null
+UPDATE parts SET unit = 'Stck' WHERE unit IS NULL;
+ALTER TABLE parts ALTER COLUMN unit SET NOT NULL;
+
+-- makemodel_id_column
+ALTER TABLE makemodel ADD COLUMN tmp integer;
+UPDATE makemodel SET tmp = make::integer WHERE COALESCE(make, '') <> '';
+ALTER TABLE makemodel DROP COLUMN make;
+ALTER TABLE makemodel RENAME COLUMN tmp TO make;
+
+CREATE SEQUENCE makemodel_id_seq;
+ALTER TABLE makemodel ADD COLUMN id integer;
+ALTER TABLE makemodel ALTER COLUMN id SET DEFAULT nextval('makemodel_id_seq');
+UPDATE makemodel SET id = nextval('makemodel_id_seq');
+ALTER TABLE makemodel ALTER COLUMN id SET NOT NULL;
+ALTER TABLE makemodel ADD PRIMARY KEY (id);