erp_invoicing 3.0.6 → 3.1.0

data/app/models/billing_account.rb

@@ -1,4 +1,6 @@
 class BillingAccount < ActiveRecord::Base
+  attr_protected :created_at, :updated_at
+
   acts_as_financial_txn_account
 
   belongs_to :calculate_balance_strategy_type
@@ -148,10 +150,10 @@ class BillingAccount < ActiveRecord::Base
 
   #override balance_date for today if calculate_balance is set to true
   def balance_date
-    if self.calculate_balance
-      Date.today
+    if self.calculate_balance_strategy_type.nil?
+      self.financial_txn_account.balance_date
     else
-      unless self.invoices.empty?
+      if self.calculate_balance_strategy_type.iid == 'invoices_and_payments' and self.invoices.empty?
         current_invoice.invoice_date
       else
         self.financial_txn_account.balance_date

data/app/models/calculate_balance_strategy_type.rb

@@ -1,4 +1,6 @@
 class CalculateBalanceStrategyType < ActiveRecord::Base
+  attr_protected :created_at, :updated_at
+
   has_many :billing_accounts
 
   def self.find_by_iid(iid)

data/app/models/invoice.rb

@@ -1,4 +1,6 @@
 class Invoice < ActiveRecord::Base
+  attr_protected :created_at, :updated_at
+
   acts_as_document
   
   belongs_to  :billing_account

data/app/models/invoice_item.rb

@@ -1,4 +1,5 @@
 class InvoiceItem < ActiveRecord::Base
+  attr_protected :created_at, :updated_at
 
 	belongs_to 	:agreement
 	belongs_to	:agreement_item_type

data/app/models/invoice_item_type.rb

@@ -1,2 +1,3 @@
 class InvoiceItemType < ActiveRecord::Base
+  attr_protected :created_at, :updated_at
 end

data/app/models/invoice_party_role.rb

@@ -1,4 +1,5 @@
 class InvoicePartyRole < ActiveRecord::Base
+  attr_protected :created_at, :updated_at
 
   belongs_to  :invoice
   belongs_to  :party

data/app/models/invoice_payment_strategy_type.rb

@@ -1,4 +1,6 @@
 class InvoicePaymentStrategyType < ActiveRecord::Base
+  attr_protected :created_at, :updated_at
+
   acts_as_erp_type
 
   has_many :invoices

data/app/models/invoice_payment_term.rb

@@ -1,4 +1,6 @@
 class InvoicePaymentTerm < ActiveRecord::Base
+  attr_protected :created_at, :updated_at
+
   has_one    :invoice_payment_term_type
   belongs_to :invoice_payment_term_set
 end

data/app/models/invoice_payment_term_set.rb

@@ -1,4 +1,6 @@
 class InvoicePaymentTermSet < ActiveRecord::Base
+  attr_protected :created_at, :updated_at
+
   belongs_to :invoice
   has_many   :invoice_payment_terms
 

data/app/models/invoice_payment_term_type.rb

@@ -1,3 +1,5 @@
 class InvoicePaymentTermType < ActiveRecord::Base
+  attr_protected :created_at, :updated_at
+
   has_many :invoice_payment_terms
 end

data/app/models/invoice_type.rb

@@ -1,2 +1,3 @@
 class InvoiceType < ActiveRecord::Base
+  attr_protected :created_at, :updated_at
 end

data/app/models/payment_application.rb

@@ -1,4 +1,5 @@
 class PaymentApplication < ActiveRecord::Base
+  attr_protected :created_at, :updated_at
 
   belongs_to :financial_txn
   belongs_to :payment_applied_to, :polymorphic => true
@@ -7,7 +8,7 @@ class PaymentApplication < ActiveRecord::Base
   before_destroy :unapply_payment
 
   def is_pending?
-    (self.financial_txn.is_scheduled? or self.financial_txn.is_pending?) unless self.financial_txn.nil?
+    self.financial_txn.nil? or (self.financial_txn.is_scheduled? or self.financial_txn.is_pending?) 
   end
 
   def apply_payment

data/app/models/recurring_payment.rb

@@ -1,4 +1,6 @@
 class RecurringPayment < ActiveRecord::Base
+  attr_protected :created_at, :updated_at
+
   belongs_to :billing_account
   belongs_to :payment_account, :polymorphic => true
 

data/db/migrate/20111121000000_invoicing_services.rb

@@ -22,6 +22,8 @@ class InvoicingServices < ActiveRecord::Migration
         t.references :invoice_type
         t.references :billing_account
         t.references :invoice_payment_strategy_type
+        t.references :balance
+        t.references :calculate_balance_strategy_type
 
         t.timestamps
       end
@@ -128,6 +130,7 @@ class InvoicingServices < ActiveRecord::Migration
         t.boolean :send_paper_bills, :default => false
         t.boolean :payable_online, :default => false
         t.date    :billing_date
+        t.integer :calculate_balance_strategy_type_id
 
         t.timestamps
       end
@@ -157,6 +160,7 @@ class InvoicingServices < ActiveRecord::Migration
         t.date     :from_date
         t.date     :thru_date
         t.boolean  :enabled
+        t.boolean  :text_to_pay
 
         t.timestamps
       end
@@ -244,6 +248,14 @@ class InvoicingServices < ActiveRecord::Migration
       end
     end
 
+    unless table_exists?(:calculate_balance_strategy_types)
+      create_table :calculate_balance_strategy_types do |t|
+        t.string :internal_identifier
+        t.string :description
+
+        t.timestamps
+      end
+    end
     
   end
 
@@ -253,7 +265,7 @@ class InvoicingServices < ActiveRecord::Migration
       :invoice_items, :invoice_item_types, :invoice_party_roles,
       :billing_accounts, :billing_contact_mechanisms,
       :payment_applications, :payment_party_roles, :recurring_payments,
-      :invoice_payment_term_sets,:invoice_payment_terms,:invoice_payment_term_types
+      :invoice_payment_term_sets,:invoice_payment_terms,:invoice_payment_term_types, :calculate_balance_strategy_types
     ].each do |tbl|
       if table_exists?(tbl)
         drop_table tbl

data/lib/erp_invoicing/version.rb

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

data/lib/erp_invoicing.rb

@@ -1,3 +1,7 @@
+require 'erp_base_erp_svcs'
+require 'erp_app'
+require 'knitkit'
+
 require "erp_invoicing/version"
 require "erp_invoicing/engine"
 

data/public/javascripts/erp_app/desktop/applications/invoice_management/billing_accounts_panel.js

@@ -37,7 +37,6 @@ Ext.define("Compass.ErpApp.Desktop.Applications.InvoiceManagement.BillingAccount
 
     config = Ext.apply({
       layout:'border',
-      autoScroll:true,
       items:[
       {
         xtype:'shared-billingaccountsgridpanel',

data/public/javascripts/erp_app/shared/invoices_grid_panel.js

@@ -118,7 +118,7 @@ Ext.define("Compass.ErpApp.Shared.InvoicesGridPanel",{
     var self = this;
     
     var store = Ext.create('Ext.data.Store', {
-      fields:['billed_to_party', 'billed_from_party', 'invoice_number','description', 'message', 'invoice_date', 'due_date', 'payment_due', 'id', 'billing_account'],
+      fields:['billed_to_party', 'billed_from_party', 'invoice_number','description', 'message', 'invoice_date', 'due_date', {name:'payment_due',type:'float'}, 'id', 'billing_account'],
       autoLoad: Compass.ErpApp.Utility.isBlank(config['autoLoad']) ? true : config['autoLoad'],
       autoSync: true,
       proxy: {

data/spec/dummy/config/application.rb

@@ -45,6 +45,12 @@ module Dummy
 
     # Enable the asset pipeline
     config.assets.enabled = true
+
+    # Enforce whitelist mode for mass assignment.
+    # This will create an empty whitelist of attributes available for mass-assignment for all models
+    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
+    # parameters by using an attr_accessible or attr_protected declaration.
+    config.active_record.whitelist_attributes = true    
   end
 end
 

data/spec/dummy/config/environments/spec.rb

@@ -1,6 +1,9 @@
 Dummy::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
+  # Raise exception on mass assignment protection for Active Record models
+  config.active_record.mass_assignment_sanitizer = :strict
+
   # In the development environment your application's code is reloaded on
   # every request.  This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.

data/spec/dummy/db/data_migrations/20101011152441_payment_gateway_actions.erp_commerce.rb

@@ -0,0 +1,28 @@
+# This migration comes from erp_commerce (originally 20101011152441)
+class PaymentGatewayActions
+  
+  def self.up
+    PaymentGatewayAction.create(
+      :internal_identifier => 'capture',
+      :description => 'capture'
+    )
+
+    PaymentGatewayAction.create(
+      :internal_identifier => 'authorize',
+      :description => 'Authorize'
+    )
+
+    PaymentGatewayAction.create(
+      :internal_identifier => 'full_reverse_of_authorization',
+      :description => 'Full Reverse Of Authorization'
+    )
+  end
+  
+  def self.down
+    ['sale','void_sale','authorize'].each do |iid|
+      type = PaymentGatewayAction.find_by_internal_identifier(iid)
+      type.destroy unless type.nil?
+    end
+  end
+
+end

data/spec/dummy/db/data_migrations/20101014142230_financial_txn_types.erp_txns_and_accts.rb

@@ -0,0 +1,16 @@
+# This migration comes from erp_txns_and_accts (originally 20101014142230)
+class FinancialTxnTypes
+  
+  def self.up
+    BizTxnType.create(
+      :description => "Payment Transaction",
+      :internal_identifier => 'payment_txn'
+    )
+  end
+  
+  def self.down
+    type = BizTxnType.iid('payment_txn')
+    type.destroy unless type.nil?
+  end
+
+end

data/spec/dummy/db/data_migrations/20110109173616_create_capability_scope_types.erp_tech_svcs.rb

@@ -0,0 +1,15 @@
+# This migration comes from erp_tech_svcs (originally 20110109173616)
+class CreateCapabilityScopeTypes
+  
+  def self.up
+    CapabilityType.create(:internal_identifier => 'download', :description => 'Download') if CapabilityType.where("internal_identifier = 'download'").first.nil?
+
+    ScopeType.create(:description => 'Instance', :internal_identifier => 'instance') if ScopeType.where("internal_identifier = 'instance'").first.nil?
+    ScopeType.create(:description => 'Class', :internal_identifier => 'class') if ScopeType.where("internal_identifier = 'class'").first.nil?
+    ScopeType.create(:description => 'Query', :internal_identifier => 'query') if ScopeType.where("internal_identifier = 'query'").first.nil?
+  end
+  
+  def self.down
+  end
+
+end

data/spec/dummy/db/data_migrations/20110324010232_product_role_types.erp_products.rb

@@ -0,0 +1,24 @@
+# This migration comes from erp_products (originally 20110324010232)
+class ProductRoleTypes
+  
+  def self.up
+    ProdTypeRelnType.create(:internal_identifier => 'product_type_package_reln', :description => 'Product Type Package Relationship')
+    ProdTypeRoleType.create(:internal_identifier => 'product_type_package', :description => 'Product Type Package')
+    ProdTypeRoleType.create(:internal_identifier => 'packaged_product_type', :description => 'Packaged Product Type')
+
+    ProdInstanceRelnType.create(:internal_identifier => 'product_instance_package_reln', :description => 'Product Instance Package Relantionship')
+    ProdInstanceRoleType.create(:internal_identifier => 'product_instance_package', :description => 'Product Instance Package')
+    ProdInstanceRoleType.create(:internal_identifier => 'packaged_product_instance', :description => 'Packaged Product Instance')
+  end
+  
+  def self.down
+   ['product_type_package_reln','product_type_package','packaged_product_type'].each do |iid|
+     ProdTypeRelnType.iid(iid).destroy
+   end
+
+    ['product_instance_package_reln','product_instance_package','packaged_product_instance'].each do |iid|
+     ProdInstanceRoleType.iid(iid).destroy
+   end
+  end
+
+end

data/spec/dummy/db/data_migrations/20110509223702_add_publisher_role.knitkit.rb

@@ -0,0 +1,22 @@
+# This migration comes from knitkit (originally 20110509223702)
+class AddPublisherRole
+  
+  def self.up
+    SecurityRole.create(:internal_identifier => 'publisher', :description => 'Publisher')
+    SecurityRole.create(:internal_identifier => 'content_author', :description => 'Content Author')
+    SecurityRole.create(:internal_identifier => 'layout_author', :description => 'Layout Author')
+    SecurityRole.create(:internal_identifier => 'editor', :description => 'Editor')
+    SecurityRole.create(:internal_identifier => 'designer', :description => 'Designer')
+    SecurityRole.create(:internal_identifier => 'website_author', :description => 'Website Author')
+  end
+  
+  def self.down
+    SecurityRole.iid('publisher').destroy
+    SecurityRole.iid('content_author').destroy
+    SecurityRole.iid('layout_author').destroy
+    SecurityRole.iid('editor').destroy
+    SecurityRole.iid('designer').destroy
+    SecurityRole.iid('website_author').destroy
+  end
+
+end

data/spec/dummy/db/data_migrations/20110525001935_add_usd_currency.erp_base_erp_svcs.rb

@@ -0,0 +1,12 @@
+# This migration comes from erp_base_erp_svcs (originally 20110525001935)
+class AddUsdCurrency
+  
+  def self.up
+    Currency.create(:name => 'US Dollar', :internal_identifier => 'USD', :major_unit_symbol => "$")
+  end
+  
+  def self.down
+    Currency.usd.destroy
+  end
+
+end

data/spec/dummy/db/data_migrations/20110527160807_add_default_prod_avail_types.erp_products.rb

@@ -0,0 +1,27 @@
+# This migration comes from erp_products (originally 20110527160807)
+class AddDefaultProdAvailTypes
+  
+  def self.up
+    ProdAvailabilityStatusType.create(
+      :description => 'Available',
+      :internal_identifier => 'available'
+    )
+
+    ProdAvailabilityStatusType.create(
+      :description => 'Sold',
+      :internal_identifier => 'sold'
+    )
+
+    ProdAvailabilityStatusType.create(
+      :description => 'Shipped',
+      :internal_identifier => 'shipped'
+    )
+  end
+  
+  def self.down
+    %w(available sold shipped).each do |iid|
+      ProdAvailabilityStatusType.find_by_internal_identifier(iid).destroy
+    end
+  end
+
+end

data/spec/dummy/db/data_migrations/20110605231556_create_order_party_roles.erp_orders.rb

@@ -0,0 +1,24 @@
+# This migration comes from erp_orders (originally 20110605231556)
+class CreateOrderPartyRoles
+  
+  def self.up
+    order_roles = BizTxnPartyRoleType.create(
+      :description => 'Order Roles',
+      :internal_identifier => 'order_roles'
+    )
+
+    buyor_role = BizTxnPartyRoleType.create(
+      :description => 'Payor',
+      :internal_identifier => 'payor'
+    )
+
+    buyor_role.move_to_child_of(order_roles)
+    buyor_role.save
+  end
+  
+  def self.down
+    BizTxnPartyRoleType.find_by_internal_identifier('payor').destroy
+    BizTxnPartyRoleType.find_by_internal_identifier('order_roles').destroy
+  end
+
+end

data/spec/dummy/db/data_migrations/20110608185830_create_default_dynamic_models_and_forms.erp_forms.rb

@@ -0,0 +1,33 @@
+# This migration comes from erp_forms (originally 20110608185830)
+class CreateDefaultDynamicModelsAndForms
+  
+  def self.up
+    #insert data here
+    DynamicFormModel.create(:model_name => 'DynamicFormDocument')
+
+    fields = []
+
+    fields << DynamicFormField.textfield({:fieldLabel => 'First Name', :name => 'first_name', :width => 250, :allowBlank => false })
+    fields << DynamicFormField.textfield({:fieldLabel => 'Last Name', :name => 'last_name', :width => 250, :allowBlank => false })
+    fields << DynamicFormField.email({:fieldLabel => 'Email', :name => 'email', :width => 250, :allowBlank => false })
+    fields << DynamicFormField.textarea({:fieldLabel => 'Message', :name => 'message', :width => 400, :height => 200, :allowBlank => false })    
+
+    d = DynamicForm.new
+    d.description = 'Contact Form'
+    d.definition = fields.to_json
+    d.model_name = 'WebsiteInquiry'
+    d.internal_identifier = 'contact_us'
+    d.default = true
+    d.dynamic_form_model = DynamicFormModel.create(:model_name => 'WebsiteInquiry')
+    d.comment = "This is the default form used by Knitkit's Contact Us Widget for Website Inquiries. NOTE: The Contact Us Widget uses Knitkit's website configuration options for email behavior & not the Dynamic Forms Widget Action setting."
+    d.msg_target = 'qtip'
+    d.save
+  end
+  
+  def self.down
+    #remove data here
+    DynamicFormModel.delete_all
+    DynamicForm.delete_all
+  end
+
+end