From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Tue, 12 Mar 2013 12:00:03 +0000 (+0100)
Subject: Merge branch 'master' of github.com:kivitendo/kivitendo-erp
X-Git-Tag: release-3.1.0beta1~525
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=39d85854d0a01b19522366dc22e784b28a85f336;hp=081e2bbcae187497b961a1d19d856c8da6e6204b;p=kivitendo-erp.git

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

diff --git a/SL/Controller/CsvImport/Base.pm b/SL/Controller/CsvImport/Base.pm
index 5f7e95e0e..fa3e4f43e 100644
--- 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
index 000000000..386e84c43
--- /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;
+