luca-jp 0.19.1 → 0.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99f4c763f4419b099695dde406de31320b586826da34308b1d13df4fdf93310b
-  data.tar.gz: 3f6e7b427033b063fba377ef6f9d5b633eb1f054132fbf3a37aa1d60d6fe9c6b
+  metadata.gz: 86f9348cd5fe742fe66e493c0381f53847681f534757b6b8e708a3e271a5929b
+  data.tar.gz: 30596a7a821462a685f32ea8ebbccf8db802c68ccad60c11d963417a47c67014
 SHA512:
-  metadata.gz: 546ec171704b541956e0982ed550d30cf1ae5c48d2c778d2b17b65377f63075e74206c48c3657036fbf3a0ab325a34ea5d98c0bade6d04eacd5ad20a1f877a31
-  data.tar.gz: dc682ce710480958ab7ba2dd88313ad955d448763ae5ab08e5afc9278035418dbcb9c6072f921dce39930062a41e4369153e4b3ed65ac533a606a96d1015eaf0
+  metadata.gz: '091a70016c17875a79e917a5c7d5e0001852ab6e64c00e0f1d372a6129f17de2deec91116cdcd73c5f22a6b59ae6eeb6ff9e55799788f0230f28cacf2b69c78e'
+  data.tar.gz: 41f7c60183071e68a1788f928bd3badf970eecb17da8e7dadba8b1556a6dac64b56e4517d49663579998e8dab637a5a23a23527bc5f45b07ca870e11731eb994

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
 
@@ -331,19 +333,16 @@ module Luca
       end
 
       def 適用額明細フォーム
-        return nil if @確定法人税額 == 0
+        return nil if 中小企業の軽減税率対象所得(所得金額) == 0
 
         'HOE990'
       end
 
       def 適用額明細
-        if 期末資本金 <= 10_000_000
+        unless 軽減税率不適用法人
           STDERR.puts "適用額明細： 必要に応じて「少額減価償却資産の損金算入」（67条の5第1項, 00277。別表16[7]）の確認が必要"
         end
-        if @確定法人税額 == 0
-          STDERR.puts "別表一：適用額明細書の有無の確認が必要"
-          return nil
-        end
+        return nil if 適用額明細フォーム.nil?
 
         render_erb(search_template('tekiyougaku.xml.erb'))
       end
@@ -354,7 +353,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')
@@ -965,14 +965,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

@@ -30,13 +30,13 @@ module Luca
       # -----------------------------------------------------
 
       def 中小企業の軽減税率対象所得(所得 = nil)
+        return 0 if 軽減税率不適用法人
+
         所得 ||= 所得金額
         return 0 if 所得 <= 0
 
         if 所得 >= 8_000_000
           8_000_000
-        elsif 所得 < 0
-          0
         else
           (所得 / 1000).floor * 1000
         end
@@ -48,16 +48,19 @@ module Luca
 
       def 中小企業の軽減税率対象を超える所得(所得 = nil)
         所得 ||= 所得金額
-        return 0 if 所得 <= 0
+        return 0 if 所得 <= 8_000_000
 
-        if 所得 <= 8_000_000
-          0
-        else
-          ((所得 - 8_000_000) / 1000).floor * 1000
-        end
+        ((所得 - 8_000_000) / 1000).floor * 1000
       end
 
       def 一般区分の税額(所得 = nil)
+        所得 ||= 所得金額
+        return 0 if 所得 <= 0
+
+        if 軽減税率不適用法人
+          return ((所得 / 1000).floor * 1000 * 23.2 / 100).to_i
+        end
+
         (中小企業の軽減税率対象を超える所得(所得) * 23.2 / 100).to_i
       end
 
@@ -68,7 +71,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

@@ -26,12 +26,13 @@
             <BGA00260><kubun_CD>1</kubun_CD></BGA00260>
         </BGA00210>
         <%= render_attr('BGA00290', @概況売上) %>
-        <BGA00300><kubun_CD>1</kubun_CD></BGA00300>
+        <BGA00300><kubun_CD><%= 適用額明細フォーム ? "1" : "2" -%></kubun_CD></BGA00300>
         <BGA00330>
             <BGA00340 IDREF="JIGYO_NENDO_FROM"/>
             <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/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/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.1'
+    VERSION = '0.20.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luca-jp
 version: !ruby/object:Gem::Version
-  version: 0.19.1
+  version: 0.20.1
 platform: ruby
 authors:
 - Chuma Takahiro
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-12 00:00:00.000000000 Z
+date: 2025-04-22 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