dorsale 2.3.2 → 2.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86390b0facce43b7f92c0bae77f65a26d39aca14
-  data.tar.gz: e99f1d7702134509d8dec28d6ed2573d5d47a881
+  metadata.gz: 94a833245ae7127b5e03bb2fe34fe73db00ef284
+  data.tar.gz: e64e088c57d897b2ce817417ad351c45184333a9
 SHA512:
-  metadata.gz: 57d1b705a9f56a60811a3dd0d28d4e73dd2878a15401a2591f3c23b2c5a8aac5b57bd2b8ffa09c310f27ec363b90a18bd432213890b7bbb9d0ec06da243824f8
-  data.tar.gz: f8445aebe05ca42f2ea894461f88215db91d00ea889b86da53035d1dab81a6c4dd84d49b5d12db6b408cdcb406be3535e33de40b73cfbe5214a894206f4068b1
+  metadata.gz: 3877c0915c91d31c11513a6a1b84ada8f3025590719b2741a85848aaba26e318d370116a660ff4b28f9c731f2311cf5efee0c876d0d4de6c22f6982dc6a8f91a
+  data.tar.gz: 3ee931c72d1cb8634a40192b3b56cb2782e954ace6a9292213aa8064314cf51b31df7e03d67b68b7b4ea002f8ab174b39171a64e818154ffa1e30ab25e849f25

data/app/assets/javascripts/dorsale/datepicker.coffee

@@ -1,5 +1,7 @@
 $(document).on "ready page:load", ->
   $("input[type*=date], input[name*=date], input[name$=_at]").map ->
+    return if this.type == "hidden"
+
     this.type = "text"
 
     if this.value.match("-")

data/app/helpers/dorsale/all_helpers.rb

@@ -1,5 +1,7 @@
 module Dorsale
   module AllHelpers
+    include ::ActionView::Helpers::NumberHelper
+
     include ::Dorsale::ButtonHelper
     include ::Dorsale::CommentsHelper
     include ::Dorsale::ContextHelper
@@ -13,5 +15,7 @@ module Dorsale
     include ::Dorsale::Alexandrie::AttachmentsHelper
     include ::Dorsale::Flyboy::ApplicationHelper
     include ::Dorsale::UsersHelper
+
+    extend self
   end
 end

data/app/helpers/dorsale/form_helper.rb

@@ -2,7 +2,8 @@ module Dorsale
   module FormHelper
     def form_buttons(opts = {})
      back_url = opts[:back_url]
-     back_url = url_for(:back).html_safe if back_url.nil?
+     back_url = url_for(:back).html_safe if back_url.blank?
+     back_url = URI(back_url).path       if back_url.include?("://")
 
       if opts[:obj].present?
         if opts[:obj].new_record?
@@ -16,11 +17,11 @@ module Dorsale
 
       content_tag("div", class: "actions") do
         submit = content_tag(:button, type: :submit, class: "btn btn-sm btn-success") do
-          icon(:save) + " " + t("actions.#{submit_action}")
+          content_tag(:span, class: "fa fa-save") {} + " " + t("actions.#{submit_action}")
         end
 
         cancel = content_tag("a", href: back_url, class: "btn btn-primary btn-sm") do
-          icon(:times) + " " + t("actions.cancel")
+          content_tag(:span, class: "fa fa-times"){} + " " + t("actions.cancel")
         end
 
         cancel = "" if back_url == false

data/lib/dorsale/version.rb

@@ -1,3 +1,3 @@
 module Dorsale
-  VERSION = "2.3.2"
+  VERSION = "2.3.3"
 end

data/spec/dummy/log/development.log

@@ -1370,3 +1370,425 @@
   SQL (0.2ms)  INSERT INTO "dorsale_flyboy_task_comments" ("description", "progress", "author_type", "task_id", "date", "created_at", "updated_at") VALUES (?, ?, ?, ?, ?, ?, ?)  [["description", "Relance faire aujourd'hui. Paiement d'ici la fin de la semaine."], ["progress", 50], ["author_type", "User"], ["task_id", 3], ["date", "2016-02-18 11:26:56.076660"], ["created_at", "2016-02-18 11:26:56.078901"], ["updated_at", "2016-02-18 11:26:56.078901"]]
   SQL (0.1ms)  UPDATE "dorsale_flyboy_tasks" SET "progress" = ?, "updated_at" = ? WHERE "dorsale_flyboy_tasks"."id" = ?  [["progress", 50], ["updated_at", "2016-02-18 11:26:56.080536"], ["id", 3]]
    (1.0ms)  commit transaction
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.2ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_dorsale_billing_machine_invoice_lines_on_invoice_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_dorsale_billing_machine_invoice_lines_on_invoice_id' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_dorsale_billing_machine_invoices_on_payment_term_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_dorsale_billing_machine_invoices_on_payment_term_id' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_dorsale_billing_machine_invoices_on_id_card_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_dorsale_billing_machine_invoices_on_id_card_id' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_dorsale_billing_machine_invoices_on_customer_type' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_dorsale_billing_machine_invoices_on_customer_type' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_dorsale_billing_machine_invoices_on_customer_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_dorsale_billing_machine_invoices_on_customer_id' AND type='index'
+
+   (0.2ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_dorsale_billing_machine_quotation_lines_on_quotation_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_dorsale_billing_machine_quotation_lines_on_quotation_id' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_dorsale_billing_machine_quotations_on_payment_term_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_dorsale_billing_machine_quotations_on_payment_term_id' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_dorsale_billing_machine_quotations_on_id_card_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_dorsale_billing_machine_quotations_on_id_card_id' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_dorsale_billing_machine_quotations_on_customer_type' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_dorsale_billing_machine_quotations_on_customer_type' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_dorsale_billing_machine_quotations_on_customer_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_dorsale_billing_machine_quotations_on_customer_id' AND type='index'
+
+   (0.2ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_dorsale_customer_vault_links_on_bob_type' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_dorsale_customer_vault_links_on_bob_type' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_dorsale_customer_vault_links_on_bob_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_dorsale_customer_vault_links_on_bob_id' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_dorsale_customer_vault_links_on_alice_type' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_dorsale_customer_vault_links_on_alice_type' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_dorsale_customer_vault_links_on_alice_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_dorsale_customer_vault_links_on_alice_id' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_dorsale_flyboy_folders_on_folderable_type' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_dorsale_flyboy_folders_on_folderable_type' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_dorsale_flyboy_folders_on_folderable_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_dorsale_flyboy_folders_on_folderable_id' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_dorsale_flyboy_task_comments_on_task_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_dorsale_flyboy_task_comments_on_task_id' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_dorsale_flyboy_tasks_on_taskable_type' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_dorsale_flyboy_tasks_on_taskable_type' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_dorsale_flyboy_tasks_on_taskable_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_dorsale_flyboy_tasks_on_taskable_id' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_taggings_on_taggable_id_and_taggable_type_and_context' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_taggings_on_taggable_id_and_taggable_type_and_context' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='taggings_idx' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='taggings_idx' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_tags_on_name' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_tags_on_name' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_users_on_reset_password_token' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_users_on_reset_password_token' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_users_on_email' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_users_on_email' AND type='index'
+
+  ActiveRecord::SchemaMigration Load (0.4ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to CreateExpenseGun (20160125201025)
+   (0.1ms)  begin transaction
+   (0.5ms)  CREATE TABLE "dorsale_expense_gun_expenses" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar, "state" varchar, "date" date, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (0.4ms)  CREATE TABLE "dorsale_expense_gun_expense_lines" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "expense_id" integer, "category_id" integer, "name" varchar, "date" date, "total_all_taxes" float, "vat" float, "company_part" float, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (0.2ms)  CREATE TABLE "dorsale_expense_gun_categories" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar, "code" varchar, "vat_deductible" boolean) 
+   (0.1ms)  select sqlite_version(*)
+   (0.1ms)  CREATE  INDEX "index_dorsale_expense_gun_expense_lines_on_expense_id" ON "dorsale_expense_gun_expense_lines" ("expense_id")
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_dorsale_expense_gun_expense_lines_on_expense_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_dorsale_expense_gun_expense_lines_on_expense_id' AND type='index'
+
+   (0.1ms)  CREATE  INDEX "index_dorsale_expense_gun_expense_lines_on_category_id" ON "dorsale_expense_gun_expense_lines" ("category_id")
+  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20160125201025"]]
+   (1.2ms)  commit transaction
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_dorsale_billing_machine_invoice_lines_on_invoice_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_dorsale_billing_machine_invoice_lines_on_invoice_id' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_dorsale_billing_machine_invoices_on_payment_term_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_dorsale_billing_machine_invoices_on_payment_term_id' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_dorsale_billing_machine_invoices_on_id_card_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_dorsale_billing_machine_invoices_on_id_card_id' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_dorsale_billing_machine_invoices_on_customer_type' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_dorsale_billing_machine_invoices_on_customer_type' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_dorsale_billing_machine_invoices_on_customer_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_dorsale_billing_machine_invoices_on_customer_id' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_dorsale_billing_machine_quotation_lines_on_quotation_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_dorsale_billing_machine_quotation_lines_on_quotation_id' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_dorsale_billing_machine_quotations_on_payment_term_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_dorsale_billing_machine_quotations_on_payment_term_id' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_dorsale_billing_machine_quotations_on_id_card_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_dorsale_billing_machine_quotations_on_id_card_id' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_dorsale_billing_machine_quotations_on_customer_type' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_dorsale_billing_machine_quotations_on_customer_type' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_dorsale_billing_machine_quotations_on_customer_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_dorsale_billing_machine_quotations_on_customer_id' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_dorsale_customer_vault_links_on_bob_type' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_dorsale_customer_vault_links_on_bob_type' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_dorsale_customer_vault_links_on_bob_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_dorsale_customer_vault_links_on_bob_id' AND type='index'
+
+   (0.2ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_dorsale_customer_vault_links_on_alice_type' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_dorsale_customer_vault_links_on_alice_type' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_dorsale_customer_vault_links_on_alice_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_dorsale_customer_vault_links_on_alice_id' AND type='index'
+
+   (0.3ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_dorsale_expense_gun_expense_lines_on_category_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_dorsale_expense_gun_expense_lines_on_category_id' AND type='index'
+
+   (0.2ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_dorsale_expense_gun_expense_lines_on_expense_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_dorsale_expense_gun_expense_lines_on_expense_id' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_dorsale_flyboy_folders_on_folderable_type' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_dorsale_flyboy_folders_on_folderable_type' AND type='index'
+
+   (0.2ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_dorsale_flyboy_folders_on_folderable_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_dorsale_flyboy_folders_on_folderable_id' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_dorsale_flyboy_task_comments_on_task_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_dorsale_flyboy_task_comments_on_task_id' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_dorsale_flyboy_tasks_on_taskable_type' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_dorsale_flyboy_tasks_on_taskable_type' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_dorsale_flyboy_tasks_on_taskable_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_dorsale_flyboy_tasks_on_taskable_id' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_taggings_on_taggable_id_and_taggable_type_and_context' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_taggings_on_taggable_id_and_taggable_type_and_context' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='taggings_idx' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='taggings_idx' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_tags_on_name' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_tags_on_name' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_users_on_reset_password_token' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_users_on_reset_password_token' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_users_on_email' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_users_on_email' AND type='index'
+