From daccf554a95568569fb81b310d7cc4e35b994878 Mon Sep 17 00:00:00 2001 From: Brice Texier Date: Sat, 10 Jun 2017 15:45:45 +0200 Subject: [PATCH] Revert "Feature/add sum in lists" --- Gemfile | 2 +- Gemfile.lock | 2 +- app/controllers/backend/accounts_controller.rb | 4 ++-- .../backend/general_ledgers_controller.rb | 12 ++++++------ .../backend/incoming_payments_controller.rb | 2 +- app/controllers/backend/interventions_controller.rb | 6 +++--- .../backend/purchase_payments_controller.rb | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Gemfile b/Gemfile index 91ffcd6e4b..798e6e68dc 100644 --- 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 index 95c1490a77..45d231400c 100644 --- 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 index e5a7ef4490..1d0925a148 100644 --- 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 index cf0d64aacd..7cc339c3fb 100644 --- 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 index 9fb4eeffa9..9bbb191fc0 100644 --- 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 index ee83b97061..ec152bdbbc 100644 --- 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 index 270131aa9b..387f9395ad 100644 --- 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