luca-jp 0.2.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 409f68316d30d3c2ebd44d2251c5bf158a93301f8c5d5561f69cf96a6332ab77
-  data.tar.gz: 20de0938d14d48f0bb733f5ca79fdb8c6f6157a0fac07114b82ae9851ae67688
+  metadata.gz: 3b66dbdc4bfe4b3dbde23a58cfff90901ca05fd0dc5b4b180c6f7229a24e499a
+  data.tar.gz: d90a7ae0ff13f5843aaec9fe482c6751bda8d50f87e7ff29f7a61635640f18ed
 SHA512:
-  metadata.gz: 6014749bc78f5fb165152e18c1828a783e2bb3bc2ce1bde618e1eeb5592dd94e613fbc1b40dd7a42560cd13601f75ec6018ff6eee97059d2b3bd1cac0e78b99b
-  data.tar.gz: f3b1c7a59698c5c5c9e9fbe35c0bab15da58ad970e5c7a867c9c23ce1e9844b543eafe14678f49a5174d109e51c0f0cc0e594b3c90f8a0a85f6d1020c9122e11
+  metadata.gz: 38b0a53ff70c2b5d145be4725d9866c6c37d727e14463acfe4e044c52fc30f977f2a44e70a2971ee882374c6529d5b1becca360e11bed9108e48bd1104dded06
+  data.tar.gz: 4ca2bae386c0a17f36454af98dbd8a1273b5756e12cc65ba73d790446e6376e3bd1384fc976931c5eb4b2404b84594e8743eb4f9f910bf632818e4e4daee9310

data/lib/luca/jp/aoiro.rb

@@ -27,6 +27,7 @@ module Luca
         @issue_date = Date.today
         @company = CGI.escapeHTML(config.dig('company', 'name'))
         @software = 'LucaJp'
+        @shinkoku_kbn = '30' # 確定申告
 
         @税額 = 税額計算
         @確定法人税額 = @税額.dig(:houjin, :kokuzei)
@@ -51,7 +52,8 @@ module Luca
         else
           @procedure_code = 'RHO0012'
           @procedure_name = '内国法人の確定申告(青色)'
-          @version = '20.0.2'
+          @form_vers = proc_version
+          @version = @form_vers['proc']
           @都道府県民税法人税割中間納付 = prepaid_tax('1859')
           @都道府県民税均等割中間納付 = prepaid_tax('185A')
           @都道府県民税中間納付 = @都道府県民税法人税割中間納付 + @都道府県民税均等割中間納付
@@ -116,6 +118,7 @@ module Luca
       end
 
       def 別表一
+        STDERR.puts "別表一： 「決算確定の日」などの追記が必要"
         render_erb(search_template('beppyo1.xml.erb'))
       end
 
@@ -148,6 +151,15 @@ module Luca
       end
 
       def 別表五一
+        @期首資本金 = readable(@start_balance.dig('911'))
+        @資本金期中減, @資本金期中増 = 純資産期中増減('911')
+        @期首資本準備金, @期末資本準備金 = 期首期末残高('9131')
+        @資本準備金期中減, @資本準備金期中増 = 純資産期中増減('9131')
+        @期首その他資本剰余金, @期末その他資本剰余金 = 期首期末残高('9132')
+        @その他資本剰余金期中減, @その他資本剰余金期中増 = 純資産期中増減('9132')
+        @期首自己株式, @期末自己株式 = 期首期末残高('916')
+        @自己株式期中減, @自己株式期中増 = 純資産期中増減('916')
+        @資本金等の額期中減, @資本金等の額期中増 = 資本金等の額期中増減
         render_erb(search_template('beppyo51.xml.erb'))
       end
 
@@ -221,7 +233,7 @@ module Luca
         @代表者報酬 = gaikyo('C11')
         @代表者借入 = gaikyo('5121')
         @概況仕入 = gaikyo('B11') + gaikyo('B12')
-        @概況外注費 = gaikyo('C10')
+        @概況外注費 = gaikyo('C1O')
         @概況人件費 = gaikyo('C11') + gaikyo('C12') + gaikyo('C13')
         render_erb(search_template('gaikyo.xml.erb'))
       end
@@ -326,7 +338,9 @@ module Luca
       # TODO: 特定同族会社の判定
       #
       def 同族会社?
+        return nil if it_part_config('shihon_kin').nil?
         return nil if it_part_config('shihon_kin') > 100_000_000
+        return nil if 別表二上位議決権割合.nil? || 別表二上位株割合.nil?
 
         return true if 別表二上位議決権割合 > 50 || 別表二上位株割合 > 50
         false
@@ -509,7 +523,7 @@ module Luca
       end
 
       def 別表五一期中減差引金額
-        期首繰越損益 + @納税充当金期中減 - @法人税期中減 - @都道府県民税期中減 - @市民税期中減 - @翌期還付法人税 - @翌期還付都道府県住民税 - @翌期還付市民税
+        期首繰越損益 + @納税充当金期中減 - @法人税期中減 - @都道府県民税期中減 - @市民税期中減 - @法人税中間納付 - @地方法人税中間納付 - @都道府県民税中間納付 - @市民税中間納付
       end
 
       def 別表五一期中増差引金額
@@ -520,6 +534,23 @@ module Luca
         readable((@bs_data[code] || 0) * -1)
       end
 
+      def 別表五一期首資本
+        readable(@start_balance.dig('911')||0 + @start_balance.dig('913')||0)
+      end
+
+      # 資本金、資本準備金、その他資本剰余金、自己株式（控除）の合算
+      #
+      def 資本金等の額期中増減
+        inc = ['911', '913', '916'].map do |code|
+          credit_amount(code, @start_date.year, @start_date.month, @end_date.year, @end_date.month) || 0
+        end
+        dec = ['911', '913', '916'].map do |code|
+          debit_amount(code, @start_date.year, @start_date.month, @end_date.year, @end_date.month) || 0
+        end
+
+        [readable(dec.sum), readable(inc.sum)]
+      end
+
       def 別表七各期青色損失
         tags = @繰越損失管理.records
                  .filter { |record| record['start_date'] > @end_date.prev_year(10) && record['end_date'] < @start_date }
@@ -543,22 +574,6 @@ module Luca
         tags.compact.join("\n")
       end
 
-      def 期首資本金
-        readable(@start_balance.dig('911')) || 0
-      end
-
-      def 期末資本金
-        readable(@bs_data.dig('911')) || 0
-      end
-
-      def 別表五一期首資本
-        期首資本金
-      end
-
-      def 別表五一期末資本
-        期末資本金
-      end
-
       def 期首未納消費税
         readable(@start_balance.dig('516')) || 0
       end
@@ -575,10 +590,10 @@ module Luca
 
       def 概況源泉徴収種類
         tags = []
-        if credit_count('5191', @start_date.year, @start_date.month, @end_date.year, @end_date.month)
+        if credit_count('5191', @start_date.year, @start_date.month, @end_date.year, @end_date.month) > 0
           tags << render_attr('IAF03100', '<kubun_CD>1</kubun_CD>')
         end
-        if credit_count('5193', @start_date.year, @start_date.month, @end_date.year, @end_date.month)
+        if credit_count('5193', @start_date.year, @start_date.month, @end_date.year, @end_date.month) > 0
           tags << render_attr('IAF03200', '<kubun_CD>1</kubun_CD>')
         elsif credit_count('5194', @start_date.year, @start_date.month, @end_date.year, @end_date.month)
           tags << render_attr('IAF03200', '<kubun_CD>1</kubun_CD>')
@@ -603,7 +618,7 @@ module Luca
       end
 
       def 概況月外注費(idx)
-        gaikyo_month(idx, 'C10')
+        gaikyo_month(idx, 'C1O')
       end
 
       def 概況月源泉徴収(idx)
@@ -636,6 +651,14 @@ module Luca
         readable(@monthly.dig(index, code) || 0)
       end
 
+      def proc_version
+        if @end_date >= Date.parse('2021-4-1')
+          { 'proc' => '21.0.2', 'HOA112' => '3.1', 'HOA116' => '2.0', 'HOA420' => '20.0', 'HOA522' => '7.0', 'HOK010' => '6.0' }
+        else
+          { 'proc' => '20.0.2', 'HOA112' => '2.0', 'HOA116' => '1.0', 'HOA420' => '19.0', 'HOA522' => '6.0', 'HOK010' => '5.0' }
+        end
+      end
+
       def lib_path
         __dir__
       end

data/lib/luca/jp/chihouzei.rb

@@ -27,11 +27,11 @@ module Luca
         @jimusho_code = eltax_config('jimusho_code')
         @jimusho_name = eltax_config('jimusho_name')
         @app_version = eltax_config('app_version')
+        @form_vers = proc_version
 
         @税額 = 税額計算
         @均等割 = @税額.dig(:kenmin, :kintou)
-        @法人税割課税標準 = 法人税割課税標準
-        @確定法人税割 = (@税額.dig(:kenmin, :houjinzei) / 100).floor * 100
+        @確定法人税割 = @税額.dig(:kenmin, :houjinzei)
         @地方特別法人事業税中間納付 = prepaid_tax('1854')
         @所得割中間納付 = prepaid_tax('1855')
         @法人税割中間納付 = prepaid_tax('1859')
@@ -63,7 +63,7 @@ module Luca
         else
           @procedure_code = 'R0102100'
           @procedure_name = '法人都道府県民税・事業税・特別法人事業税又は地方法人特別税　確定申告'
-          @form_sec = ['R0102AA190', 'R0102AG120', 別表九フォーム].compact.map{ |c| form_attr(c) }.join('')
+          @form_sec = ["R0102AA#{@form_vers['R0102AA']}", "R0102AG120", 別表九フォーム].compact.map{ |c| form_attr(c) }.join('')
           @user_inf = render_erb(search_template('eltax-userinf.xml.erb'))
           @form_data = [第六号, 別表四三, 別表九].compact.join("\n")
           render_erb(search_template('eltax.xml.erb'))
@@ -118,7 +118,7 @@ module Luca
       def 別表九フォーム
         return nil if @繰越損失管理.records.length == 0
 
-        'R0102AM190'
+        "R0102AM#{@form_vers['R0102AM']}"
       end
 
       def 別表九
@@ -206,6 +206,14 @@ module Luca
         end
       end
 
+      def proc_version
+        if @start_date >= Date.parse('2020-4-1')
+          { 'R0102AA' => '200', 'R0102AM' => '200' }
+        else
+          { 'R0102AA' => '190', 'R0102AM' => '190' }
+        end
+      end
+
       def lib_path
         __dir__
       end

data/lib/luca/jp/common.rb

@@ -119,16 +119,17 @@ module Luca
         end
       end
 
+      # 100円未満切り捨て
       def 法人税割(法人税 = nil)
         課税標準 = if 法人税
                      (法人税 / 1000).floor * 1000
                    else
-                     @法人税割課税標準
+                     法人税割課税標準
                    end
         if config.dig('jp', 'eltax', 'office_23ku')
-          [(課税標準 * 7 / 100).floor, 0]
+          [(課税標準 * 7 / 100 / 100).floor * 100, 0]
         else
-          [(課税標準 * 1 / 100).floor, (課税標準 * 6 / 100).floor]
+          [(課税標準 * 1 / 100 / 100).floor * 100, (課税標準 * 6 / 100 / 100).floor * 100]
         end
       end
 
@@ -143,6 +144,7 @@ module Luca
         end
       end
 
+      # 100円未満切り捨て
       def 所得割400万以下(所得 = nil)
         ((所得400万以下(所得) * 3.5 / 100) / 100).floor * 100
       end
@@ -160,6 +162,7 @@ module Luca
         end
       end
 
+      # 100円未満切り捨て
       def 所得割800万以下(所得 = nil)
         ((所得800万以下(所得) * 5.3 / 100) / 100).floor * 100
       end
@@ -175,10 +178,12 @@ module Luca
         end
       end
 
+      # 100円未満切り捨て
       def 所得割800万超(所得 = nil)
         ((所得800万超(所得) * 7.0 / 100) / 100).floor * 100
       end
 
+      # 100円未満切り捨て
       def 地方法人特別税(事業税)
         ((事業税 * 37 / 100) / 100).floor * 100
       end
@@ -209,7 +214,7 @@ module Luca
 
       def 未納事業税期中増減
         r = gross_amount('5152', @start_date.year, @start_date.month, @end_date.year, @end_date.month)
-        [LucaSupport::Code.readable(r[0]), LucaSupport::Code.readable(r[1])]
+        [LucaSupport::Code.readable(r[1]), LucaSupport::Code.readable(r[0])]
       end
 
 
@@ -224,6 +229,17 @@ module Luca
       def 地方消費税中間納付額
         prepaid_tax('185C')
       end
+
+      # -----------------------------------------------------
+      # :section: 外形標準の計算
+      # -----------------------------------------------------
+      def 資本金等の額
+        readable(@bs_data.dig('911') + @bs_data.dig('913'))
+      end
+
+      def 期末資本金
+        readable(@bs_data.dig('911'))
+      end
     end
   end
 end

data/lib/luca/jp/it_part.rb

@@ -24,7 +24,7 @@ module Luca
         entries << %Q(<TETSUZUKI ID="TETSUZUKI"><procedure_CD>#{@procedure_code}</procedure_CD><procedure_NM>#{@procedure_name}</procedure_NM></TETSUZUKI>)
         entries.concat([jigyo_nendo_from, jigyo_nendo_to, kazei_kikan_from, kazei_kikan_to])
         entries << render_it_tag('keiri_sekininsha')
-        entries << '<SHINKOKU_KBN ID="SHINKOKU_KBN"><kubun_CD>30</kubun_CD></SHINKOKU_KBN>'
+        entries << %Q(<SHINKOKU_KBN ID="SHINKOKU_KBN"><kubun_CD>#{@shinkoku_kbn}</kubun_CD></SHINKOKU_KBN>)
         entries.concat(['eltax_id'].map{ |key| render_it_tag(key) })
         entries << '</IT>'
         entries.compact.join("\n")

data/lib/luca/jp/syouhizei.rb

@@ -27,6 +27,7 @@ module Luca
         @issue_date = Date.today
         @company = CGI.escapeHTML(config.dig('company', 'name'))
         @software = 'LucaJp'
+        @shinkoku_kbn = '1' # 確定申告
         税率 = BigDecimal('7.8') # percent
         地方税率 = BigDecimal('2.2')
 
@@ -52,7 +53,8 @@ module Luca
         else
           @procedure_code = 'RSH0040'
           @procedure_name = '消費税及び地方消費税申告(簡易課税・法人)'
-          @version = '20.0.0'
+          @form_vers = proc_version
+          @version = @form_vers['proc']
           @form_sec = ['SHA020', 'SHB047', 'SHB067'].map{ |c| form_rdf(c) }.join('')
           @it = it_part
           @form_data = [申告書簡易課税, 付表四の三, 付表五の三].join("\n")
@@ -142,6 +144,14 @@ module Luca
         render_attr(tags[0], [amount, share].join(''))
       end
 
+      def proc_version
+        if @end_date >= Date.parse('2021-4-1')
+          { 'proc' => '20.0.1', 'SHA020' => '7.1' }
+        else
+          { 'proc' => '20.0.0', 'SHA020' => '7.0' }
+        end
+      end
+
       def lib_path
         __dir__
       end

data/lib/luca/jp/templates/beppyo1-next.xml.erb

@@ -1,4 +1,4 @@
-<HOA116 page="1" VR="1.0" id="HOA116" sakuseiNM="<%= @company %>" softNM="<%= @software %> <%= @company %>" sakuseiDay="<%= @issue_date %>">
+<HOA116 page="1" VR="<%= @form_vers['HOA116'] %>" id="HOA116" sakuseiNM="<%= @company %>" softNM="<%= @software %> <%= @company %>" sakuseiDay="<%= @issue_date %>">
 
     <QHA00000><QHA00010>
         <QHA00020 IDREF="JIGYO_NENDO_FROM"/>
@@ -24,7 +24,9 @@
     <QHC00000>
         <%= render_attr('QHC00010', @地方法人税課税標準) %>
         <QHC00030>
-            <QHC00040><kubun_CD>2</kubun_CD></QHC00040><%# 10.3% %>
+            <% if @form_vers['HOA116'] == '1.0' %>
+                <QHC00040><kubun_CD>2</kubun_CD></QHC00040><%# 10.3% %>
+            <% end %>
             <%= render_attr('QHC00050', 地方法人税額(@地方法人税課税標準)) %>
         </QHC00030>
     </QHC00000>

data/lib/luca/jp/templates/beppyo1.xml.erb

@@ -1,4 +1,4 @@
-<HOA112 page="1" VR="2.0" id="HOA112" sakuseiNM="<%= @company %>" softNM="<%= @software %> <%= @company %>" sakuseiDay="<%= @issue_date %>">
+<HOA112 page="1" VR="<%= @form_vers['HOA112'] %>" id="HOA112" sakuseiNM="<%= @company %>" softNM="<%= @software %> <%= @company %>" sakuseiDay="<%= @issue_date %>">
     <BGA00000>
         <BGA00010 IDREF="TEISYUTSU_DAY"/>
         <BGA00020 IDREF="ZEIMUSHO"/>

data/lib/luca/jp/templates/beppyo4.xml.erb

@@ -1,4 +1,4 @@
-<HOA420 page="1" VR="19.0" id="HOA420" sakuseiNM="<%= @company %>" softNM="<%= @software %> <%= @company %>" sakuseiDay="<%= @issue_date %>">
+<HOA420 page="1" VR="<%= @form_vers['HOA420'] %>" id="HOA420" sakuseiNM="<%= @company %>" softNM="<%= @software %> <%= @company %>" sakuseiDay="<%= @issue_date %>">
     <ARA00000>
         <ARA00010>
             <ARA00020 IDREF="JIGYO_NENDO_FROM"/>

data/lib/luca/jp/templates/beppyo51.xml.erb

@@ -31,7 +31,7 @@
             <ICB00530>
                 <%= render_attr('ICB00540', 期首未納法人税) %>
                 <ICB00550>
-                    <%= render_attr('ICB00560', @法人税期中減 + @翌期還付法人税) %>
+                    <%= render_attr('ICB00560', @法人税期中減 + @法人税中間納付 + @地方法人税中間納付) %>
                     <ICB00570>
                         <%= render_attr('ICB00580', @法人税中間納付 + @地方法人税中間納付) %>
                         <%= render_attr('ICB00590', 期末未納法人税) %>
@@ -42,7 +42,7 @@
             <ICB00620>
                 <%= render_attr('ICB00630', 期首未納都道府県民税) %>
                 <ICB00640>
-                    <%= render_attr('ICB00650', @都道府県民税期中減 + @翌期還付都道府県住民税) %>
+                    <%= render_attr('ICB00650', @都道府県民税期中減 + @都道府県民税中間納付) %>
                     <ICB00660>
                         <%= render_attr('ICB00670', @都道府県民税中間納付) %>
                         <%= render_attr('ICB00680', 期末未納都道府県民税) %>
@@ -53,7 +53,7 @@
             <ICB00710>
                 <%= render_attr('ICB00720', 期首未納市民税) %>
                 <ICB00730>
-                    <%= render_attr('ICB00740', @市民税期中減 + @翌期還付市民税) %>
+                    <%= render_attr('ICB00740', @市民税期中減 + @市民税中間納付) %>
                     <ICB00750>
                         <%= render_attr('ICB00760', @市民税中間納付) %>
                         <%= render_attr('ICB00770', 期末未納市民税) %>
@@ -73,20 +73,50 @@
     </ICB00000>
     <ICC00000>
         <ICC00010>
-            <%= render_attr('ICC00020', 期首資本金) %>
+            <%= render_attr('ICC00020', @期首資本金) %>
             <ICC00030>
-                <%= render_attr('ICC00040', 期首資本金) %>
-                <%= render_attr('ICC00050', 期末資本金) %>
+                <%= render_attr('ICC00040', @資本金期中減) %>
+                <%= render_attr('ICC00050', @資本金期中増) %>
             </ICC00030>
             <%= render_attr('ICC00060', 期末資本金) %>
         </ICC00010>
+        <ICC00070>
+            <%= render_attr('ICC00080', @期首資本準備金) %>
+            <ICC00090>
+                <%= render_attr('ICC00100', @資本準備金期中減) %>
+                <%= render_attr('ICC00110', @資本準備金期中増) %>
+            </ICC00090>
+            <%= render_attr('ICC00120', @期末資本準備金) %>
+        </ICC00070>
+        <% unless [@期首その他資本剰余金, @その他資本剰余金期中減, @その他資本剰余金期中増, @期末その他資本剰余金].reject { |i| i == 0 }.compact.empty? %>
+        <ICC00130>
+            <%= render_attr('ICC00140', 'その他資本剰余金') %>
+            <%= render_attr('ICC00150', @期首その他資本剰余金) %>
+            <ICC00160>
+                <%= render_attr('ICC00170', @その他資本剰余金期中減) %>
+                <%= render_attr('ICC00180', @その他資本剰余金期中増) %>
+            </ICC00160>
+            <%= render_attr('ICC00190', @期末その他資本剰余金) %>
+        </ICC00130>
+        <% end %>
+        <% unless [@期首自己株式, @自己株式期中減, @自己株式期中増, @期末自己株式].reject { |i| i == 0 }.compact.empty? %>
+            <ICC00130>
+                <%= render_attr('ICC00140', '自己株式') %>
+                <%= render_attr('ICC00150', @期首自己株式) %>
+                <ICC00160>
+                    <%= render_attr('ICC00170', @自己株式期中減) %>
+                    <%= render_attr('ICC00180', @自己株式期中増) %>
+                </ICC00160>
+                <%= render_attr('ICC00190', @期末自己株式) %>
+            </ICC00130>
+        <% end %>
         <ICC00200>
             <%= render_attr('ICC00210', 別表五一期首資本) %>
             <ICC00220>
-                <%= render_attr('ICC00230', 別表五一期首資本) %>
-                <%= render_attr('ICC00240', 別表五一期末資本) %>
+                <%= render_attr('ICC00230', @資本金等の額期中減) %>
+                <%= render_attr('ICC00240', @資本金等の額期中増) %>
             </ICC00220>
-            <%= render_attr('ICC00250', 別表五一期末資本) %>
+            <%= render_attr('ICC00250', 資本金等の額) %>
         </ICC00200>
     </ICC00000>
 </HOA511>

data/lib/luca/jp/templates/beppyo52.xml.erb

@@ -1,4 +1,4 @@
-<HOA522 page="1" VR="6.0" id="HOA522" sakuseiNM="<%= @company %>" softNM="<%= @software %> <%= @company %>" sakuseiDay="<%= @issue_date %>">
+<HOA522 page="1" VR="<%= @form_vers['HOA522'] %>" id="HOA522" sakuseiNM="<%= @company %>" softNM="<%= @software %> <%= @company %>" sakuseiDay="<%= @issue_date %>">
     <IEA00000>
         <IEA00010>
             <IEA00020 IDREF="JIGYO_NENDO_FROM"/>

data/lib/luca/jp/templates/el-no6-9.xml.erb

@@ -1,4 +1,4 @@
-<R0102AM190 xmlns="http://eltax.jp/HOJIN_DOFUKEN" vr="190" page="" seiseiSoft="<%= @software %>" seiseiVr="1" seiseiDay="<%= Date.today.strftime('%Y%m%d') %>" seiseiNM="<%= it_part_config('nozeisha_nm') %>" koshinSoft="" koshinVr="" koshinDay="" koshinNM="" taari="">
+<R0102AM<%= @form_vers['R0102AM'] %> xmlns="http://eltax.jp/HOJIN_DOFUKEN" vr="<%= @form_vers['R0102AM'] %>" page="" seiseiSoft="<%= @software %>" seiseiVr="1" seiseiDay="<%= Date.today.strftime('%Y%m%d') %>" seiseiNM="<%= it_part_config('nozeisha_nm') %>" koshinSoft="" koshinVr="" koshinDay="" koshinNM="" taari="">
         <AMA_JIGYO_SDATE idref="SDATE">
             <gen:era></gen:era><gen:yy></gen:yy><gen:mm></gen:mm><gen:dd></gen:dd>
             <gen:yyyymmdd></gen:yyyymmdd>
@@ -48,4 +48,4 @@
         </AMC00500>
         <AMC00600 />
         <AMC00700 />
-</R0102AM190>
+</R0102AM<%= @form_vers['R0102AM'] %>>

data/lib/luca/jp/templates/el-no6.xml.erb

@@ -1,4 +1,4 @@
-<R0102AA190 xmlns="http://eltax.jp/HOJIN_DOFUKEN" vr="190" page="" seiseiSoft="<%= @software %>" seiseiVr="1" seiseiDay="<%= Date.today.strftime('%Y%m%d') %>" seiseiNM="<%= it_part_config('nozeisha_nm') %>" koshinSoft="" koshinVr="" koshinDay="" koshinNM="" taari="">
+<R0102AA<%= @form_vers['R0102AA'] %> xmlns="http://eltax.jp/HOJIN_DOFUKEN" vr="<%= @form_vers['R0102AA'] %>" page="" seiseiSoft="<%= @software %>" seiseiVr="1" seiseiDay="<%= Date.today.strftime('%Y%m%d') %>" seiseiNM="<%= it_part_config('nozeisha_nm') %>" koshinSoft="" koshinVr="" koshinDay="" koshinNM="" taari="">
 <AAA00100 idref="SEIRI_NUM" />
         <AAA00200 idref="JIMUSHO_NUM"></AAA00200>
         <AAA00300 idref="HOJIN_NUM"></AAA00300>
@@ -19,10 +19,10 @@
             <gen:dd></gen:dd>
           </AAA00700>
         <AAA00800>
-          <gen:era />
-          <gen:yy />
-          <gen:mm />
-          <gen:dd />
+          <gen:era><%= gengou(@issue_date) %></gen:era>
+          <gen:yy><%= wareki(@issue_date) %></gen:yy>
+          <gen:mm><%= @issue_date.month %></gen:mm>
+          <gen:dd><%= @issue_date.day %></gen:dd>
         </AAA00800>
         <AAA00900 idref="ORG1_NAME"></AAA00900>
         <AAA_HONTEN_ZIP idref="HONTEN_ZIP"></AAA_HONTEN_ZIP>
@@ -41,9 +41,9 @@
         <AAA_SHIHON idref="SHIHON"></AAA_SHIHON>
         <AAA_SHIHON3></AAA_SHIHON3>
         <AAA_SHIHON4></AAA_SHIHON4>
-        <AAA_SHIHON2><%= @資本金準備金 %></AAA_SHIHON2>
+        <AAA_SHIHON2><%= 資本金等の額 %></AAA_SHIHON2>
         <AAA_SHIHON5><%= @資本金準備金 %></AAA_SHIHON5>
-        <AAA_SHIHON6><%= @資本金準備金 %></AAA_SHIHON6>
+        <AAA_SHIHON6><%= 資本金等の額 %></AAA_SHIHON6>
         <AAA_JIGYO_SDATE idref="SDATE">
             <gen:era></gen:era>
             <gen:yy></gen:yy>
@@ -61,7 +61,7 @@
         <AAA_RPT_KBN idref="RPT_NAME">確定</AAA_RPT_KBN>
         <AAA01200 />
         <AAB00100 />
-        <AAB00110><%= 法人税割課税標準 %></AAB00110>
+        <AAB00110><%= @税額.dig(:houjin, :kokuzei) %></AAB00110>
         <AAB00200 />
         <AAB00400 />
         <AAB00500 />
@@ -85,7 +85,7 @@
         <AAB02100><%= 納付税額(@確定法人税割, @法人税割中間納付) + 納付税額(@均等割, @均等割中間納付) %></AAB02100>
         <AAB02200 />
         <AAB02300><%= 納付税額(@確定法人税割, @法人税割中間納付) + 納付税額(@均等割, @均等割中間納付) %></AAB02300>
-        <AAC00100><%= @法人税割課税標準 %></AAC00100>
+        <AAC00100><%= 法人税割課税標準 %></AAC00100>
         <AAC00200>7.0</AAC00200>
         <AAC00210><%= 法人税割[0] %></AAC00210>
         <AAC00300 />
@@ -119,7 +119,9 @@
         <AAE00810 />
         <AAE00820 />
         <%= render_attr('AAE00900', @所得割) %>
-        <AAE00950 />
+        <% if @form_vers['R0102AA'] == '190' %>
+            <AAE00950 />
+        <% end %>
         <AAE00960 />
         <AAE01000 />
         <AAE01050 />
@@ -195,4 +197,4 @@
         <AAI00800 />
         <AAJ_DAIRI_NAME></AAJ_DAIRI_NAME>
         <AAJ_DAIRI_TEL_NUM></AAJ_DAIRI_TEL_NUM>
-</R0102AA190>
+</R0102AA<%= @form_vers['R0102AA'] %>>

data/lib/luca/jp/templates/eltax.xml.erb

@@ -3,8 +3,8 @@
     <KOUSEI_KANRI_INF id="KOUSEI_KANRI_INF">
         <KOUSEI_KANRI id="KOUSEI_KANRI">
             <KANRI_INF id="KANRI_INF">
-                <KOUSEI_KANRI_VR>0001</KOUSEI_KANRI_VR>
-                <ORG1_CD>13000</ORG1_CD>
+                <KOUSEI_KANRI_VR>0001</KOUSEI_KANRI_VR><%# 固定値 %>
+                <ORG1_CD>13000</ORG1_CD><%# 地方公共団体コード %>
                 <PROC_ID><%= @procedure_code %></PROC_ID>
                 <PROC_NAME><%= @procedure_name %></PROC_NAME>
                 <FIRST_RCPT_NUM></FIRST_RCPT_NUM>
@@ -12,9 +12,9 @@
             <%= @form_sec %>
             <GYOMU_PROC id="GYOMU_PROC">
                 <PROC_INF id="PROC_INF">
-                    <GYOMU_KBN id="GYOMU_KBN">R0</GYOMU_KBN>
-                    <ORG2_CD id="ORG2_CD"><%= @jimusho_code %></ORG2_CD>
-                    <ORG3_CD id="ORG3_CD">000000</ORG3_CD>
+                    <GYOMU_KBN id="GYOMU_KBN">R0</GYOMU_KBN><%# 申告 %>
+                    <ORG2_CD id="ORG2_CD"><%= @jimusho_code %></ORG2_CD><%# 税務事務所 %>
+                    <ORG3_CD id="ORG3_CD">000000</ORG3_CD><%# 固定値 %>
                     <ORG1_NAME id="ORG1_NAME"><%= @jimusho_name %></ORG1_NAME>
                     <SDATE id="SDATE">
                         <gen:era><%= gengou(@start_date) %></gen:era>
@@ -40,7 +40,7 @@
                     <RPT_KBN id="RPT_KBN">100</RPT_KBN>
                     <TAX_NAME id="TAX_NAME">法人都道府県民税・事業税・特別法人事業税又は地方法人特別税</TAX_NAME>
                     <RPT_NAME id="RPT_NAME">確定</RPT_NAME>
-                    <MAKE_KBN id="MAKE_KBN">1</MAKE_KBN>
+                    <MAKE_KBN id="MAKE_KBN">1</MAKE_KBN><%# 新規 %>
                     <REV_RCPT_NUM id="REV_RCPT_NUM"></REV_RCPT_NUM>
                 </PROC_INF>
                 <%= @user_inf %>
@@ -78,11 +78,11 @@
                     <HOJO_NUM id="HOJO_NUM" />
                     <STF_NUM id="STF_NUM" />
                 </ORG_INF>
-                <STIME id="STIME"><%= @app_version %></STIME>
+                <STIME id="STIME"><%# @app_version %></STIME>
                 <HOJIN_DOFUKEN id="HOJIN_DOFUKEN">
                     <FORM_INF id="FORM_INF">
                         <JIGYO_NAME id="JIGYO_NAME"><%= it_part_config('jigyo_naiyo') %></JIGYO_NAME>
-                        <SHIHON id="SHIHON"><%= it_part_config('shihon_kin') %></SHIHON>
+                        <SHIHON id="SHIHON"><%= 期末資本金 %></SHIHON>
                         <HOJIN_NUM id="HOJIN_NUM"></HOJIN_NUM>
                         <JIMUSHO_NUM id="JIMUSHO_NUM"><%= @jimusho_code %></JIMUSHO_NUM>
                         <SEIRI_NUM id="SEIRI_NUM" />
@@ -93,7 +93,7 @@
         <TAX_DATA id="TAX_DATA">
             <%= @form_data %>
             <TENPU_INF>
-                <YUSO_KBN>0</YUSO_KBN>
+                <YUSO_KBN>0</YUSO_KBN><%# 郵送添付書類なし %>
             </TENPU_INF>
         </TAX_DATA>
     </KOUSEI_KANRI_INF>
@@ -108,9 +108,9 @@
             <UDATE></UDATE>
             <SIGN_DATE></SIGN_DATE>
             <SEND_DATE></SEND_DATE>
-            <RPT_INF>10</RPT_INF>
-            <CREATE_SYS>1</CREATE_SYS>
-            <INP_KBN>1</INP_KBN>
+            <RPT_INF>10</RPT_INF><%# 未入力 %>
+            <CREATE_SYS>1</CREATE_SYS><%# PCDesk作成 %>
+            <INP_KBN>1</INP_KBN><%# 通常入力モード %>
             <USER_FILE_NM></USER_FILE_NM>
         </NOUZEI_UPDATE>
     </SYSTEM_INF>

data/lib/luca/jp/templates/gaikyo.xml.erb

@@ -1,4 +1,4 @@
-<HOK010 page="1" VR="5.0" id="HOK010" sakuseiNM="<%= @company %>" softNM="<%= @software %> <%= @company %>" sakuseiDay="<%= @issue_date %>">
+<HOK010 page="1" VR="<%= @form_vers['HOK010'] %>" id="HOK010" sakuseiNM="<%= @company %>" softNM="<%= @software %> <%= @company %>" sakuseiDay="<%= @issue_date %>">
 <HOK010-1 page="1">
     <IAA00000>
         <IAA01000>
@@ -13,7 +13,7 @@
         <IAA02400><kubun_CD><%= gaikyo_config('homepage') ? 1 : 2 %></kubun_CD></IAA02400>
         <%= render_attr('IAA02500', gaikyo_config('homepage')) %>
     </IAA00000>
-    <%= render_attr('IAS00000', it_part_config('jigyo_naiyo')) %>
+    <%= render_attr('IAB00000', it_part_config('jigyo_naiyo')) %>
     <IAC00000>
         <IAC01000>
             <%= render_attr('IAC01100', gaikyo_config('shiten_kokunai')) %>
@@ -23,21 +23,65 @@
             <%= render_attr('IAC02050', gaikyo_config('kogaisha_kokunai')) %>
             <%= render_attr('IAC02100', gaikyo_config('kogaisha_kaigai')) %>
         </IAC02000>
+        <IAC03000>
+            <%= render_attr('IAC03100', gaikyo_config('yunyu') ? '<kubun_CD>1</kubun_CD>' : nil) %>
+            <%= render_attr('IAC03200', gaikyo_config('yushutsu') ? '<kubun_CD>1</kubun_CD>' : nil) %>
+            <%= render_attr('IAC03300', (!gaikyo_config('yunyu') && !gaikyo_config('yushutsu')) ? '<kubun_CD>1</kubun_CD>' : nil) %>
+        </IAC03000>
+        <IAC04000>
+            <% if gaikyo_config('kaigai_torihiki') %>
+                <%= render_attr('IAC04100', '<kubun_CD>1</kubun_CD>') %>
+            <% elsif gaikyo_config('kaigai_torihiki') == false %>
+                <%= render_attr('IAC04100', '<kubun_CD>2</kubun_CD>') %>
+            <% end %>
+        </IAC04000>
     </IAC00000>
     <IAD00000>
         <IAD01000>
             <%= render_attr('IAD01100', gaikyo_config('yakuin')) %>
         </IAD01000>
+        <% if gaikyo_config('chingin_kotei') && gaikyo_config('chingin_buai') %>
+            <%= render_attr('IAD02000', '<kubun_CD>3</kubun_CD>') %>
+        <% elsif gaikyo_config('chingin_kotei') %>
+            <%= render_attr('IAD02000', '<kubun_CD>1</kubun_CD>') %>
+        <% elsif gaikyo_config('chingin_buai') %>
+            <%= render_attr('IAD02000', '<kubun_CD>2</kubun_CD>') %>
+        <% end %>
+        <% if gaikyo_config('shataku') %>
+            <%= render_attr('IAD03000', '<kubun_CD>1</kubun_CD>') %>
+        <% elsif gaikyo_config('shataku') == false %>
+            <%= render_attr('IAD03000', '<kubun_CD>2</kubun_CD>') %>
+        <% end %>
     </IAD00000>
     <IAE00000>
         <%= render_attr('IAE01000', gaikyo_config('software_kaikei') ? '<kubun_CD>1</kubun_CD>' : nil) %>
+        <IAE02100>
+            <%= render_attr('IAE02200', gaikyo_config('windows') ? '<kubun_CD>1</kubun_CD>' : nil) %>
+            <%= render_attr('IAE02300', gaikyo_config('mac') ? '<kubun_CD>1</kubun_CD>' : nil) %>
+            <%= render_attr('IAE02400', gaikyo_config('linux') ? '<kubun_CD>1</kubun_CD>' : nil) %>
+        </IAE02100>
         <IAE03000>
+            <%= render_attr('IAE03100', gaikyo_config('pc_kyuuyo') ? '<kubun_CD>1</kubun_CD>' : nil) %>
+            <%= render_attr('IAE03300', gaikyo_config('pc_hanbai') ? '<kubun_CD>1</kubun_CD>' : nil) %>
+            <%= render_attr('IAE03400', gaikyo_config('pc_seisan') ? '<kubun_CD>1</kubun_CD>' : nil) %>
             <%= render_attr('IAE03600', gaikyo_config('software_kaikei') ? '<kubun_CD>1</kubun_CD>' : nil) %>
         </IAE03000>
         <%= render_attr('IAE04300', gaikyo_config('software_kaikei') ? '<kubun_CD>1</kubun_CD>' : nil) %>
         <%= render_attr('IAE04500', gaikyo_config('software_kaikei')) %>
         <%= render_attr('IAE04600', gaikyo_config('software_mail')) %>
+        <IAE07000>
+            <%= render_attr('IAE07700', gaikyo_config('data_cloud') ? '<kubun_CD>1</kubun_CD>' : nil) %>
+            <%= render_attr('IAE07800', gaikyo_config('data_media') ? '<kubun_CD>1</kubun_CD>' : nil) %>
+            <%= render_attr('IAE07900', gaikyo_config('data_server') ? '<kubun_CD>1</kubun_CD>' : nil) %>
+        </IAE07000>
     </IAE00000>
+    <IAT00000>
+        <IAT01000>
+            <%= render_attr('IAT01100', gaikyo_config('ec_uriage') ? '<kubun_CD>1</kubun_CD>' : nil) %>
+            <%= render_attr('IAT01200', gaikyo_config('ec_shiire') ? '<kubun_CD>1</kubun_CD>' : nil) %>
+            <%= render_attr('IAT01300', gaikyo_config('ec_keihi') ? '<kubun_CD>1</kubun_CD>' : nil) %>
+        </IAT01000>
+    </IAT00000>
     <IAF00000>
         <IAF01000>
             <IAF01100>
@@ -47,12 +91,44 @@
                 <%= render_attr('IAF01210', gaikyo_config('tsucho_kanrisha')) %>
             </IAF01200>
         </IAF01000>
+        <IAF02000>
+            <% if gaikyo_config('shisanhyou') == 1 %>
+                <%= render_attr('IAF02100', '<kubun_CD>1</kubun_CD>') %>
+                <%= render_attr('IAF02200', '<kubun_CD>2</kubun_CD>') %>
+                <%= render_attr('IAF02300', '<kubun_CD>2</kubun_CD>') %>
+            <% elsif gaikyo_config('shisanhyou') == 12 %>
+                <%= render_attr('IAF02100', '<kubun_CD>2</kubun_CD>') %>
+                <%= render_attr('IAF02200', '<kubun_CD>2</kubun_CD>') %>
+                <%= render_attr('IAF02300', '<kubun_CD>1</kubun_CD>') %>
+            <% elsif gaikyo_config('shisanhyou') < 12 %>
+                <%= render_attr('IAF02100', '<kubun_CD>2</kubun_CD>') %>
+                <%= render_attr('IAF02200', '<kubun_CD>1</kubun_CD>') %>
+                <%= render_attr('IAF02250', gaikyo_config('shisanhyou')) %>
+                <%= render_attr('IAF02300', '<kubun_CD>2</kubun_CD>') %>
+            <% end %>
+        </IAF02000>
         <IAF03000>
             <%= 概況源泉徴収種類 %>
+            <%= render_attr('IAF03300', gaikyo_config('gensen_rishi') ? '<kubun_CD>1</kubun_CD>' : nil) %>
+            <%= render_attr('IAF03400', gaikyo_config('gensen_haitou') ? '<kubun_CD>1</kubun_CD>' : nil) %>
+            <%= render_attr('IAF03500', gaikyo_config('gensen_hikyoju') ? '<kubun_CD>1</kubun_CD>' : nil) %>
+            <%= render_attr('IAF03600', gaikyo_config('gensen_taishoku') ? '<kubun_CD>1</kubun_CD>' : nil) %>
         </IAF03000>
         <IAF04000>
             <%= render_attr('IAF04200', 消費税課税売上高) %>
+            <% if gaikyo_config('keiri_zeinuki') %>
+                <%= render_attr('IAF04300', '<kubun_CD>1</kubun_CD>') %>
+            <% elsif gaikyo_config('keiri_zeikomi') %>
+                <%= render_attr('IAF04300', '<kubun_CD>2</kubun_CD>') %>
+            <% end %>
         </IAF04000>
+        <IAF04400>
+            <% if gaikyo_config('kansa') %>
+                <%= render_attr('IAF04500', '<kubun_CD>1</kubun_CD>') %>
+            <% elsif gaikyo_config('kansa') == false %>
+                <%= render_attr('IAF04500', '<kubun_CD>2</kubun_CD>') %>
+            <% end %>
+        </IAF04400>
     </IAF00000>
     <IAI00000>
         <%= render_attr('IAI01100', @概況売上) %>

data/lib/luca/jp/templates/shoken-meisai.xml.erb

@@ -1,21 +1,27 @@
 <HOI060 page="1" VR="4.0" id="HOI060" sakuseiNM="<%= @company %>" softNM="<%= @software %> <%= @company %>" sakuseiDay="<%= @issue_date %>">
-    <% @有価証券.values.each do |scurity| %>
+    <% @有価証券.values.each do |security| %>
         <HFB00000>
             <HFB00110>
-                <%= render_attr('HFB00120', scurity[:security_purpose]) %>
-                <%= render_attr('HFB00130', scurity[:security_genre]) %>
-                <%= render_attr('HFB00140', scurity[:name]) %>
+                <%= render_attr('HFB00120', security[:security_purpose]) %>
+                <%= render_attr('HFB00130', security[:security_genre]) %>
+                <%= render_attr('HFB00140', security[:name]) %>
             </HFB00110>
             <HFB00200>
-                <%= render_attr('HFB00210', scurity[:security_units]) %>
+                <%= render_attr('HFB00210', security[:security_units]) %>
                 <HFB00215>
-                    <%= render_attr('HFB00230', scurity[:amount]) %>
+                    <%= render_attr('HFB00230', security[:amount]) %>
                 </HFB00215>
             </HFB00200>
-            <%= render_attr('HFB00400', scurity[:note]) %>
+            <% unless security[:diff].nil? || security[:diff].zero? %>
+                <HFB00300>
+                    <%= render_attr('HFB00340', security[:diff]) %>
+                </HFB00300>
+            <% end %>
+            <%= render_attr('HFB00400', security[:note]) %>
         </HFB00000>
     <% end %>
     <HFC00000>
         <%= render_attr('HFC00100', 有価証券合計) %>
+        <%= render_attr('HFC00200', @有価証券.values.map { |s| s[:diff] }.compact.sum) %>
     </HFC00000>
 </HOI060>

data/lib/luca/jp/templates/syouhizei-shinkoku-kanni.xml.erb

@@ -1,4 +1,4 @@
-<SHA020 page="1" VR="7.0" id="SHA020" sakuseiNM="<%= @company %>" softNM="<%= @software %> <%= @company %>" sakuseiDay="<%= @issue_date %>">
+<SHA020 page="1" VR="<%= @form_vers['SHA020'] %>" id="SHA020" sakuseiNM="<%= @company %>" softNM="<%= @software %> <%= @company %>" sakuseiDay="<%= @issue_date %>">
     <SHA020-1 page="1">
     <ABH00000>
         <ABH00010 IDREF="TEISYUTSU_DAY"/>
@@ -89,7 +89,7 @@
         </ABS00000>
         <ABV00000>
             <%= render_attr('ABV00010', @税額) %>
-            <%= render_attr('ABV00040', @譲渡割額) %>
+            <%= render_attr('ABV00040', @税額) %>
         </ABV00000>
     </SHA020-2>
 </SHA020>

data/lib/luca/jp/uchiwake.rb

@@ -41,18 +41,23 @@ module Luca #:nodoc:
 
         @有価証券 = @bs_data.each.with_object({}) do |(k, v), h|
           next unless account_codes.include?(k.to_s)
-          next unless readable(v || 0) > 0
+          next if v.nil? || v <= 0
 
+          inc = debit_amount(k, @start_date.year, @start_date.month, @end_date.year, @end_date.month) || 0
+          dec = credit_amount(k, @start_date.year, @start_date.month, @end_date.year, @end_date.month) || 0
           h[k] = {
             name: self.class.dict.dig(k)[:label],
-            amount: readable(v)
+            amount: readable(v),
+            diff: readable(inc - dec)
           }
+          STDERR.puts "勘定科目内訳書（有価証券）異動の追記が必要： #{h[k][:name]}" unless (inc - dec).zero?
+
           metadata = uchiwake_account_config(k).first
           if metadata && metadata['name']
             h[k][:name] = metadata['name'][0..9] if metadata['name']
             h[k][:security_purpose] = metadata['security_purpose']
             h[k][:security_genre] = metadata['security_genre']
-            h[k][:security_units] = metadata['security_units']
+            h[k][:security_units] = (h[:amount].nil? || h[:amount].zero?) ? 0 : metadata['security_units']
             h[k][:note] = metadata['note']
           end
           h[k][:security_purpose] ||= 'その他' if /^332/.match(k.to_s)

data/lib/luca/jp/util.rb

@@ -89,6 +89,19 @@ module Luca
       def eltax_config(key)
         config.dig('jp', 'eltax', key)
       end
+
+      def 期首期末残高(code)
+        pre = readable(@start_balance.dig(code))
+        post = readable(@bs_data.dig(code))
+        [readable(pre), readable(post)]
+      end
+
+      def 純資産期中増減(code)
+        inc = credit_amount(code, @start_date.year, @start_date.month, @end_date.year, @end_date.month)
+        dec = debit_amount(code, @start_date.year, @start_date.month, @end_date.year, @end_date.month)
+
+        [readable(dec), readable(inc)]
+      end
     end
   end
 end

data/lib/luca/jp/version.rb

@@ -2,6 +2,6 @@
 
 module Luca
   module Jp
-    VERSION = '0.2.2'
+    VERSION = '0.7.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luca-jp
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Chuma Takahiro
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-29 00:00:00.000000000 Z
+date: 2022-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lucabook
@@ -68,7 +68,7 @@ dependencies:
         version: 12.3.3
 description: 'JP tax extension for Luca
 
-'
+  '
 email:
 - co.chuma@gmail.com
 executables:
@@ -124,7 +124,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/chumaltd/luca-jp/tree/main
   source_code_uri: https://github.com/chumaltd/luca-jp/tree/main
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -139,8 +139,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key: 
+rubygems_version: 3.2.5
+signing_key:
 specification_version: 4
 summary: JP tax extension for Luca
 test_files: []