Revert "added roundings for periodic invoices"

[mfinanz.git] / SL / DB / MetaSetup / Order.pm

diff --git a/SL/DB/MetaSetup/Order.pm b/SL/DB/MetaSetup/Order.pm
index 3e4a3102fcbde6c9974c4e173af2bafdbed71269..b359c07b26e81b093af8e6d16064fce0ac091baa 100644 (file)
--- a/SL/DB/MetaSetup/Order.pm
+++ b/SL/DB/MetaSetup/Order.pm
@@ -4,12 +4,12 @@ package SL::DB::Order;
 
 use strict;
 
 
 use strict;
 

-use base qw(SL::DB::Object);
+use parent qw(SL::DB::Object);

 
 __PACKAGE__->meta->table('oe');
 
 __PACKAGE__->meta->columns(
 
 __PACKAGE__->meta->table('oe');
 
 __PACKAGE__->meta->columns(

-  amount                  => { type => 'numeric', precision => 5, scale => 15 },
+  amount                  => { type => 'numeric', precision => 15, scale => 5 },

   closed                  => { type => 'boolean', default => 'false' },
   cp_id                   => { type => 'integer' },
   currency_id             => { type => 'integer', not_null => 1 },
   closed                  => { type => 'boolean', default => 'false' },
   cp_id                   => { type => 'integer' },
   currency_id             => { type => 'integer', not_null => 1 },


@@ -21,16 +21,18 @@ __PACKAGE__->meta->columns(
   delivery_vendor_id      => { type => 'integer' },
   department_id           => { type => 'integer' },
   employee_id             => { type => 'integer' },
   delivery_vendor_id      => { type => 'integer' },
   department_id           => { type => 'integer' },
   employee_id             => { type => 'integer' },

+  expected_billing_date   => { type => 'date' },

   globalproject_id        => { type => 'integer' },
   id                      => { type => 'integer', not_null => 1, sequence => 'id' },
   intnotes                => { type => 'text' },
   itime                   => { type => 'timestamp', default => 'now()' },
   language_id             => { type => 'integer' },
   globalproject_id        => { type => 'integer' },
   id                      => { type => 'integer', not_null => 1, sequence => 'id' },
   intnotes                => { type => 'text' },
   itime                   => { type => 'timestamp', default => 'now()' },
   language_id             => { type => 'integer' },

-  marge_percent           => { type => 'numeric', precision => 5, scale => 15 },
-  marge_total             => { type => 'numeric', precision => 5, scale => 15 },
+  marge_percent           => { type => 'numeric', precision => 15, scale => 5 },
+  marge_total             => { type => 'numeric', precision => 15, scale => 5 },

   mtime                   => { type => 'timestamp' },
   mtime                   => { type => 'timestamp' },

-  netamount               => { type => 'numeric', precision => 5, scale => 15 },
+  netamount               => { type => 'numeric', precision => 15, scale => 5 },

   notes                   => { type => 'text' },
   notes                   => { type => 'text' },

+  order_probability       => { type => 'integer', default => '0', not_null => 1 },

   ordnumber               => { type => 'text', not_null => 1 },
   payment_id              => { type => 'integer' },
   proforma                => { type => 'boolean', default => 'false' },
   ordnumber               => { type => 'text', not_null => 1 },
   payment_id              => { type => 'integer' },
   proforma                => { type => 'boolean', default => 'false' },


@@ -42,7 +44,7 @@ __PACKAGE__->meta->columns(
   shipto_id               => { type => 'integer' },
   shipvia                 => { type => 'text' },
   taxincluded             => { type => 'boolean' },
   shipto_id               => { type => 'integer' },
   shipvia                 => { type => 'text' },
   taxincluded             => { type => 'boolean' },

-  taxzone_id              => { type => 'integer' },
+  taxzone_id              => { type => 'integer', not_null => 1 },

   transaction_description => { type => 'text' },
   transdate               => { type => 'date', default => 'now' },
   vendor_id               => { type => 'integer' },
   transaction_description => { type => 'text' },
   transdate               => { type => 'date', default => 'now' },
   vendor_id               => { type => 'integer' },


@@ -118,6 +120,11 @@ __PACKAGE__->meta->foreign_keys(
     key_columns => { shipto_id => 'shipto_id' },
   },
 
     key_columns => { shipto_id => 'shipto_id' },
   },
 

+  taxzone => {
+    class       => 'SL::DB::TaxZone',
+    key_columns => { taxzone_id => 'id' },
+  },
+

   vendor => {
     class       => 'SL::DB::Vendor',
     key_columns => { vendor_id => 'id' },
   vendor => {
     class       => 'SL::DB::Vendor',
     key_columns => { vendor_id => 'id' },