stockor 0.1.7 → 0.1.8

data/db/schema.sql

@@ -526,7 +526,7 @@ CREATE TABLE skr_sales_orders (
     billing_address_id integer NOT NULL,
     terms_id integer NOT NULL,
     order_date date NOT NULL,
-    state character varying NOT NULL,
+    state smallint NOT NULL,
     is_revised boolean DEFAULT false NOT NULL,
     hash_code character varying NOT NULL,
     ship_partial boolean DEFAULT false NOT NULL,
@@ -568,7 +568,7 @@ CREATE TABLE skr_sku_locs (
 
 CREATE TABLE skr_skus (
     id integer NOT NULL,
-    default_vendor_id integer NOT NULL,
+    default_vendor_id integer,
     gl_asset_account_id integer NOT NULL,
     default_uom_code character varying NOT NULL,
     code character varying NOT NULL,
@@ -601,22 +601,22 @@ CREATE VIEW skr_inv_details AS
     COALESCE(ttls.other_charge_total, (0)::numeric) AS total_other_charge_amount,
     (COALESCE(ttls.total, 0.0) - COALESCE(ttls.other_charge_total, 0.0)) AS subtotal_amount
    FROM (((((skr_invoices inv
-   JOIN skr_customers cust ON ((cust.id = inv.customer_id)))
-   LEFT JOIN skr_addresses ba ON ((ba.id = inv.billing_address_id)))
-   LEFT JOIN skr_sales_orders so ON ((so.id = inv.sales_order_id)))
-   LEFT JOIN skr_pick_tickets pt ON ((pt.id = inv.pick_ticket_id)))
-   LEFT JOIN ( SELECT ivl.invoice_id,
-    sum(((ivl.qty)::numeric * ivl.price)) AS total,
-    sum(
-        CASE
-            WHEN s.is_other_charge THEN ((ivl.qty)::numeric * ivl.price)
-            ELSE (0)::numeric
-        END) AS other_charge_total,
-    count(ivl.*) AS num_lines
-   FROM ((skr_inv_lines ivl
-   JOIN skr_sku_locs sl ON ((sl.id = ivl.sku_loc_id)))
-   JOIN skr_skus s ON ((s.id = sl.sku_id)))
-  GROUP BY ivl.invoice_id) ttls ON ((ttls.invoice_id = inv.id)));
+     JOIN skr_customers cust ON ((cust.id = inv.customer_id)))
+     LEFT JOIN skr_addresses ba ON ((ba.id = inv.billing_address_id)))
+     LEFT JOIN skr_sales_orders so ON ((so.id = inv.sales_order_id)))
+     LEFT JOIN skr_pick_tickets pt ON ((pt.id = inv.pick_ticket_id)))
+     LEFT JOIN ( SELECT ivl.invoice_id,
+            sum(((ivl.qty)::numeric * ivl.price)) AS total,
+            sum(
+                CASE
+                    WHEN s.is_other_charge THEN ((ivl.qty)::numeric * ivl.price)
+                    ELSE (0)::numeric
+                END) AS other_charge_total,
+            count(ivl.*) AS num_lines
+           FROM ((skr_inv_lines ivl
+             JOIN skr_sku_locs sl ON ((sl.id = ivl.sku_loc_id)))
+             JOIN skr_skus s ON ((s.id = sl.sku_id)))
+          GROUP BY ivl.invoice_id) ttls ON ((ttls.invoice_id = inv.id)));
 
 
 --
@@ -964,7 +964,7 @@ CREATE TABLE skr_purchase_orders (
     location_id integer NOT NULL,
     ship_addr_id integer NOT NULL,
     terms_id integer NOT NULL,
-    state character varying NOT NULL,
+    state smallint NOT NULL,
     is_revised boolean DEFAULT false NOT NULL,
     order_date date NOT NULL,
     receiving_completed_at timestamp without time zone,
@@ -1106,10 +1106,10 @@ CREATE VIEW skr_sku_loc_details AS
     sv.part_code AS vendor_part_code,
     sv.cost AS purchase_cost
    FROM ((((skr_sku_locs sl
-   JOIN skr_skus s ON ((s.id = sl.sku_id)))
-   LEFT JOIN skr_uoms uom ON (((uom.sku_id = s.id) AND ((uom.code)::text = (s.default_uom_code)::text))))
-   JOIN skr_vendors v ON ((s.default_vendor_id = v.id)))
-   JOIN skr_sku_vendors sv ON (((sv.vendor_id = v.id) AND (sv.sku_id = s.id))));
+     JOIN skr_skus s ON ((s.id = sl.sku_id)))
+     LEFT JOIN skr_uoms uom ON (((uom.sku_id = s.id) AND ((uom.code)::text = (s.default_uom_code)::text))))
+     JOIN skr_vendors v ON ((s.default_vendor_id = v.id)))
+     JOIN skr_sku_vendors sv ON (((sv.vendor_id = v.id) AND (sv.sku_id = s.id))));
 
 
 --
@@ -1168,24 +1168,24 @@ CREATE VIEW skr_sku_qty_details AS
     COALESCE(sol_ttl.qty, (0)::bigint) AS qty_on_orders,
     COALESCE(pol_ttl.qty, (0)::bigint) AS qty_incoming
    FROM (((skr_skus s
-   JOIN ( SELECT sum(sl.qty) AS qty,
+     JOIN ( SELECT sum(sl.qty) AS qty,
             sl.sku_id
            FROM skr_sku_locs sl
           GROUP BY sl.sku_id) sl_ttl ON ((sl_ttl.sku_id = s.id)))
-   LEFT JOIN ( SELECT s_1.id AS sku_id,
-       sum(((sol.qty - sol.qty_canceled) * sol.uom_size)) AS qty
-      FROM (((skr_so_lines sol
-   JOIN skr_sales_orders so ON (((so.id = sol.sales_order_id) AND ((so.state)::text <> ALL ((ARRAY['canceled'::character varying, 'complete'::character varying])::text[])))))
-   JOIN skr_sku_locs sl ON ((sl.id = sol.sku_loc_id)))
-   JOIN skr_skus s_1 ON ((s_1.id = sl.sku_id)))
-  GROUP BY s_1.id) sol_ttl ON ((sol_ttl.sku_id = s.id)))
-   LEFT JOIN ( SELECT s_1.id AS sku_id,
-    sum(((pol.qty - pol.qty_canceled) * pol.uom_size)) AS qty
-   FROM (((skr_po_lines pol
-   JOIN skr_purchase_orders po ON (((po.id = pol.purchase_order_id) AND ((po.state)::text <> ALL ((ARRAY['canceled'::character varying, 'complete'::character varying])::text[])))))
-   JOIN skr_sku_locs sl ON ((sl.id = pol.sku_loc_id)))
-   JOIN skr_skus s_1 ON ((s_1.id = sl.sku_id)))
-  GROUP BY s_1.id) pol_ttl ON ((pol_ttl.sku_id = s.id)));
+     LEFT JOIN ( SELECT s_1.id AS sku_id,
+            sum(((sol.qty - sol.qty_canceled) * sol.uom_size)) AS qty
+           FROM (((skr_so_lines sol
+             JOIN skr_sales_orders so ON (((so.id = sol.sales_order_id) AND (so.state <> ALL (ARRAY[5, 9])))))
+             JOIN skr_sku_locs sl ON ((sl.id = sol.sku_loc_id)))
+             JOIN skr_skus s_1 ON ((s_1.id = sl.sku_id)))
+          GROUP BY s_1.id) sol_ttl ON ((sol_ttl.sku_id = s.id)))
+     LEFT JOIN ( SELECT s_1.id AS sku_id,
+            sum(((pol.qty - pol.qty_canceled) * pol.uom_size)) AS qty
+           FROM (((skr_po_lines pol
+             JOIN skr_purchase_orders po ON (((po.id = pol.purchase_order_id) AND (po.state <> ALL (ARRAY[5, 9])))))
+             JOIN skr_sku_locs sl ON ((sl.id = pol.sku_loc_id)))
+             JOIN skr_skus s_1 ON ((s_1.id = sl.sku_id)))
+          GROUP BY s_1.id) pol_ttl ON ((pol_ttl.sku_id = s.id)));
 
 
 --
@@ -1286,14 +1286,14 @@ CREATE VIEW skr_so_allocation_details AS
             ELSE 0
         END) AS number_of_lines_fully_allocated
    FROM ((skr_so_lines sol
-   JOIN skr_sku_locs sl ON ((sl.id = sol.sku_loc_id)))
-   JOIN skr_skus s ON (((s.id = sl.sku_id) AND (s.is_other_charge = false))))
+     JOIN skr_sku_locs sl ON ((sl.id = sol.sku_loc_id)))
+     JOIN skr_skus s ON (((s.id = sl.sku_id) AND (s.is_other_charge = false))))
   GROUP BY sol.sales_order_id
  HAVING (sum(
-CASE
-    WHEN (((sol.qty_allocated - sol.qty_canceled) - sol.qty_picking) > 0) THEN 1
-    ELSE 0
-END) > 0);
+        CASE
+            WHEN (((sol.qty_allocated - sol.qty_canceled) - sol.qty_picking) > 0) THEN 1
+            ELSE 0
+        END) > 0);
 
 
 --
@@ -1313,30 +1313,30 @@ CREATE VIEW skr_so_amount_details AS
     COALESCE(ttls.shipping_charge_total, (0)::numeric) AS total_shipping_amount,
     (COALESCE(ttls.total, 0.0) - COALESCE(ttls.other_charge_total, 0.0)) AS subtotal_amount
    FROM (((skr_sales_orders so
-   JOIN skr_customers cust ON ((cust.id = so.customer_id)))
-   JOIN skr_addresses addr ON ((addr.id = so.billing_address_id)))
-   LEFT JOIN ( SELECT sol.sales_order_id,
-    sum(((sol.qty)::numeric * sol.price)) AS total,
-    sum(
-        CASE
-            WHEN s.is_other_charge THEN ((sol.qty)::numeric * sol.price)
-            ELSE (0)::numeric
-        END) AS other_charge_total,
-    sum(
-        CASE
-            WHEN ((sol.sku_code)::text = 'SHIP'::text) THEN ((sol.qty)::numeric * sol.price)
-            ELSE (0)::numeric
-        END) AS shipping_charge_total,
-    sum(
-        CASE
-            WHEN ((sol.sku_code)::text = 'TAX'::text) THEN ((sol.qty)::numeric * sol.price)
-            ELSE (0)::numeric
-        END) AS tax_charge_total,
-    count(sol.*) AS num_lines
-   FROM ((skr_so_lines sol
-   JOIN skr_sku_locs sl ON ((sl.id = sol.sku_loc_id)))
-   JOIN skr_skus s ON ((s.id = sl.sku_id)))
-  GROUP BY sol.sales_order_id) ttls ON ((ttls.sales_order_id = so.id)));
+     JOIN skr_customers cust ON ((cust.id = so.customer_id)))
+     JOIN skr_addresses addr ON ((addr.id = so.billing_address_id)))
+     LEFT JOIN ( SELECT sol.sales_order_id,
+            sum(((sol.qty)::numeric * sol.price)) AS total,
+            sum(
+                CASE
+                    WHEN s.is_other_charge THEN ((sol.qty)::numeric * sol.price)
+                    ELSE (0)::numeric
+                END) AS other_charge_total,
+            sum(
+                CASE
+                    WHEN ((sol.sku_code)::text = 'SHIP'::text) THEN ((sol.qty)::numeric * sol.price)
+                    ELSE (0)::numeric
+                END) AS shipping_charge_total,
+            sum(
+                CASE
+                    WHEN ((sol.sku_code)::text = 'TAX'::text) THEN ((sol.qty)::numeric * sol.price)
+                    ELSE (0)::numeric
+                END) AS tax_charge_total,
+            count(sol.*) AS num_lines
+           FROM ((skr_so_lines sol
+             JOIN skr_sku_locs sl ON ((sl.id = sol.sku_loc_id)))
+             JOIN skr_skus s ON ((s.id = sl.sku_id)))
+          GROUP BY sol.sales_order_id) ttls ON ((ttls.sales_order_id = so.id)));
 
 
 --
@@ -1350,13 +1350,13 @@ CREATE VIEW skr_so_dailly_sales_history AS
     COALESCE(ttls.line_count, (0)::bigint) AS line_count,
     COALESCE(ttls.total, 0.0) AS total
    FROM (generate_series(0, 120, 1) days_ago(days_ago)
-   LEFT JOIN ( SELECT count(DISTINCT sol.sales_order_id) AS order_count,
+     LEFT JOIN ( SELECT count(DISTINCT sol.sales_order_id) AS order_count,
             count(*) AS line_count,
             sum((sol.price * (sol.qty)::numeric)) AS total,
             date_trunc('day'::text, so.created_at) AS so_date
            FROM (skr_so_lines sol
-      JOIN skr_sales_orders so ON ((sol.sales_order_id = so.id)))
-     GROUP BY date_trunc('day'::text, so.created_at)) ttls ON ((ttls.so_date = date_trunc('day'::text, ((('now'::text)::date - days_ago.days_ago))::timestamp with time zone))))
+             JOIN skr_sales_orders so ON ((sol.sales_order_id = so.id)))
+          GROUP BY date_trunc('day'::text, so.created_at)) ttls ON ((ttls.so_date = date_trunc('day'::text, ((('now'::text)::date - days_ago.days_ago))::timestamp with time zone))))
   ORDER BY date_trunc('day'::text, ((('now'::text)::date - days_ago.days_ago))::timestamp with time zone) DESC;
 
 

data/db/seed.rb

@@ -4,11 +4,12 @@ require_relative '../lib/skr'
 
 
 module Skr
-
     user = Lanes::User.where(login: 'admin').first
     if user.nil?
-        user = Lanes::User.new(name: "Admin", email: "admin@test.com",
-                               login: 'admin', role_names: ['admin'])
+        user = Lanes::User.create!(name: "Admin", email: "admin@test.com",
+                                   password: 'senal', password_confirmation: 'senal',
+                                   login: 'admin', role_names: ['administrator'])
+
     end
     Lanes::User.scoped_to(user) do
         seeds_path = Pathname.new(__FILE__).dirname.join('seed')

data/lib/skr/access_roles.rb

@@ -1,4 +1,5 @@
 require 'lanes/access'
+require_relative "model"
 
 module Lanes::Access
     module Roles
@@ -6,23 +7,32 @@ module Lanes::Access
 
         # re-open the exising Support role
         class Support
-            grant Skr::Customer
+            grant Skr::Customer,
+                  Skr::Sku,
+                  Skr::SalesOrder
+
         end
 
 
         class Accounting < Lanes::Access::Role
-            grant Skr::Customer, Skr::PaymentTerm
-
+            grant Skr::Customer,
+                  Skr::PaymentTerm,
+                  Skr::Sku,
+                  Skr::SalesOrder
+            lock_writes Skr::Sku, :gl_asset_account_id
             lock_writes Skr::Customer, :terms_id
         end
 
 
         class Purchasing < Lanes::Access::Role
-            self.read  << Skr::Customer
+            read Skr::Customer
+            grant Skr::Sku,
+                  Skr::SalesOrder
         end
 
     end
 
+    Role.grant_global_access(Skr::Address)
     Role.grant_global_access(:read, Skr::PaymentTerm)
 
 end

data/lib/skr/concerns/state_machine.rb

@@ -20,10 +20,15 @@ module Skr
                 #   * Blacklists the "state" field so it cannot be set via the API
                 #   * Allows access to the "state_event" pseudo field from the API
                 #   * Sets up the aasm library with the contents of &block
-                def state_machine( options={}, &block )
+                def state_machine(options={}, &block )
                     include InstanceMethods
                     include AASM
-                    aasm( options.merge( column: 'state' ), &block )
+                    attr_accessor :state_event
+                    whitelist_attributes :state_event
+                    default_options={
+                        no_direct_assignment: true, column: 'state', enum: true
+                    }
+                    aasm(default_options.merge(options), &block)
 
                     whitelist_attributes :state_event
 

data/lib/skr/extension.rb

@@ -9,6 +9,16 @@ module Skr
         root_path Pathname.new(__FILE__).dirname.join("..","..").expand_path
         components "record-finder", "select-field"
 
+        def client_bootstrap_data(view)
+            gl_accounts = Skr::GlAccount.all.as_json
+            {
+                default_gl_account_ids: Hash[ Skr.config.default_gl_accounts.map{ |code,number|
+                    account = gl_accounts.detect{|gla|gla['number'] == number}
+                    [code, account ? account['id'] : 0]
+                }],
+                gl_accounts: gl_accounts
+            }
+        end
 
     end
 

data/lib/skr/model.rb

@@ -12,8 +12,41 @@ module Skr
         include Concerns::ImmutableModel
         include Concerns::VisibleIdIdentifier
         include Concerns::LockedFields
-        include Concerns::CodeIdentifier
         include Concerns::RandomHashCode
     end
 
+    autoload :Address,              "skr/models/address"
+    autoload :BusinessEntity,       "skr/models/business_entity"
+    autoload :Customer,             "skr/models/customer"
+    autoload :GlAccount,            "skr/models/gl_account"
+    autoload :GlManualEntry,        "skr/models/gl_manual_entry"
+    autoload :GlPeriod,             "skr/models/gl_period"
+    autoload :GlPosting,            "skr/models/gl_posting"
+    autoload :GlTransaction,        "skr/models/gl_transaction"
+    autoload :IaLine,               "skr/models/ia_line"
+    autoload :IaReason,             "skr/models/ia_reason"
+    autoload :InvLine,              "skr/models/inv_line"
+    autoload :InventoryAdjustment,  "skr/models/inventory_adjustment"
+    autoload :Invoice,              "skr/models/invoice"
+    autoload :Location,             "skr/models/location"
+    autoload :PaymentTerm,          "skr/models/payment_term"
+    autoload :PickTicket,           "skr/models/pick_ticket"
+    autoload :PoLine,               "skr/models/po_line"
+    autoload :PoReceipt,            "skr/models/po_receipt"
+    autoload :PorLine,              "skr/models/por_line"
+    autoload :PtLine,               "skr/models/pt_line"
+    autoload :PurchaseOrder,        "skr/models/purchase_order"
+    autoload :SalesOrder,           "skr/models/sales_order"
+    autoload :SequentialId,         "skr/models/sequential_id"
+    autoload :Sku,                  "skr/models/sku"
+    autoload :SkuLoc,               "skr/models/sku_loc"
+    autoload :SkuTran,              "skr/models/sku_tran"
+    autoload :SkuVendor,            "skr/models/sku_vendor"
+    autoload :SoLine,               "skr/models/so_line"
+    autoload :Uom,                  "skr/models/uom"
+    autoload :UserProxy,            "skr/models/user_proxy"
+    autoload :DocumentsController,  "skr/models/user_proxy"
+    autoload :Vendor,               "skr/models/vendor"
+    autoload :VoLine,               "skr/models/vo_line"
+    autoload :Voucher,              "skr/models/voucher"
 end

data/lib/skr/models/address.rb

@@ -23,7 +23,7 @@ module Skr
         validates  :name, :line1, :city, :state, :postal_code, :presence=>true, :if=>:ensure_not_blank
         validates  :email, :presence=>true, :email=>true, :if=>:validate_email
         validates  :phone, :presence=>true, :if=>:validate_phone
-       
+
         # @return [Address] a blank copy of an address
         def self.blank
             Address.new({ name: '', line1: '', city: '', state: '', postal_code: '' })
@@ -45,9 +45,9 @@ module Skr
             end
         end
 
-        # @return [Boolean] is any of (name line1 city state postal_code) blank?
-        def blank?
-            return !! %w{ name line1 city state postal_code }.detect{ |field| self[field].blank? }
+        # @return [Boolean] is all of (name line1 city state postal_code) blank?
+        def incomplete?
+            return %w{ name line1 city state postal_code }.all?{ |field| self[field].blank? }
         end
 
         # split the name on space

data/lib/skr/models/customer.rb

@@ -6,7 +6,7 @@ module Skr
     #
     class Customer < Skr::Model
 
-        # Common code shared with {Vendor}
+        # Common code shared with {Customer} and {Vendor}
         include BusinessEntity
 
         belongs_to :gl_receivables_account, class_name: 'Skr::GlAccount', export: true

data/lib/skr/models/purchase_order.rb

@@ -47,7 +47,12 @@ module Skr
         }
 
         export_scope :only_incoming, lambda { |should_use=true|
-            with_details.where("state !='received'") if should_use
+            with_details.where.not(state: :received) if should_use
+        }
+
+        enum state: {
+            open: 1,
+            received: 2
         }
 
         state_machine do

data/lib/skr/models/sales_order.rb

@@ -62,7 +62,7 @@ module Skr
 
         # a open SalesOrder is one who's state is not "complete" or "canceled"
         scope :open, lambda { | *args |
-            where( arel_table[:state].not_in ['complete', 'canceled'] )
+            where.not(state: [:complete,:canceled])
         }, export: true
 
         # a SalesOrder is allocated if it has one or more lines with qty_allocated>0
@@ -89,6 +89,12 @@ module Skr
             connection.execute(qry).values
         end
 
+        enum state: {
+            open: 1,
+            complete: 5,
+            canceled: 9
+        }
+
         state_machine do
             state :open, initial: true
             state :complete

data/lib/skr/version.rb

@@ -1,3 +1,3 @@
 module Skr
-    VERSION='0.1.7'
+    VERSION='0.1.8'
 end

data/lib/skr.rb

@@ -13,6 +13,5 @@ module Skr
 end
 
 require_rel "skr/concerns/*.rb"
-require_rel "skr/model"
-require_rel 'skr/models/*.rb'
+require_relative "skr/model"
 require_relative "skr/access_roles"

data/spec/fixtures/skr/address.yml

@@ -1,2 +1,10 @@
 # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
 
+billy_billing:
+  name: Billy Goat
+
+billy_shipping:
+  name: Billy Goat
+
+bigco:
+  name: BigCo

data/spec/fixtures/skr/customer.yml

@@ -1,2 +1,9 @@
 # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
 
+billy:
+  code: GOAT
+  name: Billy Goat Gruff
+  terms: cashy
+  gl_receivables_account: recv
+  billing_address: billy_billing
+  shipping_address: billy_shipping

data/spec/fixtures/skr/gl_account.yml

@@ -1,2 +1,43 @@
 # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
 
+cash:
+  number: 1010
+  name: Cash
+  description: Checking account balance (as shown in company records), currency, coins, checks received from customers but not yet deposited.
+
+bank_checking:
+  number: 1011
+  name: Cash
+  description: Checking account balance (as shown in company records), currency, coins, checks received from customers but not yet deposited.
+
+deposits:
+  number: 1200
+  name: Deposits
+  description: Deposit holding account
+
+inv_recpt:
+  number: 2600
+  name: Accounts Receivable Clearing
+  description: Inventory Receipts clearing
+
+ar:
+  number: 1220
+  name: Accounts Receivable
+  description: Amounts owed to the company for services performed or products sold but not yet paid for.
+
+tax:
+  number: 2250
+  name: Sales Tax Recv
+  description: Tax collected
+
+ap:
+  number: 2200
+  name: Accounts Payable
+  description: Amounts owed to the outside vendors for services performed or products received but not yet paid for.
+
+sales:
+  number: 4000
+  name: Sales
+  description: Amounts earned from selling physical goods. When a sale is provided on credit, both this account and Accounts Receivable will increase. When a service is provided for immediate cash, both this account and Cash will increase.
+
+

data/spec/fixtures/skr/location.yml

@@ -1,2 +1,7 @@
 # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
 
+
+default:
+  code: DEFAULT
+  name: Default
+  address: bigco

data/spec/fixtures/skr/payment_term.yml

@@ -1,2 +1,6 @@
 # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
 
+cashy:
+  code: CASHY
+  description: Cash is King
+

data/spec/server/models/{address.rb → address_spec.rb}

@@ -1,6 +1,6 @@
-require_relative 'spec_helper'
+require_relative '../spec_helper'
 
-describe Skr::Address do
+class AddressSpec < Skr::TestCase
 
     it "can be instantiated" do
         model = Address.new

data/spec/server/models/{customer.rb → customer_spec.rb}

@@ -1,6 +1,6 @@
-require_relative 'spec_helper'
+require_relative '../spec_helper'
 
-describe Skr::Customer do
+class CustomerSpec < Skr::TestCase
 
     it "can be instantiated" do
         model = Customer.new

data/spec/server/models/{gl_account.rb → gl_account_spec.rb}

@@ -1,6 +1,6 @@
-require_relative 'spec_helper'
+require_relative '../spec_helper'
 
-describe Skr::GlAccount do
+class GlAccountSpec < Skr::TestCase
 
     it "can be instantiated" do
         model = GlAccount.new

data/spec/server/models/{gl_manual_entry.rb → gl_manual_entry_spec.rb}

@@ -1,6 +1,6 @@
-require_relative 'spec_helper'
+require_relative '../spec_helper'
 
-describe Skr::GlManualEntry do
+class GlManualEntrySpec < Skr::TestCase
 
     it "can be instantiated" do
         model = GlManualEntry.new

data/spec/server/models/{gl_period.rb → gl_period_spec.rb}

@@ -1,6 +1,6 @@
-require_relative 'spec_helper'
+require_relative '../spec_helper'
 
-describe Skr::GlPeriod do
+class GlPeriodSpec < Skr::TestCase
 
     it "can be instantiated" do
         model = GlPeriod.new

data/spec/server/models/{gl_posting.rb → gl_posting_spec.rb}

@@ -1,6 +1,6 @@
-require_relative 'spec_helper'
+require_relative '../spec_helper'
 
-describe Skr::GlPosting do
+class GlPostingSpec < Skr::TestCase
 
     it "can be instantiated" do
         model = GlPosting.new

data/spec/server/models/{gl_transaction.rb → gl_transaction_spec.rb}

@@ -1,6 +1,6 @@
-require_relative 'spec_helper'
+require_relative '../spec_helper'
 
-describe Skr::GlTransaction do
+class GlTransactionSpec < Skr::TestCase
 
     it "can be instantiated" do
         model = GlTransaction.new

data/spec/server/models/{ia_line.rb → ia_line_spec.rb}

@@ -1,6 +1,6 @@
-require_relative 'spec_helper'
+require_relative '../spec_helper'
 
-describe Skr::IaLine do
+class IaLineSpec < Skr::TestCase
 
     it "can be instantiated" do
         model = IaLine.new

data/spec/server/models/{ia_reason.rb → ia_reason_spec.rb}

@@ -1,6 +1,6 @@
-require_relative 'spec_helper'
+require_relative '../spec_helper'
 
-describe Skr::IaReason do
+class IaReasonSpec < Skr::TestCase
 
     it "can be instantiated" do
         model = IaReason.new

data/spec/server/models/{inv_line.rb → inv_line_spec.rb}

@@ -1,6 +1,6 @@
-require_relative 'spec_helper'
+require_relative '../spec_helper'
 
-describe Skr::InvLine do
+class InvLineSpec < Skr::TestCase
 
     it "can be instantiated" do
         model = InvLine.new

data/spec/server/models/{inventory_adjustment.rb → inventory_adjustment_spec.rb}

@@ -1,6 +1,6 @@
-require_relative 'spec_helper'
+require_relative '../spec_helper'
 
-describe Skr::InventoryAdjustment do
+class InventoryAdjustmentSpec < Skr::TestCase
 
     it "can be instantiated" do
         model = InventoryAdjustment.new

data/spec/server/models/{invoice.rb → invoice_spec.rb}

@@ -1,6 +1,6 @@
-require_relative 'spec_helper'
+require_relative '../spec_helper'
 
-describe Skr::Invoice do
+class InvoiceSpec < Skr::TestCase
 
     it "can be instantiated" do
         model = Invoice.new