fina_files 0.2.0 → 0.2.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +12 -4
  3. data/lib/fina_files/version.rb +1 -1
  4. data/lib/fina_files/zbrojni_nalog_generator.rb +2 -2
  5. data/spec/fina_files/zbrojni_nalog_generator_spec.rb +9 -2
  6. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 28fb8fae7b8da73168813d10fbf14b7260a59cc0
4
- data.tar.gz: b1ba29c8b27ba5f88c91127448e96de6acccae5d
3
+ metadata.gz: afb8b14398d5d56e18ac5319a5c5e44c94060ed4
4
+ data.tar.gz: 5df63dc40160b87d7e430b41a1f212f295da1911
5
5
  SHA512:
6
- metadata.gz: 097b7623f4ec54deb46cbb54ead32b00bb1e43e18ae8ce78b0d4845381aad27afec6877015088a9b5f2dd7afb377725e645837df3ff5b37cb008da6f8ffaedde
7
- data.tar.gz: c015a328599561f52511653ef41415ea091d918a6f21413fd894a872cfd4b7a1d5fa6f4379af7fd3cca2bfa805606a6d543ad16a667e4c50c1bc7dd568134994
6
+ metadata.gz: 1a3331a2bb597d449fbaea6d93f91484ec9d922aeb6375301b98ab9f509072aad344a4c98aea4da65fa24589aa85a7642d1af9b4823893a9e164374e3bbed94a
7
+ data.tar.gz: a3f2d4d44f53893fecb43efa4b73fe2d2275d1ece94ee47f79a9b54ad3d7d2df0e57ef19138e3a75ce37de6b7b8476bd67d248378353b7bbe010696125d463f2
data/README.md CHANGED
@@ -82,12 +82,12 @@ ZbrojniNalogGenerator.new("HR3624840081105230796").tap do |result|
82
82
  porez_na_kapitalnu = (BigDecimal.new('0.164958062')*avans_dobiti).round(2) #za Zagreb
83
83
 
84
84
  if !avans_dobiti.nil? && avans_dobiti > 0
85
- result.nalozi << [ "HR99", "Avans dobiti", Doprinosi.get_iban("2484008-55555555555"), "Marko Jurjevac", avans_dobiti ]
86
- result.nalozi << [ "HR681910-OIB", "Porez i prirez na kapitalnu dobit", Doprinosi.get_iban("1001005-1713312009"), "POREZ I PRIREZ NA DOHODAK", porez_na_kapitalnu]
85
+ result.nalozi << [ "HR99", "HR99", "Avans dobiti", Doprinosi.get_iban("2484008-55555555555"), "Marko Jurjevac", avans_dobiti ]
86
+ result.nalozi << [ "HR99", "HR681910-OIB", "Porez i prirez na kapitalnu dobit", Doprinosi.get_iban("1001005-1713312009"), "POREZ I PRIREZ NA DOHODAK", porez_na_kapitalnu]
87
87
  end
88
88
 
89
- result.nalozi << [ "HR99",'Najam poslovnog prostora', Doprinosi.get_iban("2340009-3555555146"),"Ante Markovic", 5530.0 ]
90
- result.nalozi << [ "HR99",'Usluge', Doprinosi.get_iban("2340009-3555555555"),"Marko Markovic", 1000.0 ]
89
+ result.nalozi << [ "HR99", "HR99",'Najam poslovnog prostora', Doprinosi.get_iban("2340009-3555555146"),"Ante Markovic", 5530.0 ]
90
+ result.nalozi << [ "HR99", "HR99",'Usluge', Doprinosi.get_iban("2340009-3555555555"),"Marko Markovic", 1000.0 ]
91
91
 
92
92
  result.export('~/Desktop/doprinosi.hub3')
93
93
  end
@@ -138,3 +138,11 @@ Doprinosi na placu - poziv na broj/popravak
138
138
  0.2.0
139
139
  Novi poziv na broj - isplata redovne place
140
140
  HR69 40002-OIB-100
141
+
142
+
143
+ 0.2.1
144
+ Novi poziv na broj odobrenja za isplatu place
145
+ HR67 OIB-JJOPD-0
146
+
147
+ 0.2.3
148
+ Dodan poziv na broj odobrenja(platitelja) kao prvi podatak naloga
data/lib/fina_files/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module FinaFiles
2
- VERSION = "0.2.0"
2
+ VERSION = "0.2.2"
3
3
  end
data/lib/fina_files/zbrojni_nalog_generator.rb CHANGED
@@ -27,13 +27,13 @@ class ZbrojniNalogGenerator
27
27
  end
28
28
 
29
29
  def row_309(nalog)
30
- nalog[2].ljust(34) + nalog[3].ljust(70) + " "*103 + nalog[1].ljust(140) +("%016.2f" % nalog[4]).gsub(".","") + nalog[0].gsub(" ","").ljust(26) + " "*159 + "0" + " "*449 + "309"
30
+ nalog[3].ljust(34) + nalog[4].ljust(70) + " "*73 + nalog[0].gsub(" ","").ljust(26) + " "*4 + nalog[2].ljust(140) +("%016.2f" % nalog[5]).gsub(".","") + nalog[1].gsub(" ","").ljust(26) + " "*159 + "0" + " "*449 + "309"
31
31
  end
32
32
 
33
33
  def zbroj_to_s
34
34
  raise 'nema naloga' if nalozi.count == 0
35
35
  amount = nalozi.map do |nalog|
36
- BigDecimal.new(nalog[4].to_s).round(2)
36
+ BigDecimal.new(nalog[5].to_s).round(2)
37
37
  end.reduce(:+)
38
38
  ("%021.2f" % amount).gsub(".","")
39
39
  end
data/spec/fina_files/zbrojni_nalog_generator_spec.rb CHANGED
@@ -1,9 +1,14 @@
1
1
  #encoding:utf-8
2
2
  require 'fina_files/zbrojni_nalog_generator'
3
3
 
4
+ RSpec.configure do |config|
5
+ config.expect_with(:rspec) { |c| c.syntax = :should }
6
+ end
7
+
4
8
  describe ZbrojniNalogGenerator do
5
9
  NALOZI = [
6
10
  [
11
+ "HR99",
7
12
  "HR68 8109-58914703561-1209",
8
13
  "MIO I STUP",
9
14
  "1001005-1863000160",
@@ -11,6 +16,7 @@ describe ZbrojniNalogGenerator do
11
16
  574.6
12
17
  ],
13
18
  [
19
+ "HR67 48923563560-16183-0",
14
20
  "HR68 2003-58914703561-1209",
15
21
  "MIO II STUP",
16
22
  "1001005-1700036001",
@@ -40,7 +46,8 @@ describe ZbrojniNalogGenerator do
40
46
  it 'stavlja red 309 prvi' do
41
47
  subject.datum = DateTime.parse('2012-07-25')
42
48
  subject.nalozi = NALOZI
43
- subject.rows[2].should == "1001005-1863000160" + " "*16 + "DRŽAVNI PRORAČUN REPUBLIKE HRVATSKE" + " "*35 + " "*103 +
49
+ subject.rows[2].should == "1001005-1863000160" + " "*16 + "DRŽAVNI PRORAČUN REPUBLIKE HRVATSKE" + " "*35 + " "*73 +
50
+ "HR99" + " "*22 + " "*4 +
44
51
  "MIO I STUP" + " "*130 + "000000000057460" + "HR68" + "8109-58914703561-1209 " + " "*159 + "0" + " "*449 + "309"
45
52
  subject.rows[2].length.should == 1000
46
53
  end
@@ -48,7 +55,7 @@ describe ZbrojniNalogGenerator do
48
55
  it 'stavlja red 309 drugi' do
49
56
  subject.datum = DateTime.parse('2012-07-25')
50
57
  subject.nalozi = NALOZI
51
- subject.rows[3].should == "1001005-1700036001 DOPRINOS ZA MIROVINSKO OSIGURANJE MIO II STUP 000000000019153HR682003-58914703561-1209 0 309"
58
+ subject.rows[3].should == "1001005-1700036001 DOPRINOS ZA MIROVINSKO OSIGURANJE HR6748923563560-16183-0 MIO II STUP 000000000019153HR682003-58914703561-1209 0 309"
52
59
 
53
60
  subject.rows[3].length.should == 1000
54
61
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fina_files
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.0
4
+ version: 0.2.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - drKreso
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-07-01 00:00:00.000000000 Z
11
+ date: 2016-07-31 00:00:00.000000000 Z
12
12
  dependencies: []
13
13
  description: FINA formati na jednom mjestu
14
14
  email: