From 0ab0b919060aa3808399b57605843a0cb9633523 Mon Sep 17 00:00:00 2001
From: Peter Hormanns <peter.hormanns@jalin.de>
Date: Tue, 30 Apr 2013 13:18:53 +0200
Subject: [PATCH] merge

---
 hsarback/database/database_update.sql |   56 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 51 insertions(+), 5 deletions(-)

diff --git a/hsarback/database/database_update.sql b/hsarback/database/database_update.sql
index 9789373..3d69d26 100644
--- a/hsarback/database/database_update.sql
+++ b/hsarback/database/database_update.sql
@@ -54,10 +54,7 @@
 
 ALTER TABLE packet DROP COLUMN order_number;
 ALTER TABLE packet DROP COLUMN webserver_group;
-<<<<<<< HEAD
 ALTER TABLE packet ADD COLUMN free boolean NOT NULL DEFAULT false;
-=======
->>>>>>> branch 'master' of ssh://hsh04-source@hsh04.hostsharing.net/home/doms/source.hostsharing.net/source/hsadmin.git
 
 ALTER TABLE domain DROP COLUMN domain_status;
 ALTER TABLE domain DROP COLUMN domain_status_changed;
@@ -88,6 +85,55 @@
 	vat decimal(4,2) NOT NULL,
 	price_list integer REFERENCES price_list(id)                                             
 );
-INSERT INTO price (article_number, price, vat, price_list) 
-	VALUES (0, 0, 0, (SELECT id FROM price_list WHERE name LIKE 'Default%')); 
 
+update basecomponent set description='Benutzer, Datenbanken, E-Mail' where basecomponent_id=1;
+update basecomponent set description='%s GB Datentransfervolumen' where basecomponent_id=10;
+update basecomponent set description='%s MB Speicherplatz' where basecomponent_id=11;
+update basecomponent set description='CPU-Thread' where basecomponent_id=19;
+update basecomponent set description='%s MB Arbeitsspeicher' where basecomponent_id=20;
+update basecomponent set description='%s GB Datentransfervolumen' where basecomponent_id=10;
+
+update basepacket set basepacket_code='PAC/SW', description='Statik Web Paket', article_number=1100 where basepacket_id=19;
+update basepacket set basepacket_code='PAC/DW', description='Dynamik Web Paket', article_number=1200 where basepacket_id=20;
+update basepacket set basepacket_code='PAC/WEB', description='Web Paket', article_number=1000 where basepacket_id=21;
+update basepacket set basepacket_code='SRV/MGD', description='Managed Server', article_number=2000 where basepacket_id=22;
+
+insert into price (article_number, price, vat, price_list) values (1, 0, 0, 0, (select id from price_list where name like 'Default%')); 
+
+insert into price (article_number, price, vat, price_list) values (100, 8.00, 0.00, (select id from price_list where name like 'Default%'));
+
+insert into price (article_number, price, vat, price_list) values (1000, 2.00, 19.00, (select id from price_list where name like 'Default%'));
+insert into price (article_number, price, vat, price_list) values (1011, 1.00, 19.00, (select id from price_list where name like 'Default%'));
+insert into price (article_number, price, vat, price_list) values (1012, 1.00, 19.00, (select id from price_list where name like 'Default%'));
+insert into price (article_number, price, vat, price_list) values (1013, 1.00, 19.00, (select id from price_list where name like 'Default%'));
+insert into price (article_number, price, vat, price_list) values (1014, 2.00, 19.00, (select id from price_list where name like 'Default%'));
+insert into price (article_number, price, vat, price_list) values (1021, 10.00, 19.00, (select id from price_list where name like 'Default%'));
+
+insert into price (article_number, price, vat, price_list) values (1100, 1.00, 19.00, (select id from price_list where name like 'Default%'));
+insert into price (article_number, price, vat, price_list) values (1111, 1.00, 19.00, (select id from price_list where name like 'Default%'));
+insert into price (article_number, price, vat, price_list) values (1112, 1.00, 19.00, (select id from price_list where name like 'Default%'));
+insert into price (article_number, price, vat, price_list) values (1113, 1.00, 19.00, (select id from price_list where name like 'Default%'));
+insert into price (article_number, price, vat, price_list) values (1114, 2.00, 19.00, (select id from price_list where name like 'Default%'));
+insert into price (article_number, price, vat, price_list) values (1121, 8.00, 19.00, (select id from price_list where name like 'Default%'));
+
+insert into price (article_number, price, vat, price_list) values (1200, 1.00, 19.00, (select id from price_list where name like 'Default%'));
+insert into price (article_number, price, vat, price_list) values (1211, 1.00, 19.00, (select id from price_list where name like 'Default%'));
+insert into price (article_number, price, vat, price_list) values (1212, 1.00, 19.00, (select id from price_list where name like 'Default%'));
+insert into price (article_number, price, vat, price_list) values (1213, 1.00, 19.00, (select id from price_list where name like 'Default%'));
+insert into price (article_number, price, vat, price_list) values (1214, 2.00, 19.00, (select id from price_list where name like 'Default%'));
+insert into price (article_number, price, vat, price_list) values (1221, 8.00, 19.00, (select id from price_list where name like 'Default%'));
+
+update component set article_number=1111 where basepacket_id=19 and basecomponent_id=1;
+update component set article_number=1112 where basepacket_id=19 and basecomponent_id=11;
+update component set article_number=1113 where basepacket_id=19 and basecomponent_id=10;
+update component set article_number=1121 where basepacket_id=19 and basecomponent_id=21;
+
+update component set article_number=1211 where basepacket_id=20 and basecomponent_id=1;
+update component set article_number=1212 where basepacket_id=20 and basecomponent_id=11;
+update component set article_number=1213 where basepacket_id=20 and basecomponent_id=10;
+update component set article_number=1221 where basepacket_id=20 and basecomponent_id=21;
+
+update component set article_number=1011 where basepacket_id=21 and basecomponent_id=1;
+update component set article_number=1012 where basepacket_id=21 and basecomponent_id=11;
+update component set article_number=1013 where basepacket_id=21 and basecomponent_id=10;
+update component set article_number=1021 where basepacket_id=21 and basecomponent_id=21;

--
Gitblit v1.9.1