dorsale 2.4.3 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 607158c6e243ca3759f3ee342f0cb51f510b1849
-  data.tar.gz: 9bb7ca2ae6a3d937ddb267b810463f481ea795e8
+  metadata.gz: 440a037661b26b077f25466d7893487c797e4276
+  data.tar.gz: b29007bd7a54add8d064bbc4af228277f8511af2
 SHA512:
-  metadata.gz: 08f8c8433616e3cc5e2499601900ec31fa324f1cdcb951a8e3ef764ab8851061da50f2faa57c1b32675fd292a0170a75fb5ae55f2e90cd412cb7664613869619
-  data.tar.gz: 8f4fe0a820b92c825cbddcbe6c4d2fc54ccd83f74895f2287e3255e7795f515d9f705547f08d64275422c3923d4cf6a136a3a82e7094f8cc92720102b87187c2
+  metadata.gz: c94f5122db07d75c03853d8163e90f6627aabd2461652d61aeaa69dc87ee2af3a87788e489c5d965a9e0a6b65f52fb350269476783477a19890e721bfab690db
+  data.tar.gz: 3d9d15f4b6ace4de92364f07449cce09acecc3f688765dd0d4a6aca12693cae464ee7299dc142e2c70b0976a70fdf13f54ec08eabce2939f8bc02cd40ce9a706

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

@@ -126,7 +126,7 @@ module Dorsale
       def t(*args)
         return super if args.any?
 
-        if balance < 0
+        if balance && balance < 0
           super(:credit_note)
         else
           self.class.t

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

@@ -2,26 +2,11 @@ module Dorsale
   module BillingMachine
     class InvoiceMultipleVatPdf < ::Dorsale::BillingMachine::InvoiceSingleVatPdf
 
-      def first_column_width
-        6.4.cm
-      end
-
-      def second_column_width
-        2.cm
-      end
-
-      def third_column_width
-        second_column_width
-      end
-
-      def fourth_column_width
-       second_column_width
-      end
-
-      def fifth_column_width
-        2.9.cm
-      end
-
+      def first_column_width;  64.mm; end
+      def second_column_width; 22.mm; end
+      def third_column_width;  20.mm; end
+      def fourth_column_width; 20.mm; end
+      def fifth_column_width;  29.mm; end
       def last_column_width
         bounds.width - first_column_width - second_column_width - third_column_width - fourth_column_width - fifth_column_width
       end
@@ -31,12 +16,12 @@ module Dorsale
         top    = bounds.top
         width  = bounds.width - left
 
-        bounding_box [left, top], width: width, height: 9.5.cm do
+        bounding_box [left, top], width: width, height: products_table_height do
           repeat :all do
             float do
                 table [["","","","","",""]],
                     :column_widths => [first_column_width, second_column_width, third_column_width, fourth_column_width, fifth_column_width, last_column_width],
-                    :cell_style => {:height => 9.5.cm} do
+                    :cell_style => {height: products_table_height} do
                       row(0).style :text_color       => BLACK
                       row(0).style :font_style       => :bold
                       column(0).style :align => :left
@@ -46,20 +31,20 @@ module Dorsale
               end
           end
 
-        bounding_box [left, top], width: width, height: 8.8.cm do
+        bounding_box [left, top], width: width, height: products_table_height do
           draw_bounds_debug
-          repeat :all do
-            build_line
-          end
-          table_products = [[I18n.t("pdfs.designation"),
-            I18n.t("pdfs.quantity"),
-            I18n.t("pdfs.unity"),
-            I18n.t("pdfs.tax"),
-            I18n.t("pdfs.unit_price"),
-            I18n.t("pdfs.line_total")]]
+
+          table_products = [[
+            main_document.t(:designation).mb_chars.upcase.to_s,
+            main_document.t(:quantity).mb_chars.upcase.to_s,
+            main_document.t(:unit).mb_chars.upcase.to_s,
+            main_document.t(:tax).mb_chars.upcase.to_s,
+            main_document.t(:unit_price).mb_chars.upcase.to_s,
+            main_document.t(:line_total).mb_chars.upcase.to_s,
+          ]]
 
 
-          @main_document.lines.each do |line|
+          main_document.lines.each do |line|
             table_products.push [line.label,
                 number(line.quantity).gsub(",00","").gsub(".00",""),
                 line.unit,
@@ -82,29 +67,48 @@ module Dorsale
       end
 
       def build_total
-
         left   = bounds.left
-        top    = bounds.top - 10.3.cm
+        top    = bounds.top - products_table_height - 5.mm
         width  = bounds.width - left
+        height = middle_height - products_table_height
 
-        bounding_box [left, top], width: width, height: middle_height - 9.5.cm do
+        bounding_box [left, top], width: width, height: height do
           draw_bounds_debug
 
           table_totals = [[]]
 
           if has_discount
-            table_totals.push ["#{I18n.t("pdfs.commercial_discount")}", "\- #{euros(@main_document.commercial_discount)}"]
+            table_totals.push [
+              main_document.t(:commercial_discount).mb_chars.upcase.to_s,
+              euros(-main_document.commercial_discount),
+            ]
           end
 
-          table_totals.push ["#{I18n.t("pdfs.total_excluding_taxes")}", euros(@main_document.total_excluding_taxes)]
+          table_totals.push [
+            main_document.t(:total_excluding_taxes).mb_chars.upcase.to_s,
+            euros(main_document.total_excluding_taxes),
+          ]
 
-          table_totals.push ["#{I18n.t("pdfs.vat_amount")}", euros(@main_document.vat_amount)]
+          table_totals.push [
+            main_document.t(:vat_amount).mb_chars.upcase.to_s,
+            euros(main_document.vat_amount),
+          ]
 
           if has_advance
-            table_totals.push ["#{I18n.t("pdfs.advance")}", euros(@main_document.advance)]
-            table_totals.push ["#{I18n.t("pdfs.total_including_taxes")}", euros(@main_document.balance)]
+            table_totals.push [
+              main_document.t(:advance).mb_chars.upcase.to_s,
+              euros(main_document.advance),
+            ]
+
+            table_totals.push [
+              main_document.t(:total_including_taxes).mb_chars.upcase.to_s,
+              euros(main_document.balance),
+            ]
           else
-            table_totals.push ["#{I18n.t("pdfs.total_including_taxes")}", euros(@main_document.total_including_taxes)]
+            table_totals.push [
+              main_document.t(:total_including_taxes).mb_chars.upcase.to_s,
+              euros(main_document.total_including_taxes),
+            ]
           end
 
           table table_totals,

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

@@ -15,31 +15,11 @@ module Dorsale
       BLUE       = "005F9E"
 
       def has_advance
-        @main_document.try(:advance) && @main_document.advance != 0.0
+        main_document.try(:advance) && main_document.advance != 0.0
       end
 
       def has_discount
-        @main_document.try(:commercial_discount) && @main_document.commercial_discount != 0.0
-      end
-
-      def first_column_width
-        7.6.cm
-      end
-
-      def second_column_width
-        2.4.cm
-      end
-
-      def third_column_width
-        second_column_width
-      end
-
-      def fourth_column_width
-       2.9.cm
-      end
-
-      def last_column_width
-        bounds.width - first_column_width - second_column_width - third_column_width - fourth_column_width
+        main_document.try(:commercial_discount) && main_document.commercial_discount != 0.0
       end
 
       attr_reader :main_document
@@ -51,20 +31,22 @@ module Dorsale
         @id_card       = main_document.id_card
       end
 
-      def header_height
-        9.cm
-      end
+      def header_height;         90.mm; end
+      def logo_height;           32.mm; end
 
-      def middle_height
-        15.cm
-      end
+      def footer_height;         40.mm; end
+      def footer_top_height;     15.mm; end
+      def footer_bottom_height;  15.mm; end
 
-      def footer_height
-        4.cm
-      end
+      def middle_height;         14.cm; end
+      def products_table_height; 90.mm; end
 
-      def logo_height
-        3.2.cm
+      def first_column_width;  7.6.cm; end
+      def second_column_width; 2.4.cm; end
+      def third_column_width;  2.5.cm; end
+      def fourth_column_width; 2.9.cm; end
+      def last_column_width
+        bounds.width - first_column_width - second_column_width - third_column_width - fourth_column_width
       end
 
       def build
@@ -72,6 +54,7 @@ module Dorsale
           build_header
           build_footer
         end
+
         build_middle
         build_page_numbers
       end
@@ -107,23 +90,35 @@ module Dorsale
         height = 1.cm
         bounding_box [left, top], width: width, height: height do
           draw_bounds_debug
-          text "<b>#{main_document.t} n° #{@main_document.tracking_id}</b>", inline_format: true, size: 20, align: :center
+          text "<b>#{main_document.t} n° #{main_document.tracking_id}</b>", inline_format: true, size: 20, align: :center
         end
       end
 
+      def logo_path
+        main_document.id_card.logo.path
+      rescue NoMethodError
+        nil
+      end
+
       def build_logo
-        width = 3.2.cm
+        return if logo_path.nil?
+
+        width  = 3.2.cm
         height = logo_height
+
         bounding_box [bounds.left, bounds.top], width: width, height: height do
           draw_bounds_debug
-          if @main_document.id_card.logo.present?
-            image @main_document.id_card.logo.path, width: (bounds.width - 1.cm)
-          end
+          image logo_path, width: (bounds.width - 1.cm)
         end
       end
 
-      def address_line
-        [@id_card.address1,@id_card.address2, @id_card.zip, @id_card.city].select(&:present?).join(", ")
+      def contact_address_line
+        [
+          @id_card.address1,
+          @id_card.address2,
+          @id_card.zip,
+          @id_card.city,
+        ].select(&:present?).join(", ")
       end
 
       def build_contact
@@ -132,16 +127,20 @@ module Dorsale
         width  = bounds.width / 2 - 1.1.cm
         height = 2.5.cm
 
+        contact_text = []
+        contact_text << "<b>#{@id_card.entity_name}</b>"                                           if @id_card.entity_name.present?
+        contact_text << "<b>#{contact_address_line}</b>"                                           if contact_address_line.present?
+        contact_text << " "
+        contact_text << "<b>#{main_document.t(:your_contact)} : #{@id_card.contact_full_name}</b>" if @id_card.contact_full_name.present?
+        contact_text << "<b>#{main_document.t(:contact_phone)} : </b> #{@id_card.contact_phone}"   if @id_card.contact_phone.present?
+        contact_text << "<b>#{main_document.t(:contact_fax)} : </b> #{@id_card.contact_fax}"       if @id_card.contact_fax.present?
+        contact_text << "<b>#{main_document.t(:contact_email)} : </b> #{@id_card.contact_email}"   if @id_card.contact_email.present?
+        contact_text = contact_text.join("\n")
+
         bounding_box [left, top], width: width, height: height do
           draw_bounds_debug
           font_size 8 do
-          text "<b>#{@id_card.entity_name}</b>", inline_format: true if @id_card.entity_name.present?
-          text "<b>#{address_line} </b>", inline_format: true
-          text " "
-          text "<b>#{I18n.t("pdfs.your_contact")} : #{@id_card.contact_full_name}</b>", inline_format: true if @id_card.contact_full_name.present?
-          text "<b>#{I18n.t("pdfs.contact_phone")}</b>  #{@id_card.contact_phone}", inline_format: true if @id_card.contact_phone.present?
-          text "<b>#{I18n.t("pdfs.contact_fax")}</b> #{@id_card.contact_fax}",   inline_format: true if @id_card.contact_fax.present?
-          text "<b>#{I18n.t("pdfs.contact_email")}</b> #{@id_card.contact_email}",   inline_format: true if @id_card.contact_email.present?
+            text contact_text, inline_format: true
           end
         end
       end
@@ -155,17 +154,35 @@ module Dorsale
         bounding_box [left, top], width: width, height: height do
           draw_bounds_debug
 
-          if @main_document.label.present?
-            text "<b>#{I18n.t("pdfs.subject")}</b> #{@main_document.label}", inline_format: true
+          if main_document.label.present?
+            text "<b>#{main_document.t(:label)} : </b> #{main_document.label}", inline_format: true
           end
 
-          if @main_document.date.present?
+          if main_document.date.present?
             move_down 3.mm
-            text "<b>#{@main_document.t :date} :</b> #{date @main_document.date}", inline_format: true
+            text "<b>#{main_document.t(:date)} : </b> #{date main_document.date}", inline_format: true
           end
         end
       end
 
+      def customer_content
+        return if main_document.customer.nil?
+
+        content = []
+        content << main_document.customer.name
+        content << main_document.customer.address.street
+        content << main_document.customer.address.street_bis
+        content << "#{main_document.customer.address.zip} #{main_document.customer.address.city}"
+        content << main_document.customer.address.country
+
+        if main_document.customer.try(:european_union_vat_number).present?
+          content << main_document.customer.t(:european_union_vat_number)
+          content << main_document.customer.european_union_vat_number
+        end
+
+        content.select(&:present?).join("\n")
+      end
+
       def build_customer
         top    = bounds.top - 4.cm
         left   = bounds.width / 2 + 1.1.cm
@@ -181,22 +198,8 @@ module Dorsale
             fill_color BLACK
           end
 
-          customer_text = []
-          customer_text << @main_document.customer.name
-          customer_text << @main_document.customer.address.street
-          customer_text <<  @main_document.customer.address.street_bis
-          customer_text << "#{@main_document.customer.address.zip} #{@main_document.customer.address.city}"
-          customer_text << @main_document.customer.address.country
-
-          if @main_document.customer.try(:european_union_vat_number).present?
-            customer_text << @main_document.customer.t(:european_union_vat_number)
-            customer_text << @main_document.customer.european_union_vat_number
-          end
-
-          customer_text = customer_text.select(&:present?).join("\n")
-
           bounding_box [bounds.left + padding, bounds.top - padding], height: bounds.height - padding, width: bounds.width - padding do
-            text customer_text
+            text customer_content
           end
         end
       end # def build_customer
@@ -205,7 +208,9 @@ module Dorsale
         left   = bounds.left
         top    = bounds.top - header_height
         width  = bounds.width - left
-        bounding_box [left, top], width: width, height: middle_height do
+        height = middle_height
+
+        bounding_box [left, top], width: width, height: height do
           build_table
           build_total
           build_payment_conditions
@@ -219,80 +224,115 @@ module Dorsale
         left   = bounds.left
         top    = bounds.top
         width  = bounds.width - left
+        height = products_table_height
 
-        bounding_box [left, top], width: width, height: 9.5.cm do
+        # Empty table to draw lines
+        bounding_box [left, top], width: width, height: height do
           repeat :all do
             float do
-                table [["","","","",""]],
-                    :column_widths => [first_column_width, second_column_width, third_column_width, fourth_column_width, last_column_width],
-                    :cell_style => {:height => 9.5.cm} do
-                      row(0).style :text_color       => BLACK
-                      row(0).style :font_style       => :bold
-                      column(0).style :align => :left
-                      column(1..4).style :align => :right
-                    end
-                 end
-              end
-          end
-
-        bounding_box [left, top], width: width, height: 8.8.cm do
+              table [["","","","",""]],
+                :column_widths => [
+                  first_column_width,
+                  second_column_width,
+                  third_column_width,
+                  fourth_column_width,
+                  last_column_width,
+                ],
+                :cell_style => {height: height} \
+              do
+                row(0).style       :text_color => BLACK
+                row(0).style       :font_style => :bold
+                column(0).style    :align      => :left
+                column(1..4).style :align      => :right
+              end # table
+            end # float
+          end # repeat all
+        end # bounding_box
+
+        # products table
+        bounding_box [left, top], width: width, height: height do
           draw_bounds_debug
-          repeat :all do
-            build_line
-          end
-          table_products = [[I18n.t("pdfs.designation"),
-            I18n.t("pdfs.quantity"),
-            I18n.t("pdfs.unity"),
-            I18n.t("pdfs.unit_price"),
-            I18n.t("pdfs.line_total")]]
-
-
-          @main_document.lines.each do |line|
-            table_products.push [line.label,
-                number(line.quantity).gsub(",00","").gsub(".00",""),
-                line.unit,
-                euros(line.unit_price),
-                euros(line.total),]
+
+          table_products = [[
+            main_document.t(:designation).mb_chars.upcase.to_s,
+            main_document.t(:quantity).mb_chars.upcase.to_s,
+            main_document.t(:unit).mb_chars.upcase.to_s,
+            main_document.t(:unit_price).mb_chars.upcase.to_s,
+            main_document.t(:line_total).mb_chars.upcase.to_s,
+          ]]
+
+          main_document.lines.each do |line|
+            table_products.push [
+              line.label,
+              number(line.quantity).gsub(",00","").gsub(".00",""),
+              line.unit,
+              euros(line.unit_price),
+              euros(line.total),
+            ]
           end
 
-        table table_products,
-          :column_widths => [first_column_width, second_column_width, third_column_width, fourth_column_width, last_column_width],
-          :header => true,
-          :cell_style    => {border_width: 0} do
+          table table_products,
+            :column_widths => [
+              first_column_width,
+              second_column_width,
+              third_column_width,
+              fourth_column_width,
+              last_column_width,
+            ],
+            :header => true,
+            :cell_style => {border_width: 0} \
+          do
             row(0).font_style = :bold
             row(0).border_width = 1,
-            cells.style do |c|
-              c.align = c.column == 0 ? :left : :right
-            end
-          end
-        end
-      end
+            cells.style { |c| c.align = c.column == 0 ? :left : :right }
+          end # table
+        end # bounding_box
+      end # build_table
 
       def build_total
-
         left   = bounds.left
-        top    = bounds.top - 10.3.cm
+        top    = bounds.top - products_table_height - 5.mm
         width  = bounds.width - left
+        height = middle_height - products_table_height
 
-        bounding_box [left, top], width: width, height: middle_height - 9.5.cm do
+        bounding_box [left, top], width: width, height: height do
           draw_bounds_debug
 
           table_totals = [[]]
 
           if has_discount
-            table_totals.push ["#{I18n.t("pdfs.commercial_discount")}", "\- #{euros(@main_document.commercial_discount)}"]
+            table_totals.push [
+              main_document.t(:commercial_discount).mb_chars.upcase.to_s,
+              euros(-main_document.commercial_discount),
+            ]
           end
 
-          table_totals.push ["#{I18n.t("pdfs.total_excluding_taxes")}", euros(@main_document.total_excluding_taxes)]
+          table_totals.push [
+            main_document.t(:total_excluding_taxes).mb_chars.upcase.to_s,
+            euros(main_document.total_excluding_taxes),
+          ]
 
-          vat_rate = number(@main_document.vat_rate)
-          table_totals.push ["#{I18n.t("pdfs.vat")}#{vat_rate} %", euros(@main_document.vat_amount)]
+          vat_rate = number(main_document.vat_rate)
+          table_totals.push [
+            "#{main_document.t(:vat).mb_chars.upcase.to_s} #{percentage vat_rate}",
+            euros(main_document.vat_amount),
+          ]
 
           if has_advance
-            table_totals.push ["#{I18n.t("pdfs.advance")}", euros(@main_document.advance)]
-            table_totals.push ["#{I18n.t("pdfs.total_including_taxes")}", euros(@main_document.balance)]
+            table_totals.push [
+              main_document.t(:advance).mb_chars.upcase.to_s,
+              euros(main_document.advance),
+            ]
+
+            table_totals.push [
+              main_document.t(:total_including_taxes).mb_chars.upcase.to_s,
+              euros(main_document.balance),
+            ]
           else
-            table_totals.push ["#{I18n.t("pdfs.total_including_taxes")}", euros(@main_document.total_including_taxes)]
+            table_totals.push [
+              main_document.t(:total_including_taxes).mb_chars.upcase.to_s,
+              euros(main_document.total_including_taxes),
+            ]
           end
 
           table table_totals,
@@ -314,13 +354,14 @@ module Dorsale
       end
 
       def build_comments
-        return if @main_document.comments.blank?
-        top = bounds.top - 13.cm
-        height = 1.5.cm
+        return if main_document.comments.blank?
+
+        top    = bounds.top - products_table_height - 35.mm
+        height = top - bounds.bottom
         width  = 10.cm
 
         font_size 9 do
-          text_box @main_document.comments,
+          text_box main_document.comments,
             :at       => [bounds.left, top],
             :height   => height,
             :width    => width,
@@ -329,15 +370,15 @@ module Dorsale
       end
 
       def build_payment_conditions
-        top = bounds.top - 10.3.cm
+        top = bounds.top - products_table_height - 5.mm
         height = 1.cm
         width  = 7.5.cm
 
         bounding_box [bounds.left, top], height: height, width: width do
           draw_bounds_debug
           font_size 9 do
-            text I18n.t("pdfs.payment_terms"), style: :bold if @main_document.payment_term.present?
-            text @main_document.payment_term.try(:label)
+            text main_document.t(:payment_terms), style: :bold if main_document.payment_term.present?
+            text main_document.payment_term.try(:label)
           end
         end
       end
@@ -346,61 +387,79 @@ module Dorsale
       end
 
       def build_bank_informations
-        top = bounds.top - 11.5.cm
+        top = bounds.top - products_table_height - 20.mm
         height = 1.cm
         width  = 7.5.cm
 
         bounding_box [bounds.left, top], height: height, width: width do
           draw_bounds_debug
           font_size 9 do
-            text "#{I18n.t("pdfs.iban")} #{@id_card.iban}" if @id_card.iban.present?
-            text "#{I18n.t("pdfs.bic_swift")} #{@id_card.bic_swift}"  if @id_card.bic_swift.present?
+            text "#{main_document.t(:iban)} : #{@id_card.iban}"           if @id_card.iban.present?
+            text "#{main_document.t(:bic_swift)} : #{@id_card.bic_swift}" if @id_card.bic_swift.present?
           end
         end
       end
 
       def build_footer
         top = bounds.bottom + footer_height
-        bounding_box [0, top], width: bounds.width, height: footer_height do
-
-          builds_legals
-          build_line
-          builds_id_card_informations
 
+        bounding_box [0, top], width: bounds.width, height: footer_height do
+          draw_bounds_debug
+          build_footer_top
+          build_footer_line
+          build_footer_bottom
         end
       end
 
-      def builds_legals
-        top = bounds.top
-        height = 1.5.cm
+      def footer_top_content
+        @id_card.custom_info_1.to_s
+      end
+
+      def build_footer_top
+        top    = bounds.top
+        height = footer_top_height
         width  = bounds.width
-        bounding_box [bounds.left, top], height: height, width: width do
-          font_size 9 do
-            text @id_card.custom_info_1, inline_format: true
-          end
+
+        font_size 9 do
+          text_box footer_top_content,
+            :at       => [bounds.left, top],
+            :height   => height,
+            :width    => width,
+            :overflow => :shrink_to_fit
         end
       end
 
-      def build_line
+      def build_footer_line
+        # Center line between the two footer parts
+        n = footer_top_height + (footer_height - footer_top_height - footer_bottom_height) / 2
+        move_down n
         stroke do
           horizontal_rule
           line_width 1
         end
       end
 
-      def builds_id_card_informations
-        top = bounds.top - 1.8.cm
-        height = 1.1.cm
+      def footer_bottom_content
+        infos_text = []
+        infos_text << @id_card.entity_name                                                                                if @id_card.entity_name.present?
+        infos_text << "#{main_document.t(:info_phone)} : #{@id_card.contact_phone}"                                       if @id_card.contact_phone.present?
+        infos_text << "#{main_document.t(:info_fax)} : #{@id_card.contact_fax}"                                           if @id_card.contact_fax.present?
+        infos_text << "#{@id_card.contact_email}"                                                                         if @id_card.contact_email.present?
+        infos_text << "#{@id_card.legal_form.to_s}"                                                                       if @id_card.legal_form.present?
+        infos_text << "#{main_document.t(:capital)} : #{euros @id_card.capital}"                                          if @id_card.capital.present?
+        infos_text << "#{main_document.t(:registration)} : #{@id_card.registration_city} #{@id_card.registration_number}" if @id_card.registration_number.present?
+        infos_text << "#{main_document.t(:siret)} : #{@id_card.siret}"                                                    if @id_card.siret.present?
+        infos_text << "#{main_document.t(:intracommunity_vat)} : #{@id_card.intracommunity_vat}"                          if @id_card.intracommunity_vat.present?
+        infos_text = infos_text.join(" - ")
+      end
+
+      def build_footer_bottom
+        height = footer_bottom_height
+        top    = bounds.bottom + height
         width  = bounds.width
-        tel = "#{I18n.t("pdfs.info_phone")} #{@id_card.contact_phone} - " if @id_card.contact_phone.present?
-        fax = "#{I18n.t("pdfs.info_fax")} #{@id_card.contact_fax} -" if @id_card.contact_fax.present?
-        email = "#{@id_card.contact_email}" if @id_card.contact_email.present?
-        capital = "#{ @id_card.legal_form.to_s} #{I18n.t("pdfs.capital")} " + number_with_delimiter(@id_card.capital, :delimiter => '.').to_s + " €" if @id_card.legal_form.present? && @id_card.capital.present?
-        registration = I18n.t("pdfs.registration") + @id_card.registration_city.to_s + ' ' + @id_card.registration_number.to_s if @id_card.registration_number.present?
-        siret = I18n.t("pdfs.siret") + @id_card.siret.to_s if @id_card.siret.present?
-        tva = I18n.t("pdfs.vat") + @id_card.intracommunity_vat.to_s if @id_card.intracommunity_vat.present?
+
         font_size 9 do
-          text_box "#{@id_card.entity_name} #{address_line}\n#{tel} #{fax} #{email}\n#{capital} #{registration} #{siret} #{tva}",
+          text_box footer_bottom_content,
             :at       => [bounds.left, top],
             :height   => height,
             :width    => width,
@@ -409,15 +468,14 @@ module Dorsale
       end
 
       def build_page_numbers
-        top = bounds.bottom + footer_height - 1.8.cm
-        bounding_box [0, top], height: footer_height, width: bounds.width do
+        height = 5.mm
+        top    = bounds.bottom + height
+        width  = bounds.width
+
+        bounding_box [0, top], height: height, width: bounds.width do
           font_size 9 do
             float do
-              options = {
-              :align => :right,
-              :start_count_at => 1
-              }
-              number_pages "page <page>/<total>", options
+              number_pages "page <page>/<total>", align: :right
             end
           end
         end