money_s3 0.12.0 → 2.3.0

data/lib/money_s3/builders/nepritomnost_type.rb

@@ -5,25 +5,23 @@ module MoneyS3
 
       def builder
         root = Ox::Element.new(name)
-        if data.respond_to? :attributes
-          data.attributes.each { |k, v| root[k] = v }
-        end
+        root = add_attributes_and_namespaces(root)
 
-        root << build_element('Typ', data[:typ]) if data.key? :typ
-        root << build_element('Zacatek', data[:zacatek]) if data.key? :zacatek
-        root << build_element('Konec', data[:konec]) if data.key? :konec
-        root << build_element('DatPorodu', data[:dat_porodu]) if data.key? :dat_porodu
-        root << build_element('OdpHodZ', data[:odp_hod_z]) if data.key? :odp_hod_z
-        root << build_element('OdpHodK', data[:odp_hod_k]) if data.key? :odp_hod_k
-        root << build_element('KalDnu', data[:kal_dnu]) if data.key? :kal_dnu
-        root << build_element('PracDnu', data[:prac_dnu]) if data.key? :prac_dnu
-        root << build_element('Hodin', data[:hodin]) if data.key? :hodin
-        root << build_element('SvatDnu', data[:svat_dnu]) if data.key? :svat_dnu
-        root << build_element('SvatHod', data[:svat_hod]) if data.key? :svat_hod
-        root << build_element('PokracNepr', data[:pokrac_nepr]) if data.key? :pokrac_nepr
-        root << build_element('NahrMzdy', data[:nahr_mzdy]) if data.key? :nahr_mzdy
-        root << build_element('PrepocDny', data[:prepoc_dny]) if data.key? :prepoc_dny
-        root << build_element('Pozn', data[:pozn]) if data.key? :pozn
+        root << build_element('Typ', data[:typ], data[:typ_attributes]) if data.key? :typ
+        root << build_element('Zacatek', data[:zacatek], data[:zacatek_attributes]) if data.key? :zacatek
+        root << build_element('Konec', data[:konec], data[:konec_attributes]) if data.key? :konec
+        root << build_element('DatPorodu', data[:dat_porodu], data[:dat_porodu_attributes]) if data.key? :dat_porodu
+        root << build_element('OdpHodZ', data[:odp_hod_z], data[:odp_hod_z_attributes]) if data.key? :odp_hod_z
+        root << build_element('OdpHodK', data[:odp_hod_k], data[:odp_hod_k_attributes]) if data.key? :odp_hod_k
+        root << build_element('KalDnu', data[:kal_dnu], data[:kal_dnu_attributes]) if data.key? :kal_dnu
+        root << build_element('PracDnu', data[:prac_dnu], data[:prac_dnu_attributes]) if data.key? :prac_dnu
+        root << build_element('Hodin', data[:hodin], data[:hodin_attributes]) if data.key? :hodin
+        root << build_element('SvatDnu', data[:svat_dnu], data[:svat_dnu_attributes]) if data.key? :svat_dnu
+        root << build_element('SvatHod', data[:svat_hod], data[:svat_hod_attributes]) if data.key? :svat_hod
+        root << build_element('PokracNepr', data[:pokrac_nepr], data[:pokrac_nepr_attributes]) if data.key? :pokrac_nepr
+        root << build_element('NahrMzdy', data[:nahr_mzdy], data[:nahr_mzdy_attributes]) if data.key? :nahr_mzdy
+        root << build_element('PrepocDny', data[:prepoc_dny], data[:prepoc_dny_attributes]) if data.key? :prepoc_dny
+        root << build_element('Pozn', data[:pozn], data[:pozn_attributes]) if data.key? :pozn
 
         root
       end

data/lib/money_s3/builders/neskl_polozka.rb

@@ -5,30 +5,28 @@ module MoneyS3
 
       def builder
         root = Ox::Element.new(name)
-        if data.respond_to? :attributes
-          data.attributes.each { |k, v| root[k] = v }
-        end
+        root = add_attributes_and_namespaces(root)
 
-        root << build_element('Zkrat', data[:zkrat]) if data.key? :zkrat
-        root << build_element('MJ', data[:mj]) if data.key? :mj
-        root << build_element('UzivCode', data[:uziv_code]) if data.key? :uziv_code
-        root << build_element('Katalog', data[:katalog]) if data.key? :katalog
-        root << build_element('BarCode', data[:bar_code]) if data.key? :bar_code
-        root << build_element('Zaloha', data[:zaloha]) if data.key? :zaloha
-        root << build_element('ZdanZaloha', data[:zdan_zaloha]) if data.key? :zdan_zaloha
-        root << build_element('KonecOdpocet', data[:konec_odpocet]) if data.key? :konec_odpocet
-        root << build_element('TypZarDoby', data[:typ_zar_doby]) if data.key? :typ_zar_doby
-        root << build_element('ZarDoba', data[:zar_doba]) if data.key? :zar_doba
-        root << build_element('Protizapis', data[:protizapis]) if data.key? :protizapis
-        root << build_element('PlnenoDPH', data[:plneno_dph]) if data.key? :plneno_dph
-        root << build_element('Hmotnost', data[:hmotnost]) if data.key? :hmotnost
-        root << build_element('VyrobniCis', data[:vyrobni_cis]) if data.key? :vyrobni_cis
-        root << build_element('DatExp', data[:dat_exp]) if data.key? :dat_exp
-        root << build_element('DatNakupu', data[:dat_nakupu]) if data.key? :dat_nakupu
+        root << build_element('MJ', data[:mj], data[:mj_attributes]) if data.key? :mj
+        root << build_element('Katalog', data[:katalog], data[:katalog_attributes]) if data.key? :katalog
+        root << build_element('Zaloha', data[:zaloha], data[:zaloha_attributes]) if data.key? :zaloha
+        root << build_element('ZdanZaloha', data[:zdan_zaloha], data[:zdan_zaloha_attributes]) if data.key? :zdan_zaloha
+        root << build_element('TypZarDoby', data[:typ_zar_doby], data[:typ_zar_doby_attributes]) if data.key? :typ_zar_doby
+        root << build_element('ZarDoba', data[:zar_doba], data[:zar_doba_attributes]) if data.key? :zar_doba
+        root << build_element('Protizapis', data[:protizapis], data[:protizapis_attributes]) if data.key? :protizapis
+        root << build_element('BarCode', data[:bar_code], data[:bar_code_attributes]) if data.key? :bar_code
+        root << build_element('Zkrat', data[:zkrat], data[:zkrat_attributes]) if data.key? :zkrat
+        root << build_element('UzivCode', data[:uziv_code], data[:uziv_code_attributes]) if data.key? :uziv_code
+        root << build_element('Hmotnost', data[:hmotnost], data[:hmotnost_attributes]) if data.key? :hmotnost
+        root << build_element('PlnenoDPH', data[:plneno_dph], data[:plneno_dph_attributes]) if data.key? :plneno_dph
+        root << build_element('KonecOdpocet', data[:konec_odpocet], data[:konec_odpocet_attributes]) if data.key? :konec_odpocet
+        root << build_element('VyrobniCis', data[:vyrobni_cis], data[:vyrobni_cis_attributes]) if data.key? :vyrobni_cis
+        root << build_element('DatExp', data[:dat_exp], data[:dat_exp_attributes]) if data.key? :dat_exp
+        root << build_element('DatNakupu', data[:dat_nakupu], data[:dat_nakupu_attributes]) if data.key? :dat_nakupu
         if data.key? :dodavatel
           root << FirmaType.new('Dodavatel', data[:dodavatel]).builder
         end
-        root << build_element('PredmPln', data[:predm_pln]) if data.key? :predm_pln
+        root << build_element('PredmPln', data[:predm_pln], data[:predm_pln_attributes]) if data.key? :predm_pln
 
         root
       end

data/lib/money_s3/builders/neskl_polozka2.rb

@@ -5,20 +5,19 @@ module MoneyS3
 
       def builder
         root = Ox::Element.new(name)
-        if data.respond_to? :attributes
-          data.attributes.each { |k, v| root[k] = v }
-        end
+        root = add_attributes_and_namespaces(root)
 
-        root << build_element('Zkrat', data[:zkrat]) if data.key? :zkrat
-        root << build_element('MJ', data[:mj]) if data.key? :mj
-        root << build_element('UzivCode', data[:uziv_code]) if data.key? :uziv_code
-        root << build_element('Katalog', data[:katalog]) if data.key? :katalog
-        root << build_element('BarCode', data[:bar_code]) if data.key? :bar_code
-        root << build_element('TypZarDoby', data[:typ_zar_doby]) if data.key? :typ_zar_doby
-        root << build_element('ZarDoba', data[:zar_doba]) if data.key? :zar_doba
-        root << build_element('VyrobniCis', data[:vyrobni_cis]) if data.key? :vyrobni_cis
-        root << build_element('DatExp', data[:dat_exp]) if data.key? :dat_exp
-        root << build_element('DatNakupu', data[:dat_nakupu]) if data.key? :dat_nakupu
+        root << build_element('Zkrat', data[:zkrat], data[:zkrat_attributes]) if data.key? :zkrat
+        root << build_element('MJ', data[:mj], data[:mj_attributes]) if data.key? :mj
+        root << build_element('UzivCode', data[:uziv_code], data[:uziv_code_attributes]) if data.key? :uziv_code
+        root << build_element('Katalog', data[:katalog], data[:katalog_attributes]) if data.key? :katalog
+        root << build_element('BarCode', data[:bar_code], data[:bar_code_attributes]) if data.key? :bar_code
+        root << build_element('TypZarDoby', data[:typ_zar_doby], data[:typ_zar_doby_attributes]) if data.key? :typ_zar_doby
+        root << build_element('ZarDoba', data[:zar_doba], data[:zar_doba_attributes]) if data.key? :zar_doba
+        root << build_element('PredPC', data[:pred_pc], data[:pred_pc_attributes]) if data.key? :pred_pc
+        root << build_element('VyrobniCis', data[:vyrobni_cis], data[:vyrobni_cis_attributes]) if data.key? :vyrobni_cis
+        root << build_element('DatExp', data[:dat_exp], data[:dat_exp_attributes]) if data.key? :dat_exp
+        root << build_element('DatNakupu', data[:dat_nakupu], data[:dat_nakupu_attributes]) if data.key? :dat_nakupu
         if data.key? :dodavatel
           root << FirmaType.new('Dodavatel', data[:dodavatel]).builder
         end

data/lib/money_s3/builders/norm_poloz_id_type.rb

@@ -5,24 +5,22 @@ module MoneyS3
 
       def builder
         root = Ox::Element.new(name)
-        if data.respond_to? :attributes
-          data.attributes.each { |k, v| root[k] = v }
-        end
+        root = add_attributes_and_namespaces(root)
 
-        root << build_element('Poradi', data[:poradi]) if data.key? :poradi
-        root << build_element('Popis', data[:popis]) if data.key? :popis
-        root << build_element('Zkratka', data[:zkratka]) if data.key? :zkratka
-        root << build_element('Cena', data[:cena]) if data.key? :cena
-        root << build_element('CenaTyp', data[:cena_typ]) if data.key? :cena_typ
-        root << build_element('SazbaDPH', data[:sazba_dph]) if data.key? :sazba_dph
-        root << build_element('TextMJ', data[:text_mj]) if data.key? :text_mj
-        root << build_element('PocetMJ', data[:pocet_mj]) if data.key? :pocet_mj
-        root << build_element('PrKont', data[:pr_kont]) if data.key? :pr_kont
-        root << build_element('Cleneni', data[:cleneni]) if data.key? :cleneni
-        root << build_element('Stred', data[:stred]) if data.key? :stred
-        root << build_element('Zakazka', data[:zakazka]) if data.key? :zakazka
-        root << build_element('Cinnost', data[:cinnost]) if data.key? :cinnost
-        root << build_element('Poznamka', data[:poznamka]) if data.key? :poznamka
+        root << build_element('Poradi', data[:poradi], data[:poradi_attributes]) if data.key? :poradi
+        root << build_element('Popis', data[:popis], data[:popis_attributes]) if data.key? :popis
+        root << build_element('Zkratka', data[:zkratka], data[:zkratka_attributes]) if data.key? :zkratka
+        root << build_element('Cena', data[:cena], data[:cena_attributes]) if data.key? :cena
+        root << build_element('CenaTyp', data[:cena_typ], data[:cena_typ_attributes]) if data.key? :cena_typ
+        root << build_element('SazbaDPH', data[:sazba_dph], data[:sazba_dph_attributes]) if data.key? :sazba_dph
+        root << build_element('TextMJ', data[:text_mj], data[:text_mj_attributes]) if data.key? :text_mj
+        root << build_element('PocetMJ', data[:pocet_mj], data[:pocet_mj_attributes]) if data.key? :pocet_mj
+        root << build_element('PrKont', data[:pr_kont], data[:pr_kont_attributes]) if data.key? :pr_kont
+        root << build_element('Cleneni', data[:cleneni], data[:cleneni_attributes]) if data.key? :cleneni
+        root << build_element('Stred', data[:stred], data[:stred_attributes]) if data.key? :stred
+        root << build_element('Zakazka', data[:zakazka], data[:zakazka_attributes]) if data.key? :zakazka
+        root << build_element('Cinnost', data[:cinnost], data[:cinnost_attributes]) if data.key? :cinnost
+        root << build_element('Poznamka', data[:poznamka], data[:poznamka_attributes]) if data.key? :poznamka
 
         root
       end

data/lib/money_s3/builders/norm_poloz_ud_type.rb

@@ -5,25 +5,23 @@ module MoneyS3
 
       def builder
         root = Ox::Element.new(name)
-        if data.respond_to? :attributes
-          data.attributes.each { |k, v| root[k] = v }
-        end
+        root = add_attributes_and_namespaces(root)
 
-        root << build_element('Poradi', data[:poradi]) if data.key? :poradi
-        root << build_element('Popis', data[:popis]) if data.key? :popis
-        root << build_element('Cena', data[:cena]) if data.key? :cena
-        root << build_element('Valuty', data[:valuty]) if data.key? :valuty
-        root << build_element('CenaTyp', data[:cena_typ]) if data.key? :cena_typ
-        root << build_element('SazbaDPH', data[:sazba_dph]) if data.key? :sazba_dph
-        root << build_element('TextMJ', data[:text_mj]) if data.key? :text_mj
-        root << build_element('PocetMJ', data[:pocet_mj]) if data.key? :pocet_mj
-        root << build_element('PrKont', data[:pr_kont]) if data.key? :pr_kont
-        root << build_element('Cleneni', data[:cleneni]) if data.key? :cleneni
-        root << build_element('PredmPln', data[:predm_pln]) if data.key? :predm_pln
-        root << build_element('Stred', data[:stred]) if data.key? :stred
-        root << build_element('Zakazka', data[:zakazka]) if data.key? :zakazka
-        root << build_element('Cinnost', data[:cinnost]) if data.key? :cinnost
-        root << build_element('Poznamka', data[:poznamka]) if data.key? :poznamka
+        root << build_element('Poradi', data[:poradi], data[:poradi_attributes]) if data.key? :poradi
+        root << build_element('Popis', data[:popis], data[:popis_attributes]) if data.key? :popis
+        root << build_element('Cena', data[:cena], data[:cena_attributes]) if data.key? :cena
+        root << build_element('Valuty', data[:valuty], data[:valuty_attributes]) if data.key? :valuty
+        root << build_element('CenaTyp', data[:cena_typ], data[:cena_typ_attributes]) if data.key? :cena_typ
+        root << build_element('SazbaDPH', data[:sazba_dph], data[:sazba_dph_attributes]) if data.key? :sazba_dph
+        root << build_element('TextMJ', data[:text_mj], data[:text_mj_attributes]) if data.key? :text_mj
+        root << build_element('PocetMJ', data[:pocet_mj], data[:pocet_mj_attributes]) if data.key? :pocet_mj
+        root << build_element('PrKont', data[:pr_kont], data[:pr_kont_attributes]) if data.key? :pr_kont
+        root << build_element('Cleneni', data[:cleneni], data[:cleneni_attributes]) if data.key? :cleneni
+        root << build_element('PredmPln', data[:predm_pln], data[:predm_pln_attributes]) if data.key? :predm_pln
+        root << build_element('Stred', data[:stred], data[:stred_attributes]) if data.key? :stred
+        root << build_element('Zakazka', data[:zakazka], data[:zakazka_attributes]) if data.key? :zakazka
+        root << build_element('Cinnost', data[:cinnost], data[:cinnost_attributes]) if data.key? :cinnost
+        root << build_element('Poznamka', data[:poznamka], data[:poznamka_attributes]) if data.key? :poznamka
 
         root
       end

data/lib/money_s3/builders/obdobi_dph.rb

@@ -5,23 +5,21 @@ module MoneyS3
 
       def builder
         root = Ox::Element.new(name)
-        if data.respond_to? :attributes
-          data.attributes.each { |k, v| root[k] = v }
-        end
+        root = add_attributes_and_namespaces(root)
 
-        root << build_element('DatumOd', data[:datum_od]) if data.key? :datum_od
-        root << build_element('UcMD_1', data[:uc_md_1]) if data.key? :uc_md_1
-        root << build_element('UcD_1', data[:uc_d_1]) if data.key? :uc_d_1
-        root << build_element('UcMD_2', data[:uc_md_2]) if data.key? :uc_md_2
-        root << build_element('UcD_2', data[:uc_d_2]) if data.key? :uc_d_2
-        root << build_element('UcMD_3', data[:uc_md_3]) if data.key? :uc_md_3
-        root << build_element('UcD_3', data[:uc_d_3]) if data.key? :uc_d_3
-        root << build_element('UcMD_4', data[:uc_md_4]) if data.key? :uc_md_4
-        root << build_element('UcD_4', data[:uc_d_4]) if data.key? :uc_d_4
-        root << build_element('UcMD_5', data[:uc_md_5]) if data.key? :uc_md_5
-        root << build_element('UcD_5', data[:uc_d_5]) if data.key? :uc_d_5
-        root << build_element('UcMD_6', data[:uc_md_6]) if data.key? :uc_md_6
-        root << build_element('UcD_6', data[:uc_d_6]) if data.key? :uc_d_6
+        root << build_element('DatumOd', data[:datum_od], data[:datum_od_attributes]) if data.key? :datum_od
+        root << build_element('UcMD_1', data[:uc_md_1], data[:uc_md_1_attributes]) if data.key? :uc_md_1
+        root << build_element('UcD_1', data[:uc_d_1], data[:uc_d_1_attributes]) if data.key? :uc_d_1
+        root << build_element('UcMD_2', data[:uc_md_2], data[:uc_md_2_attributes]) if data.key? :uc_md_2
+        root << build_element('UcD_2', data[:uc_d_2], data[:uc_d_2_attributes]) if data.key? :uc_d_2
+        root << build_element('UcMD_3', data[:uc_md_3], data[:uc_md_3_attributes]) if data.key? :uc_md_3
+        root << build_element('UcD_3', data[:uc_d_3], data[:uc_d_3_attributes]) if data.key? :uc_d_3
+        root << build_element('UcMD_4', data[:uc_md_4], data[:uc_md_4_attributes]) if data.key? :uc_md_4
+        root << build_element('UcD_4', data[:uc_d_4], data[:uc_d_4_attributes]) if data.key? :uc_d_4
+        root << build_element('UcMD_5', data[:uc_md_5], data[:uc_md_5_attributes]) if data.key? :uc_md_5
+        root << build_element('UcD_5', data[:uc_d_5], data[:uc_d_5_attributes]) if data.key? :uc_d_5
+        root << build_element('UcMD_6', data[:uc_md_6], data[:uc_md_6_attributes]) if data.key? :uc_md_6
+        root << build_element('UcD_6', data[:uc_d_6], data[:uc_d_6_attributes]) if data.key? :uc_d_6
 
         root
       end

data/lib/money_s3/builders/obdobi_dph2.rb

@@ -5,17 +5,15 @@ module MoneyS3
 
       def builder
         root = Ox::Element.new(name)
-        if data.respond_to? :attributes
-          data.attributes.each { |k, v| root[k] = v }
-        end
+        root = add_attributes_and_namespaces(root)
 
-        root << build_element('DatumOd', data[:datum_od]) if data.key? :datum_od
-        root << build_element('PohD_1', data[:poh_d_1]) if data.key? :poh_d_1
-        root << build_element('PohD_2', data[:poh_d_2]) if data.key? :poh_d_2
-        root << build_element('PohD_3', data[:poh_d_3]) if data.key? :poh_d_3
-        root << build_element('PohD_4', data[:poh_d_4]) if data.key? :poh_d_4
-        root << build_element('PohD_5', data[:poh_d_5]) if data.key? :poh_d_5
-        root << build_element('PohD_6', data[:poh_d_6]) if data.key? :poh_d_6
+        root << build_element('DatumOd', data[:datum_od], data[:datum_od_attributes]) if data.key? :datum_od
+        root << build_element('PohD_1', data[:poh_d_1], data[:poh_d_1_attributes]) if data.key? :poh_d_1
+        root << build_element('PohD_2', data[:poh_d_2], data[:poh_d_2_attributes]) if data.key? :poh_d_2
+        root << build_element('PohD_3', data[:poh_d_3], data[:poh_d_3_attributes]) if data.key? :poh_d_3
+        root << build_element('PohD_4', data[:poh_d_4], data[:poh_d_4_attributes]) if data.key? :poh_d_4
+        root << build_element('PohD_5', data[:poh_d_5], data[:poh_d_5_attributes]) if data.key? :poh_d_5
+        root << build_element('PohD_6', data[:poh_d_6], data[:poh_d_6_attributes]) if data.key? :poh_d_6
 
         root
       end

data/lib/money_s3/builders/obj_prij.rb

@@ -5,9 +5,7 @@ module MoneyS3
 
       def builder
         root = Ox::Element.new(name)
-        if data.respond_to? :attributes
-          data.attributes.each { |k, v| root[k] = v }
-        end
+        root = add_attributes_and_namespaces(root)
 
         super.nodes.each do |n|
           root << n

data/lib/money_s3/builders/obj_vyd.rb

@@ -5,9 +5,7 @@ module MoneyS3
 
       def builder
         root = Ox::Element.new(name)
-        if data.respond_to? :attributes
-          data.attributes.each { |k, v| root[k] = v }
-        end
+        root = add_attributes_and_namespaces(root)
 
         super.nodes.each do |n|
           root << n

data/lib/money_s3/builders/objednavka_type.rb

@@ -5,65 +5,64 @@ module MoneyS3
 
       def builder
         root = Ox::Element.new(name)
-        if data.respond_to? :attributes
-          data.attributes.each { |k, v| root[k] = v }
-        end
+        root = add_attributes_and_namespaces(root)
 
-        root << build_element('Doklad', data[:doklad]) if data.key? :doklad
-        root << build_element('Popis', data[:popis]) if data.key? :popis
-        root << build_element('Poznamka', data[:poznamka]) if data.key? :poznamka
-        root << build_element('TextPredPo', data[:text_pred_po]) if data.key? :text_pred_po
-        root << build_element('TextZaPol', data[:text_za_pol]) if data.key? :text_za_pol
-        root << build_element('Vystaveno', data[:vystaveno]) if data.key? :vystaveno
-        root << build_element('Vyridit_do', data[:vyridit_do]) if data.key? :vyridit_do
-        root << build_element('Vyrizeno', data[:vyrizeno]) if data.key? :vyrizeno
+        root << build_element('Doklad', data[:doklad], data[:doklad_attributes]) if data.key? :doklad
+        root << build_element('Popis', data[:popis], data[:popis_attributes]) if data.key? :popis
+        root << build_element('Poznamka', data[:poznamka], data[:poznamka_attributes]) if data.key? :poznamka
+        root << build_element('TextPredPo', data[:text_pred_po], data[:text_pred_po_attributes]) if data.key? :text_pred_po
+        root << build_element('TextZaPol', data[:text_za_pol], data[:text_za_pol_attributes]) if data.key? :text_za_pol
+        root << build_element('Vystaveno', data[:vystaveno], data[:vystaveno_attributes]) if data.key? :vystaveno
+        root << build_element('Vyridit_do', data[:vyridit_do], data[:vyridit_do_attributes]) if data.key? :vyridit_do
+        root << build_element('Vyrizeno', data[:vyrizeno], data[:vyrizeno_attributes]) if data.key? :vyrizeno
         if data.key? :dod_odb
           root << DokladFirmaType.new('DodOdb', data[:dod_odb]).builder
         end
         if data.key? :konec_prij
           root << KonecPrijFirmaType.new('KonecPrij', data[:konec_prij]).builder
         end
-        root << build_element('KPFromOdb', data[:kp_from_odb]) if data.key? :kp_from_odb
-        root << build_element('SazbaDPH1', data[:sazba_dph1]) if data.key? :sazba_dph1
-        root << build_element('SazbaDPH2', data[:sazba_dph2]) if data.key? :sazba_dph2
+        root << build_element('KPFromOdb', data[:kp_from_odb], data[:kp_from_odb_attributes]) if data.key? :kp_from_odb
         if data.key? :souhrn_dph
           root << SouhrnDPHType.new('SouhrnDPH', data[:souhrn_dph]).builder
         end
-        root << build_element('Celkem', data[:celkem]) if data.key? :celkem
+        root << build_element('Celkem', data[:celkem], data[:celkem_attributes]) if data.key? :celkem
+        root << build_element('DRada', data[:d_rada], data[:d_rada_attributes]) if data.key? :d_rada
+        root << build_element('DCislo', data[:d_cislo], data[:d_cislo_attributes]) if data.key? :d_cislo
+        root << build_element('Stredisko', data[:stredisko], data[:stredisko_attributes]) if data.key? :stredisko
+        root << build_element('Zakazka', data[:zakazka], data[:zakazka_attributes]) if data.key? :zakazka
+        root << build_element('Cinnost', data[:cinnost], data[:cinnost_attributes]) if data.key? :cinnost
+        root << build_element('Vystavil', data[:vystavil], data[:vystavil_attributes]) if data.key? :vystavil
+        root << build_element('NeRezervov', data[:ne_rezervov], data[:ne_rezervov_attributes]) if data.key? :ne_rezervov
+        root << build_element('PevneCeny', data[:pevne_ceny], data[:pevne_ceny_attributes]) if data.key? :pevne_ceny
+        root << build_element('PlatPodm', data[:plat_podm], data[:plat_podm_attributes]) if data.key? :plat_podm
+        root << build_element('Doprava', data[:doprava], data[:doprava_attributes]) if data.key? :doprava
+        root << build_element('CasVystave', data[:cas_vystave], data[:cas_vystave_attributes]) if data.key? :cas_vystave
+        root << build_element('DatumVysta', data[:datum_vysta], data[:datum_vysta_attributes]) if data.key? :datum_vysta
+        root << build_element('Nadpis', data[:nadpis], data[:nadpis_attributes]) if data.key? :nadpis
+        root << build_element('VyriditNej', data[:vyridit_nej], data[:vyridit_nej_attributes]) if data.key? :vyridit_nej
+        root << build_element('ZkratkaTyp', data[:zkratka_typ], data[:zkratka_typ_attributes]) if data.key? :zkratka_typ
+        root << build_element('PrimDoklad', data[:prim_doklad], data[:prim_doklad_attributes]) if data.key? :prim_doklad
+        root << build_element('VarSymbol', data[:var_symbol], data[:var_symbol_attributes]) if data.key? :var_symbol
+        root << build_element('NeVyrizova', data[:ne_vyrizova], data[:ne_vyrizova_attributes]) if data.key? :ne_vyrizova
+        root << build_element('SizDecDPH', data[:siz_dec_dph], data[:siz_dec_dph_attributes]) if data.key? :siz_dec_dph
+        root << build_element('SizDecCelk', data[:siz_dec_celk], data[:siz_dec_celk_attributes]) if data.key? :siz_dec_celk
+        root << build_element('ZobrPoznVy', data[:zobr_pozn_vy], data[:zobr_pozn_vy_attributes]) if data.key? :zobr_pozn_vy
+        root << build_element('StatMOSS', data[:stat_moss], data[:stat_moss_attributes]) if data.key? :stat_moss
+        root << build_element('TypTransakce', data[:typ_transakce], data[:typ_transakce_attributes]) if data.key? :typ_transakce
+        root << build_element('DodaciPodm', data[:dodaci_podm], data[:dodaci_podm_attributes]) if data.key? :dodaci_podm
+        root << build_element('DruhDopravy', data[:druh_dopravy], data[:druh_dopravy_attributes]) if data.key? :druh_dopravy
+        root << build_element('StOdeslUrc', data[:st_odesl_urc], data[:st_odesl_urc_attributes]) if data.key? :st_odesl_urc
         if data.key? :valuty
           root << Valuty2.new('Valuty', data[:valuty]).builder
         end
-        root << build_element('DRada', data[:d_rada]) if data.key? :d_rada
-        root << build_element('DCislo', data[:d_cislo]) if data.key? :d_cislo
-        root << build_element('Stredisko', data[:stredisko]) if data.key? :stredisko
-        root << build_element('Zakazka', data[:zakazka]) if data.key? :zakazka
-        root << build_element('Cinnost', data[:cinnost]) if data.key? :cinnost
-        root << build_element('Vystavil', data[:vystavil]) if data.key? :vystavil
-        root << build_element('NeRezervov', data[:ne_rezervov]) if data.key? :ne_rezervov
-        root << build_element('PevneCeny', data[:pevne_ceny]) if data.key? :pevne_ceny
-        root << build_element('PlatPodm', data[:plat_podm]) if data.key? :plat_podm
-        root << build_element('Doprava', data[:doprava]) if data.key? :doprava
-        root << build_element('CasVystave', data[:cas_vystave]) if data.key? :cas_vystave
-        root << build_element('DatumVysta', data[:datum_vysta]) if data.key? :datum_vysta
-        root << build_element('Nadpis', data[:nadpis]) if data.key? :nadpis
-        root << build_element('VyriditNej', data[:vyridit_nej]) if data.key? :vyridit_nej
-        root << build_element('ZkratkaTyp', data[:zkratka_typ]) if data.key? :zkratka_typ
-        root << build_element('PrimDoklad', data[:prim_doklad]) if data.key? :prim_doklad
-        root << build_element('VarSymbol', data[:var_symbol]) if data.key? :var_symbol
-        root << build_element('NeVyrizova', data[:ne_vyrizova]) if data.key? :ne_vyrizova
-        root << build_element('SizDecDPH', data[:siz_dec_dph]) if data.key? :siz_dec_dph
-        root << build_element('SizDecCelk', data[:siz_dec_celk]) if data.key? :siz_dec_celk
-        root << build_element('ZobrPoznVy', data[:zobr_pozn_vy]) if data.key? :zobr_pozn_vy
-        root << build_element('StatMOSS', data[:stat_moss]) if data.key? :stat_moss
-        root << build_element('TypTransakce', data[:typ_transakce]) if data.key? :typ_transakce
-        root << build_element('DodaciPodm', data[:dodaci_podm]) if data.key? :dodaci_podm
-        root << build_element('DruhDopravy', data[:druh_dopravy]) if data.key? :druh_dopravy
-        root << build_element('StOdeslUrc', data[:st_odesl_urc]) if data.key? :st_odesl_urc
-        root << build_element('Sleva', data[:sleva]) if data.key? :sleva
+        root << build_element('ZpVypDPH', data[:zp_vyp_dph], data[:zp_vyp_dph_attributes]) if data.key? :zp_vyp_dph
+        root << build_element('SazbaDPH1', data[:sazba_dph1], data[:sazba_dph1_attributes]) if data.key? :sazba_dph1
+        root << build_element('SazbaDPH2', data[:sazba_dph2], data[:sazba_dph2_attributes]) if data.key? :sazba_dph2
+        root << build_element('Sleva', data[:sleva], data[:sleva_attributes]) if data.key? :sleva
         if data.key? :eshop
           root << Eshop3.new('eshop', data[:eshop]).builder
         end
-        root << build_element('Pojisteno', data[:pojisteno]) if data.key? :pojisteno
+        root << build_element('Pojisteno', data[:pojisteno], data[:pojisteno_attributes]) if data.key? :pojisteno
         if data.key? :prepravce
           root << PrepravceType.new('Prepravce', data[:prepravce]).builder
         end
@@ -98,6 +97,7 @@ module MoneyS3
           data[:dokumenty].map { |i| Ox::Element.new('Dokument') << i }.each { |i| element << i }
           root << element
         end
+        root << build_element('UzivatelskaPole', data[:uzivatelska_pole], data[:uzivatelska_pole_attributes]) if data.key? :uzivatelska_pole
 
         root
       end

data/lib/money_s3/builders/osoba_type.rb

@@ -5,18 +5,16 @@ module MoneyS3
 
       def builder
         root = Ox::Element.new(name)
-        if data.respond_to? :attributes
-          data.attributes.each { |k, v| root[k] = v }
-        end
+        root = add_attributes_and_namespaces(root)
 
-        root << build_element('Osloveni', data[:osloveni]) if data.key? :osloveni
-        root << build_element('TitulPred', data[:titul_pred]) if data.key? :titul_pred
-        root << build_element('TitulZa', data[:titul_za]) if data.key? :titul_za
-        root << build_element('Jmeno', data[:jmeno]) if data.key? :jmeno
-        root << build_element('Prijmeni', data[:prijmeni]) if data.key? :prijmeni
-        root << build_element('DatNar', data[:dat_nar]) if data.key? :dat_nar
-        root << build_element('Pohlavi', data[:pohlavi]) if data.key? :pohlavi
-        root << build_element('Funkce', data[:funkce]) if data.key? :funkce
+        root << build_element('Osloveni', data[:osloveni], data[:osloveni_attributes]) if data.key? :osloveni
+        root << build_element('TitulPred', data[:titul_pred], data[:titul_pred_attributes]) if data.key? :titul_pred
+        root << build_element('TitulZa', data[:titul_za], data[:titul_za_attributes]) if data.key? :titul_za
+        root << build_element('Jmeno', data[:jmeno], data[:jmeno_attributes]) if data.key? :jmeno
+        root << build_element('Prijmeni', data[:prijmeni], data[:prijmeni_attributes]) if data.key? :prijmeni
+        root << build_element('DatNar', data[:dat_nar], data[:dat_nar_attributes]) if data.key? :dat_nar
+        root << build_element('Pohlavi', data[:pohlavi], data[:pohlavi_attributes]) if data.key? :pohlavi
+        root << build_element('Funkce', data[:funkce], data[:funkce_attributes]) if data.key? :funkce
         if data.key? :adresa
           root << AdresaType.new('Adresa', data[:adresa]).builder
         end
@@ -29,14 +27,14 @@ module MoneyS3
         if data.key? :mobil
           root << TelefonType.new('Mobil', data[:mobil]).builder
         end
-        root << build_element('Spojeni', data[:spojeni]) if data.key? :spojeni
-        root << build_element('EMail', data[:e_mail]) if data.key? :e_mail
-        root << build_element('Mail', data[:mail]) if data.key? :mail
-        root << build_element('MailDatum', data[:mail_datum]) if data.key? :mail_datum
-        root << build_element('Pozn', data[:pozn]) if data.key? :pozn
-        root << build_element('KodPartn', data[:kod_partn]) if data.key? :kod_partn
-        root << build_element('GUID', data[:guid]) if data.key? :guid
-        root << build_element('Jednatel', data[:jednatel]) if data.key? :jednatel
+        root << build_element('Spojeni', data[:spojeni], data[:spojeni_attributes]) if data.key? :spojeni
+        root << build_element('EMail', data[:e_mail], data[:e_mail_attributes]) if data.key? :e_mail
+        root << build_element('Mail', data[:mail], data[:mail_attributes]) if data.key? :mail
+        root << build_element('MailDatum', data[:mail_datum], data[:mail_datum_attributes]) if data.key? :mail_datum
+        root << build_element('Pozn', data[:pozn], data[:pozn_attributes]) if data.key? :pozn
+        root << build_element('KodPartn', data[:kod_partn], data[:kod_partn_attributes]) if data.key? :kod_partn
+        root << build_element('GUID', data[:guid], data[:guid_attributes]) if data.key? :guid
+        root << build_element('Jednatel', data[:jednatel], data[:jednatel_attributes]) if data.key? :jednatel
 
         root
       end