br_danfe 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bfdad1f5eba72650cb7f3502c4d255378cacf217
-  data.tar.gz: 1652da945d3f4eca2f6f03dd7b3ef53ebef14aa1
+  metadata.gz: 8820182a8bbc65175a5bcf053e329a3583edd374
+  data.tar.gz: e2248c10394096c63619505c8eacb2f65d4f3cef
 SHA512:
-  metadata.gz: 91a9a8b20bac8d845542f37412512d57b7ea924ef1a597630336c2677eca5ca9e198a2589f4704f3b13b1fc912caa35ba76e21b3fe032a5acbecf4bd42a23c6b
-  data.tar.gz: f6d94fb7f01dfaa286651136c5a4c6bfda71606f6e54c91a2a3c6929bfcd210b36dddb978a7b1079047e6d50434bd16f5b11d53e52aed13927892cae2b252ef1
+  metadata.gz: 38ba94bcf2d4b47664f3be6d5f0f00aa58b3c47b12cfb57a547a4e39bb36ca74555fc7bc0471bf5f4eba4e84d5590a836aa06cc1751a4f11f61137cdbbd4bf0a
+  data.tar.gz: 5e77bfccdf34f992a5e775269318cf40ad9c5e7c34578905b8f561cab9170586e248b5f8da89b713507dfafcdf06f02c0f9ec21677e258d45e4a2c20a7b67fb9

data/README.md

@@ -4,6 +4,8 @@
 
 This gem generates PDF files for Brazilian DANFE (_Documento Auxiliar da Nota Fiscal Eletrônica_) from a valid NF-e XML.
 
+[See an example here.](https://github.com/asseinfo/br_danfe/blob/master/spec/fixtures/v2.00/nfe_with_logo.xml.fixture.pdf?raw=true)
+
 This gem requires `ruby >= 1.9.x`.
 
 ## Supported NF-e versions

data/config/locales/pt-BR.yml

@@ -9,8 +9,8 @@ pt-BR:
       sefaz: "Consulta de autenticidade no portal nacional da NF-e www.nfe.fazenda.gov.br/portal ou no site da Sefaz Autorizadora"
     ide:
       dEmi: "DATA DA EMISSÃO"
-      dSaiEnt: "DATA DA SAÍDA/ENTRADA"
-      hSaiEnt: "HORA DE SAÍDA"
+      dSaiEnt: "DATA DA ENTRADA/SAÍDA"
+      hSaiEnt: "HORA DE ENTRADA/SAÍDA"
       tpNF:
         entry: "ENTRADA"
         departure: "SAÍDA"
@@ -119,7 +119,7 @@ pt-BR:
         pesoB: "PESO B.:"
         pesoL: "PESO LÍQ.:"
     ticket:
-        xNome: "RECEBEMOS DE %{xNome} OS PRODUTOS CONSTANTES DA NOTA FISCAL INDICADA ABAIXO"
+        xNome: "RECEBEMOS DE %{xNome} OS PRODUTOS/SERVIÇOS CONSTANTES DA NOTA FISCAL INDICADA AO LADO"
         received_at: "DATA DE RECEBIMENTO"
         receiver: "IDENTIFICAÇÃO E ASSINATURA DO RECEBEDOR"
         document: "NF-e\nN°. %{nNF}\nSÉRIE %{serie}"

data/lib/br_danfe/danfe.rb

@@ -1,4 +1,7 @@
 module BrDanfe
+  LINE_HEIGHT = 0.80
+  SPACE_BETWEEN_GROUPS = 0.52
+
   class Danfe
     attr_reader :options
 
@@ -55,14 +58,15 @@ module BrDanfe
 
     def repeat_on_each_page
       Ticket.render(@pdf, @xml)
-      Emit.new(@pdf, @xml, @options.logo_path).render
+      EmitHeader.new(@pdf, @xml, @options.logo_path).render
+      Emit.new(@pdf, @xml).render
       Dest.new(@pdf, @xml).render
       Dup.new(@pdf, @xml).render
-      Icmstot.render(@pdf, @xml)
-      Transp.render(@pdf, @xml)
+      Icmstot.new(@pdf, @xml).render
+      Transp.new(@pdf, @xml).render
       nVol = Vol.new(@pdf, @xml).render
       DetHeader.new(@pdf, @xml).render
-      Issqn.render(@pdf, @xml)
+      Issqn.new(@pdf, @xml).render
       Infadic.new(@pdf, @xml).render(nVol)
     end
   end

data/lib/br_danfe/dest.rb

@@ -1,30 +1,38 @@
 module BrDanfe
   class Dest
+    Y = 8.58
+
     def initialize(pdf, xml)
       @pdf = pdf
       @xml = xml
+
+      @ltitle = Y - 0.42
+      @l1 = Y
+      @l2 = Y + LINE_HEIGHT
+      @l3 = Y + (LINE_HEIGHT * 2)
     end
 
     def render
-      @pdf.ititle 0.42, 10.00, 0.25, 8.16, "dest.title"
+      @pdf.ititle 0.42, 10.00, 0.25, @ltitle, "dest.title"
 
       render_line1
       render_line2
       render_line3
+
+      render_dates_block
     end
 
     private
     def render_line1
-      @pdf.lbox 0.85, 12.32, 0.25, 8.58, @xml, "dest/xNome"
+      @pdf.lbox LINE_HEIGHT, 12.32, 0.25, @l1, @xml, "dest/xNome"
       render_cnpj_cpf
-      @pdf.idate 0.85, 2.92, 17.90, 8.58, "ide.dEmi", @xml["ide/dEmi"], { align: :right }
     end
 
     def render_cnpj_cpf
       if @xml["dest/CNPJ"] == ""
-        @pdf.ibox 0.85, 5.33, 12.57, 8.58, I18n.t("danfe.dest.CPF"), cpf
+        @pdf.ibox LINE_HEIGHT, 4.87, 12.57, @l1, I18n.t("danfe.dest.CPF"), cpf
       else
-        @pdf.ibox 0.85, 5.33, 12.57, 8.58, I18n.t("danfe.dest.CNPJ"), cnpj
+        @pdf.ibox LINE_HEIGHT, 4.87, 12.57, @l1, I18n.t("danfe.dest.CNPJ"), cnpj
       end
     end
 
@@ -39,14 +47,9 @@ module BrDanfe
     end
 
     def render_line2
-      @pdf.ibox 0.85, 10.16, 0.25, 9.43, I18n.t("danfe.enderDest.xLgr"), street
-      @pdf.lbox 0.85, 4.83, 10.41, 9.43, @xml, "enderDest/xBairro"
-      @pdf.ibox 0.85, 2.67, 15.24, 9.43, I18n.t("danfe.enderDest.CEP"), cep
-      if @xml.version_310?
-        @pdf.idate 0.85, 2.92, 17.90, 9.43, "ide.dSaiEnt", @xml["ide/dhSaiEnt"], { align: :right }
-      else
-        @pdf.idate 0.85, 2.92, 17.90, 9.43, "ide.dSaiEnt", @xml["ide/dSaiEnt"], { align: :right }
-      end
+      @pdf.ibox LINE_HEIGHT, 10.16, 0.25, @l2, I18n.t("danfe.enderDest.xLgr"), street
+      @pdf.lbox LINE_HEIGHT, 4.83, 10.41, @l2, @xml, "enderDest/xBairro"
+      @pdf.ibox LINE_HEIGHT, 2.20, 15.24, @l2, I18n.t("danfe.enderDest.CEP"), cep
     end
 
     def street
@@ -58,15 +61,25 @@ module BrDanfe
     end
 
     def render_line3
-      @pdf.lbox 0.85, 7.11, 0.25, 10.28, @xml, "enderDest/xMun"
-      @pdf.ibox 0.85, 4.06, 7.36, 10.28, I18n.t("danfe.enderDest.fone"), phone
-      @pdf.lbox 0.85, 1.14, 11.42, 10.28, @xml, "enderDest/UF"
-      @pdf.ibox 0.85, 5.33, 12.56, 10.28, I18n.t("danfe.dest.IE"), ie
+      @pdf.lbox LINE_HEIGHT, 7.11, 0.25, @l3, @xml, "enderDest/xMun"
+      @pdf.ibox LINE_HEIGHT, 4.06, 7.36, @l3, I18n.t("danfe.enderDest.fone"), phone
+      @pdf.lbox LINE_HEIGHT, 1.14, 11.42, @l3, @xml, "enderDest/UF"
+      @pdf.ibox LINE_HEIGHT, 4.88, 12.56, @l3, I18n.t("danfe.dest.IE"), ie
+    end
+
+    def render_dates_block
+      @pdf.ldate LINE_HEIGHT, 2.92, 17.90, @l1, "ide.dEmi", @xml["ide/dEmi"], { align: :right }
+
       if @xml.version_310?
-        @pdf.itime 0.85, 2.92, 17.90, 10.28, "ide.hSaiEnt", @xml["ide/dhSaiEnt"], { align: :right }
+        dSaiEnt = @xml["ide/dhSaiEnt"]
+        hSaiEnt = @xml["ide/dhSaiEnt"]
       else
-        @pdf.itime 0.85, 2.92, 17.90, 10.28, "ide.hSaiEnt", @xml["ide/hSaiEnt"], { align: :right }
+        dSaiEnt = @xml["ide/dSaiEnt"]
+        hSaiEnt = @xml["ide/hSaiEnt"]
       end
+
+      @pdf.ldate LINE_HEIGHT, 2.92, 17.90, @l2, "ide.dSaiEnt", dSaiEnt, { align: :right }
+      @pdf.ltime LINE_HEIGHT, 2.92, 17.90, @l3, "ide.hSaiEnt", hSaiEnt, { align: :right }
     end
 
     def phone

data/lib/br_danfe/det_body.rb

@@ -6,15 +6,20 @@ module BrDanfe
     end
 
     def render
+      options = {
+        column_widths: column_widths,
+        cell_style: { padding: 2, border_width: 0 }
+      }
+
       @pdf.font_size(6) do
-        @pdf.itable 6.37, 21.50, 0.25, 18.17,
-          products,
-          column_widths: column_widths,
-          cell_style: {padding: 2, border_width: 0} do |table|
+        @pdf.bounding_box [0.25.cm, Helper.invert(18.17.cm)], width: 21.50.cm, height: 6.37.cm do
+          @pdf.table products, options do |table|
             table.column(6..13).style(align: :right)
-            table.column(0..13).border_width = 1
+            table.column(0..13).border_width = 0.3
+            table.column(0..13).border_lines = [:dotted]
             table.column(0..13).borders = [:bottom]
           end
+        end
       end
     end
 

data/lib/br_danfe/det_header.rb

@@ -1,12 +1,17 @@
 module BrDanfe
+  Y = 17.39 + SPACE_BETWEEN_GROUPS
+
   class DetHeader
     def initialize(pdf, xml)
       @pdf = pdf
       @xml = xml
+
+      @ltitle = Y - 0.42
+      @l1 = Y
     end
 
     def render
-      @pdf.ititle 0.42, 10.00, 0.25, 17.45, "det.title"
+      @pdf.ititle 0.42, 10.00, 0.25, @ltitle, "det.title"
 
       column(2.00, 0.25, "prod.cProd")
       column(4.90, 2.25, "prod.xProd")
@@ -23,12 +28,12 @@ module BrDanfe
       column(0.90, 19.05, "ICMS.pICMS")
       column(0.86, 19.95, "IPI.pIPI")
 
-      @pdf.horizontal_line 0.25.cm, 20.83.cm, at: Helper.invert(18.17.cm)
+      @pdf.horizontal_line 0.25.cm, 20.81.cm, at: Helper.invert(18.17.cm)
     end
 
     private
     def column(w, x, title)
-      @pdf.ibox 6.70, w, x, 17.87, I18n.t("danfe.det.#{title}")
+      @pdf.ibox 6.70, w, x, @l1, I18n.t("danfe.det.#{title}")
     end
   end
 end

data/lib/br_danfe/document.rb

@@ -7,10 +7,10 @@ module BrDanfe
         left_margin: 0,
         right_margin: 0,
         top_margin: 0,
-        botton_margin: 0
-      )
+        botton_margin: 0)
 
       @document.font "Times-Roman"
+      @document.line_width = 0.3
     end
 
     def method_missing(method_name, *args, &block)
@@ -21,7 +21,7 @@ module BrDanfe
       title = ""
       title = I18n.t("danfe.#{i18n}") if i18n != ""
 
-      self.text_box title, size: 10, at: [x.cm, Helper.invert(y.cm) - 2], width: w.cm, height: h.cm, style: :bold
+      self.text_box title, size: 8, at: [x.cm, Helper.invert(y.cm) - 4], width: w.cm, height: h.cm, style: :bold
     end
 
     def ibarcode(h, w, x, y, info)
@@ -40,22 +40,14 @@ module BrDanfe
       ibox(h, w, x, y, label, data, options)
     end
 
-    def idate(h, w, x, y, i18n = "", info = "", options = {})
+    def ldate(h, w, x, y, i18n = "", info = "", options = {})
       data = BrDanfe::Helper::format_date(info)
-
-      label = ""
-      label = I18n.t("danfe.#{i18n}") if i18n != ""
-
-      ibox h, w, x, y, label, data, options
+      i18n_lbox(h, w, x, y, i18n, data, options)
     end
 
-    def itime(h, w, x, y, i18n = "", info = "", options = {})
+    def ltime(h, w, x, y, i18n = "", info = "", options = {})
       data = BrDanfe::Helper::format_time(info)
-
-      label = ""
-      label = I18n.t("danfe.#{i18n}") if i18n != ""
-
-      ibox h, w, x, y, label, data, options
+      i18n_lbox(h, w, x, y, i18n, data, options)
     end
 
     def lnumeric(h, w, x, y, xml, xpath, options = {})
@@ -72,14 +64,6 @@ module BrDanfe
       numeric [x.cm, Helper.invert(y.cm)], w.cm, h.cm, label, data, options
     end
 
-    def itable(h, w, x, y, data, options = {}, &block)
-      self.bounding_box [x.cm, Helper.invert(y.cm)], width: w.cm, height: h.cm do
-        self.table data, options do |table|
-          yield(table)
-        end
-      end
-    end
-
     private
     def numeric(at, w, h, title = "", info = "", options = {})
       options = {
@@ -90,6 +74,13 @@ module BrDanfe
       box at, w, h, title, info, options.merge({align: :right})
     end
 
+    def i18n_lbox(h, w, x, y, i18n = "", info = "", options = {})
+      label = ""
+      label = I18n.t("danfe.#{i18n}") if i18n != ""
+
+      ibox h, w, x, y, label, info, options
+    end
+
     def box(at, w, h, title = "", info = "", options = {})
       options = {
         align: :left,
@@ -106,10 +97,10 @@ module BrDanfe
       if title != ""
         title_coord = Array.new(at)
         title_coord[1] -= 2
-        self.text_box title, size: 6, style: :italic, at: title_coord, width: w - 4, height: 8
+        self.text_box title, size: 6, at: title_coord, width: w - 4, height: 8
       end
 
-      title_adjustment = title == "" ? 4 : 14
+      title_adjustment = title == "" ? 4 : 13
       at[1] -= title_adjustment
       self.text_box info, size: options[:size], at: at, width: w - 4, height: h - title_adjustment, align: options[:align], style: options[:style], valign: options[:valign]
     end

data/lib/br_danfe/dup.rb

@@ -1,16 +1,20 @@
 module BrDanfe
   class Dup
+    Y = 11.50
+
     def initialize(pdf, xml)
       @pdf = pdf
       @xml = xml
+
+      @ltitle = Y - 0.42
     end
 
     def render
-      @pdf.ititle 0.42, 10.00, 0.25, 11.12, "dup.title"
-      @pdf.ibox 0.85, 20.57, 0.25, 11.51
+      @pdf.ititle 0.42, 10.00, 0.25, @ltitle, "dup.title"
+      @pdf.ibox 0.85, 20.57, 0.25, Y
 
       x = 0.25
-      y = 11.51
+      y = Y
       @xml.collect("xmlns", "dup") do |det|
         render_dup(det, x, y)
         x += 2.30

data/lib/br_danfe/emit.rb

@@ -1,111 +1,31 @@
 module BrDanfe
   class Emit
-    def initialize(pdf, xml, logo_path)
+    Y = 6.46
+    L1 = Y
+    L2 = Y + LINE_HEIGHT
+
+    def initialize(pdf, xml)
       @pdf = pdf
       @xml = xml
-      @logo_path = logo_path
     end
 
     def render
-      address_box
-      danfe_box
-      access_key_box
-      sefaz_box
-      operationkind_box
-      protocol_box
-      ie_box
-      ie_st_box
-      cnpj_box
-    end
-
-    private
-    def address_box
-      @pdf.ibox 3.92, 8.46, 0.25, 2.54
-
-      @pdf.ibox 3.92, 8.46, 0.25, 2.80, "", @xml["emit/xNome"],
-        { size: 12, align: :center, border: 0, style: :bold }
-
-      if @logo_path.empty?
-        @pdf.ibox 3.92, 8.46, 0.75, 4, "", address, { align: :left, border: 0 }
-      else
-        @pdf.ibox 3.92, 8.46, 2.75, 4, "", address,
-          { size: 8, align: :left, border: 0 }
-
-        @pdf.image @logo_path, at: [0.5.cm, Helper.invert(4.cm)],
-          width: 2.cm
-      end
-    end
-
-    def address
-      formatted = @xml["enderEmit/xLgr"] + ", " + @xml["enderEmit/nro"] + "\n"
-      formatted += @xml["enderEmit/xBairro"] + " - " + cep + "\n"
-      formatted += @xml["enderEmit/xMun"] + "/" + @xml["enderEmit/UF"] + "\n"
-      formatted += phone + " " + @xml["enderEmit/email"]
-
-      formatted
-    end
-
-    def phone
-      Phone.format(@xml["enderEmit/fone"])
-    end
-
-    def cep
-      Cep.format(@xml["enderEmit/CEP"])
-    end
-
-    def danfe_box
-      @pdf.ibox 3.92, 2.08, 8.71, 2.54
-
-      @pdf.ibox 0.60, 2.08, 8.71, 2.54, "", "DANFE",
-        { size: 12, align: :center, border: 0, style: :bold }
-
-      @pdf.ibox 1.20, 2.08, 8.71, 3.14, "", I18n.t("danfe.others.danfe"),
-        { size: 8, align: :center, border: 0 }
-
-      @pdf.ibox 0.60, 2.08, 8.71, 4.34, "", "#{@xml['ide/tpNF']} - " + (@xml["ide/tpNF"] == "0" ? I18n.t("danfe.ide.tpNF.entry") : I18n.t("danfe.ide.tpNF.departure")),
-        { size: 8, align: :center, border: 0 }
-
-      @pdf.ibox 1.00, 2.08, 8.71, 4.94, "",
-        I18n.t("danfe.ide.document", nNF: @xml["ide/nNF"], serie: @xml["ide/serie"]),
-        { size: 8, align: :center, valign: :center, border: 0, style: :bold }
-    end
-
-    def access_key_box
-      @pdf.ibox 2.20, 10.02, 10.79, 2.54
-      @pdf.ibarcode 1.50, 8.00, 10.9010, 4.44, @xml["chNFe"]
-      @pdf.ibox 0.85, 10.02, 10.79, 4.74, I18n.t("danfe.chNFe"), @xml["chNFe"].gsub(/(\d)(?=(\d\d\d\d)+(?!\d))/, "\\1 "),
-        { style: :bold, align: :center }
-    end
-
-    def sefaz_box
-      @pdf.ibox 0.85, 10.02, 10.79, 5.60 , "", I18n.t("danfe.others.sefaz"),
-        { align: :center, size: 8 }
-    end
-
-    def operationkind_box
-      @pdf.lbox 0.85, 10.54, 0.25, 6.46, @xml, "ide/natOp"
-    end
-
-    def protocol_box
-      @pdf.ibox 0.85, 10.02, 10.79, 6.46, I18n.t("danfe.infProt"), @xml["infProt/nProt"] + " " + Helper.format_datetime(@xml["infProt/dhRecbto"]), { align: :center }
-    end
-
-    def ie_box
+      @pdf.lbox LINE_HEIGHT, 10.54, 0.25, L1, @xml, "ide/natOp"
+      @pdf.ibox LINE_HEIGHT, 10.02, 10.79, L1, I18n.t("danfe.infProt"), @xml["infProt/nProt"] + " " + Helper.format_datetime(@xml["infProt/dhRecbto"]), { align: :center }
       ie(0.25, "IE")
-    end
-
-    def ie_st_box
       ie(7.11, "IE_ST")
+      cnpj_box
     end
 
+    private
     def ie(x, field)
       ie = BrDocuments::IE::Factory.create(@xml["enderEmit/UF"], @xml["emit/#{field}"])
-      @pdf.ibox 0.85, 6.86, x, 7.31, I18n.t("danfe.emit.#{field}"), ie.formatted
+      @pdf.ibox LINE_HEIGHT, 6.86, x, L2, I18n.t("danfe.emit.#{field}"), ie.formatted
     end
 
     def cnpj_box
       cnpj = BrDocuments::CnpjCpf::Cnpj.new(@xml["emit/CNPJ"])
-      @pdf.ibox 0.85, 6.84, 13.97, 7.31, I18n.t("danfe.emit.CNPJ"), cnpj.formatted
+      @pdf.ibox LINE_HEIGHT, 6.84, 13.97, L2, I18n.t("danfe.emit.CNPJ"), cnpj.formatted
     end
   end
 end

data/lib/br_danfe/emit_header.rb

@@ -0,0 +1,80 @@
+module BrDanfe
+  class EmitHeader
+    def initialize(pdf, xml, logo_path)
+      @pdf = pdf
+      @xml = xml
+      @logo_path = logo_path
+    end
+
+    def render
+      address_box
+      danfe_box
+      access_key_box
+      sefaz_box
+    end
+
+    private
+    def address_box
+      @pdf.ibox 3.92, 8.46, 0.25, 2.54
+
+      @pdf.ibox 3.92, 8.46, 0.25, 2.80, "", @xml["emit/xNome"],
+        { size: 12, align: :center, border: 0, style: :bold }
+
+      if @logo_path.empty?
+        @pdf.ibox 3.92, 8.46, 0.75, 4, "", address, { align: :left, border: 0 }
+      else
+        @pdf.ibox 3.92, 8.46, 2.75, 4, "", address,
+          { size: 8, align: :left, border: 0 }
+
+        @pdf.image @logo_path, at: [0.5.cm, Helper.invert(4.cm)],
+          width: 2.cm
+      end
+    end
+
+    def address
+      formatted = @xml["enderEmit/xLgr"] + ", " + @xml["enderEmit/nro"] + "\n"
+      formatted += @xml["enderEmit/xBairro"] + " - " + cep + "\n"
+      formatted += @xml["enderEmit/xMun"] + "/" + @xml["enderEmit/UF"] + "\n"
+      formatted += phone + " " + @xml["enderEmit/email"]
+
+      formatted
+    end
+
+    def phone
+      Phone.format(@xml["enderEmit/fone"])
+    end
+
+    def cep
+      Cep.format(@xml["enderEmit/CEP"])
+    end
+
+    def danfe_box
+      @pdf.ibox 3.92, 2.08, 8.71, 2.54
+
+      @pdf.ibox 0.60, 2.08, 8.71, 2.54, "", "DANFE",
+        { size: 12, align: :center, border: 0, style: :bold }
+
+      @pdf.ibox 1.20, 2.08, 8.71, 3.14, "", I18n.t("danfe.others.danfe"),
+        { size: 8, align: :center, border: 0 }
+
+      @pdf.ibox 0.60, 2.08, 8.71, 4.34, "", "#{@xml['ide/tpNF']} - " + (@xml["ide/tpNF"] == "0" ? I18n.t("danfe.ide.tpNF.entry") : I18n.t("danfe.ide.tpNF.departure")),
+        { size: 8, align: :center, border: 0 }
+
+      @pdf.ibox 1.00, 2.08, 8.71, 4.94, "",
+        I18n.t("danfe.ide.document", nNF: @xml["ide/nNF"], serie: @xml["ide/serie"]),
+        { size: 8, align: :center, valign: :center, border: 0, style: :bold }
+    end
+
+    def access_key_box
+      @pdf.ibox 2.22, 10.02, 10.79, 2.54
+      @pdf.ibarcode 1.50, 8.00, 10.9010, 4.44, @xml["chNFe"]
+      @pdf.ibox 0.85, 10.02, 10.79, 4.76, I18n.t("danfe.chNFe"), @xml["chNFe"].gsub(/(\d)(?=(\d\d\d\d)+(?!\d))/, "\\1 "),
+        { style: :bold, align: :center }
+    end
+
+    def sefaz_box
+      @pdf.ibox 0.85, 10.02, 10.79, 5.61, "", I18n.t("danfe.others.sefaz"),
+        { align: :center, size: 8 }
+    end
+  end
+end

data/lib/br_danfe/helper.rb

@@ -40,7 +40,7 @@ module BrDanfe
         formated = xml_datetime
       elsif xml_datetime.length > 8
         date = DateTime.strptime(xml_datetime, "%Y-%m-%dT%H:%M:%S %Z").to_time
-        formated = date.getutc.strftime("%H:%M:%S")
+        formated = date.strftime("%H:%M:%S")
       end
 
       formated

data/lib/br_danfe/icmstot.rb

@@ -1,19 +1,31 @@
 module BrDanfe
   class Icmstot
-    def self.render(pdf, xml)
-      pdf.ititle 0.42, 5.60, 0.25, 12.36, "ICMSTot.title"
+    Y = 12.35 + SPACE_BETWEEN_GROUPS
 
-      pdf.lnumeric 0.85, 4.06, 0.25, 12.78, xml, "ICMSTot/vBC"
-      pdf.lnumeric 0.85, 4.06, 4.31, 12.78, xml, "ICMSTot/vICMS"
-      pdf.lnumeric 0.85, 4.06, 8.37, 12.78, xml, "ICMSTot/vBCST"
-      pdf.lnumeric 0.85, 4.06, 12.43, 12.78, xml, "ICMSTot/vST"
-      pdf.lnumeric 0.85, 4.32, 16.49, 12.78, xml, "ICMSTot/vProd"
-      pdf.lnumeric 0.85, 3.46, 0.25, 13.63, xml, "ICMSTot/vFrete"
-      pdf.lnumeric 0.85, 3.46, 3.71, 13.63, xml, "ICMSTot/vSeg"
-      pdf.lnumeric 0.85, 3.46, 7.17, 13.63, xml, "ICMSTot/vDesc"
-      pdf.lnumeric 0.85, 3.46, 10.63, 13.63, xml, "ICMSTot/vOutro"
-      pdf.lnumeric 0.85, 3.46, 14.09, 13.63, xml, "ICMSTot/vIPI"
-      pdf.lnumeric 0.85, 3.27, 17.55, 13.63, xml, "ICMSTot/vNF", style: :bold
+    def initialize(pdf, xml)
+      @pdf = pdf
+      @xml = xml
+
+      @ltitle = Y - 0.42
+      @l1 = Y
+      @l2 = Y + LINE_HEIGHT
+    end
+
+    def render
+      @pdf.ititle 0.42, 5.60, 0.25, @ltitle, "ICMSTot.title"
+
+      @pdf.lnumeric LINE_HEIGHT, 4.06, 0.25, @l1, @xml, "ICMSTot/vBC"
+      @pdf.lnumeric LINE_HEIGHT, 4.06, 4.31, @l1, @xml, "ICMSTot/vICMS"
+      @pdf.lnumeric LINE_HEIGHT, 4.06, 8.37, @l1, @xml, "ICMSTot/vBCST"
+      @pdf.lnumeric LINE_HEIGHT, 4.06, 12.43, @l1, @xml, "ICMSTot/vST"
+      @pdf.lnumeric LINE_HEIGHT, 4.32, 16.49, @l1, @xml, "ICMSTot/vProd"
+
+      @pdf.lnumeric LINE_HEIGHT, 3.05, 0.25, @l2, @xml, "ICMSTot/vFrete"
+      @pdf.lnumeric LINE_HEIGHT, 3.05, 3.30, @l2, @xml, "ICMSTot/vSeg"
+      @pdf.lnumeric LINE_HEIGHT, 3.04, 6.35, @l2, @xml, "ICMSTot/vDesc"
+      @pdf.lnumeric LINE_HEIGHT, 3.04, 9.39, @l2, @xml, "ICMSTot/vOutro"
+      @pdf.lnumeric LINE_HEIGHT, 4.06, 12.43, @l2, @xml, "ICMSTot/vIPI"
+      @pdf.lnumeric LINE_HEIGHT, 4.32, 16.49, @l2, @xml, "ICMSTot/vNF", style: :bold
     end
   end
 end

data/lib/br_danfe/infadic.rb

@@ -1,29 +1,34 @@
 module BrDanfe
   class Infadic
+    Y = 25.92 + SPACE_BETWEEN_GROUPS
+
     def initialize(pdf, xml)
       @pdf = pdf
       @xml = xml
+
+      @ltitle = Y - 0.41
+      @l1 = Y
     end
 
     def render(nVol)
-      @pdf.ititle 0.42, 10.00, 0.25, 25.91, "infAdic.title"
+      @pdf.ititle 0.42, 10.00, 0.25, @ltitle, "infAdic.title"
 
       if nVol > 1
         render_extra_volumes
       else
-        @pdf.ibox 3.07, 12.93, 0.25, 26.33, I18n.t("danfe.infAdic.infCpl"), @xml["infAdic/infCpl"], { size: 6, valign: :top }
+        @pdf.ibox 3.07, 12.93, 0.25, @l1, I18n.t("danfe.infAdic.infCpl"), @xml["infAdic/infCpl"], { size: 6, valign: :top }
       end
 
-      @pdf.ibox 3.07, 7.62, 13.17, 26.33, I18n.t("danfe.infAdic.reserved")
+      @pdf.ibox 3.07, 7.62, 13.19, @l1, I18n.t("danfe.infAdic.reserved")
     end
 
     private
     def render_extra_volumes
-      @pdf.ibox 3.07, 12.93, 0.25, 26.33, I18n.t("danfe.infAdic.infCpl"), "", { size: 8, valign: :top }
-      @pdf.ibox 3.07, 12.93, 0.25, 26.60, "", I18n.t("danfe.infAdic.vol.title"), { size: 5, valign: :top, border: 0 }
+      @pdf.ibox 3.07, 12.93, 0.25, @l1, I18n.t("danfe.infAdic.infCpl"), "", { size: 8, valign: :top }
+      @pdf.ibox 3.07, 12.93, 0.25, Y + 0.27, "", I18n.t("danfe.infAdic.vol.title"), { size: 5, valign: :top, border: 0 }
 
       volumes = 0
-      y = 26.67
+      y = Y + 0.34
       @xml.collect("xmlns", "vol") do |det|
         volumes += 1
         if volumes > 1

data/lib/br_danfe/issqn.rb

@@ -1,12 +1,22 @@
 module BrDanfe
   class Issqn
-    def self.render(pdf, xml)
-      pdf.ititle 0.42, 10.00, 0.25, 24.64, "issqn.title"
+    Y = 24.60 + SPACE_BETWEEN_GROUPS
 
-      pdf.lbox 0.85, 5.08, 0.25, 25.06, xml, "emit/IM"
-      pdf.lbox 0.85, 5.08, 5.33, 25.06, xml, "total/vServ"
-      pdf.lbox 0.85, 5.08, 10.41, 25.06, xml, "total/vBCISS"
-      pdf.lbox 0.85, 5.28, 15.49, 25.06, xml, "total/ISSTot"
+    def initialize(pdf, xml)
+      @pdf = pdf
+      @xml = xml
+
+      @ltitle = Y - 0.42
+      @l1 = Y
+    end
+
+    def render
+      @pdf.ititle 0.42, 10.00, 0.25, @ltitle, "issqn.title"
+
+      @pdf.lbox LINE_HEIGHT, 5.14, 0.25, @l1, @xml, "emit/IM"
+      @pdf.lbox LINE_HEIGHT, 5.14, 5.39, @l1, @xml, "total/vServ"
+      @pdf.lbox LINE_HEIGHT, 5.14, 10.53, @l1, @xml, "total/vBCISS"
+      @pdf.lbox LINE_HEIGHT, 5.14, 15.67, @l1, @xml, "total/ISSTot"
     end
   end
 end