luca-jp 0.16.0 → 0.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca379cda7bf415ef81ed4c7c72da443f1565f6b34e1bfad2e93c842aa71c011f
-  data.tar.gz: 8b5143397b416820bce2337169f4ff90b936bb712477b28bf3e5b2c457347471
+  metadata.gz: 4a2439c73cf61040d39604aba50f3765abd94a42ca9a6a3f531864993856e2c6
+  data.tar.gz: 6ecf8ad72b8fe7c6ac1a68c04360f0a5dc4f7c5ec754291c728d4a172319c6fe
 SHA512:
-  metadata.gz: 8e3812b030abf84a467eb10689c6dd9bd15b5265cbfcbf4ba2993a258b0c5a55454c276b69f95e23bdd07be93336d107d2de8360a4c6169559eded86eaecb502
-  data.tar.gz: 82f9f7fee16b38b1dbb63980a5a30e1ea9499bedb55608d93c3a759dd2e872df080e0c1a5ac3f776fa201cddc463c4af3fff88ccad3423311870a4591567c170
+  metadata.gz: d9983fbb9704f1867813024e0da0653d2079443190673c62964074d4c81cac6d92a5a8a6a86c1c8b4988b6f1e0db7d974ba9ed504ff0c35176961dd8e755c63f
+  data.tar.gz: 7e0303ee440175e577d7ef1c563f06278edf4f48e42a4e9c4a930c92cd353f9e7a511dcea715491c37e6f31af72b46dc687b3f31ff08949bc7cca9c12e9bd64b

data/exe/luca-jp

@@ -4,6 +4,8 @@
 require 'optparse'
 require 'luca/jp'
 require 'luca_salary/jp_payreport'
+require 'luca_cmd'
+require 'luca_support/const'
 
 class LucaCmd
   def self.syouhizei(args, params)
@@ -54,6 +56,26 @@ class LucaCmd
       [r[0].year, r[0].month, r[1].year, r[1].month]
     end
   end
+
+  def self.check_dir_jp(target)
+    check_dir(target) do
+      begin
+        ex_conf = YAML.safe_load(
+          File.read(Pathname(LucaSupport::CONST.pjdir) / 'config-lucajp.yml'),
+          permitted_classes: [Date]
+        )
+        if ex_conf
+          LucaSupport::CONST.set_config(
+            LucaSupport::CONST.config.merge(ex_conf)
+          )
+        end
+      rescue Errno::ENOENT
+        nil
+      end
+
+      yield
+    end
+  end
 end
 
 module LucaSalaryCmd
@@ -64,7 +86,7 @@ module LucaSalaryCmd
   end
 end
 
-LucaRecord::Base.valid_project?
+#LucaRecord::Base.valid_project?
 cmd = ARGV.shift
 params = {}
 
@@ -75,7 +97,9 @@ when 'h', /hou?jinzei/
     opt.on('--export', 'export json') { |_v| params[:export] = true }
     opt.on('--lastyear', 'report on last Financial year') { |_v| params[:lastyear] = true }
     args = opt.parse!(ARGV)
-    LucaCmd.houjinzei(args, params)
+    LucaCmd.check_dir_jp('journals') do
+      LucaCmd.houjinzei(args, params)
+    end
   end
 when 's', /s[yh]ou?hizei/
     OptionParser.new do |opt|
@@ -83,7 +107,9 @@ when 's', /s[yh]ou?hizei/
       opt.on('--export', 'export json') { |_v| params[:export] = true }
       opt.on('--lastyear', 'report on last Financial year') { |_v| params[:lastyear] = true }
       args = opt.parse!(ARGV)
-      LucaCmd.syouhizei(args, params)
+      LucaCmd.check_dir_jp('journals') do
+        LucaCmd.syouhizei(args, params)
+      end
     end
 when 'c', /chihou?zei/
   OptionParser.new do |opt|
@@ -91,7 +117,9 @@ when 'c', /chihou?zei/
     opt.on('--export', 'export json') { |_v| params[:export] = true }
     opt.on('--lastyear', 'report on last Financial year') { |_v| params[:lastyear] = true }
     args = opt.parse!(ARGV)
-    LucaCmd.chihouzei(args, params)
+    LucaCmd.check_dir_jp('journals') do
+      LucaCmd.chihouzei(args, params)
+    end
   end
 when /urikake/
   OptionParser.new do |opt|
@@ -99,14 +127,21 @@ when /urikake/
     opt.on('--total VAL', '売掛金総額') { |v| params[:total] = v&.to_i }
     opt.on('--utf8', 'UTF-8でファイル生成') { |_v| params[:encode] = 'UTF-8' }
     args = opt.parse!(ARGV)
-    LucaCmd.urikake(args, params)
+    LucaCmd.check_dir_jp('invoices') do
+      LucaCmd.urikake(args, params)
+    end
   end
 when 'k', 'kyuyo', 'salary'
   OptionParser.new do |opt|
     opt.banner = 'Usage: luca-jp kyuyo [--export] year'
     args = opt.parse(ARGV)
-    LucaSalaryCmd::Export.payreport(args)
+    LucaCmd.check_dir_jp('profiles') do
+      LucaSalaryCmd::Export.payreport(args)
+    end
   end
+when 'version'
+  puts "luca-jp: version #{Luca::Jp::VERSION}"
+  exit 0
 else
   puts 'Proper subcommand needed.'
   puts

data/lib/luca/jp/aoiro.rb

@@ -5,7 +5,6 @@ require 'cgi/escape'
 require 'luca_book'
 require 'luca_support'
 require 'luca_record/dict'
-require 'luca_support/config'
 require 'luca/jp'
 
 module Luca

data/lib/luca/jp/chihouzei.rb

@@ -5,7 +5,6 @@ require 'cgi/escape'
 require 'luca_book'
 require 'luca_support'
 require 'luca_record/dict'
-require 'luca_support/config'
 require 'luca/jp'
 
 module Luca

data/lib/luca/jp/it_part.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'luca_support'
-require 'luca_support/config'
 
 module Luca
   module Jp

data/lib/luca/jp/sonshitsu.rb

@@ -4,7 +4,7 @@ require 'date'
 require 'pathname'
 require 'yaml'
 require 'luca_book'
-require 'luca_support/config'
+require 'luca_support/const'
 
 module Luca
   module Jp
@@ -95,7 +95,7 @@ module Luca
       end
 
       def self.record_file
-        Pathname(LucaSupport::PJDIR) / 'data' / 'balance' / 'sonshitsu.yml'
+        Pathname(LucaSupport::CONST.pjdir) / 'data' / 'balance' / 'sonshitsu.yml'
       end
     end
   end

data/lib/luca/jp/syouhizei.rb

@@ -5,7 +5,6 @@ require 'cgi/escape'
 require 'luca_book'
 require 'luca_support'
 require 'luca_record/dict'
-require 'luca_support/config'
 require 'luca/jp/util'
 
 module Luca

data/lib/luca/jp/urikake.rb

@@ -4,7 +4,6 @@ require 'json'
 require 'cgi/escape'
 require 'luca_deal'
 require 'luca_support'
-require 'luca_support/config'
 require 'luca/jp'
 
 module Luca

data/lib/luca/jp/util.rb

@@ -64,7 +64,7 @@ module Luca
       end
 
       def config
-        EX_CONF.nil? ? LucaSupport::CONFIG : LucaSupport::CONFIG.merge(EX_CONF)
+        LucaSupport::CONST.config
       end
 
       def it_part_config(key)

data/lib/luca/jp/version.rb

@@ -2,6 +2,6 @@
 
 module Luca
   module Jp
-    VERSION = '0.16.0'
+    VERSION = '0.16.2'
   end
 end

data/lib/luca/jp.rb

@@ -2,7 +2,8 @@
 
 require 'date'
 require 'luca/jp/version'
-require 'luca_support/config'
+require 'luca_support/const'
+require 'yaml'
 
 module Luca
   module Jp
@@ -17,10 +18,4 @@ module Luca
     autoload :Uchiwake, 'luca/jp/uchiwake'
     autoload :Util, 'luca/jp/util'
   end
-
-  EX_CONF = begin
-              YAML.safe_load(File.read(Pathname(LucaSupport::PJDIR) / 'config-lucajp.yml'), permitted_classes: [Date])
-            rescue Errno::ENOENT
-              nil
-            end
 end

data/lib/luca_salary/jp/version.rb

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

data/lib/luca_salary/jp_payreport.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 require 'luca_salary'
-require 'luca_support/config'
+require 'luca_support/const'
 require 'csv'
 require 'open3'
 
@@ -24,11 +24,11 @@ module LucaSalary
       # TODO: extract effective field
       def self.set_company(year)
         {}.tap do |h|
-          h['name'] = CONFIG.dig('company', 'name')
-          h['address'] = CONFIG.dig('company', 'address')
-          h['address2'] = CONFIG.dig('company', 'address2')
-          h['tel'] = CONFIG.dig('company', 'tel')
-          h['tax_id'] = CONFIG.dig('company', 'tax_id')
+          h['name'] = LucaSupport::CONST.config.dig('company', 'name')
+          h['address'] = LucaSupport::CONST.config.dig('company', 'address')
+          h['address2'] = LucaSupport::CONST.config.dig('company', 'address2')
+          h['tel'] = LucaSupport::CONST.config.dig('company', 'tel')
+          h['tax_id'] = LucaSupport::CONST.config.dig('company', 'tax_id')
 
           raise "会社名、住所の設定は必須" if h['name'].nil? or h['address'].nil?
         end
@@ -49,7 +49,7 @@ def 給与支払報告明細行(slip, company, year)
     支払を受ける者の詳細(slip, year),
     company['tax_id'], # 法人番号
     支払を受ける者の扶養情報(slip['profile'], year),
-    slip['911'], # 基礎控除の額
+    slip['911'] == 480_000 ? nil : slip['911'], # 基礎控除の額、48万の場合記載しない
     nil, # 所得金額調整控除額 TODO: 未実装 措法41の3の3
     nil, # ひとり親
     提出先判定(slip), # 必須：作成区分（国税のみ0, 地方のみ1, 両方2）
@@ -82,6 +82,7 @@ end
 
 def 支払(slip, year)
   配偶者控除等 = [slip['916'], slip['917']].compact.sum
+  扶養対象 = 扶養親族分類(slip.dig('profile', 'family'), year)
   [
     '給料', # 種別
     slip['1'], # 支払金額
@@ -93,12 +94,12 @@ def 支払(slip, year)
     配偶者控除等 > 0 ? 1 : 2, # 控除対象配偶者の有無 TODO: 従たる給与
     老人控除対象配偶者(slip.dig('profile', 'spouse'), year),
     配偶者控除等, # 配偶者控除の額
-    nil, # 控除対象扶養親族の数 特定 主
+    扶養対象['特定'].length, # 控除対象扶養親族の数 特定 主
     nil, # 控除対象扶養親族の数 特定 従
-    nil, # 控除対象扶養親族の数 老人 主
+    扶養対象['老人'].length, # 控除対象扶養親族の数 老人 主
     nil, # 控除対象扶養親族の数 老人 上の内訳
     nil, # 控除対象扶養親族の数 老人 従
-    nil, # 控除対象扶養親族の数 その他 主
+    扶養対象['その他'].length, # 控除対象扶養親族の数 その他 主
     nil, # 控除対象扶養親族の数 その他 従
     nil, # 障害者の数 特別障害者
     nil, # 障害者の数 上の内訳 NOTE: 同居・同一生計
@@ -122,7 +123,7 @@ def 支払を受ける者の詳細(slip, year)
     nil, # 地震保険料の控除額
     nil, # 住宅借入金等特別控除等の額
     nil, # 旧個人年金保険料の額
-    slip.dig('spouse', 'income'), # 配偶者の合計所得
+    slip.dig('profile', 'spouse', 'income', year), # 配偶者の合計所得
     nil, # 旧長期損害保険料の額
     生年月日[0], # 必須：受給者の生年月日 元号
     生年月日[1], # 必須：受給者の生年月日 年
@@ -174,7 +175,7 @@ def 支払を受ける者の扶養情報(profile, year)
     nil, # 青色専従者
     nil, # 条約免除
     半角変換(profile['katakana']), # 必須：支払を受ける者のフリガナ（半角）
-    nil, # 需給者番号
+    nil, # 受給者番号
     profile.dig('resident', 'area_code'), # 必須：提出先市町村コード
     profile.dig('resident', 'tax_id'), # 指定番号
   ]
@@ -203,17 +204,27 @@ end
 def 扶養親族分類(family, year)
   return {} if family.nil?
 
-  { '16才以上' => [], '16才未満' => [] }.tap do |result|
+  this_year = Date.new(year, 12, -1)
+  { '16才以上' => [], '16才未満' => [], '老人' => [], '特定' => [], 'その他' => [] }.tap do |result|
     family.each do |p|
       if !p['birth_date']
         result['16才以上'] << p
+        result['その他'] << p
       else
         date = p['birth_date']
         date = Date.parse(date) if date.is_a?(String)
-        if date.next_year(16) < Date.new(year, 12, -1)
+        if date.next_year(16) <= this_year
           result['16才以上'] << p
+          if date.next_year(70) <= this_year
+            result['老人'] << p
+          elsif date.next_year(19) <= this_year and date.next_year(23) > this_year
+            result['特定'] << p
+          else
+            result['その他'] << p
+          end
         else
           result['16才未満'] << p
+          result['その他'] << p
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luca-jp
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.16.2
 platform: ruby
 authors:
 - Chuma Takahiro
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-06 00:00:00.000000000 Z
+date: 2024-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lucabook
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: jp-national-tax
   requirement: !ruby/object:Gem::Requirement