luca-jp 0.19.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90bae24e5243dd793a1c43b66e67d4aa92df675264b5f80e1ad2020b86fb7a85
-  data.tar.gz: 54064470cd7f69a391ce7a22e25fea56eea0eb0820c94a3678fb6fb8eca0cf58
+  metadata.gz: ba1a44cc2c4fb3c68846033a3f74f4791a298a9d0c4efcd0786d9cebc75954ce
+  data.tar.gz: 30ab64d9b5a8a733848ca07968f545958e8f28584ad68425763b0e7e13e8250e
 SHA512:
-  metadata.gz: 85ce4d176026e2250e5a8feca739f212730461231801b633a078d6a3895db04a7cdba2ec2916aa94a2d3f5da62b96b3eb5808f2991a92ea05d6718d6e1cbdbb9
-  data.tar.gz: 134e8fe26f2dd02d2606b56915eb25be299644c8a1ead108078b8f4695923d2a9e7ef9245a0d3fd7e4dd989461da25905333a9be7306ce327f5efd725d223e66
+  metadata.gz: 47ced553bf51ef56c53875947c421ca42ff76d28aa29a8f1239c7b88908dcaf9a0d8e61491b69ec2e62e249d7d34e5c2329e158a4b086a359565f295217eec3c
+  data.tar.gz: 217197462328275f4ccf4a59ec706d5515196036b1eb3f0950bd701a0017d24ba0a79f695170e11e7ca463c6aa23ef9c00aed5e570e92ed8279da2584b79f5d1

data/exe/luca-jp

@@ -3,8 +3,8 @@
 
 require 'optparse'
 require 'luca/jp'
-require 'luca_salary/jp_payreport'
 require 'luca_cmd'
+require 'luca_salary/jp_payreport'
 require 'luca_support/const'
 require 'yaml'
 
@@ -24,7 +24,7 @@ class LucaCmd
     if params[:export]
       puts Luca::Jp::Aoiro.range(*auto_range(args, params)).export_json(ext_config: ext_config)
     else
-      puts Luca::Jp::Aoiro.range(*auto_range(args, params)).kani(ext_config: ext_config, no_xbrl: params[:noxbrl])
+      puts Luca::Jp::Aoiro.range(*auto_range(args, params)).kani(ext_config: ext_config, no_xbrl: params[:noxbrl], kessanbi: params[:kessanbi])
     end
   end
 
@@ -37,7 +37,9 @@ class LucaCmd
       puts JSON.dump(accounts)
     else
       Luca::Jp::Util.eltax_config('reports').each do |report|
-        File.open("chihouzei-#{report['jichitai_code']}#{report['jimusho_code']}.xml", 'w') { |f| f.puts(Luca::Jp::Chihouzei.range(*auto_range(args, params)).kani(report, ext_config: ext_config))}
+        File.open("chihouzei-#{report['jichitai_code']}#{report['jimusho_code']}.xml", 'w') do |f|
+          f.puts(Luca::Jp::Chihouzei.range(*auto_range(args, params)).kani(report, ext_config: ext_config, kessanbi: params[:kessanbi]))
+        end
       end
     end
   end
@@ -56,9 +58,14 @@ class LucaCmd
       r = LucaBook::Util.current_fy(date, to: date)
       [r[0].year, r[0].month, r[1].year, r[1].month]
     when 0
-      date = params[:lastyear] ? Date.today.prev_year : Date.today
-      r = LucaBook::Util.current_fy(date)
-      [r[0].year, r[0].month, r[1].year, r[1].month]
+      if params[:kessanbi]
+        r = LucaBook::Util.previous_fy(params[:kessanbi])
+        [r[0].year, r[0].month, r[1].year, r[1].month]
+      else
+        date = params[:lastyear] ? Date.today.prev_year : Date.today
+        r = LucaBook::Util.current_fy(date)
+        [r[0].year, r[0].month, r[1].year, r[1].month]
+      end
     end
   end
 end
@@ -81,6 +88,7 @@ when 'h', /hou?jinzei/
     opt.banner = 'Usage: luca-jp h|houjinzei [options] [yyyy mm yyyy mm]'
     opt.on('-x VAL', 'extra config') { |v| params[:extra] = v }
     opt.on('--export', 'export json') { |_v| params[:export] = true }
+    opt.on('--kessan VAL', 'settlement date') { |v| params[:kessanbi] = Date.parse(v) }
     opt.on('--lastyear', 'report on last Financial year') { |_v| params[:lastyear] = true }
     opt.on('--no-xbrl', 'skip XBRL statement') { |_v| params[:noxbrl] = true }
     args = opt.parse!(ARGV)
@@ -103,6 +111,7 @@ when 'c', /chihou?zei/
     opt.banner = 'Usage: luca-jp c|chihouzei [options] [yyyy mm yyyy mm]'
     opt.on('-x VAL', 'extra config') { |v| params[:extra] = v }
     opt.on('--export', 'export json') { |_v| params[:export] = true }
+    opt.on('--kessan VAL', 'settlement date') { |v| params[:kessanbi] = Date.parse(v) }
     opt.on('--lastyear', 'report on last Financial year') { |_v| params[:lastyear] = true }
     args = opt.parse!(ARGV)
     LucaCmd.check_dir('journals', ext_conf: EXT_CONF) do
@@ -112,7 +121,7 @@ when 'c', /chihou?zei/
 when /urikake/
   OptionParser.new do |opt|
     opt.banner = 'Usage: luca-jp urikake [options] yyyy mm'
-    opt.on('--utf8', 'UTF-8でファイル生成') { |_v| params[:encode] = 'UTF-8' }
+    opt.on('--utf8', '確認用にUTF-8でファイル生成') { |_v| params[:encode] = 'UTF-8' }
     args = opt.parse!(ARGV)
     LucaCmd.check_dir('invoices', ext_conf: EXT_CONF) do
       LucaCmd.urikake(args, params)

data/lib/luca/jp/aoiro.rb

@@ -20,10 +20,11 @@ module Luca
       @dirname = 'journals'
       @record_type = 'raw'
 
-      def kani(ext_config: nil, export: false, no_xbrl: false)
+      def kani(ext_config: nil, export: false, no_xbrl: false, kessanbi: nil)
         set_pl(4)
         set_bs(4)
         @issue_date = Date.today
+        @kessanbi = kessanbi
         @company = CGI.escapeHTML(config.dig('company', 'name'))
         @software = 'LucaJp'
         @shinkoku_kbn = '30' # 確定申告
@@ -50,6 +51,7 @@ module Luca
         @法人税未払 = [@差引所得に対する法人税額 - @法人税中間納付, 0].max
 
         if export
+          @繰越損失管理.save unless @繰越損失管理.nil?
           {
             kokuzei: {
               zeigaku: @確定法人税額,
@@ -161,7 +163,7 @@ module Luca
       end
 
       def 別表一
-        STDERR.puts "別表一： 「決算確定の日」などの追記が必要"
+        STDERR.puts "別表一： 「決算確定の日」などの追記、または --kessan オプション指定が必要" if @kessanbi.nil?
         render_erb(search_template('beppyo1.xml.erb'))
       end
 
@@ -354,7 +356,8 @@ module Luca
         @概況給料 = gaikyo('C12')
         @概況交際費 = gaikyo('C1B')
         @概況減価償却 = gaikyo('C1P')
-        @概況地代租税 = ['C1E', 'C1I'].map { |k| gaikyo(k) }.compact.sum
+        chidai_accounts = @form_vers['HOK010'] >= '6.0' ? ['C1E'] : ['C1E', 'C1I']
+        @概況地代租税 = chidai_accounts.map { |k| gaikyo(k) }.compact.sum
         @概況営業損益 = gaikyo('CA')
         @概況特別利益 = gaikyo('F0')
         @概況特別損失 = gaikyo('G0')
@@ -394,7 +397,10 @@ module Luca
       end
 
       def 決算書
-        return nil if @no_xbrl
+        if @no_xbrl
+          STDERR.puts "決算書XBRLをeTaxソフトに追加インポートする必要あり"
+          return nil
+        end
 
         @xbrl_filename = %Q(statement-#{@issue_date.to_s})
         @xbrl, @xsd = LucaBook::State.range(@start_date.year, @start_date.month, @end_date.year, @end_date.month)
@@ -544,8 +550,15 @@ module Luca
         @当期純損益 + @損金不算入額留保 - @益金不算入額留保
       end
 
+      # NOTE: 別表四社外流出欄の本書と外書の区分は紙の事務を前提としており自明ではない。
+      # 帳票フィールド仕様書を参照して実装するほかない
+      #
       def 別表四調整所得仮計社外流出
-        @当期純損益 + @損金不算入額社外流出 - @益金不算入額社外流出
+        @損金不算入額社外流出
+      end
+
+      def 別表四調整所得仮計社外流出外書
+        @益金不算入額社外流出 * -1
       end
 
       # 損金経理した税額控除対象額の調整
@@ -569,6 +582,10 @@ module Luca
         ].compact.sum
       end
 
+      def 別表四調整所得合計社外流出外書
+        別表四調整所得仮計社外流出外書
+      end
+
       def 別表四還付法人税等金額
         refund_tax()
       end
@@ -951,14 +968,27 @@ module Luca
       end
 
       def proc_version
-        if @end_date >= Date.parse('2023-4-1')
-          { 'proc' => '23.0.2', 'HOA112' => '5.0', 'HOA116' => '4.0', 'HOA201' => '5.0', 'HOA420' => '22.0', 'HOA511' => '14.0', 'HOA522' => '9.0', 'HOB710' => '13.0', 'HOE200' => '14.0', 'HOE990' => '7.0', 'HOK010' => '6.0' }
+        init_version = {
+          'HOA201' => '4.0',
+          'HOA511' => '13.0',
+          'HOB710' => '11.0',
+          'HOE200' => '13.0',
+          'HOE990' => '5.0',
+          'HOI090' => '4.0',
+          'HOI100' => '5.0',
+          'HOI150' => '3.0',
+          'HOI160' => '3.0',
+        }
+        if @end_date >= Date.parse('2024-4-1')
+          { 'proc' => '24.0.2', 'HOA112' => '6.0', 'HOA116' => '4.0', 'HOA201' => '5.0', 'HOA420' => '23.0', 'HOA511' => '15.0', 'HOA522' => '9.0', 'HOB710' => '13.0', 'HOE200' => '14.0', 'HOE990' => '7.0', 'HOI090' => '5.0', 'HOI100' => '6.0', 'HOI150' => '4.0', 'HOI160' => '4.0', 'HOK010' => '7.0' }
+        elsif @end_date >= Date.parse('2023-4-1')
+          init_version.merge({ 'proc' => '23.0.2', 'HOA112' => '5.0', 'HOA116' => '4.0', 'HOA201' => '5.0', 'HOA420' => '22.0', 'HOA511' => '14.0', 'HOA522' => '9.0', 'HOB710' => '13.0', 'HOE200' => '14.0', 'HOE990' => '7.0', 'HOK010' => '6.0' })
         elsif @end_date >= Date.parse('2022-4-1')
-          { 'proc' => '22.0.3', 'HOA112' => '4.0', 'HOA116' => '3.0', 'HOA201' => '4.0', 'HOA420' => '21.0', 'HOA511' => '14.0', 'HOA522' => '8.0', 'HOB710' => '12.0', 'HOE200' => '14.0', 'HOE990' => '6.1', 'HOK010' => '6.0' }
+          init_version.merge({ 'proc' => '22.0.3', 'HOA112' => '4.0', 'HOA116' => '3.0', 'HOA420' => '21.0', 'HOA511' => '14.0', 'HOA522' => '8.0', 'HOB710' => '12.0', 'HOE200' => '14.0', 'HOE990' => '6.1', 'HOK010' => '6.0' })
         elsif @end_date >= Date.parse('2021-4-1')
-          { 'proc' => '21.0.2', 'HOA112' => '3.1', 'HOA116' => '2.0', 'HOA201' => '4.0', 'HOA420' => '20.0', 'HOA511' => '13.0', 'HOA522' => '7.0', 'HOB710' => '11.0', 'HOE200' => '13.0', 'HOE990' => '5.0', 'HOK010' => '6.0' }
+          init_version.merge({ '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', 'HOA201' => '4.0', 'HOA420' => '19.0', 'HOA511' => '13.0', 'HOA522' => '6.0', 'HOB710' => '11.0', 'HOE200' => '13.0', 'HOE990' => '5.0', 'HOK010' => '5.0' }
+          init_version.merge({ 'proc' => '20.0.2', 'HOA112' => '2.0', 'HOA116' => '1.0', 'HOA420' => '19.0', 'HOA522' => '6.0', 'HOK010' => '5.0' })
         end
       end
 

data/lib/luca/jp/chihouzei.rb

@@ -17,10 +17,11 @@ module Luca
       @dirname = 'journals'
       @record_type = 'raw'
 
-      def kani(report_cfg, export: false, ext_config: nil)
+      def kani(report_cfg, export: false, ext_config: nil, kessanbi: nil)
         set_pl(4)
         set_bs(4)
         @issue_date = Date.today
+        @kessanbi = kessanbi
         @software = 'LucaJp'
         @jimusho_name = report_cfg['jimusho_name']
         @report_category = report_cfg['type']
@@ -147,7 +148,7 @@ module Luca
 
       def 第六号
         @資本金準備金 = readable(['911', '9131'].map { |cd| @bs_data.dig(cd) }.compact.sum)
-        STDERR.puts "第六号様式： 「決算確定の日」などの追記が必要。「国外関連者」の確認が必要"
+        STDERR.puts "第六号様式： #{ %q(「決算確定の日」などの追記、または --kessan オプション指定が必要。) if @kessanbi.nil? }「国外関連者」の確認が必要"
         render_erb(search_template('el-no6.xml.erb'))
       end
 
@@ -199,8 +200,8 @@ module Luca
           next if deduction == 0 && record['amount'] == 0
 
           %Q(<AMB00200>
-          <AMB00210>#{etax_date(@start_date)}</AMB00210>
-          <AMB00220>#{etax_date(@end_date)}</AMB00220>
+            <AMB00210>#{etax_date(record['start_date'])}</AMB00210>
+              <AMB00220>#{etax_date(record['end_date'])}</AMB00220>
           <AMB00225>1</AMB00225>
           #{render_attr('AMB00230', deduction + record['amount'])}
           #{render_attr('AMB00240', deduction)}
@@ -268,7 +269,11 @@ module Luca
       end
 
       def proc_version
-        if @end_date >= Date.parse('2022-4-1')
+        if @start_date >= Date.parse('2025-4-1')
+          { 'R0102AA' => '250', 'R0102AG' => '211', 'R0102AM' => '240' }
+        elsif @end_date >= Date.parse('2024-4-1')
+          { 'R0102AA' => '240', 'R0102AG' => '211', 'R0102AM' => '240' }
+        elsif @end_date >= Date.parse('2022-4-1')
           { 'R0102AA' => '211', 'R0102AG' => '211', 'R0102AM' => '211' }
         elsif @start_date >= Date.parse('2020-4-1')
           { 'R0102AA' => '200', 'R0102AG' => '120','R0102AM' => '200' }

data/lib/luca/jp/common.rb

@@ -68,7 +68,7 @@ module Luca
       # 繰越損失適用後の所得金額
       #
       def 所得金額
-        @繰越損失管理 = Sonshitsu.load(@end_date).update(@別表四調整所得).save if @繰越損失管理.nil?
+        @繰越損失管理 = Sonshitsu.load(@end_date).update(@別表四調整所得) if @繰越損失管理.nil?
         @繰越損失管理.profit
       end
 

data/lib/luca/jp/sonshitsu.rb

@@ -31,9 +31,9 @@ module Luca
       #   - start_date: 2020-01-01
       #     end_date: 2020-12-31
       #     increase: 1000000
-      #   - start_date: 2021-01-01
-      #     end_date: 2021-12-31
-      #     decrease: 800000
+      #     decrease:
+      #     - date: 2021-12-31
+      #       val: 800000
       #
       def self.load(this_year)
         records = if File.exist?(record_file)
@@ -47,6 +47,10 @@ module Luca
       end
 
       def save
+        @records.each do |record|
+          record.delete('amount')
+          record.delete('decrease') if record['decrease'].nil? || record['decrease'].empty?
+        end
         File.open(self.class.record_file, 'w') { |f| f.puts YAML.dump(@records)}
         self
       end
@@ -83,14 +87,14 @@ module Luca
       def net_amount
         @records.each do |record|
           record['amount'] = record['increase'] - past_decreased(record['decrease'])
-          record['decrease'] = record['decrease']&.reject { |decrease_record| decrease_record['date'] > @report_date.prev_year }
+          record['decrease'] = record['decrease']&.reject { |decrease_record| decrease_record['date'] >= @report_date }
         end
       end
 
       def past_decreased(decrease_records)
         return 0 if decrease_records.nil?
 
-        decrease_records.filter { |record| record['date'] <= @report_date.prev_year }
+        decrease_records.filter { |record| record['date'] < @report_date }
           .map { |record| record['val'] }.sum || 0
       end
 

data/lib/luca/jp/syouhizei.rb

@@ -169,7 +169,9 @@ module Luca
       end
 
       def proc_version
-        if @end_date >= Date.parse('2023-10-1')
+        if @end_date >= Date.parse('2024-4-1')
+          { 'proc' => '23.2.0', 'SHA020' => '9.0' }
+        elsif @end_date >= Date.parse('2023-10-1')
           { 'proc' => '23.0.0', 'SHA020' => '9.0' }
         elsif @end_date >= Date.parse('2021-4-1')
           { 'proc' => '20.0.1', 'SHA020' => '7.1' }

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

@@ -32,6 +32,7 @@
             <BGA00350 IDREF="JIGYO_NENDO_TO"/>
         </BGA00330>
         <BGA00360 IDREF="SHINKOKU_KBN"/>
+        <%= render_attr('BGA00410', etax_date(@kessanbi)) -%>
         <BGA00420 IDREF="KANPU_KINYUKIKAN"/>
     </BGA00000>
 

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

@@ -96,7 +96,7 @@
             <%= render_attr('ARD00290', @益金不算入額) %>
             <%= render_attr('ARD00300', @益金不算入額留保) %>
             <ARD00310>
-                <%= render_attr('ARD00330', @益金不算入額社外流出) %>
+                <%= render_attr('ARD00320', @益金不算入額社外流出) %>
             </ARD00310>
         </ARD00280>
     </ARD00000>
@@ -104,6 +104,7 @@
         <%= render_attr('ARE00010', 別表四調整所得仮計) %>
         <%= render_attr('ARE00020', 別表四調整所得仮計留保) %>
         <ARE00030>
+            <%= render_attr('ARE00040', 別表四調整所得仮計社外流出外書) %>
             <%= render_attr('ARE00050', 別表四調整所得仮計社外流出) %>
         </ARE00030>
     </ARE00000>
@@ -111,6 +112,7 @@
         <%= render_attr('ARZ10010', 別表四調整所得仮計) %>
         <%= render_attr('ARZ10020', 別表四調整所得仮計留保) %>
         <ARZ10030>
+            <%= render_attr('ARZ10040', 別表四調整所得仮計社外流出外書) %>
             <%= render_attr('ARZ10050', 別表四調整所得仮計社外流出) %>
         </ARZ10030>
     </ARZ10000>
@@ -129,6 +131,7 @@
         <%= render_attr('ARK00010', 別表四調整所得合計) %>
         <%= render_attr('ARK00020', 別表四調整所得合計留保) %>
         <ARK00030>
+            <%= render_attr('ARK00040', 別表四調整所得合計社外流出外書) %>
             <%= render_attr('ARK00050', 別表四調整所得合計社外流出) %>
         </ARK00030>
     </ARK00000>
@@ -136,7 +139,8 @@
         <%= render_attr('ARM00010', 別表四調整所得合計 - @繰越損失管理.deduction) %>
         <%= render_attr('ARM00020', 別表四調整所得合計留保) %>
         <ARM00030>
-            <%= render_attr('ARM00050', 別表四調整所得合計社外流出 - @繰越損失管理.deduction) %>
+            <%= render_attr('ARM00040', 別表四調整所得合計社外流出外書 - @繰越損失管理.deduction) %>
+            <%= render_attr('ARM00050', 別表四調整所得合計社外流出) %>
         </ARM00030>
     </ARM00000>
     <%# ARN10010 中間申告における繰戻しによる還付に係る災害損失欠損金額の益金算入額 %>
@@ -145,6 +149,7 @@
         <%= render_attr('ARS00010', @別表四調整所得) %>
         <%= render_attr('ARS00020', 別表四調整所得合計留保) %>
         <ARS00030>
+            <%= render_attr('ARS00040', 別表四調整所得合計社外流出外書) %>
             <%= render_attr('ARS00050', 別表四調整所得合計社外流出) %>
         </ARS00030>
     </ARS00000>
@@ -154,6 +159,7 @@
         <%= render_attr('ARS50010', @別表四調整所得) %>
         <%= render_attr('ARS50020', 別表四調整所得合計留保) %>
         <ARS50030>
+            <%= render_attr('ARS50040', 別表四調整所得合計社外流出外書) %>
             <%= render_attr('ARS50050', 別表四調整所得合計社外流出) %>
         </ARS50030>
     </ARS50000>
@@ -167,7 +173,8 @@
         <%= render_attr('ARV00010', @別表四調整所得 - @繰越損失管理.deduction) %>
         <%= render_attr('ARV00020', 別表四調整所得合計留保) %>
         <ARV00030>
-            <%= render_attr('ARV00050', 別表四調整所得合計社外流出 - @繰越損失管理.deduction) %>
+            <%= render_attr('ARV00040', 別表四調整所得合計社外流出外書 - @繰越損失管理.deduction) %>
+            <%= render_attr('ARV00050', 別表四調整所得合計社外流出) %>
         </ARV00030>
     </ARV00000>
 </HOA420>

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

@@ -1,15 +1,20 @@
-<HOI150 page="1" VR="3.0" id="HOI150" sakuseiNM="<%= @company %>" softNM="<%= @software %> <%= @company %>" sakuseiDay="<%= @issue_date %>">
+<HOI150 page="1" VR="<%= @form_vers['HOI150'] %>" id="HOI150" sakuseiNM="<%= @company %>" softNM="<%= @software %> <%= @company %>" sakuseiDay="<%= @issue_date %>">
     <HOB00000>
-    <% @地代家賃.values.each do |rent| %>
-        <HOB10000>
-            <%= render_attr('HOB11000', rent[:rent_type]) %>
-            <%= render_attr('HOB12000', rent[:rent_purpose]) %>
-            <%= render_attr('HOB13000', rent[:rent_address]) %>
-            <%= render_attr('HOB14000', rent[:name]) %>
-            <%= render_attr('HOB15000', rent[:address]) %>
-            <%= render_attr('HOB17000', rent[:amount]) %>
-            <%= render_attr('HOB18000', rent[:note]) %>
-        </HOB10000>
-    <% end %>
+        <% @地代家賃.values.each do |rent| %>
+            <HOB10000>
+                <%= render_attr('HOB11000', rent[:rent_type]) %>
+                <%= render_attr('HOB12000', rent[:rent_purpose]) %>
+                <%= render_attr('HOB13000', rent[:rent_address]) %>
+                <% if @form_vers['HOI150'] >= '4.0' && rent[:tax_id] %>
+                    <HOB27000>
+                        <%= render_attr('HOB27100', rent[:tax_id]) %>
+                    </HOB27000>
+                <% end %>
+                <%= render_attr('HOB14000', rent[:name]) %>
+                <%= render_attr('HOB15000', rent[:address]) %>
+                <%= render_attr('HOB17000', rent[:amount]) %>
+                <%= render_attr('HOB18000', rent[:note]) %>
+            </HOB10000>
+        <% end %>
     </HOB00000>
 </HOI150>

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

@@ -18,12 +18,7 @@
             <gen:mm></gen:mm>
             <gen:dd></gen:dd>
           </AAA00700>
-        <AAA00800>
-          <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>
+        <%= render_attr('AAA00800', etax_date(@issue_date)) -%>
         <AAA00900 idref="ORG1_NAME"></AAA00900>
         <AAA_HONTEN_ZIP idref="HONTEN_ZIP"></AAA_HONTEN_ZIP>
         <AAA_HONTEN_ADDR idref="HONTEN_ADDR"></AAA_HONTEN_ADDR>
@@ -40,6 +35,11 @@
         <AAA_JIGYO_NAME idref="JIGYO_NAME"></AAA_JIGYO_NAME>
         <AAA_SHIHON idref="SHIHON"></AAA_SHIHON>
         <AAA_SHIHON3></AAA_SHIHON3>
+        <% if @form_vers['R0102AA'] == '250' %>
+          <AAA_GASSAN></AAA_GASSAN>
+          <AAA_GASSAN2></AAA_GASSAN2>
+          <AAA_HOUJIN_KBN></AAA_HOUJIN_KBN>
+        <% end %>
         <AAA_SHIHON4></AAA_SHIHON4>
         <AAA_SHIHON2><%= 資本金等の額 %></AAA_SHIHON2>
         <AAA_SHIHON5><%= @資本金準備金 %></AAA_SHIHON5>
@@ -161,10 +161,11 @@
         <AAH00200><%= 中間還付税額(@確定法人税割, @法人税割中間納付) + 中間還付税額(@所得割, 事業税中間納付) + 中間還付税額(特別法人事業税(@所得割), @地方特別法人事業税中間納付) %></AAH00200>
         <AAH00400><%= eltax_kouza %></AAH00400>
         <AAI00100>
-          <gen:era />
-          <gen:yy />
-          <gen:mm />
-          <gen:dd />
+          <% if @kessanbi -%>
+            <%= etax_date(@kessanbi) %>
+          <% else -%>
+            <gen:era /><gen:yy /><gen:mm /><gen:dd />
+          <% end -%>
         </AAI00100>
         <AAI00900>
           <gen:era />
@@ -198,4 +199,10 @@
         <AAI00800>2</AAI00800>
         <AAJ_DAIRI_NAME></AAJ_DAIRI_NAME>
         <AAJ_DAIRI_TEL_NUM></AAJ_DAIRI_TEL_NUM>
+        <% if @form_vers['R0102AA'] == '250' %>
+          <AAL00100></AAL00100>
+          <AAL00200></AAL00200>
+          <AAL00300></AAL00300>
+          <AAL00400></AAL00400>
+        <% end %>
 </R0102AA<%= @form_vers['R0102AA'] %>>

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

@@ -69,11 +69,18 @@
         <%= 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')) %>
+        <% if @form_vers['HOK010'] >= '7.0' %>
+          <IAE07910>
+            <%= render_attr('IAE07920', gaikyo_config('dencho_good') ? '<kubun_CD>1</kubun_CD>' : nil) %>
+            <%= render_attr('IAE07930', gaikyo_config('dencho_generic') ? '<kubun_CD>1</kubun_CD>' : nil) %>
+            <%= render_attr('IAE07940', gaikyo_config('dencho_scanner') ? '<kubun_CD>1</kubun_CD>' : nil) %>
+          </IAE07910>
+        <% end %>
         <% if @form_vers['HOK010'] < '7.0' %>
-        <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>
+                <%= 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>
         <% end %>
     </IAE00000>

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

@@ -1,7 +1,12 @@
-<HOI090 page="1" VR="4.0" id="HOI090" sakuseiNM="<%= @company %>" softNM="<%= @software %> <%= @company %>" sakuseiDay="<%= @issue_date %>">
+<HOI090 page="1" VR="<%= @form_vers['HOI090'] %>" id="HOI090" sakuseiNM="<%= @company %>" softNM="<%= @software %> <%= @company %>" sakuseiDay="<%= @issue_date %>">
     <% @買掛金.values.each do |payable| %>
         <HIB00000>
             <%= render_attr('HIB00100', payable[:payable_type]) %>
+            <% if @form_vers['HOI090'] >= '5.0' && payable[:tax_id] -%>
+              <HIB00500>
+                <%= render_attr('HIB00510', payable[:tax_id]) %>
+              </HIB00500>
+            <% end -%>
             <HIB00200>
                 <%= render_attr('HIB00210', payable[:name]) %>
                 <%= render_attr('HIB00220', payable[:address]) %>

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

@@ -1,4 +1,4 @@
-<HOI100 page="1" VR="5.0" id="HOI100" sakuseiNM="<%= @company %>" softNM="<%= @software %> <%= @company %>" sakuseiDay="<%= @issue_date %>">
+<HOI100 page="1" VR="<%= @form_vers['HOI100'] %>" id="HOI100" sakuseiNM="<%= @company %>" softNM="<%= @software %> <%= @company %>" sakuseiDay="<%= @issue_date %>">
     <HJB00000>
         <HJB01000>
             <%= render_attr('HJB01100', '預り金') %>

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

@@ -7,6 +7,9 @@
             <ILA00050><%= it_part_config('daihyo_adr') %></ILA00050>
             <ILA00060><kubun_CD>1</kubun_CD></ILA00060>
         </ILA00010>
+        <ILA00310>
+            <%= render_attr('ILA00320', @役員報酬) %>
+        </ILA00310>
     </ILA00000>
     <ILB00000>
         <ILB00010>

data/lib/luca/jp/uchiwake.rb

@@ -101,6 +101,7 @@ module Luca #:nodoc:
           metadata = uchiwake_account_config(k).first
           if metadata && metadata['name']
             h[k][:name] = metadata['name']
+            h[k][:tax_id] = metadata['tax_id']&.to_s&.sub(/T/, '')
             h[k][:payable_type] = self.class.dict.dig(k[0..2], :label)
             h[k][:address] = metadata['address']
             h[k][:note] = metadata['note']
@@ -118,7 +119,10 @@ module Luca #:nodoc:
 
       def 仮受金内訳
         @源泉給与 = readable(@bs_data.dig('5191') || 0)
-        @源泉報酬 = readable(@bs_data.dig('5193') || 0)
+        @源泉報酬 = [
+          readable(@bs_data.dig('5193') || 0),
+          readable(@bs_data.dig('5194') || 0)
+        ].sum
         render_erb(search_template('kariuke-meisai.xml.erb'))
       end
 
@@ -182,6 +186,7 @@ module Luca #:nodoc:
           metadata = uchiwake_account_config(k).first
           if metadata && metadata['name']
             h[k][:name] = metadata['name']
+            h[k][:tax_id] = metadata['tax_id']&.to_s&.sub(/T/, '')
             h[k][:address] = metadata['address']
             h[k][:rent_type] = metadata['rent_type'] || '家賃'
             h[k][:rent_purpose] = metadata['rent_purpose']

data/lib/luca/jp/urikake.rb

@@ -15,22 +15,32 @@ module Luca
         listed_amount = 0
         encoding ||= 'SJIS'
         customers, total = list
+        format_ver = @date > Date.new(2024, 3, 1) ? 4 : 3
         str = CSV.generate(String.new, headers: false, col_sep: ',', encoding: encoding) do |f|
           customers.map do |c|
             amount = readable(c['unsettled'])
             listed_amount += amount
-            f << ['3', '0', '売掛金', c['customer'], c['address'], amount, nil ]
+            if format_ver >= 4
+              address = c['tax_id'] ? nil : c['address']
+              f << ['3', '0', '売掛金', c['tax_id']&.to_i, nil, c['customer'], address, amount, nil ]
+            else
+              f << ['3', '0', '売掛金', c['customer'], c['address'], amount, nil ]
+            end
           end
-          if total - listed_amount > 0
+          if format_ver >= 4
+            f << ['3', '0', '売掛金', nil, nil, 'その他', nil, total - listed_amount, nil ]
+            f << ['3', '1', nil, nil, nil, nil, nil, total, nil ]
+          else
             f << ['3', '0', '売掛金', 'その他', nil, total - listed_amount, nil ]
+            f << ['3', '1', nil, nil, nil, total, nil ]
           end
-          f << ['3', '1', nil, nil, nil, total, nil ]
         end
-        File.open('HOI030_3.0.csv', 'w') { |f| f.write(str) }
+        STDERR.puts "Writing HOI030_#{format_ver}.0.csv..."
+        File.open("HOI030_#{format_ver}.0.csv", 'w') { |f| f.write(str) }
       end
 
       def list
-        customers = self.class.report(@date, detail: true)
+        customers = self.class.report(@date, detail: true, due: true)
                      .sort_by { |customer| customer['unsettled'] }
                      .reverse
         total = customers.inject(0) { |sum, customer| sum + customer['unsettled'] }

data/lib/luca/jp/util.rb

@@ -63,6 +63,8 @@ module Luca
       end
 
       def etax_date(date)
+        return nil if date.nil?
+
         "<gen:era>#{gengou(date)}</gen:era><gen:yy>#{wareki(date)}</gen:yy><gen:mm>#{date.month}</gen:mm><gen:dd>#{date.day}</gen:dd>"
       end
 

data/lib/luca/jp/version.rb

@@ -2,6 +2,6 @@
 
 module Luca
   module Jp
-    VERSION = '0.19.0'
+    VERSION = '0.20.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luca-jp
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.20.0
 platform: ruby
 authors:
 - Chuma Takahiro
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-11 00:00:00.000000000 Z
+date: 2025-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lucabook
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 0.5.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 0.5.6
 - !ruby/object:Gem::Dependency
   name: lucadeal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: 0.5.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: 0.5.8
 - !ruby/object:Gem::Dependency
   name: lucasalary
   requirement: !ruby/object:Gem::Requirement