Merge branch 'master' of github.com:kivitendo/kivitendo-erp

diff --git a/SL/Controller/CsvImport/Base.pm b/SL/Controller/CsvImport/Base.pm
index 5f7e95e..fa3e4f4 100644 (file)
--- a/SL/Controller/CsvImport/Base.pm
+++ b/SL/Controller/CsvImport/Base.pm
@@ -382,7 +382,7 @@ sub save_objects {
   return unless $data->[0];
   return unless $data->[0]{object};
 
-  $self->controller->track_progress(phase => 'saving objects', progress => 0); # scale from 45..95%;
+  $self->controller->track_progress(phase => 'saving data', progress => 0); # scale from 45..95%;
 
   my $dbh = $data->[0]{object}->db;
 

diff --git a/sql/Pg-upgrade2/delete_cust_vend_tax.sql b/sql/Pg-upgrade2/delete_cust_vend_tax.sql
new file mode 100644 (file)
index 0000000..386e84c
--- /dev/null
+++ b/sql/Pg-upgrade2/delete_cust_vend_tax.sql
@@ -0,0 +1,17 @@
+-- @tag: delete_cust_vend_tax
+-- @description: Alte Tabellen löschen
+-- @depends: delete_customertax_vendortax_partstax
+-- @charset: utf-8
+
+CREATE OR REPLACE FUNCTION del_customer() RETURNS "trigger" AS
+  'BEGIN
+     DELETE FROM shipto WHERE trans_id = old.id;
+     RETURN NULL;
+   END;' LANGUAGE plpgsql;
+
+CREATE OR REPLACE FUNCTION del_vendor() RETURNS "trigger" AS
+  'BEGIN
+    DELETE FROM shipto WHERE trans_id = old.id;
+    RETURN NULL;
+  END;' LANGUAGE plpgsql;
+