aoiro 0.1.0__py3-none-any.whl → 0.1.1__py3-none-any.whl

aoiro/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.1.0"
+__version__ = "0.1.1"
 from ._ledger import (
     GeneralLedgerLine,
     GeneralLedgerLineImpl,

aoiro/reader/_sales.py

@@ -120,14 +120,18 @@ def ledger_from_sales(
             )
         )
     for (t, date, currency), df_ in df.groupby(["取引先", "振込日", "通貨"]):
-        amount = Decimal(df_["金額"].sum())
+        fees = Decimal(df_["手数料"].sum())
+        receivable = Decimal(df_["金額"].sum())
+        recievable_without_fees = receivable - fees
         if currency == "":
             withholding = withholding_tax(
                 df_.loc[df_["源泉徴収"] == True, "金額"].sum()
             )
             values = [
                 LedgerElementImpl(
-                    account="事業主貸", amount=amount - withholding, currency=currency
+                    account="事業主貸",
+                    amount=recievable_without_fees - withholding,
+                    currency=currency,
                 )
             ]
             if withholding > 0:
@@ -140,15 +144,23 @@ def ledger_from_sales(
             if (df_["源泉徴収"] == True).any():
                 raise ValueError("通貨が異なる取引に源泉徴収が含まれています。")
             values = [
-                LedgerElementImpl(account="事業主貸", amount=amount, currency=currency)
+                LedgerElementImpl(
+                    account="事業主貸",
+                    amount=recievable_without_fees,
+                    currency=currency,
+                )
             ]
+        if fees > 0:
+            values.append(
+                LedgerElementImpl(account="支払手数料", amount=fees, currency=currency)
+            )
         ledger_lines.append(
             GeneralLedgerLineImpl(
                 date=date,
                 values=[
                     *values,
                     LedgerElementImpl(
-                        account="売掛金", amount=-amount, currency=currency
+                        account="売掛金", amount=-receivable, currency=currency
                     ),
                 ],
             )

{aoiro-0.1.0.dist-info → aoiro-0.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: aoiro
-Version: 0.1.0
+Version: 0.1.1
 Summary: CSV-based 青色申告 CLI app
 License: AGPL-3.0-only
 Author: 34j

{aoiro-0.1.0.dist-info → aoiro-0.1.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-aoiro/__init__.py,sha256=D8t03maRfGmkHrZtRdmbJ5U5NCEIpB7Zh8FbEytsXHk,1342
+aoiro/__init__.py,sha256=qNPQL4wHxhTc5yCQuZfAqdlXxn66hfqUq27L6C2_lGI,1342
 aoiro/__main__.py,sha256=37q_z3ZTcZhgeSOGjKR91PPFHinUKZpyZTTfpiOizjs,80
 aoiro/_ledger.py,sha256=uqpy9lenWdxNa-7UkKQRu2YMX74Byw2dbrgyAtuVf4o,8662
 aoiro/_multidimensional.py,sha256=1XOsLX8JULZ5KdTMaePWt_emYHlTY0tzZP6yglxa2vU,6046
@@ -9,9 +9,9 @@ aoiro/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 aoiro/reader/__init__.py,sha256=h53M_CpbPpZVCnY3nxY6qqWmabK_50X8sih-G_adFN4,332
 aoiro/reader/_expenses.py,sha256=ncZug8uwMGC18qJLCOEkLLbdASMdaoLc87IoZ9o4KrM,1394
 aoiro/reader/_io.py,sha256=8GSkBxn_8MVpq-4-47FeXEI5D1sugR415LsRA5hQH_I,4411
-aoiro/reader/_sales.py,sha256=jRzs2032YqZNiSbdrp-G9Qhlo8AA40fYmhBhFFQuViE,5297
-aoiro-0.1.0.dist-info/LICENSE,sha256=2xqHuoHohba7gpcZZKtOICRjzeKsQANXG8WoV9V35KM,33893
-aoiro-0.1.0.dist-info/METADATA,sha256=ZMkQgpsV3fny5YYwXd2qCNmOj5h_e14eNcAfdCUFlpA,13486
-aoiro-0.1.0.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-aoiro-0.1.0.dist-info/entry_points.txt,sha256=bfcB8r_8xOWhLGp_SRYaNbohnbiZjhCCsHWCgtLeMWM,39
-aoiro-0.1.0.dist-info/RECORD,,
+aoiro/reader/_sales.py,sha256=6TdYYRT4uTODZZ16IptHO4UilG1Q6_z-_RaelQQGNbg,5713
+aoiro-0.1.1.dist-info/LICENSE,sha256=2xqHuoHohba7gpcZZKtOICRjzeKsQANXG8WoV9V35KM,33893
+aoiro-0.1.1.dist-info/METADATA,sha256=r9NXkmi4tjhuCSfugPlt39XdYqjcIuKgXVp698LJkC8,13486
+aoiro-0.1.1.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+aoiro-0.1.1.dist-info/entry_points.txt,sha256=bfcB8r_8xOWhLGp_SRYaNbohnbiZjhCCsHWCgtLeMWM,39
+aoiro-0.1.1.dist-info/RECORD,,