luca-jp 0.20.3 → 0.20.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 827562f80bb3c45d9b0058ba94e99c08e537c6e05288d695970b2b25420abf6d
-  data.tar.gz: c7b1dc9f95b4d5a0a0430a312d32eb17e679e8ca0e9a7679f0b28fb8d754b7fd
+  metadata.gz: c08c93c99340c765ef5a6f54e7d32a08da995925a42d9217b987e432b3a83cde
+  data.tar.gz: b1bfd83cec6fc56050f7a70a0578de2942fcf74e539249faef30bc1da6f05ddb
 SHA512:
-  metadata.gz: d48e2910162d833838b007ba484490f24db49b8ad22917cea36eb76abfa59366db5df2f674a17f80c602d12278b3cc02b2ed03c8b4856e1ca7f2caafa7ac265f
-  data.tar.gz: 2d14ba140686ec2957cd0d8b09e887aa9cc7dfc4816c4e9a9ebeeb9b96f43975576e5ab4d96d350c5efad30068495fef1ed5ed27533db29fb88f6b2f4127039e
+  metadata.gz: 504a1bdfcccdf1e2b1881b44c928a8b62ab5cd640eb262d6082a9ff290c1d73184575540a9e661a0b88fd126fdeb397bc7ef56dc4f5ca268f5d42d1cd16c4d68
+  data.tar.gz: cb95c8d8bca2d4aee9442f6253b7159ae9b8c24df12dd255d887de889a00312c894af39608772a38191f999db215d7a0846ad78c70ada84c755accfef632f1fc

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.3'
+    VERSION = '0.20.5'
   end
 end

data/lib/luca_salary/jp/version.rb

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

data/lib/luca_salary/jp.rb

@@ -43,8 +43,8 @@ class LucaSalary::Jp < LucaSalary::Base
     payment.tap do |p|
       p['901'] = 給与等の金額
       p['911'] = JpNationalTax::IncomeTax.basic_deduction(給与等の金額, date)
-      p['916'] = 配偶者控除の金額(p['1'], profile['spouse'], date)
-      p['917'] = 配偶者特別控除の金額(p['1'], profile['spouse'], date)
+      p['916'] = 配偶者控除の金額(給与等の金額, profile['spouse'], date)
+      p['917'] = 配偶者特別控除の金額(給与等の金額, profile['spouse'], date)
       p['918'] = 扶養控除の金額(profile['family'], date)
       p['912'] = ['201', '202', '204', '205'].map{ |cd| p[cd] }.compact.sum
       課税給与所得金額 = 給与等の金額 - ['911', '912', '916', '917', '918'].map{ |cd| p[cd] }.compact.sum
@@ -65,68 +65,23 @@ class LucaSalary::Jp < LucaSalary::Base
     end
   end
 
-  def self.配偶者控除の金額(income, spouse, date)
-    puts spouse
+  def self.配偶者控除の金額(salary, spouse, date)
     return nil if spouse.nil?
 
-    puts spouse
     spouse_salary = JpNationalTax::IncomeTax.year_salary_taxable(spouse['income'][date.year.to_s] || 0, date)
-    return 0 if spouse_salary > 480_000
-
-    salary = JpNationalTax::IncomeTax.year_salary_taxable(income || 0, date)
-    birth_date = spouse['birth_date'] || date
-    if salary <= 9_000_000
-      birth_date <= date.prev_year(70) ? 480_000 : 380_000
-    elsif salary <= 9_500_000
-      birth_date <= date.prev_year(70) ? 320_000 : 260_000
-    elsif salary <= 10_000_000
-      birth_date <= date.prev_year(70) ? 160_000 : 130_000
-    else
-      0
-    end
+    return 0 if spouse_salary > 580_000
+
+    JpNationalTax::IncomeTax.spouse_deduction(salary, spouse_salary, date, spouse['birth_date'])
   end
 
-  def self.配偶者特別控除の金額(income, spouse, date)
+  def self.配偶者特別控除の金額(salary, spouse, date)
     return nil if spouse.nil?
-
-    salary = JpNationalTax::IncomeTax.year_salary_taxable(income || 0, date)
     return 0 if salary > 10_000_000
 
     spouse_salary = JpNationalTax::IncomeTax.year_salary_taxable(spouse['income'][date.year.to_s] || 0, date)
-    return 0 if spouse_salary <= 480_000
-    return 0 if spouse_salary > 1_330_000
-
-    if salary <= 9_000_000
-      return 380_000 if spouse_salary <= 950_000
-      return 360_000 if spouse_salary <= 1_000_000
-      return 310_000 if spouse_salary <= 1_050_000
-      return 260_000 if spouse_salary <= 1_100_000
-      return 210_000 if spouse_salary <= 1_150_000
-      return 160_000 if spouse_salary <= 1_200_000
-      return 110_000 if spouse_salary <= 1_250_000
-      return 60_000 if spouse_salary <= 1_300_000
-      return 30_000
-    elsif salary <= 9_500_000
-      return 260_000 if spouse_salary <= 950_000
-      return 240_000 if spouse_salary <= 1_000_000
-      return 210_000 if spouse_salary <= 1_050_000
-      return 180_000 if spouse_salary <= 1_100_000
-      return 140_000 if spouse_salary <= 1_150_000
-      return 110_000 if spouse_salary <= 1_200_000
-      return 80_000 if spouse_salary <= 1_250_000
-      return 40_000 if spouse_salary <= 1_300_000
-      return 20_000
-    else
-      return 130_000 if spouse_salary <= 950_000
-      return 120_000 if spouse_salary <= 1_000_000
-      return 110_000 if spouse_salary <= 1_050_000
-      return 90_000 if spouse_salary <= 1_100_000
-      return 70_000 if spouse_salary <= 1_150_000
-      return 60_000 if spouse_salary <= 1_200_000
-      return 40_000 if spouse_salary <= 1_250_000
-      return 20_000 if spouse_salary <= 1_300_000
-      return 10_000
-    end
+    return 0 if spouse_salary <= 580_000
+
+    JpNationalTax::IncomeTax.spouse_deduction(salary, spouse_salary, date, spouse['birth_date'])
   end
 
   def self.扶養控除の金額(family, date)
@@ -139,15 +94,8 @@ class LucaSalary::Jp < LucaSalary::Base
     birth_date = person['birth_date']
     return 0 if birth_date.nil?
 
-    if birth_date > date.prev_year(16)
-      0
-    elsif birth_date <= date.prev_year(70)
-      person['live_with'] ? 580_000 : 480_000 # 老人扶養親族
-    elsif birth_date <= date.prev_year(19) and birth_date > date.prev_year(23)
-      630_000 # 特定扶養親族
-    else
-      380_000
-    end
+    salary = JpNationalTax::IncomeTax.year_salary_taxable(person.dig('income', date.year.to_s) || 0, date)
+    JpNationalTax::IncomeTax.family_deduction(birth_date, date, salary, live_with: person['live_with'])
   end
 
   def self.扶養控除対象者の数(family, date)

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.3
+  version: 0.20.5
 platform: ruby
 authors:
 - Chuma Takahiro
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-01-09 00:00:00.000000000 Z
+date: 2026-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lucabook
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement