dorsale 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6da724b4f6932eaab9a6495fa239b88f5fa3ecdc
-  data.tar.gz: bfdfc5c3b9f49758ec9113698f3aa987d542d401
+  metadata.gz: 080edf5ce998ce2ff9d20d241e1147ba3266c692
+  data.tar.gz: cb2025cefb2bcab071c4d6c1196bf2c9d108b8c7
 SHA512:
-  metadata.gz: 4e548a35a6f03654bf3fad329ad58d3cf21daecb51307837c248b396e0e239ba6160c1989b27a53a18b6df67265b326813e8b3554f530dc13062e9374c7db042
-  data.tar.gz: 44167e05d8e8cf0bfc7b9950548b9c7cc579ac9b873bafbd1c71b43e34c8b891bdddb3545531d955ca5996a72768d96b31b9671c08d488a98c63a7e0d7ffd1b1
+  metadata.gz: 91e23b0864e4ff32653fde419f136809ad0e8104daf884b2b4a92f275eb6aeb245015e3cbaa3a154382fbae8a15b607e91970925a1a02939811f7f288c35d5f3
+  data.tar.gz: e68e1c2d2bcadf1f9da78f8c46a298c03e0abfc92fa23392de9a22a2c3e67e533e96cf964c804e27f513258f78b4c4ecb733ee1d4112c446eb31c0c6c8ec24de

data/app/controllers/dorsale/billing_machine/id_cards_controller.rb

@@ -0,0 +1,84 @@
+module Dorsale
+  module BillingMachine
+    class IdCardsController < ::Dorsale::BillingMachine::ApplicationController
+      def index
+        authorize! :list, IdCard
+        @id_cards ||= ::Dorsale::BillingMachine::IdCard.all
+      end
+
+      def new
+        @id_card = ::Dorsale::BillingMachine::IdCard.new
+        authorize! :create, @id_card
+      end
+
+      def create
+        @id_card ||= ::Dorsale::BillingMachine::IdCard.new(id_card_params)
+        authorize! :create, @id_card
+        if @id_card.save
+          flash[:notice] = t("id_cards.create_ok")
+          redirect_to billing_machine_id_cards_path
+        else
+          render action: "new"
+        end
+      end
+
+      def edit
+        @id_card = ::Dorsale::BillingMachine::IdCard.find(params[:id])
+        authorize! :update, @id_card
+      end
+
+      def update
+        @id_card = ::Dorsale::BillingMachine::IdCard.find(params[:id])
+        authorize! :update, @id_card
+        if @id_card.update_attributes(id_card_params)
+          flash[:notice] = t("id_cards.update_ok")
+          redirect_to billing_machine_id_cards_path
+        else
+          render action: "edit"
+        end
+      end
+
+      private
+
+      def permitted_params
+        [
+          :id,
+          :id_card_name,
+          :entity_name,
+          :siret,
+          :legal_form,
+          :capital,
+          :registration_number,
+          :intracommunity_vat,
+          :address1,
+          :address2,
+          :zip,
+          :city,
+          :phone,
+          :contact_full_name,
+          :contact_phone,
+          :contact_address_1,
+          :contact_address_2,
+          :contact_zip,
+          :contact_city,
+          :iban,
+          :bic_swift,
+          :bank_name,
+          :bank_address,
+          :ape_naf,
+          :custom_info_1,
+          :custom_info_2,
+          :custom_info_3,
+          :contact_fax,
+          :contact_email,
+          :logo,
+          :registration_city,
+        ]
+      end
+
+      def id_card_params
+        params.require(:billing_machine_id_card).permit(permitted_params)
+      end
+    end
+  end
+end

data/app/controllers/dorsale/billing_machine/payment_terms_controller.rb

@@ -0,0 +1,54 @@
+module Dorsale
+  module BillingMachine
+    class PaymentTermsController < ::Dorsale::BillingMachine::ApplicationController
+      def index
+        authorize! :list, PaymentTerm
+        @payment_terms ||= ::Dorsale::BillingMachine::PaymentTerm.all
+      end
+
+      def new
+        @payment_term = ::Dorsale::BillingMachine::PaymentTerm.new
+        authorize! :create, @payment_term
+      end
+
+      def create
+        @payment_term ||= ::Dorsale::BillingMachine::PaymentTerm.new(payment_term_params)
+        authorize! :create, @payment_term
+        if @payment_term.save
+          flash[:notice] = t("payment_terms.create_ok")
+          redirect_to billing_machine_payment_terms_path
+        else
+          render action: "new"
+        end
+      end
+
+      def edit
+        @payment_term = ::Dorsale::BillingMachine::PaymentTerm.find(params[:id])
+        authorize! :update, @payment_term
+      end
+
+      def update
+        @payment_term = ::Dorsale::BillingMachine::PaymentTerm.find(params[:id])
+        authorize! :update, @payment_term
+        if @payment_term.update_attributes(payment_term_params)
+          flash[:notice] = t("payment_terms.update_ok")
+          redirect_to billing_machine_payment_terms_path
+        else
+          render action: "edit"
+        end
+      end
+
+      private
+
+      def permitted_params
+        [
+          :label,
+        ]
+      end
+
+      def payment_term_params
+        params.require(:billing_machine_payment_term).permit(permitted_params)
+      end
+    end
+  end
+end

data/app/controllers/dorsale/expense_gun/categories_controller.rb

@@ -0,0 +1,62 @@
+module Dorsale
+  module ExpenseGun
+    class CategoriesController < ::Dorsale::ExpenseGun::ApplicationController
+      def index
+        authorize! :list, Category
+
+        @categories ||= ::Dorsale::ExpenseGun::Category.all
+      end
+
+      def new
+        @category = ::Dorsale::ExpenseGun::Category.new
+
+        authorize! :create, @category
+      end
+
+      def create
+        @category ||= ::Dorsale::ExpenseGun::Category.new(category_params)
+
+        authorize! :create, @category
+
+        if @category.save
+          flash[:notice] = t("categories.create_ok")
+          redirect_to expense_gun_categories_path
+        else
+          render action: "new"
+        end
+      end
+
+      def edit
+        @category = ::Dorsale::ExpenseGun::Category.find(params[:id])
+        authorize! :update, @category
+      end
+
+      def update
+        @category ||= ::Dorsale::ExpenseGun::Category.find(params[:id])
+
+        authorize! :update, @category
+
+        if @category.update_attributes(category_params)
+          flash[:notice] = t("categories.update_ok")
+          redirect_to expense_gun_categories_path
+        else
+          render action: "edit"
+        end
+      end
+
+      private
+
+      def permitted_params
+        [
+          :name,
+          :code,
+          :vat_deductible,
+        ]
+      end
+
+      def category_params
+        params.require(:expense_gun_category).permit(permitted_params)
+      end
+    end
+  end
+end

data/app/controllers/dorsale/users_controller.rb

@@ -12,11 +12,11 @@ module Dorsale
     def index
       authorize! :list, User
 
-      @users = User.all
+      @users ||= User.all
     end
 
     def new
-      @user = User.new
+      @user ||= User.new
 
       authorize! :create, @user
     end
@@ -26,7 +26,7 @@ module Dorsale
     end
 
     def create
-      @user = User.new(user_params)
+      @user ||= User.new(user_params)
 
       authorize! :create, @user
 
@@ -68,7 +68,7 @@ module Dorsale
     end
 
     def user_params
-      params.require(:user).permit(permitted_params)
+      params.fetch(:user, {}).permit(permitted_params)
     end
   end
 end

data/app/models/dorsale/billing_machine/ability_helper.rb

@@ -4,6 +4,8 @@ module Dorsale
       def define_dorsale_billing_machine_abilities
         can [:list, :create, :read, :update, :pay, :copy, :download, :email], ::Dorsale::BillingMachine::Invoice
         can [:list, :create, :read, :update, :delete, :copy, :download], ::Dorsale::BillingMachine::Quotation
+        can [:list, :create, :update], Dorsale::BillingMachine::IdCard
+        can [:list, :create, :update], Dorsale::BillingMachine::PaymentTerm
       end
     end
   end

data/app/models/dorsale/expense_gun/ability_helper.rb

@@ -3,6 +3,7 @@ module Dorsale
     module AbilityHelper
       def define_dorsale_expense_gun_abilities
         can [:list, :create, :show, :edit, :submit , :accept, :refuse, :cancel], ::Dorsale::ExpenseGun::Expense
+        can [:list, :create, :update], ::Dorsale::ExpenseGun::Category
       end
     end
   end

data/app/models/dorsale/expense_gun/category.rb

@@ -2,7 +2,9 @@ module Dorsale
   module ExpenseGun
     class Category < ActiveRecord::Base
       self.table_name = "dorsale_expense_gun_categories"
+
       validates :name, presence: true
+      validates :vat_deductible, inclusion: {in: [true, false]}
     end
   end
-end
+end

data/app/views/dorsale/billing_machine/id_cards/_form.html.slim

@@ -0,0 +1,33 @@
+.well
+  = horizontal_form_for @id_card do |f|
+    = f.input :id_card_name
+    = f.input :entity_name
+    = f.input :siret
+    = f.input :legal_form
+    = f.input :capital
+    = f.input :registration_number
+    = f.input :intracommunity_vat
+    = f.input :address1
+    = f.input :address2
+    = f.input :zip
+    = f.input :city
+    = f.input :phone
+    = f.input :contact_full_name
+    = f.input :contact_phone
+    = f.input :contact_address_1
+    = f.input :contact_address_2
+    = f.input :contact_zip
+    = f.input :contact_city
+    = f.input :iban
+    = f.input :bic_swift
+    = f.input :bank_name
+    = f.input :bank_address
+    = f.input :ape_naf
+    = f.input :custom_info_1
+    = f.input :custom_info_2
+    = f.input :custom_info_3
+    = f.input :contact_fax
+    = f.input :contact_email
+    = f.input :logo
+    = f.input :registration_city
+    = form_buttons

data/app/views/dorsale/billing_machine/id_cards/edit.html.slim

@@ -0,0 +1 @@
+= render "form"

data/app/views/dorsale/billing_machine/id_cards/index.html.slim

@@ -0,0 +1,26 @@
+p.actions
+  = create_button new_billing_machine_id_card_path, action: :create
+
+  table.table.default#id_card
+    thead
+      tr
+        th.actions.id_card-id_card_name
+          = ::Dorsale::BillingMachine::IdCard.t(:id_card_name)
+        th.actions.id_card-entity_name
+          = ::Dorsale::BillingMachine::IdCard.t(:entity_name)
+        th.actions.id_card-contact_full_name
+          = ::Dorsale::BillingMachine::IdCard.t(:contact_full_name)
+        th.actions.id_card-action
+          = "Action"
+
+    tbody
+      - @id_cards.each do |id_card|
+        tr.actions.id_card
+          td.actions.id_card-id_card_name
+            = id_card.id_card_name
+          td.actions.id_card-entity_name
+            = id_card.entity_name
+          td.actions.id_card-contact_full_name
+            = id_card.contact_full_name
+          td.actions.id_card-action
+            = update_button edit_billing_machine_id_card_path(id_card), id: "edit-#{id_card.id}"

data/app/views/dorsale/billing_machine/id_cards/new.html.slim

@@ -0,0 +1 @@
+= render "form"

data/app/views/dorsale/billing_machine/payment_terms/_form.html.slim

@@ -0,0 +1,4 @@
+.well
+  = horizontal_form_for @payment_term do |f|
+    = f.input :label
+    = form_buttons

data/app/views/dorsale/billing_machine/payment_terms/edit.html.slim

@@ -0,0 +1 @@
+= render "form"

data/app/views/dorsale/billing_machine/payment_terms/index.html.slim

@@ -0,0 +1,18 @@
+p.actions
+  = create_button new_billing_machine_payment_term_path, action: :create
+
+  table.table.default#payment_term
+    thead
+      tr
+        th.actions.payment_term-label
+          = ::Dorsale::BillingMachine::PaymentTerm.t(:label)
+        th.actions.payment_term-action
+          = "Action"
+
+    tbody
+      - @payment_terms.each do |payment_term|
+        tr.actions.payment_term
+          td.actions.payment_term-label
+            = payment_term.label
+          td.actions.payment_term-action
+            = update_button edit_billing_machine_payment_term_path(payment_term), id: "edit-#{payment_term.id}"

data/app/views/dorsale/billing_machine/payment_terms/new.html.slim

@@ -0,0 +1 @@
+= render "form"

data/app/views/dorsale/expense_gun/categories/_form.html.slim

@@ -0,0 +1,6 @@
+.well
+  = horizontal_form_for @category do |f|
+    = f.input :name
+    = f.input :code
+    = f.input :vat_deductible, as: :select
+    = form_buttons

data/app/views/dorsale/expense_gun/categories/edit.html.slim

@@ -0,0 +1 @@
+= render "form"

data/app/views/dorsale/expense_gun/categories/index.html.slim

@@ -0,0 +1,29 @@
+p.actions
+  = create_button new_expense_gun_category_path, action: :create
+
+  table.table.default#category
+    thead
+      tr
+        th.actions.category-name
+          = ::Dorsale::ExpenseGun::Category.t(:name)
+        th.actions.category-code
+          = ::Dorsale::ExpenseGun::Category.t(:code)
+        th.actions.category-vat_deductible
+          = ::Dorsale::ExpenseGun::Category.t(:vat_deductible)
+        th.actions.category-action
+          = "Action"
+
+    tbody
+      - @categories.each do |category|
+        tr.actions.category
+          td.actions.category-name
+            = category.name
+          td.actions.category-code
+            = category.code
+          td.actions.category-vat_deductible
+            - if category.vat_deductible?
+              = icon(:check)
+            - else
+              = icon(:remove)
+          td.actions.category-action
+            = update_button edit_expense_gun_category_path(category), id: "edit-#{category.id}"

data/app/views/dorsale/expense_gun/categories/new.html.slim

@@ -0,0 +1 @@
+= render "form"

data/app/views/dorsale/expense_gun/expenses/show.html.slim

@@ -67,7 +67,7 @@
               strong = t("labels.employee_payback") + " : "
               = euros expense_line.employee_payback
             p
-              strong = t("labels.deductible_vat") + " : "
+              strong = t("labels.vat_deductible") + " : "
               = euros expense_line.total_vat_deductible
 
   hr
@@ -85,7 +85,7 @@
             strong = t("labels.employee_payback") + " : "
             = euros @expense.total_employee_payback
           p
-            strong = t("labels.deductible_vat") + " : "
+            strong = t("labels.vat_deductible") + " : "
             = euros @expense.total_vat_deductible
 
   .attachments-panel

data/config/locales/alexandrie.en.yml

@@ -9,6 +9,18 @@ en:
       delete_error : "Impossible to delete the file."
       no_file_selected: "No file selected."
 
+  categories:
+    create_ok : "Category successfully created."
+    update_ok : "Category successfully updated."
+
+  id_cards:
+    create_ok : "Card successfully created."
+    update_ok : "Card successfully updated."
+
+  payment_terms:
+    create_ok : "Payment Term successfully created."
+    update_ok : "Payment Term successfully updated."
+
   activerecord:
     models:
       dorsale/alexandrie/attachment:

data/config/locales/alexandrie.fr.yml

@@ -9,6 +9,18 @@ fr:
       delete_error : "Impossible de supprimer le fichier."
       no_file_selected: "Pas de fichier selectionné"
 
+  categories:
+    create_ok : "La Catégorie a été créée."
+    update_ok : "La Catégorie a été modifiée."
+
+  id_cards:
+    create_ok : "La Carte a été créée."
+    update_ok : "La Carte a été modifiée."
+
+  payment_terms:
+    create_ok : "La Paiement a été créé."
+    update_ok : "La Paiement a été modifié."
+
   activerecord:
     models:
       dorsale/alexandrie/attachment:

data/config/locales/billing_machine.en.yml

@@ -57,10 +57,21 @@ en:
 
   activerecord:
     models:
-      dorsale/billing_machine/invoice: "Invoice"
-      dorsale/billing_machine/quotation: "Quotation"
-      dorsale/billing_machine/id_card: "Id card"
-      dorsale/billing_machine/payment_term: "Payment term"
+      dorsale/billing_machine/invoice:
+        one: "Invoice"
+        other: "Invoices"
+
+      dorsale/billing_machine/quotation:
+        one: "Quotation"
+        other: "Quotations"
+
+      dorsale/billing_machine/id_card:
+        one: "Id card"
+        other: "Id cards"
+
+      dorsale/billing_machine/payment_term:
+        one: "Payment term"
+        other: "Payment terms"
 
     attributes:
       dorsale/billing_machine/invoice:

data/config/locales/billing_machine.fr.yml

@@ -57,10 +57,21 @@ fr:
 
   activerecord:
     models:
-      dorsale/billing_machine/invoice: "Facture"
-      dorsale/billing_machine/quotation: "Devis"
-      dorsale/billing_machine/id_card: "Carte d'identité"
-      dorsale/billing_machine/payment_term: "Conditions de paiement"
+      dorsale/billing_machine/invoice:
+        one: "Facture"
+        other: "Factures"
+
+      dorsale/billing_machine/quotation:
+        one: "Devis"
+        other: "Devis"
+
+      dorsale/billing_machine/id_card:
+        one: "Carte d'identité"
+        other: "Cartes d'identité"
+
+      dorsale/billing_machine/payment_term:
+        one: "Condition de paiement"
+        other: "Conditions de paiement"
 
     attributes:
       dorsale/billing_machine/invoice:

data/config/locales/common.fr.yml

@@ -143,6 +143,13 @@ fr:
     current_avatar        : "Avatar actuel"
     logo                  : "Logo"
     active                : "Actif ?"
+    administrator         : "Administrateur?"
+    billing_machine       : "Accès Facturation?"
+    time_machine          : "Accès Gestion Du Temps?"
+    expense_gun           : "Accès Note de Frais?"
+    customer_vault        : "Accès Annuaire?"
+    flyboy                : "Accès Taches?"
+    notify_invoices_late_payments: "Notifications de Retard de Paiement?"
 
   errors:
     messages:

data/config/locales/expense_gun.fr.yml

@@ -1,4 +1,19 @@
 fr:
+  activerecord:
+    models:
+      dorsale/expense_gun/expense:
+        one: "Note de frais"
+        other: "Notes de frais"
+
+      dorsale/expense_gun/expense_line:
+        one: "Dépense"
+        other: "Dépenses"
+
+      dorsale/expense_gun/category:
+        one: "Catégorie"
+        other: "Catégories"
+
+
   expense_gun:
     expense:
       label  : "Note de frais"
@@ -42,7 +57,7 @@ fr:
       employee         : "Employé"
       state            : "État"
       employee_payback : "Remboursement employé"
-      deductible_vat   : "TVA déductible"
+      vat_deductible   : "TVA déductible"
       total            : "Total"
 
       states:
@@ -69,4 +84,4 @@ fr:
         <<: *labels
 
     options:
-      defaults:
+      defaults:

data/config/routes.rb

@@ -34,6 +34,9 @@ Dorsale::Engine.routes.draw do
   end
 
   namespace :billing_machine do
+    resources :id_cards, except: [:destroy, :show]
+    resources :payment_terms, except: [:destroy, :show]
+
     resources :invoices, except: [:destroy] do
       member do
         get :copy
@@ -65,6 +68,8 @@ Dorsale::Engine.routes.draw do
   end
 
   namespace :expense_gun do
+    resources :categories, except: [:destroy, :show]
+
     resources :expenses, except: [:destroy] do
       resources :expense_lines
       member do

data/lib/dorsale/version.rb

@@ -1,3 +1,3 @@
 module Dorsale
-  VERSION = "3.0.1"
+  VERSION = "3.0.2"
 end