dorsale 2.4.3 → 2.5.0

data/app/pdfs/dorsale/billing_machine/quotation_pdf_common_methods.rb

@@ -7,7 +7,7 @@ module Dorsale
       end
 
       def build_attachments
-        @main_document.attachments.each do |attachment|
+        main_document.attachments.each do |attachment|
           next unless File.extname(attachment.file.path) == ".pdf"
 
           file     = attachment.file.path
@@ -23,7 +23,8 @@ module Dorsale
       end
 
       def build_expiry
-        return if @main_document.expires_at.nil?
+        return if main_document.expires_at.nil?
+
         top = bounds.top - 11.5.cm
         height = 0.5.cm
         width  = 7.5.cm
@@ -31,7 +32,7 @@ module Dorsale
         bounding_box [bounds.left, top], height: height, width: width do
           draw_bounds_debug
           font_size 9 do
-            text "<b>#{I18n.t("pdfs.expires_at")}</b> #{I18n.l(@main_document.expires_at)}", inline_format: true
+            text "<b>#{main_document.t(:expires_at)}</b> #{I18n.l(main_document.expires_at)}", inline_format: true
           end
         end
       end

data/config/locales/billing_machine.en.yml

@@ -2,6 +2,59 @@ en:
   actions:
     create_invoice: "Create invoice"
 
+  attributes:
+    id_card: "Id Card"
+    id_card_name: "Id Card name"
+    entity_name: "Entity name"
+    intracommunity_vat: "Intracommunity VAT"
+    legal_form: "Legal form"
+    registration_number: "Registration number"
+    registration_city: "Registration city"
+    contact_full_name: "Contact name"
+    contact_fax: "Contact fax number"
+    contact_email: "Contact email"
+    contact_phone: "Contact phone"
+    contact_address_1: "Contact address (1)"
+    contact_address_2: "Contact address (2)"
+    contact_zip: "Contact zip"
+    contact_city: "Contact city"
+    bank_name: "Bank name"
+    bank_address: "Bank address"
+    siret: "SIRET"
+    capital: "Capital"
+    iban: "IBAN"
+    bic_swift: "BIC/SWIFT"
+    ape_naf: "APE/NAF"
+    custom_info_1: "Custom informations (1)"
+    custom_info_2: "Custom informations (2)"
+    custom_info_3: "Custom informations (3)"
+    your_contact: "Your contact"
+    contact_phone: "Phone"
+    contact_email: "Email"
+    contact_fax: "Fax"
+    tracking_number: "Number"
+    customer: "Customer"
+    designation: "Designation"
+    quantity: "Quantity"
+    unit: "Unit"
+    tax: "Tax %"
+    unit_price: "Unit Price"
+    line_total: "Total"
+    payment_terms: "Payment terms"
+    iban: "IBAN"
+    bic_swift: "BIC / SWIFT"
+    info_phone: "Phone"
+    info_fax: "Fax"
+    registration: "Registration"
+    siret: "SIRET"
+    vat: "VAT"
+    vat_amount: "VAT Amount"
+    commercial_discount: "Discount"
+    total_excluding_taxes: "Subtotal"
+    advance: "Advance"
+    total_including_taxes: "Total"
+    expires_at: "Expires at"
+
   activerecord:
     models:
       dorsale/billing_machine/invoice: "Invoice"
@@ -11,8 +64,12 @@ en:
 
     attributes:
       dorsale/billing_machine/invoice:
+        label: "Subject"
         credit_note: "Credit note"
 
+      dorsale/billing_machine/quotation:
+        label: "Subject"
+
       dorsale/billing_machine/invoice/payment_status:
         all: "All statuses"
         pending: "Pending"
@@ -29,68 +86,6 @@ en:
         canceled: "Canceled"
         not_canceled: "Not canceled"
 
-      dorsale/billing_machine/id_card:
-        id_card_name: "id card name"
-        entity_name: "entity name"
-        intracommunity_vat: "intracommunity VAT"
-        legal_form: "legal form"
-        registration_number: "registration number"
-        registration_city: "registration city"
-        contact_full_name: "contact name"
-        contact_fax: "contact fax number"
-        contact_email: "contact email"
-        contact_phone: "contact phone"
-        contact_address_1: "contact address (1)"
-        contact_address_2: "contact address (2)"
-        contact_zip: "contact zip"
-        contact_city: "contact city"
-        bank_name: "bank name"
-        bank_address: "bank address"
-        siret: "siret"
-        capital: "capital"
-        address1: "adress (1)"
-        address2: "adress (2)"
-        zip: "zip"
-        city: "city"
-        phone: "phone"
-        iban: "iban"
-        bic_swift: "BIC/SWIFT"
-        ape_naf: "APE/NAF"
-        custom_info_1: "custom informations (1)"
-        custom_info_2: "custom informations (2)"
-        custom_info_3: "custom informations (3)"
-        logo: "logo"
-  pdfs:
-    your_contact: "Your contact : "
-    contact_phone: "Phone : "
-    contact_email: "Email : "
-    contact_fax: "Fax : "
-    subject: "Subject : "
-    tracking_number: "Number : "
-    date: "Date : "
-    customer: "Customer :"
-    designation: "DESIGNATION"
-    quantity: "QUANTITY"
-    unity: "UNITY"
-    tax: "TAX %"
-    unit_price: "UNIT PRICE"
-    line_total: "TOTAL"
-    payment_terms: "Payment terms:"
-    iban: "IBAN :"
-    bic_swift: "BIC / SWIFT :"
-    info_phone: "Phone :"
-    info_fax: "Fax :"
-    capital: "capital :"
-    registration: "registration :"
-    siret: "SIRET "
-    vat: "VAT "
-    vat_amount: "VAT AMOUNT"
-    commercial_discount: "DISCOUNT"
-    total_excluding_taxes: "SUBTOTAL"
-    advance: "ADVANCE"
-    total_including_taxes: "TOTAL"
-    expires_at: "Expires at : "
-
   emails:
     invoices:
       send_invoice_to_customer: ""

data/config/locales/billing_machine.fr.yml

@@ -2,6 +2,59 @@ fr:
   actions:
     create_invoice: "Facturer"
 
+  attributes:
+    id_card: "Carte d'identité"
+    id_card_name: "Nom de la carte"
+    entity_name: "Nom de l'entité"
+    intracommunity_vat: "TVA intracommunautaire"
+    legal_form: "Forme juridique"
+    registration_number: "Numéro d'immatriculation"
+    registration_city: "Ville d'immatriculation"
+    contact_full_name: "Nom du contact"
+    contact_fax: "Fax du contact"
+    contact_email: "Email du contact"
+    contact_phone: "Téléphone du contact"
+    contact_address_1: "Adresse du contact (1)"
+    contact_address_2: "Adresse du contact (2)"
+    contact_zip: "Code postal du contact"
+    contact_city: "Ville du contact"
+    bank_name: "Nom de la banque"
+    bank_address: "Adresse de la banque"
+    siret: "Siret"
+    capital: "Capital"
+    iban: "IBAN"
+    bic_swift: "BIC/SWIFT"
+    ape_naf: "APE/NAF"
+    custom_info_1: "Information personalisées (1)"
+    custom_info_2: "Information personalisées (2)"
+    custom_info_3: "Information personalisées (3)"
+    your_contact: "Votre contact"
+    contact_phone: "Téléphone"
+    contact_email: "Email"
+    contact_fax: "Fax"
+    tracking_number: "Numéro"
+    customer: "Client"
+    designation: "Désignation"
+    quantity: "Qte"
+    unit: "Unité"
+    tax: "TVA %"
+    unit_price: "P.U €HT"
+    line_total: "TOTAL €HT"
+    payment_terms: "Conditions de paiement"
+    iban: "IBAN"
+    bic_swift: "BIC / SWIFT"
+    info_phone: "Tel."
+    info_fax: "Fax"
+    registration: "RCS"
+    siret: "SIRET "
+    vat: "TVA"
+    vat_amount: "Montant TVA"
+    commercial_discount: "Remise"
+    total_excluding_taxes: "Total HT"
+    advance: "Acompte"
+    total_including_taxes: "Total TTC"
+    expires_at: "Date d'expiration"
+
   activerecord:
     models:
       dorsale/billing_machine/invoice: "Facture"
@@ -11,8 +64,12 @@ fr:
 
     attributes:
       dorsale/billing_machine/invoice:
+        label: "Objet"
         credit_note: "Facture d'avoir"
 
+      dorsale/billing_machine/quotation:
+        label: "Objet"
+
       dorsale/billing_machine/invoice/payment_status:
         all: "Tous les statuts"
         pending: "En attente"
@@ -29,68 +86,6 @@ fr:
         canceled: "Annulé"
         not_canceled: "Non annulé"
 
-      dorsale/billing_machine/id_card:
-        id_card_name: "nom de la carte"
-        entity_name: "nom de l'entité"
-        intracommunity_vat: "TVA intracommunautaire"
-        legal_form: "forme juridique"
-        registration_number: "numéro d'immatriculation"
-        registration_city: "ville d'immatriculation"
-        contact_full_name: "nom du contact"
-        contact_fax: "fax du contact"
-        contact_email: "email du contact"
-        contact_phone: "téléphone du contact"
-        contact_address_1: "adresse du contact (1)"
-        contact_address_2: "adresse du contact (2)"
-        contact_zip: "code postal du contact"
-        contact_city: "ville du contact"
-        bank_name: "nom de la banque"
-        bank_address: "adresse de la banque"
-        siret: "siret"
-        capital: "capital"
-        address1: "adresse (1)"
-        address2: "adresse (2)"
-        zip: "code postal"
-        city: "ville"
-        phone: "téléphone"
-        iban: "iban"
-        bic_swift: "BIC/SWIFT"
-        ape_naf: "APE/NAF"
-        custom_info_1: "information personalisées (1)"
-        custom_info_2: "information personalisées (2)"
-        custom_info_3: "information personalisées (3)"
-        logo: "logo"
-  pdfs:
-    your_contact: "Votre contact : "
-    contact_phone: "Téléphone : "
-    contact_email: "Email : "
-    contact_fax: "Fax : "
-    subject: "Objet : "
-    tracking_number: "Numéro : "
-    date: "Date : "
-    customer: "Client :"
-    designation: "DÉSIGNATION"
-    quantity: "QTITÉ"
-    unity: "UNITÉ"
-    tax: "TVA %"
-    unit_price: "P.U €HT"
-    line_total: "TOTAL €HT"
-    payment_terms: "Conditions de paiement :"
-    iban: "IBAN :"
-    bic_swift: "BIC / SWIFT :"
-    info_phone: "Tel. :"
-    info_fax: "Fax :"
-    capital: "au capital de"
-    registration: "RCS "
-    siret: "SIRET "
-    vat: "TVA "
-    vat_amount: "MONTANT TVA"
-    commercial_discount: "REMISE"
-    total_excluding_taxes: "TOTAL HT"
-    advance: "ACOMPTE"
-    total_including_taxes: "TOTAL TTC"
-    expires_at: "Date d'expiration : "
-
   emails:
     invoices:
       send_invoice_to_customer: "Bonjour,\n\nVeuillez-trouver ci-joint votre facture.\n\nCordialement,\n%{from}"

data/config/locales/common.en.yml

@@ -133,20 +133,6 @@ en:
     logo                  : "Logo"
     active                : "Active ?"
 
-    # BillingMachine
-    unit                  : "Unit"
-    unit_price            : "Unit price"
-    payment_term          : "Payment term"
-    payment_term_id       : "Payment term"
-    vat_rate              : "VAT rate"
-    vat_amount            : "VAT amount"
-    advance               : "Advance"
-    total_excluding_taxes : "Total excluding taxes"
-    total_including_taxes : "Total including taxes"
-    balance               : "Balance"
-    expires_at            : "Expires at"
-    commercial_discount   : "Commercial discount"
-
   errors:
     messages:
       extension_white_list_error : "This file type is not supported"

data/config/locales/common.fr.yml

@@ -144,21 +144,6 @@ fr:
     logo                  : "Logo"
     active                : "Actif ?"
 
-    # BillingMachine
-    unit                  : "Unité"
-    unit_price            : "Prix unitaire"
-    payment_term          : "Conditions de paiement"
-    payment_term_id       : "Conditions de paiement"
-    vat_rate              : "Taux TVA"
-    vat_amount            : "Montant TVA"
-    advance               : "Avance"
-    total_including_taxes : "Total TTC"
-    total_excluding_taxes : "Total HT"
-    balance               : "Total à payer"
-    expires_at            : "Date d'expiration"
-    commercial_discount   : "Remise commerciale"
-    id_card               : "Carte d'identité"
-
   errors:
     messages:
       extension_white_list_error : "Ce type de fichier n'est pas prit en charge"

data/lib/dorsale/version.rb

@@ -1,3 +1,3 @@
 module Dorsale
-  VERSION = "2.4.3"
+  VERSION = "2.5.0"
 end

data/spec/dummy/log/development.log

@@ -12163,3 +12163,218 @@ Processing by Dorsale::BillingMachine::InvoicesController#edit as HTML
   Rendered /Users/benoit/www/agilidee/dorsale/app/views/dorsale/billing_machine/invoices/_form.html.slim (137.5ms)
   Rendered /Users/benoit/www/agilidee/dorsale/app/views/dorsale/billing_machine/invoices/edit.html.slim (187.2ms)
 Completed 200 OK in 245ms (Views: 238.0ms | ActiveRecord: 1.3ms)
+  ActiveRecord::SchemaMigration Load (0.6ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to AddUserOnExpenseGunExpense (20160317124838)
+   (0.1ms)  begin transaction
+   (0.5ms)  ALTER TABLE "dorsale_expense_gun_expenses" ADD "user_id" integer
+  SQL (0.6ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20160317124838"]]
+   (1.0ms)  commit transaction
+  ActiveRecord::SchemaMigration Load (0.2ms)  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.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.2ms)              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_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.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)              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.2ms)              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.2ms)              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'
+