erp_invoicing 3.0.5 → 3.0.6

data/app/models/billing_account.rb

@@ -22,7 +22,8 @@ class BillingAccount < ActiveRecord::Base
   has_one  :recurring_payment, :dependent => :destroy
 
   def self.find_by_account_number(account_number)
-    self.includes(:financial_txn_account).where(:financial_txn_accounts => {:account_number => account_number.to_s}).first
+    #self.includes(:financial_txn_account).where(:financial_txn_accounts => {:account_number => account_number.to_s}).first
+    self.where(:account_number => account_number.to_s).first
   end
 
   def has_recurring_payment_enabled?
@@ -59,7 +60,7 @@ class BillingAccount < ActiveRecord::Base
     unless self.calculate_balance_strategy_type.nil?
       case self.calculate_balance_strategy_type.internal_identifier
         when 'invoices_and_payments'
-          (self.invoices.balance.amount - self.total_payments)
+          (self.invoices.all.sum(&:calculate_balance) - self.total_payments)
         when 'payments'
           balance_amt = (self.balance - self.total_payments)
           balance_amt == 0 ? 0 : balance_amt.round(2)

data/app/models/invoice.rb

@@ -59,6 +59,8 @@ class Invoice < ActiveRecord::Base
       case self.calculate_balance_strategy_type.internal_identifier
         when 'invoice_items_and_payments'
           (self.items.all.sum(&:total_amount) - self.total_payments)
+        when 'payable_balances_and_payments'
+           (self.payable_balances.all.sum(&:balance).amount - self.total_payments)
         when 'payments'
           (self.balance - self.total_payments)
         else

data/db/data_migrations/20120229174322_add_billpay_widget.rb

@@ -6,17 +6,15 @@ class AddBillpayWidget
       app = Application.find_by_internal_identifier('crm')
 
       billpay = Widget.create(
-          :description => 'Bill Pay',
-          :internal_identifier => 'billpay',
-          :icon => 'icon-grid',
-          :xtype => 'billpay'
-        )
+        :description => 'Bill Pay',
+        :internal_identifier => 'billpay',
+        :icon => 'icon-grid',
+        :xtype => 'billpay'
+      )
 
       app.widgets << billpay
       app.save
 
-      billpay.roles << Role.find_by_internal_identifier('admin')
-      billpay.save
     end
   end
   

data/lib/erp_invoicing/engine.rb

@@ -6,10 +6,8 @@ module ErpInvoicing
       app.middleware.insert_before Rack::Lock, ::ActionDispatch::Static, "#{root}/public"
     end
 
-    engine = self
-    config.to_prepare do
-      ErpBaseErpSvcs.register_compass_ae_engine(engine)
-      ::ErpApp::Widgets::Loader.load_compass_ae_widgets(engine)
-    end
+    ErpBaseErpSvcs.register_as_compass_ae_engine(config, self)
+    ::ErpApp::Widgets::Loader.load_compass_ae_widgets(config, self)
+
   end
 end

data/lib/erp_invoicing/version.rb

@@ -2,7 +2,7 @@ module ErpInvoicing
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 0
-    TINY  = 5
+    TINY  = 6
 
     STRING = [MAJOR, MINOR, TINY].compact.join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erp_invoicing
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 3.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-24 00:00:00.000000000 Z
+date: 2013-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erp_inventory
-  requirement: &70232070628880 !ruby/object:Gem::Requirement
+  requirement: &70149467252040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70232070628880
+  version_requirements: *70149467252040
 - !ruby/object:Gem::Dependency
   name: erp_work_effort
-  requirement: &70232070628360 !ruby/object:Gem::Requirement
+  requirement: &70149467251380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70232070628360
+  version_requirements: *70149467251380
 - !ruby/object:Gem::Dependency
   name: erp_commerce
-  requirement: &70232070627820 !ruby/object:Gem::Requirement
+  requirement: &70149467250920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70232070627820
+  version_requirements: *70149467250920
 - !ruby/object:Gem::Dependency
   name: erp_dev_svcs
-  requirement: &70232070627200 !ruby/object:Gem::Requirement
+  requirement: &70149467250460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70232070627200
+  version_requirements: *70149467250460
 description: ErpInvoicing adds models and services to the CompassAE core to handle
   invoicing and billing functions. It includes extensions to the core ERP classes
   for accounts and things that are 'billable' (products, work efforts), and additional