From: Moritz Bunkus Date: Thu, 13 Jan 2011 10:22:47 +0000 (+0100) Subject: Aktualisierung der RDBO-Models anhand des aktuellen Datebankschemas X-Git-Tag: release-2.6.2beta2~29 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=eb58f1087cd0cab8ba186b5dad150d98ca3ecd2b;p=kivitendo-erp.git Aktualisierung der RDBO-Models anhand des aktuellen Datebankschemas --- diff --git a/SL/DB/MetaSetup/Customer.pm b/SL/DB/MetaSetup/Customer.pm index 93f63b7ee..00bdb258f 100644 --- a/SL/DB/MetaSetup/Customer.pm +++ b/SL/DB/MetaSetup/Customer.pm @@ -11,14 +11,14 @@ __PACKAGE__->meta->setup( columns => [ id => { type => 'integer', not_null => 1, sequence => 'id' }, - name => { type => 'varchar', length => 75, not_null => 1 }, + name => { type => 'text', not_null => 1 }, department_1 => { type => 'varchar', length => 75 }, department_2 => { type => 'varchar', length => 75 }, street => { type => 'varchar', length => 75 }, zipcode => { type => 'varchar', length => 10 }, city => { type => 'varchar', length => 75 }, country => { type => 'varchar', length => 75 }, - contact => { type => 'varchar', length => 75 }, + contact => { type => 'text' }, phone => { type => 'varchar', length => 30 }, fax => { type => 'varchar', length => 30 }, homepage => { type => 'text' }, @@ -33,8 +33,8 @@ __PACKAGE__->meta->setup( bcc => { type => 'text' }, business_id => { type => 'integer' }, taxnumber => { type => 'text' }, - account_number => { type => 'varchar', length => 15 }, - bank_code => { type => 'varchar', length => 10 }, + account_number => { type => 'text' }, + bank_code => { type => 'text' }, bank => { type => 'text' }, language => { type => 'varchar', length => 5 }, datevexport => { type => 'integer' }, @@ -50,10 +50,10 @@ __PACKAGE__->meta->setup( payment_id => { type => 'integer' }, taxzone_id => { type => 'integer', default => '0', not_null => 1 }, greeting => { type => 'text' }, - ustid => { type => 'varchar', length => 14 }, - direct_debit => { type => 'boolean', default => 'false' }, + ustid => { type => 'text' }, iban => { type => 'varchar', length => 100 }, bic => { type => 'varchar', length => 100 }, + direct_debit => { type => 'boolean', default => 'false' }, ], primary_key_columns => [ 'id' ], diff --git a/SL/DB/MetaSetup/Default.pm b/SL/DB/MetaSetup/Default.pm index 4eb5e6644..f213eda7f 100644 --- a/SL/DB/MetaSetup/Default.pm +++ b/SL/DB/MetaSetup/Default.pm @@ -17,7 +17,6 @@ __PACKAGE__->meta->setup( fxloss_accno_id => { type => 'integer' }, invnumber => { type => 'text' }, sonumber => { type => 'text' }, - yearend => { type => 'varchar', length => 5 }, weightunit => { type => 'varchar', length => 5 }, businessnumber => { type => 'text' }, version => { type => 'varchar', length => 8 }, @@ -42,6 +41,7 @@ __PACKAGE__->meta->setup( dunning_ar => { type => 'integer' }, pdonumber => { type => 'text' }, sdonumber => { type => 'text' }, + ar_paid_accno_id => { type => 'integer' }, id => { type => 'serial', not_null => 1 }, ], diff --git a/SL/DB/MetaSetup/MakeModel.pm b/SL/DB/MetaSetup/MakeModel.pm index cc0ae7fcb..c6499a593 100644 --- a/SL/DB/MetaSetup/MakeModel.pm +++ b/SL/DB/MetaSetup/MakeModel.pm @@ -10,12 +10,15 @@ __PACKAGE__->meta->setup( table => 'makemodel', columns => [ - parts_id => { type => 'integer' }, - model => { type => 'text' }, - itime => { type => 'timestamp', default => 'now()' }, - mtime => { type => 'timestamp' }, - make => { type => 'integer' }, - id => { type => 'serial', not_null => 1 }, + parts_id => { type => 'integer' }, + model => { type => 'text' }, + itime => { type => 'timestamp', default => 'now()' }, + mtime => { type => 'timestamp' }, + lastcost => { type => 'numeric', precision => 5, scale => 15 }, + lastupdate => { type => 'date' }, + sortorder => { type => 'integer' }, + make => { type => 'integer' }, + id => { type => 'serial', not_null => 1 }, ], primary_key_columns => [ 'id' ], diff --git a/SL/DB/MetaSetup/SepaExport.pm b/SL/DB/MetaSetup/SepaExport.pm index 943121ad4..da0981799 100644 --- a/SL/DB/MetaSetup/SepaExport.pm +++ b/SL/DB/MetaSetup/SepaExport.pm @@ -15,6 +15,7 @@ __PACKAGE__->meta->setup( executed => { type => 'boolean', default => 'false' }, closed => { type => 'boolean', default => 'false' }, itime => { type => 'timestamp', default => 'now()' }, + vc => { type => 'varchar', length => 10 }, ], primary_key_columns => [ 'id' ], diff --git a/SL/DB/MetaSetup/SepaExportItem.pm b/SL/DB/MetaSetup/SepaExportItem.pm index b9899c2e5..cd2152bed 100644 --- a/SL/DB/MetaSetup/SepaExportItem.pm +++ b/SL/DB/MetaSetup/SepaExportItem.pm @@ -12,7 +12,7 @@ __PACKAGE__->meta->setup( columns => [ id => { type => 'integer', not_null => 1, sequence => 'id' }, sepa_export_id => { type => 'integer', not_null => 1 }, - ap_id => { type => 'integer', not_null => 1 }, + ap_id => { type => 'integer' }, chart_id => { type => 'integer', not_null => 1 }, amount => { type => 'numeric', precision => 5, scale => 25 }, reference => { type => 'varchar', length => 35 }, @@ -21,9 +21,10 @@ __PACKAGE__->meta->setup( execution_date => { type => 'date' }, our_iban => { type => 'varchar', length => 100 }, our_bic => { type => 'varchar', length => 100 }, - vendor_iban => { type => 'varchar', length => 100 }, - vendor_bic => { type => 'varchar', length => 100 }, + vc_iban => { type => 'varchar', length => 100 }, + vc_bic => { type => 'varchar', length => 100 }, end_to_end_id => { type => 'varchar', length => 35 }, + ar_id => { type => 'integer' }, ], primary_key_columns => [ 'id' ], @@ -34,6 +35,11 @@ __PACKAGE__->meta->setup( key_columns => { ap_id => 'id' }, }, + ar => { + class => 'SL::DB::Invoice', + key_columns => { ar_id => 'id' }, + }, + chart => { class => 'SL::DB::Chart', key_columns => { chart_id => 'id' }, diff --git a/SL/DB/MetaSetup/Shipto.pm b/SL/DB/MetaSetup/Shipto.pm index 0943c0448..cde5a320d 100644 --- a/SL/DB/MetaSetup/Shipto.pm +++ b/SL/DB/MetaSetup/Shipto.pm @@ -26,6 +26,7 @@ __PACKAGE__->meta->setup( mtime => { type => 'timestamp' }, module => { type => 'text' }, shipto_id => { type => 'integer', not_null => 1, sequence => 'id' }, + shiptocp_gender => { type => 'text' }, ], primary_key_columns => [ 'shipto_id' ],