From: Jan Büren Date: Thu, 30 Apr 2015 14:02:49 +0000 (+0200) Subject: Merge branch 'master' of github.com:kivitendo/kivitendo-erp X-Git-Tag: release-3.3.0beta~110 X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/c364a9c287a8b66061be8c8331dcdef7106064c8?hp=e29c3e6e7df4b6ddea251e17fe854a7c29161804 Merge branch 'master' of github.com:kivitendo/kivitendo-erp --- diff --git a/css/common.css b/css/common.css index fb8ec75a3..2594ef665 100644 --- a/css/common.css +++ b/css/common.css @@ -42,7 +42,7 @@ a.cti_call_action { position: relative; top: 2px; vertical-align: center; - background-image: url(../../image/icons/16x16/phone.png); + background-image: url(../image/icons/16x16/phone.png); background-repeat: no-repeat; } diff --git a/index.html b/index.html index 5170e1d4a..71bb76600 100644 --- a/index.html +++ b/index.html @@ -3,6 +3,7 @@ + kivitendo-Login diff --git a/sql/Pg-upgrade2/convert_taxzone.pl b/sql/Pg-upgrade2/convert_taxzone.pl index b1e1a0bb6..3343c6f12 100644 --- a/sql/Pg-upgrade2/convert_taxzone.pl +++ b/sql/Pg-upgrade2/convert_taxzone.pl @@ -39,22 +39,27 @@ SQL } $sth->finish; + my $taxzone_charts_update_query = "INSERT INTO taxzone_charts (taxzone_id, buchungsgruppen_id, income_accno_id, expense_accno_id) VALUES (?, ?, ?, ?)"; + $sth = $self->dbh->prepare($taxzone_charts_update_query); + # convert Buchungsgruppen to taxzone_charts if any exist # the default swiss COA doesn't have any, for example - if ( scalar @{ $::form->{buchungsgruppen} } > 0 ) { - my $taxzone_charts_update_query; + if ( scalar @{ $::form->{buchungsgruppen} } > 0 ) { foreach my $taxzone ( @{$::form->{taxzones}} ) { foreach my $buchungsgruppe ( @{$::form->{buchungsgruppen}} ) { my $id = $taxzone->{id}; my $income_accno_id = $buchungsgruppe->{"income_accno_id_$id"}; my $expense_accno_id = $buchungsgruppe->{"expense_accno_id_$id"}; - # TODO: check if the variables have a value - $taxzone_charts_update_query .= "INSERT INTO taxzone_charts (taxzone_id, buchungsgruppen_id, income_accno_id, expense_accno_id) VALUES ('$taxzone->{id}', '$buchungsgruppe->{id}', $income_accno_id, $expense_accno_id);\n"; + my @values = ($taxzone->{id}, $buchungsgruppe->{id}, $income_accno_id, $expense_accno_id); + $sth->execute(@values) && next; + $taxzone_charts_update_query =~ s{\?}{shift(@values)}eg; + $::form->dberror($taxzone_charts_update_query); }; }; - $self->db_query($taxzone_charts_update_query) if $taxzone_charts_update_query; }; + $sth->finish; + my $clean_buchungsgruppen_query = < dois).
Falls die Constraint nicht gesetzt werden kann, kontaktieren Sie einen Dienstleister und / oder löschen sie die Verknüpfung der Warenbewegung mit Lieferschein auf eigene Verantwortung mit: "UPDATE inventory SET oe_id = NULL WHERE oe_id NOT IN (select id from delivery_orders);"
Hintergrund: Eingelagerte Lieferscheine können / sollen nicht gelöscht werden, allerdings weist dieser Datenbestand genau diesen Fall auf. --- @depends: release_3_1_0 +-- @depends: release_3_1_0 remove_obsolete_trigger ALTER TABLE inventory RENAME orderitems_id TO delivery_order_items_stock_id; ALTER TABLE inventory ADD CONSTRAINT delivery_order_items_stock_id_fkey FOREIGN KEY (delivery_order_items_stock_id) REFERENCES delivery_order_items_stock (id); ALTER TABLE inventory ADD CONSTRAINT oe_id_fkey FOREIGN KEY (oe_id) REFERENCES delivery_orders (id);