• R/O
  • SSH
  • HTTPS

aoiro: Commit


Commit MetaInfo

Revisão27 (tree)
Hora2020-02-08 11:58:58
Autorhirukawa_ryo

Mensagem de Log

* aoiro 0.3.5
個人事業主の場合、貸借対照表を「負債・純資産の部」ではなく「負債・資本の部」と表示するようにしました。
損益計算書の右側の表示順を「家事消費等」「雑収入」にしました。(国税庁の決算書の並び順に合わせました。)
依存ライブラリのバージョンを上げました。

Mudança Sumário

Diff

--- aoiro/trunk/etc/index.html (nonexistent)
+++ aoiro/trunk/etc/index.html (revision 27)
@@ -0,0 +1,13 @@
1+<!DOCTYPE html>
2+<html lang="en">
3+ <head>
4+ <meta charset="utf-8" />
5+ <meta http-equiv="X-UA-Compatible" content="IE=edge" />
6+ <meta http-equiv="refresh" content="1;URL=https://aoiro.osdn.jp/">
7+ <meta name="description" content="aoiro" />
8+ <title>aoiro</title>
9+ </head>
10+ <body>
11+ See <a href="https://aoiro.osdn.jp/">https://aoiro.osdn.jp/</a>
12+ </body>
13+</html>
--- aoiro/trunk/lib/yamlbeans/LICENSE (revision 26)
+++ aoiro/trunk/lib/yamlbeans/LICENSE (nonexistent)
@@ -1,20 +0,0 @@
1-
2-Copyright (c) 2008 Nathan Sweet, Copyright (c) 2006 Ola Bini
3-
4-Permission is hereby granted, free of charge, to any person obtaining a copy of
5-this software and associated documentation files (the "Software"), to deal in
6-the Software without restriction, including without limitation the rights to
7-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
8-of the Software, and to permit persons to whom the Software is furnished to do
9-so, subject to the following conditions:
10-
11-The above copyright notice and this permission notice shall be included in all
12-copies or substantial portions of the Software.
13-
14-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
19-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
20-SOFTWARE.
--- aoiro/trunk/lib/yamlbeans/CREDITS (revision 26)
+++ aoiro/trunk/lib/yamlbeans/CREDITS (nonexistent)
@@ -1,10 +0,0 @@
1-
2-CREDITS
3--------
4-
5-Kirill Simonov <xi@resolvent.net>
6-For writing the PyYAML3000 YAML parser.
7-
8-Ola Bini <ola@ologix.com>
9-For porting PyYAML3000 to RbYAML and RbYAML to JvYAML.
10-The yamlbeans project is based on the JvYAML tokenizer, parser, and emitter.
--- aoiro/trunk/lib/jna/LICENSE (revision 26)
+++ aoiro/trunk/lib/jna/LICENSE (nonexistent)
@@ -1,22 +0,0 @@
1-Java Native Access project (JNA) is dual-licensed under 2
2-alternative Open Source/Free licenses: LGPL 2.1 or later and
3-Apache License 2.0. (starting with JNA version 4.0.0).
4-
5-You can freely decide which license you want to apply to
6-the project.
7-
8-You may obtain a copy of the LGPL License at:
9-
10-http://www.gnu.org/licenses/licenses.html
11-
12-A copy is also included in the downloadable source code package
13-containing JNA, in file "LGPL2.1", under the same directory
14-as this file.
15-
16-You may obtain a copy of the Apache License at:
17-
18-http://www.apache.org/licenses/
19-
20-A copy is also included in the downloadable source code package
21-containing JNA, in file "AL2.0", under the same directory
22-as this file.
--- aoiro/trunk/src/main/java/net/osdn/aoiro/AccountSettlement.java (revision 26)
+++ aoiro/trunk/src/main/java/net/osdn/aoiro/AccountSettlement.java (revision 27)
@@ -300,6 +300,8 @@
300300
301301
302302 //損益勘定の差額を資本振替します。
303+ //貸借対照表の「資本の部」は「純資産の部」に変わりましたが、
304+ //損益勘定を繰越利益剰余金に振り替えることは「資本振替」といいます。(純資産振替とはいいません)
303305 {
304306 if(incomeSummary == 0) {
305307 //損益勘定の差額が 0 のときは振替仕訳を作成しません。
@@ -471,7 +473,7 @@
471473 }
472474 }
473475
474- //純資産の残高振替
476+ //純資産(資本)の残高振替
475477 {
476478 List<Debtor> debtors = new ArrayList<Debtor>();
477479 int debtorsTotal = 0;
@@ -508,23 +510,27 @@
508510 }
509511 }
510512 //残高勘定仕訳
511- if(debtors.size() > 0) {
512- //貸方
513- Creditor creditor = new Creditor(AccountTitle.BALANCE, debtorsTotal);
514- //仕訳
515- JournalEntry incomeSummaryEntry = new JournalEntry(date, "純資産の残高振替", debtors, Arrays.asList(creditor));
516- journalEntries.add(incomeSummaryEntry);
513+ {
514+ // 個人の場合は資本の残高振替、会社の場合は純資産の残高振替と表示します。
515+ String description = isSoloProprietorship ? "資本の残高振替" : "純資産の残高振替";
516+ if(debtors.size() > 0) {
517+ //貸方
518+ Creditor creditor = new Creditor(AccountTitle.BALANCE, debtorsTotal);
519+ //仕訳
520+ JournalEntry incomeSummaryEntry = new JournalEntry(date, description, debtors, Arrays.asList(creditor));
521+ journalEntries.add(incomeSummaryEntry);
522+ }
523+ if(creditors.size() > 0) {
524+ //借方
525+ Debtor debtor = new Debtor(AccountTitle.BALANCE, creditorsTotal);
526+ //仕訳
527+ JournalEntry incomeSummaryEntry = new JournalEntry(date, description, Arrays.asList(debtor), creditors);
528+ journalEntries.add(incomeSummaryEntry);
529+ }
530+ if(out != null) {
531+ out.println(" " + description + "が完了しました。");
532+ }
517533 }
518- if(creditors.size() > 0) {
519- //借方
520- Debtor debtor = new Debtor(AccountTitle.BALANCE, creditorsTotal);
521- //仕訳
522- JournalEntry incomeSummaryEntry = new JournalEntry(date, "純資産の残高振替", Arrays.asList(debtor), creditors);
523- journalEntries.add(incomeSummaryEntry);
524- }
525- if(out != null) {
526- out.println(" 純資産の残高振替が完了しました。");
527- }
528534 }
529535 }
530536
--- aoiro/trunk/src/main/java/net/osdn/aoiro/report/BalanceSheet.java (revision 26)
+++ aoiro/trunk/src/main/java/net/osdn/aoiro/report/BalanceSheet.java (revision 27)
@@ -282,6 +282,21 @@
282282 printData.add("\t\t\\box 155.7 0 6 -0");
283283 printData.add("\t\t\\text " + closingDay);
284284
285+ //負債・資本の部のタイトル変更
286+ //2006年の新会社法で貸借対照表の「資本の部」が「純資産の部」に変更になりました。
287+ //しかし、国税庁が用意している個人の確定申告用の決算書(貸借対照表)では「資本の部」という表示のままとなっています。
288+ //国税庁が用意している決算書(貸借対照表)への転記しやすさを考え、
289+ //aoiroでは会社の場合は「純資産の部」、個人事業主の場合は「資本の部」と表記を切り替えるようにしています。
290+ printData.add("\t\\box 0 25 -0 6");
291+ printData.add("\t\t\\font sans-serif 9");
292+ printData.add("\t\t\\align center");
293+ printData.add("\t\t\\box 87.5 0 87.5 -0");
294+ if(isSoloProprietorship) {
295+ printData.add("\t\t\\text 負 債 ・ 資 本 の 部");
296+ } else {
297+ printData.add("\t\t\\text 負 債 ・ 純 資 産 の 部");
298+ }
299+
285300 //印字領域の設定
286301 int assetsRows = 1;
287302 for(int i = 1; i < assetsList.size(); i++) {
@@ -485,9 +500,9 @@
485500
486501 public void writeTo(File file) throws IOException {
487502 prepare();
488-
489- BrewerData pb = new BrewerData(printData);
503+
490504 PdfBrewer brewer = new PdfBrewer();
505+ BrewerData pb = new BrewerData(printData, brewer.getFontLoader());
491506 brewer.setTitle("貸借対照表");
492507 brewer.process(pb);
493508 brewer.save(file);
--- aoiro/trunk/src/main/java/net/osdn/aoiro/report/GeneralJournal.java (revision 26)
+++ aoiro/trunk/src/main/java/net/osdn/aoiro/report/GeneralJournal.java (revision 27)
@@ -351,9 +351,9 @@
351351
352352 public void writeTo(File file) throws IOException {
353353 prepare();
354-
355- BrewerData pb = new BrewerData(printData);
354+
356355 PdfBrewer brewer = new PdfBrewer();
356+ BrewerData pb = new BrewerData(printData, brewer.getFontLoader());
357357 brewer.setTitle("仕訳帳");
358358 brewer.process(pb);
359359 brewer.save(file);
--- aoiro/trunk/src/main/java/net/osdn/aoiro/report/GeneralLedger.java (revision 26)
+++ aoiro/trunk/src/main/java/net/osdn/aoiro/report/GeneralLedger.java (revision 27)
@@ -443,9 +443,9 @@
443443
444444 public void writeTo(File file) throws IOException {
445445 prepare();
446-
447- BrewerData pb = new BrewerData(printData);
446+
448447 PdfBrewer brewer = new PdfBrewer();
448+ BrewerData pb = new BrewerData(printData, brewer.getFontLoader());
449449 brewer.setTitle("総勘定元帳");
450450 brewer.process(pb);
451451 brewer.save(file);
--- aoiro/trunk/src/main/java/net/osdn/aoiro/report/ProfitAndLoss.java (revision 26)
+++ aoiro/trunk/src/main/java/net/osdn/aoiro/report/ProfitAndLoss.java (revision 27)
@@ -174,8 +174,8 @@
174174 String month = (calendar.get(Calendar.MONTH) + 1) + "月";
175175 map.put(month, new Amount[2]);
176176 }
177+ map.put("家事消費等", new Amount[2]);
177178 map.put("雑収入", new Amount[2]);
178- map.put("家事消費等", new Amount[2]);
179179
180180 for(JournalEntry entry : journalEntries) {
181181 //開始仕訳と締切仕訳は集計に含めません。
@@ -406,9 +406,9 @@
406406
407407 public void writeTo(File file) throws IOException {
408408 prepare();
409-
410- BrewerData pb = new BrewerData(printData);
409+
411410 PdfBrewer brewer = new PdfBrewer();
411+ BrewerData pb = new BrewerData(printData, brewer.getFontLoader());
412412 brewer.setTitle("損益計算書");
413413 brewer.process(pb);
414414 brewer.save(file);
--- aoiro/trunk/src/main/java/net/osdn/aoiro/report/StatementOfChangesInEquity.java (revision 26)
+++ aoiro/trunk/src/main/java/net/osdn/aoiro/report/StatementOfChangesInEquity.java (revision 27)
@@ -462,9 +462,9 @@
462462
463463 public void writeTo(File file) throws IOException {
464464 prepare();
465-
466- BrewerData pb = new BrewerData(printData);
465+
467466 PdfBrewer brewer = new PdfBrewer();
467+ BrewerData pb = new BrewerData(printData, brewer.getFontLoader());
468468 brewer.setTitle("社員資本等変動計算書");
469469 brewer.process(pb);
470470 brewer.save(file);
Show on old repository browser