Merge branch 'master' into rb-wiederkehrende-rechnungen

diff --git a/SL/DB/MetaSetup/Customer.pm b/SL/DB/MetaSetup/Customer.pm
index 93f63b7ee4ea4a25c29b81582e30f80f24decc65..00bdb258f4089fd02a342fc5ca3e716c80dc0320 100644 (file)
--- 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 4eb5e6644cc27b1fdf91a74b0ebc7045367a9d64..f213eda7f7f9648ee1ba7d6e5f4ed69b320e47df 100644 (file)
--- 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/DeliveryOrder.pm b/SL/DB/MetaSetup/DeliveryOrder.pm
index 806c9637a9a2727e04484db76444c4c6ccdaf31c..66596543dcf94c4b2d580ca3e8b780b26bf7d03d 100644 (file)
--- a/SL/DB/MetaSetup/DeliveryOrder.pm
+++ b/SL/DB/MetaSetup/DeliveryOrder.pm
@@ -36,7 +36,6 @@ __PACKAGE__->meta->setup(
     is_sales                => { type => 'boolean' },
     itime                   => { type => 'timestamp', default => 'now()' },
     mtime                   => { type => 'timestamp' },
-    notes_bottom            => { type => 'text' },
     taxzone_id              => { type => 'integer' },
     taxincluded             => { type => 'boolean' },
     terms                   => { type => 'integer' },

diff --git a/SL/DB/MetaSetup/Invoice.pm b/SL/DB/MetaSetup/Invoice.pm
index 6269da90a544b8e35c6f2b55c2b0a15506679253..be3466d60854756b25e0d85b51286bb6fce16266 100644 (file)
--- a/SL/DB/MetaSetup/Invoice.pm
+++ b/SL/DB/MetaSetup/Invoice.pm
@@ -54,7 +54,6 @@ __PACKAGE__->meta->setup(
     storno_id               => { type => 'integer' },
     marge_total             => { type => 'numeric', precision => 5, scale => 15 },
     marge_percent           => { type => 'numeric', precision => 5, scale => 15 },
-    notes_bottom            => { type => 'text' },
     donumber                => { type => 'text' },
   ],
 

diff --git a/SL/DB/MetaSetup/MakeModel.pm b/SL/DB/MetaSetup/MakeModel.pm
index cc0ae7fcb60b4bb3f01993beb7e91143e8de4984..c6499a5936c10a791f3d0557173a2ea655361c3b 100644 (file)
--- 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/Order.pm b/SL/DB/MetaSetup/Order.pm
index 914918dabc7337da4d4ec10f218f66f564698611..e616aa3d0d82051c4f6ff97156fe4da4a11aeed0 100644 (file)
--- a/SL/DB/MetaSetup/Order.pm
+++ b/SL/DB/MetaSetup/Order.pm
@@ -46,8 +46,6 @@ __PACKAGE__->meta->setup(
     transaction_description => { type => 'text' },
     marge_total             => { type => 'numeric', precision => 5, scale => 15 },
     marge_percent           => { type => 'numeric', precision => 5, scale => 15 },
-    notes_bottom            => { type => 'text' },
-    project_manager_id      => { type => 'integer' },
   ],
 
   primary_key_columns => [ 'id' ],
@@ -65,11 +63,6 @@ __PACKAGE__->meta->setup(
       key_columns => { globalproject_id => 'id' },
     },
 
-    project_manager => {
-      class       => 'SL::DB::Employee',
-      key_columns => { project_manager_id => 'id' },
-    },
-
     salesman => {
       class       => 'SL::DB::Employee',
       key_columns => { salesman_id => 'id' },

diff --git a/SL/DB/MetaSetup/PurchaseInvoice.pm b/SL/DB/MetaSetup/PurchaseInvoice.pm
index 0ea9d10fa3e1c80159ea03817ea41892112c376d..448b2a6e087f1b6b9e4559a832dcbecee322f7fa 100644 (file)
--- a/SL/DB/MetaSetup/PurchaseInvoice.pm
+++ b/SL/DB/MetaSetup/PurchaseInvoice.pm
@@ -43,7 +43,6 @@ __PACKAGE__->meta->setup(
     globalproject_id        => { type => 'integer' },
     transaction_description => { type => 'text' },
     storno_id               => { type => 'integer' },
-    notes_bottom            => { type => 'text' },
   ],
 
   primary_key_columns => [ 'id' ],

diff --git a/SL/DB/MetaSetup/SepaExport.pm b/SL/DB/MetaSetup/SepaExport.pm
index 943121ad4e821d8174d48e749a2c7f29bd12adb9..da0981799cede753964cf8f9e4da664b9c1877e2 100644 (file)
--- 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 b9899c2e5079fb082fe5c48bef54202748784879..cd2152bedba059930dd1b9431db93782ca92c98a 100644 (file)
--- 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 0943c0448ceb67331ee5b3ad6254fd170f314360..cde5a320d1ee631d9ca5c4cd14e730c972f03380 100644 (file)
--- 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' ],

diff --git a/SL/Form.pm b/SL/Form.pm
index 2dcd31f7c386b269e2c05ac53757ce8008f40f61..e1646e69d228360a3650bcda04376f8f26e0dfde 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -680,7 +680,6 @@ EOT
   print <<EOT;
   <link rel="stylesheet" href="css/jquery.autocomplete.css" type="text/css" />
   <meta name="robots" content="noindex,nofollow" />
-  <script type="text/javascript" src="js/highlight_input.js"></script>
   <link rel="stylesheet" type="text/css" href="css/tabcontent.css" />
   <script type="text/javascript" src="js/tabcontent.js">