Revert "Feature/add sum in lists"

ekylibre · Jun 10, 2017 · daccf55 · daccf55
1 parent 1ad90a9
commit daccf55
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 deletions.
diff --git a/Gemfile b/Gemfile
@@ -97,7 +97,7 @@ gem 'unicorn', group: :production
 gem 'exception_notification'
 
 # Views helpers
-gem 'active_list', '>= 6.9.0' # , path: "../active_list"
+gem 'active_list', '>= 6.8.2' # , path: "../active_list"
 gem 'haml'
 gem 'simple_calendar'
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -557,7 +557,7 @@ PLATFORMS
 
 DEPENDENCIES
   actionpack-xml_parser
-  active_list (>= 6.9.0)
+  active_list (>= 6.8.2)
   activerecord-postgis-adapter (>= 3.0.0)
   acts_as_list
   agric (~> 3.0)

diff --git a/app/controllers/backend/accounts_controller.rb b/app/controllers/backend/accounts_controller.rb
@@ -86,8 +86,8 @@ def self.account_moves_conditions(_options = {})
       t.column :real_credit, currency: :real_currency, hidden: true
       t.column :debit,  currency: true, hidden: true
       t.column :credit, currency: true, hidden: true
-      t.column :absolute_debit,  currency: :absolute_currency, on_select: :sum
-      t.column :absolute_credit, currency: :absolute_currency, on_select: :sum
+      t.column :absolute_debit,  currency: :absolute_currency
+      t.column :absolute_credit, currency: :absolute_currency
     end
 
     list(:entities, conditions: ['? IN (client_account_id, supplier_account_id)', 'params[:id]'.c], order: { created_at: :desc }) do |t|

diff --git a/app/controllers/backend/general_ledgers_controller.rb b/app/controllers/backend/general_ledgers_controller.rb
@@ -44,12 +44,12 @@ def self.list_conditions
       t.column :letter
       t.column :real_debit,  currency: :real_currency, hidden: true
       t.column :real_credit, currency: :real_currency, hidden: true
-      t.column :debit,  currency: true, hidden: true, on_select: :sum
-      t.column :credit, currency: true, hidden: true, on_select: :sum
-      t.column :absolute_debit,  currency: :absolute_currency, on_select: :sum
-      t.column :absolute_credit, currency: :absolute_currency, on_select: :sum
-      t.column :cumulated_absolute_debit,  currency: :absolute_currency, on_select: :sum
-      t.column :cumulated_absolute_credit, currency: :absolute_currency, on_select: :sum
+      t.column :debit,  currency: true, hidden: true
+      t.column :credit, currency: true, hidden: true
+      t.column :absolute_debit,  currency: :absolute_currency
+      t.column :absolute_credit, currency: :absolute_currency
+      t.column :cumulated_absolute_debit,  currency: :absolute_currency
+      t.column :cumulated_absolute_credit, currency: :absolute_currency
     end
 
     def show; end

diff --git a/app/controllers/backend/incoming_payments_controller.rb b/app/controllers/backend/incoming_payments_controller.rb
@@ -57,7 +57,7 @@ def self.incoming_payments_conditions(_options = {})
       t.column :number, url: true
       t.column :payer, url: true
       t.column :paid_at
-      t.column :amount, currency: true, url: true, on_select: :sum
+      t.column :amount, currency: true, url: true
       t.column :mode
       t.column :bank_check_number
       t.column :to_bank_at

diff --git a/app/controllers/backend/interventions_controller.rb b/app/controllers/backend/interventions_controller.rb
@@ -136,11 +136,11 @@ def self.list_conditions
       t.column :human_activities_names
       t.column :started_at
       t.column :stopped_at, hidden: true
-      t.column :human_working_duration, on_select: :sum, value_method: 'working_duration.in(:second).in(:hour)', datatype: :decimal
+      t.column :human_working_duration
       t.status
       t.column :human_target_names
-      t.column :human_working_zone_area, on_select: :sum, datatype: :decimal
-      t.column :total_cost, label_method: :human_total_cost, currency: true, on_select: :sum, datatype: :decimal
+      t.column :human_working_zone_area
+      t.column :total_cost, label_method: :human_total_cost, currency: true
       t.column :nature
       t.column :issue, url: true
       t.column :trouble_encountered, hidden: true

diff --git a/app/controllers/backend/purchase_payments_controller.rb b/app/controllers/backend/purchase_payments_controller.rb
@@ -21,7 +21,7 @@ def self.list_conditions
       t.column :number, url: true
       t.column :payee, url: true
       t.column :paid_at
-      t.column :amount, currency: true, url: true, on_select: :sum
+      t.column :amount, currency: true, url: true
       t.column :mode
       t.column :bank_check_number
       t.column :to_bank_at