luca-jp 0.20.4 → 0.20.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea7c42dee2cf6b8002de5606bf2056714154a68bd4212762580029644f2f6607
-  data.tar.gz: f759cb53bf48adfe8148eb5f68f6f95a71c8b2decc103d63cfb6e4dce3fac2c9
+  metadata.gz: dfd6af4ff40f3d2562f04f71b59e02c944fec0fbc66dc18ae72d868bda2c5b82
+  data.tar.gz: 42f779967ee6e22db9a488bebdfa1c123e8c1738532f78e3ed5201916d92ca8a
 SHA512:
-  metadata.gz: 3a5e412b5cb291bd2be9e39350385969e7ad6bb9f13b8f67c62b52bdc23a5f8aa226eee59cba6684d9d787bb0e6dff14b6b711113f9e5d2291d2e467419f7c7e
-  data.tar.gz: 92333c73665f5e7a06a6830a4e79f4cf67ee82b3f04f715efcd1136fe66ebdb3daee355693ceecfec1199b6f8c763ecd95c5af9d2907b0a6aefdfaf2ad10236e
+  metadata.gz: 9b7f6ceb960f5dee8eea66435f631567123e7d98757fbb07f607b20fea1725516a87f054f1f48e7173b7fe4d343c644d51f0b5b11904ee681db7cde43e80a9be
+  data.tar.gz: 1e4929bef66fc8459ce622c75c590e49d1fdc5a96ac7d4d3e63543ba1971490f69bfd1fc62c469da03111a4973561579a11a76683f055c0b1ef749ce3e4fc9f8

data/exe/luca-jp

@@ -4,6 +4,7 @@
 require 'optparse'
 require 'luca/jp'
 require 'luca_cmd'
+require 'luca_salary/jp_adjustment'
 require 'luca_salary/jp_payreport'
 require 'luca_support/const'
 require 'yaml'
@@ -76,6 +77,13 @@ module LucaSalaryCmd
       puts LucaSalary::JpPayreport.export(args.first)
     end
   end
+
+  class Import
+    def self.profiles(args, params = nil)
+      path, id = args
+      puts LucaSalary::JpAdjustment.import(path, id, params)
+    end
+  end
 end
 
 #LucaRecord::Base.valid_project?
@@ -135,6 +143,14 @@ when 'k', 'kyuyo', 'salary'
       LucaSalaryCmd::Export.payreport(args)
     end
   end
+when 'n', /nenmats?u/, /nenmats?u-?chou?sei/
+  OptionParser.new do |opt|
+    opt.banner = 'Usage: luca-jp nenmatsu <zip-file-path> <profile id>'
+    args = opt.parse(ARGV)
+    LucaCmd.check_dir('profiles', ext_conf: EXT_CONF) do
+      LucaSalaryCmd::Import.profiles(args, params)
+    end
+  end
 when 'version'
   puts "luca-jp: version #{Luca::Jp::VERSION}"
   exit 0
@@ -146,6 +162,7 @@ else
   puts '  s[youhizei]: 消費税の計算'
   puts '  c[hihouzei]: 地方税の計算'
   puts '  k[yuyo]: 給与報告（所得税）の計算'
+  puts '  n[enmatsu]: 年末調整アプリのデータインポート'
   puts '  urikake: 勘定科目内訳明細書の売掛金リスト(CSV)'
   exit 1
 end

data/lib/luca/jp/util.rb

@@ -21,6 +21,10 @@ module Luca
         end
       end
 
+      def alphadigit_ja(str)
+        str.tr('A-Z0-9\- ', 'Ａ-Ｚ０-９ー　')
+      end
+
       # TODO: customerオプションを適切に扱うには
       # 納付時にx-customerを付加していないケースの考慮が必要
       def prepaid_tax(code, customer = nil)

data/lib/luca/jp/version.rb

@@ -2,6 +2,6 @@
 
 module Luca
   module Jp
-    VERSION = '0.20.4'
+    VERSION = '0.20.6'
   end
 end

data/lib/luca_salary/jp/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LucaSalaryJp
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/lib/luca_salary/jp_adjustment.rb

@@ -0,0 +1,271 @@
+# frozen_string_literal: true
+require 'luca_salary'
+require 'luca_support/const'
+require 'luca/jp/util'
+require 'zip'
+
+require 'rexml/document'
+
+module LucaSalary
+  class JpAdjustment < LucaSalary::Profile
+
+    def self.import(path, id = nil, params = nil)
+      s_profile = profiles(id)
+      bulk_load(path).each do |o|
+        s_profile['spouse']['name'] ||= o['spouse']['name']
+        s_profile['spouse']['katakana'] ||= o['spouse']['kana']
+        s_profile['spouse']['income'].merge!(o['spouse']['income'])
+        if ! s_profile['family'].empty? || ! o['family'].empty?
+          s_profile['family'] = merge_family(s_profile['family'].concat(o['family']))
+        end
+      end
+      save(s_profile, 's_profiles')
+    end
+
+    def self.profiles(id = nil)
+      if id
+        list = id_completion(id, basedir: 's_profiles')
+        id = if list.length > 1
+               raise "#{list.length} entries found for ID: #{id}. abort..."
+             else
+               list.first
+             end
+        #merged = find_secure(id, 'profiles') # NOTE for content match by name, birth_date
+        find(id, 's_profiles')
+      end
+    end
+
+    # XMLタグ定義: https://www.nta.go.jp/users/gensen/oshirase/0019004-159.htm
+    #
+    TAGS = {
+      'NTAAPP001' => {
+        year: 'xml001_B00020',
+        family: {
+          root: 'xml001_D00000',   # 扶養親族情報繰り返し
+          kana: 'xml001_D00020',   # フリガナ
+          name: 'xml001_D00030',   # 氏名
+          birth_date: {
+            root: 'xml001_D00080', # 生年月日
+            year: 'xml001_D00090', # 西暦
+            month: 'xml001_D00120', # 月
+            day: 'xml001_D00130'   # 日
+          },
+          income: 'xml001_D00160',  # 本年中の所得の見積額
+          elderly: 'xml001_D00140', # 老人扶養親族
+          tokutei: 'xml001_D00150', # 特定扶養親族/特定親族
+          nonresident: 'xml001_D00170', # 非居住者である親族/控除対象外国外扶養親族
+          handicapped: {
+            root: 'xml001_D00290', # 障害者である事実
+            type: 'xml001_D00300'  # 障害者区分
+          }
+        }
+      },
+      'NTAAPP004' => {
+        year: 'xml004_B00020',
+        spouse: {
+          root: 'xml004_D00000',
+          kana: 'xml004_D00010',   # フリガナ
+          name: 'xml004_D00020',   # 氏名
+          income: 'xml004_D00260', # 配偶者の本年中の合計所得金額の見積額
+          elderly: 'xml004_D00160', # 老人控除対象配偶者 (1: 該当)
+          nonresident: 'xml004_D00170' # 非居住者である配偶者
+        }
+      }
+    }
+
+    def self.parse_xml(xml_set)
+      h = { 'spouse' => { 'income' => {} }, 'family' => [] }
+      xml_set.each do |xml|
+        # ルート要素の属性から様式IDを取得
+        form_id = xml.root.name
+        tags = TAGS[form_id]
+        next unless tags
+
+        year_node = xml.elements["//#{tags[:year]}"]
+        year = year_node&.text&.to_i
+
+        # NTAAPP001: 扶養控除等申告書
+        if form_id == 'NTAAPP001'
+          xml.elements.each("//#{tags[:family][:root]}") do |dep|
+            f = {}
+            f['name'] = dep.elements[tags[:family][:name]]&.text
+            f['kana'] = dep.elements[tags[:family][:kana]]&.text
+
+            bd_tags = tags[:family][:birth_date]
+            bd_node = dep.elements[bd_tags[:root]]
+            if bd_node
+              y = bd_node.elements[bd_tags[:year]]&.text
+              m = bd_node.elements[bd_tags[:month]]&.text
+              d = bd_node.elements[bd_tags[:day]]&.text
+              if y && m && d
+                f['birth_date'] = Date.new(y.to_i, m.to_i, d.to_i)
+              end
+            end
+
+            if year
+              dep_income = dep.elements[tags[:family][:income]]&.text
+              if dep_income && !dep_income.empty?
+                f['income'] = { year => dep_income.to_i }
+              end
+
+              elderly = dep.elements[tags[:family][:elderly]]&.text
+              if elderly && (elderly == '1' || elderly == '2')
+                f['elderly'] = { year => elderly.to_i }
+              end
+
+              tokutei = dep.elements[tags[:family][:tokutei]]&.text
+              if tokutei && (tokutei == '1' || tokutei == '2')
+                f['tokutei'] = { year => tokutei.to_i }
+              end
+
+              nonresident = dep.elements[tags[:family][:nonresident]]&.text
+              f['nonresident'] = { year => nonresident.to_i } if nonresident == '1'
+
+              hc_tags = tags[:family][:handicapped]
+              hc_node = dep.elements[hc_tags[:root]]
+              if hc_node
+                hc_type = hc_node.elements[hc_tags[:type]]&.text
+                if hc_type && !hc_type.empty? && hc_type != '0'
+                  f['handicapped'] = { year => hc_type.to_i }
+                end
+              end
+            end
+
+            h['family'] << f
+          end
+        end
+
+        # NTAAPP004: 配偶者控除等申告書
+        if form_id == 'NTAAPP004'
+          if year
+            spouse = xml.elements["//#{tags[:spouse][:root]}"]
+            if spouse
+              h['spouse']['name'] = spouse.elements[tags[:spouse][:name]]&.text
+              h['spouse']['kana'] = spouse.elements[tags[:spouse][:kana]]&.text
+
+              nonresident = spouse.elements[tags[:spouse][:nonresident]]&.text
+              if nonresident == '1'
+                h['spouse']['nonresident'] = {} unless h['spouse']['nonresident']
+                h['spouse']['nonresident'][year] = nonresident.to_i
+              end
+
+              income = spouse.elements[tags[:spouse][:income]]&.text
+              h['spouse']['income'][year] = income.to_i if income && !income.empty?
+
+              elderly = spouse.elements[tags[:spouse][:elderly]]&.text
+              h['spouse']['elderly'] = '1' if elderly == '1'
+            end
+          end
+        end
+      end
+
+      h['family'] = merge_family(h['family']) # 翌年の扶養控除等申告書との重複
+      h
+    end
+
+    def self.merge_family(family_list)
+      merged = {}
+      family_list.each do |f|
+        key = [f['name'].gsub("　", "").strip, f['birth_date']]
+        if merged.key?(key)
+          target = merged[key]
+
+          ['income', 'elderly', 'tokutei', 'nonresident', 'handicapped'].each do |field|
+            if f[field]
+              target[field] ||= {}
+              target[field].merge!(f[field])
+            end
+          end
+        else
+          merged[key] = f
+        end
+      end
+      merged.values
+    end
+
+    def self.bulk_load(path)
+      return enum_for(:bulk_load, path) unless block_given?
+
+      has_many = if File.directory?(path)
+                   children = Dir.children(path).map { |c| File.join(path, c) }
+                   has_subdir = children.any? { |c| File.directory?(c) }
+                   has_zip = children.any? { |c| File.file?(c) && File.extname(c).downcase == '.zip' }
+
+                   has_subdir || has_zip
+                 elsif File.file?(path)
+                   if File.extname(path).downcase == '.zip'
+                     false
+                   else
+                     raise "Unsupported file type: #{path}"
+                   end
+                 else
+                   raise "Path not found: #{path}"
+                 end
+
+      if has_many
+        # NOTE implement search by content logic
+        raise "Multiple import is not supported yet."
+
+        Dir.children(path).sort.map do |child|
+          full_path = File.join(path, child)
+          if File.directory?(full_path) || (File.file?(full_path) && File.extname(full_path).downcase == '.zip')
+            data = load_xml_export(full_path)
+            yield parse_xml(data) unless data.empty?
+          else
+            nil
+          end
+        end.compact
+      else
+        data = load_xml_export(path)
+        yield parse_xml(data) unless data.empty?
+      end
+    end
+
+    # 年末調整アプリのエクスポートデータ読み込み(非暗号zipまたはzipを解凍したディレクトリをサポート)
+    def self.load_xml_export(path)
+      docs = []
+      if File.directory?(path)
+        Dir.children(path).sort.each do |child|
+          full_path = File.join(path, child)
+          next if File.directory?(full_path)
+
+          ext = File.extname(child).downcase
+          if ext == '.xml'
+            begin
+              docs << REXML::Document.new(File.read(full_path))
+            rescue StandardError => e
+              STDERR.puts "#{full_path}: #{e.message}"
+            end
+          elsif ext == '.zip'
+            # skip without warning
+          else
+            STDERR.puts full_path
+          end
+        end
+        return docs
+      end
+
+      if File.file?(path) && File.extname(path).downcase == '.zip'
+        Zip::File.open(path) do |zip|
+          zip.each do |entry|
+            next if entry.directory?
+
+            ext = File.extname(entry.name).downcase
+            if ext == '.xml'
+              begin
+                docs << REXML::Document.new(entry.get_input_stream.read)
+              rescue StandardError => e
+                STDERR.puts "#{entry.name}: #{e.message}"
+              end
+            elsif ext == '.zip'
+              # skip without warning
+            else
+              STDERR.puts entry.name
+            end
+          end
+        end
+      end
+      docs
+    end
+  end
+end

data/lib/luca_salary/jp_payreport.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 require 'luca_salary'
 require 'luca_support/const'
+require 'luca/jp/util'
+
 require 'csv'
 require 'open3'
 
@@ -39,7 +41,7 @@ end
 private
 
 def 給与支払報告明細行(slip, company, year)
-  [
+  record = [
     315, # 法定資料の種類
     提出義務者(company),
     0, # 提出区分（新規0, 追加1, 訂正2, 取消3）
@@ -49,18 +51,20 @@ def 給与支払報告明細行(slip, company, year)
     支払を受ける者の詳細(slip, year),
     company['tax_id'], # 法人番号
     支払を受ける者の扶養情報(slip['profile'], year),
-    slip['911'] == 480_000 ? nil : slip['911'], # 基礎控除の額、48万の場合記載しない
+    (year <= 2024 && slip['911'] == 480_000) ? nil : slip['911'], # 基礎控除の額
     nil, # 所得金額調整控除額 TODO: 未実装 措法41の3の3
     nil, # ひとり親
-    提出先判定(slip), # 必須：作成区分（国税のみ0, 地方のみ1, 両方2）
-  ].flatten
+  ]
+  record << [nil, nil, nil] if year >= 2025 # 特定親族控除 TODO: 未実装
+  record << 提出先判定(slip) # 必須：作成区分（国税のみ0, 地方のみ1, 両方2）
+  record.flatten
 end
 
 def 提出義務者(company)
   [
     nil,  # 整理番号1
     nil,  # 本支店等区分番号
-    ['address', 'address2'].map { |attr| company[attr] }
+    ['address', 'address2'].map { |attr| Luca::Jp::Util.alphadigit_ja(company[attr]) }
       .compact.join('　'), # 必須：住所又は所在地
     company['name'], # 必須：氏名又は名称
     company['tel'],  # 電話番号
@@ -72,7 +76,7 @@ end
 
 def 支払を受ける者(profile)
   [
-    ['address', 'address2'].map { |attr| profile[attr] }
+    ['address', 'address2'].map { |attr| Luca::Jp::Util.alphadigit_ja(profile[attr]) }
       .compact.join('　'), # 必須：住所又は居所
     nil, # 国外住所表示（国内は"0"、国外は"1"）
     profile['name'], # 必須：氏名

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luca-jp
 version: !ruby/object:Gem::Version
-  version: 0.20.4
+  version: 0.20.6
 platform: ruby
 authors:
 - Chuma Takahiro
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-01-09 00:00:00.000000000 Z
+date: 2026-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lucabook
@@ -80,6 +80,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.1
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -185,6 +213,7 @@ files:
 - lib/luca_salary/jp.rb
 - lib/luca_salary/jp/insurance.rb
 - lib/luca_salary/jp/version.rb
+- lib/luca_salary/jp_adjustment.rb
 - lib/luca_salary/jp_payreport.rb
 homepage: https://github.com/chumaltd/luca-jp
 licenses: