stockor 0.4.0 → 0.5.0

data/db/seed.rb

@@ -14,18 +14,6 @@ module Skr
     Lanes::User.scoped_to(user) do
         seeds_path = Pathname.new(__FILE__).dirname.join('seed')
 
-        unless BankAccount.default
-            BankAccount.create(code: Skr.config.default_bank_account_code, name: "System default",
-              address: Address.new(name:"System default")
-            )
-        end
-
-        unless Location.default
-            Location.create( code: Skr.config.default_location_code, name: "System default",
-              address: Address.new(name:"System default")
-            )
-        end
-
         YAML::load( seeds_path.join('chart_of_accounts.yml').read ).each do | acct_data |
             GlAccount.where(number: acct_data['number'].to_s).any? || GlAccount.create!(acct_data)
         end
@@ -54,6 +42,18 @@ module Skr
             )
         end
 
+        unless BankAccount.default
+            BankAccount.create(code: Skr.config.default_bank_account_code, name: "System default",
+              address: Address.new(name:"System default")
+            )
+        end
+
+        unless Location.default
+            Location.create( code: Skr.config.default_location_code, name: "System default",
+              address: Address.new(name:"System default")
+            )
+        end
+
     end
 
 end

data/lib/skr/access_roles.rb

@@ -14,7 +14,8 @@ module Lanes::Access
                  Skr::Sku
 
             grant Skr::SalesOrder,
-                  Skr::TimeEntry
+                  Skr::TimeEntry,
+                  Skr::ExpenseEntry
         end
 
         # Accounting role for members who deal with finance
@@ -27,7 +28,9 @@ module Lanes::Access
                   Skr::TimeEntry,
                   Skr::GlTransaction,
                   Skr::BankAccount,
-                  Skr::Payment
+                  Skr::Payment,
+                  Skr::ExpenseCategory,
+                  Skr::ExpenseEntry
 
             lock_writes Skr::Customer, :terms
             lock Skr::Sku, :gl_asset_account
@@ -38,7 +41,8 @@ module Lanes::Access
         class Purchasing < Lanes::Access::Role
             read Skr::Customer
             grant Skr::Sku,
-                  Skr::SalesOrder
+                  Skr::SalesOrder,
+                  Skr::ExpenseEntry
         end
 
         # Standard employee role
@@ -47,7 +51,8 @@ module Lanes::Access
                  Skr::Sku
             grant Skr::SalesOrder,
                   Skr::Invoice,
-                  Skr::TimeEntry
+                  Skr::TimeEntry,
+                  Skr::ExpenseEntry
         end
     end
 

data/lib/skr/concerns/has_gl_transaction.rb

@@ -53,7 +53,7 @@ module Skr
                     identifier = has_attribute?(:visible_id) ? visible_id : id
                     {
                         source: self,
-                        location: location,
+                        location: try(:location) || Location.default,
                         description: "#{self.class.to_s.demodulize} #{identifier}"
                     }
                 end

data/lib/skr/configuration.rb

@@ -48,7 +48,9 @@ module Skr
             # Clearing account for inventory that's been
             inventory_receipts_clearing: '2600',
             # Holding account for funds that are awaiting deposit
-            deposit_holding: '1010'
+            deposit_holding: '1010',
+            # Bank Account
+            bank: '1000'
         }
     end
 

data/lib/skr/db/migration_helpers.rb

@@ -43,7 +43,7 @@ module Skr
 
                 options[:column] ||= to_table.to_s + '_id'
 
-                column( options[:column], :integer, :null=>options[:null] || false )
+                column( options[:column], (options[:type] || :integer), :null=>options[:null] || false )
                 to_table = options[:to_table] if options.has_key? :to_table
 
                 if options[:single]
@@ -75,7 +75,7 @@ module Skr
                     skr_add_foreign_key( table_name, to_table, options )
                 end
                 definition.skr_extra_indexes.each do | index_column, options |
-                    skr_add_index( table_name, index_column, options )
+                    skr_add_index(table_name, index_column, options )
                 end
             end
 

data/lib/skr/handlers/approve_expense_entries.rb

@@ -0,0 +1,16 @@
+module Skr
+    module Handlers
+        class ApproveExpenseEntries < ::Lanes::API::ControllerBase
+
+            def create
+                bank_account = BankAccount.find(data['bank_account_id'])
+                entries = []
+                ExpenseEntry.where(id: data['expense_ids']).includes(:gl_transaction).find_each do | entry |
+                    entries.push entry.approve!(bank_account) unless entry.gl_transaction
+                end
+                std_api_reply :create, { entries: entries }, success: true
+            end
+
+        end
+    end
+end

data/lib/skr/handlers/invoice_from_time_entries.rb

@@ -10,7 +10,7 @@ module Skr
                 @sku_loc   = @project.sku.sku_locs.find_by(location: @location)
             end
 
-            def perform_creation
+            def create
                 invoice = Invoice.new(
                     notes:    @options['notes'],
                     po_num:   @options['po_num'] || @project.po_num,

data/lib/skr/handlers/sequential_ids.rb

@@ -13,7 +13,7 @@ module Skr
                 @data = data
             end
 
-            def perform_retrieval
+            def show
                 ids = {}
                 Skr::SequentialId.pluck(:name, :current_value).map do |name, count|
                     ids[name.demodulize] = count
@@ -28,7 +28,7 @@ module Skr
                 std_api_reply(:retrieve, {id: 'all', ids: list}, success: true)
             end
 
-            def perform_update
+            def update
                 data['ids'].each do | si |
                     Lanes.logger.warn "#{si['id']}"
                     id = if 0 == si['id'].index(Payment::SEQUENTIAL_ID_PREFIX)

data/lib/skr/jobs/fresh_books/import.rb

@@ -91,8 +91,8 @@ module Skr::Jobs::FreshBooks
         def process_invoice(r)
             return nil if is_ignored?('invoices',  r['invoice_id'])
 
-            inv = Skr::Invoice.create(
-                visible_id: r['number'].sub(/^0+/,''),
+            inv = Skr::Invoice.create!(
+                visible_id: r['number'].sub(/^0+/, '').gsub(/\D/, ''),
                 options: { freshbooks_id: r['invoice_id'] },
                 customer: customer_for_fb_id(r['client_id']),
                 location: Skr::Location.default,
@@ -107,26 +107,27 @@ module Skr::Jobs::FreshBooks
                 },
                 lines_attributes: Array.wrap(r['lines']['line']).map { | l |
                     is_time = 'Time' == l['type']
-                    if l['name'] or l['description'] # blank name == blank line
-                        sku = Skr::Sku.find_by(code: is_time ? 'LABOR' : 'MISC')
-                        invl = {
-                            sku_loc: sku.sku_locs.default,
-                            price: l['unit_cost'],
-                            description: l['description'],
-                            qty: l['quantity']
-                        }
-                        if l.has_key?('time_entries')
-                            invl['time_entry'] =
-                                Skr::TimeEntry.find_by("options ->>'freshbooks_id' = ?",
-                                                       l['time_entries']['time_entry']['time_entry_id'])
-                        end
-                        invl
+                    next unless l['name'] or l['description'] # blank name == blank line
+                    sku = Skr::Sku.find_by(code: is_time ? 'LABOR' : 'MISC')
+                    invl = {
+                        sku_loc: sku.sku_locs.default,
+                        price: l['unit_cost'],
+                        description: l['description'],
+                        qty: l['quantity']
+                    }
+                    if l.has_key?('time_entries')
+                        invl['time_entry'] =
+                            Skr::TimeEntry.find_by("options ->>'freshbooks_id' = ?",
+                                                   l['time_entries']['time_entry']['time_entry_id'])
                     end
+                    invl
                 }.compact
             )
             if r['paid'].to_f > 0
                 inv.payments.create!(
-                    amount: r['paid'], bank_account: Skr::BankAccount.default
+                    amount: r['paid'],
+                    name: inv.customer.name,
+                    bank_account: Skr::BankAccount.default
                 )
             end
             inv

data/lib/skr/model.rb

@@ -54,4 +54,7 @@ module Skr
     autoload :BankAccount,          "skr/models/bank_account"
     autoload :PaymentCategory,      "skr/models/payment_category"
     autoload :Payment,              "skr/models/payment"
+    autoload :ExpenseCategory,      "skr/models/expense_category"
+    autoload :ExpenseEntry,         "skr/models/expense_entry"
+    autoload :ExpenseEntryCategory, "skr/models/expense_entry_category"
 end

data/lib/skr/models/bank_account.rb

@@ -9,6 +9,8 @@ module Skr
         belongs_to :address,  class_name: 'Skr::Address',
                    export: { writable: true }, dependent: :destroy
 
+        before_validation :set_defaults, :on=>:create
+
         def self.default
             account = nil
             if default_id = Skr.system_settings['bank_acount_id']
@@ -19,6 +21,13 @@ module Skr
                 BankAccount.first
         end
 
+      private
+
+        def set_defaults
+            self.gl_account ||= GlAccount.default_for(:bank)
+            true
+        end
+
     end
 
 

data/lib/skr/models/expense_category.rb

@@ -0,0 +1,27 @@
+module Skr
+
+    class ExpenseCategory < Model
+
+        belongs_to :gl_account, class_name: 'Skr::GlAccount', export: true
+
+        validates :name, :gl_account, presence: true
+
+        has_many :entry_categories, foreign_key: 'category_id',
+                 class_name: 'Skr::ExpenseEntryCategory' do
+
+            def total
+                proxy_association.loaded? ? inject(0){ | sum, cat | sum+cat.amount } : sum('amount')
+            end
+
+        end
+
+        has_many :entries,  class_name: 'Skr::ExpenseEntry',
+                 through: :entry_categories, source: :entry
+
+        def balance
+            entry_categories.total
+        end
+
+    end
+
+end

data/lib/skr/models/expense_entry.rb

@@ -0,0 +1,76 @@
+module Skr
+
+    class ExpenseEntry < Model
+
+        self.primary_key = 'id'
+
+        has_one :gl_transaction, class_name: 'Skr::GlTransaction', as: :source
+
+        has_many :attachments, as: :owner, class_name: 'Lanes::Asset',
+                 export: {writable: true}
+
+        has_many :categories, class_name: 'Skr::ExpenseEntryCategory',
+                 inverse_of: :entry, export: {writable: true}, foreign_key: 'entry_id'  do
+            def total
+                proxy_association.loaded? ? inject(0){ | sum, cat | sum+cat.amount } : sum('amount')
+            end
+        end
+
+        validates :categories, presence: true
+        validates :name, presence: true
+        validates :occured, presence: true, on: :update
+
+        before_create :set_defaults
+
+        export_sort :amount do |q, dir|
+            q.order("category_total #{dir}")
+        end
+
+        def self.access_limits_for_query(query, user, params)
+            if user.roles.include?('accounting') && (params['id'] || params['review'] == 'true')
+                query
+            else
+                query.where(created_by_id: user.id)
+            end
+        end
+
+        scope :with_category_details, lambda { | category_id = nil |
+            sql = "join skr_expense_entry_details as details on " +
+                  "details.expense_entry_id = #{table_name}.#{primary_key}"
+            sql << " and #{category_id.to_i} = ANY(category_ids)" if category_id
+            q = joins(sql).select("details.*")
+            if current_scope.nil? || current_scope.select_values.exclude?("#{table_name}.*")
+                q = q.select("#{table_name}.*")
+            end
+            q
+        }, export: true
+
+        def amount
+            categories.total
+        end
+
+        def approve!(bank, location: Location.default)
+            debit = bank.gl_account
+            glt = GlTransaction.record(
+                location: location, description: "Expenses"
+            ) do | transaction |
+                transaction.source = self
+                categories.each do | entry_category |
+                    GlTransaction.push_or_save(
+                        owner: self, amount: entry_category.amount,
+                        debit: debit, credit: entry_category.category.gl_account
+                    )
+                end
+            end
+        end
+
+        private
+
+        def set_defaults
+            self.uuid    ||= SecureRandom.uuid
+            self.occured ||= Time.now
+        end
+
+    end
+
+end

data/lib/skr/models/expense_entry_category.rb

@@ -0,0 +1,15 @@
+module Skr
+
+    class ExpenseEntryCategory < Model
+
+        belongs_to :category,
+                   class_name: 'Skr::ExpenseCategory', export: {writable: true}
+
+        belongs_to :entry,
+                   class_name: 'Skr::ExpenseEntry', export: {writable: true}
+
+        validates :amount, :category, :entry, presence: true
+
+    end
+
+end

data/lib/skr/models/gl_transaction.rb

@@ -53,7 +53,7 @@ module Skr
         # @param amount [BigDecimal] the amount to apply to each posting
         # @param debit [GlAccount]
         # @param credit [GlAccount]
-        def add_posting( amount: nil, debit: nil, credit: nil )
+        def add_posting(amount: nil, debit: nil, credit: nil)
             Lanes.logger.debug "GlTransaction add_posting #{debit} : #{credit}"
             self.credits.build( location: @location, is_debit: false,
                                 account: credit, amount: amount )
@@ -112,7 +112,7 @@ module Skr
             if (glt = self.current) # we push
                 glt.add_posting( amount: amount, debit: debit, credit: credit )
             else
-                options.merge!(source: owner, location: options[:location] || owner.location)
+                options.merge!(source: owner, location: options[:location] || owner.try(:location))
                 if owner.respond_to?(:attributes_for_gl_transaction)
                     options.reverse_merge!( owner.attributes_for_gl_transaction )
                 end

data/lib/skr/models/inv_line.rb

@@ -34,7 +34,9 @@ module Skr
         }, export: true
 
         scope :summarize_by, lambda { | values |
-            select( "sum(inv_lines.qty) as qty, count(*) as num_sales, sum(inv_lines.price) as price, avg(inv_lines.price) as avg_price, s.code as sku_code, s.description, s.id as sku_id, 1 as uom_size, 'EA' as uom_code")
+            select( "sum(inv_lines.qty) as qty, count(*) as num_sales, sum(inv_lines.price) as price, " \
+                    "avg(inv_lines.price) as avg_price, s.code as sku_code, s.description, " \
+                    "s.id as sku_id, 1 as uom_size, 'EA' as uom_code")
             .joins("join sku_locs sl on sl.id = inv_lines.sku_loc_id join skus s on s.id = sl.sku_id")
             .where(["inv_lines.created_at between ? and ?",values['from'], values['to'] ])
             .group('s.code,s.description, s.id')

data/lib/skr/models/invoice.rb

@@ -31,6 +31,8 @@ module Skr
         has_gl_transaction
         is_order_like
 
+        export_methods :total_hours
+
         belongs_to :sales_order,      export: true
         belongs_to :customer_project, export: true
         belongs_to :customer,         export: true
@@ -114,6 +116,12 @@ module Skr
             GlPeriod.is_date_locked?(self.invoice_date)
         end
 
+        def total_hours
+            lines.reduce(BigDecimal.new('0')){|t, l|
+                l.time_entry ? t + l.qty : t
+            }
+        end
+
         private
 
         # set the state if the amount_paid was changed
@@ -121,11 +129,7 @@ module Skr
             if self.fully_paid? && self.may_mark_paid?
                 self.mark_paid!
             elsif self.payments.total > 0 && self.may_mark_partialy_paid?
-                Lanes.logger_debug('paying')
-
-                #self.mark_partialy_paid!
-
-                Lanes.logger_debug('paid')
+                self.mark_partialy_paid!
             end
         end
 

data/lib/skr/models/payment.rb

@@ -85,7 +85,7 @@ module Skr
                     self.name = invoice.billing_address.name
                 end
             end
-            if bank_account && outgoing?
+            if bank_account.present? && outgoing?
                 self.check_number ||= SequentialId.next_for(SEQUENTIAL_ID_PREFIX + bank_account.id.to_s)
             end
             self.bank_account ||= BankAccount.default