projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Release 3.0.0rc1
[kivitendo-erp.git]
/
sql
/
Pg-upgrade
/
Pg-upgrade-2.2.0.31-2.2.0.32.pl
diff --git
a/sql/Pg-upgrade/Pg-upgrade-2.2.0.31-2.2.0.32.pl
b/sql/Pg-upgrade/Pg-upgrade-2.2.0.31-2.2.0.32.pl
index
54f19ee
..
c465ae9
100644
(file)
--- a/
sql/Pg-upgrade/Pg-upgrade-2.2.0.31-2.2.0.32.pl
+++ b/
sql/Pg-upgrade/Pg-upgrade-2.2.0.31-2.2.0.32.pl
@@
-11,8
+11,7
@@
sub mydberror {
sub myshowerror {
my ($msg) = @_;
sub myshowerror {
my ($msg) = @_;
- print($main::form->parse_html_template("dbupgrade/units_error",
- { "message" => $msg }));
+ print($main::form->parse_html_template("dbupgrade/units_error", { "message" => $msg }));
return 2;
}
return 2;
}
@@
-27,7
+26,7
@@
sub update_steuersaetze_skr03 {
if (!$count) {
$query =
qq|INSERT INTO chart (accno, description, charttype, category, link, taxkey_id, pos_ustva, pos_eur)
if (!$count) {
$query =
qq|INSERT INTO chart (accno, description, charttype, category, link, taxkey_id, pos_ustva, pos_eur)
- VALUES ('1776','Umsatzsteuer 19 %', 'A', 'I', 'AR_tax:IC_taxpart:IC_taxservice
:CT_tax
', 0, 511,6)|;
+ VALUES ('1776','Umsatzsteuer 19 %', 'A', 'I', 'AR_tax:IC_taxpart:IC_taxservice', 0, 511,6)|;
$dbh->do($query) || mydberror($query);
}
$query = "SELECT COUNT(*) FROM chart " .
$dbh->do($query) || mydberror($query);
}
$query = "SELECT COUNT(*) FROM chart " .
@@
-37,7
+36,7
@@
sub update_steuersaetze_skr03 {
if (!$count) {
$query =
qq|INSERT INTO chart (accno, description, charttype, category, link, taxkey_id, pos_ustva, pos_eur)
if (!$count) {
$query =
qq|INSERT INTO chart (accno, description, charttype, category, link, taxkey_id, pos_ustva, pos_eur)
- VALUES ('1576','Abziehbare Vorsteuer 19 %', 'A', 'E', 'AP_tax:IC_taxpart:IC_taxservice
:CT_tax
', 0, 66,27)|;
+ VALUES ('1576','Abziehbare Vorsteuer 19 %', 'A', 'E', 'AP_tax:IC_taxpart:IC_taxservice', 0, 66,27)|;
$dbh->do($query) || mydberror($query);
}
$dbh->do($query) || mydberror($query);
}
@@
-70,7
+69,7
@@
sub update_steuersaetze_skr04 {
if (!$count) {
$query =
qq|INSERT INTO chart (accno, description, charttype, category, link, taxkey_id, pos_ustva, pos_eur)
if (!$count) {
$query =
qq|INSERT INTO chart (accno, description, charttype, category, link, taxkey_id, pos_ustva, pos_eur)
- VALUES ('3806','Umsatzsteuer 19 %', 'A', 'I', 'AR_tax:IC_taxpart:IC_taxservice
:CT_tax
', 0, 511,6)|;
+ VALUES ('3806','Umsatzsteuer 19 %', 'A', 'I', 'AR_tax:IC_taxpart:IC_taxservice', 0, 511,6)|;
$dbh->do($query) || mydberror($query);
}
$query = "SELECT COUNT(*) FROM chart " .
$dbh->do($query) || mydberror($query);
}
$query = "SELECT COUNT(*) FROM chart " .
@@
-80,7
+79,7
@@
sub update_steuersaetze_skr04 {
if (!$count) {
$query =
qq|INSERT INTO chart (accno, description, charttype, category, link, taxkey_id, pos_ustva, pos_eur)
if (!$count) {
$query =
qq|INSERT INTO chart (accno, description, charttype, category, link, taxkey_id, pos_ustva, pos_eur)
- VALUES ('1406','Abziehbare Vorsteuer 19 %', 'A', 'E', 'AP_tax:IC_taxpart:IC_taxservice
:CT_tax
', 0, 66,27)|;
+ VALUES ('1406','Abziehbare Vorsteuer 19 %', 'A', 'E', 'AP_tax:IC_taxpart:IC_taxservice', 0, 66,27)|;
$dbh->do($query) || mydberror($query);
}
$dbh->do($query) || mydberror($query);
}
@@
-117,13
+116,11
@@
sub update_steuersaetze {
return update_steuersaetze_skr04();
}
return update_steuersaetze_skr04();
}
- print($form->parse_html_template("dbupgrade/" .
- "std_buchungsgruppen_unknown_coa",
- { "coa" => $coa }));
+ print($form->parse_html_template("dbupgrade/std_buchungsgruppen_unknown_coa", { "coa" => $coa }));
return 1;
}
return 1;
}
-return update_steuersaetze();
\ No newline at end of file
+return update_steuersaetze();