dinary 1.2.0__tar.gz → 1.2.1__tar.gz

{dinary-1.2.0 → dinary-1.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dinary
-Version: 1.2.0
+Version: 1.2.1
 Summary: Server for [Dinary - your dinar diary](https://github.com/andgineer/dinary). Track expenses, scan receipts, analyze spending with AI
 Project-URL: Homepage, https://andgineer.github.io/dinary/
 Project-URL: Documentation, https://andgineer.github.io/dinary/

dinary-1.2.1/src/dinary/__about__.py

@@ -0,0 +1 @@
+__version__ = "1.2.1"

{dinary-1.2.0 → dinary-1.2.1}/tasks/__init__.py

@@ -20,6 +20,7 @@ from .devtools.constants import ALLOWED_VERSION_TYPES
 from .devtools.dev import build_static, dev, pre, reqs, test, uv, ver_task_factory, version
 from .healthcheck import healthcheck
 from .imports.import_tasks import (
+    export_income_original,
     import_budget,
     import_budget_all,
     import_catalog,
@@ -47,6 +48,7 @@ __all__ = [
     "dev",
     "docs_task_factory",
     "healthcheck",
+    "export_income_original",
     "import_budget",
     "import_budget_all",
     "import_catalog",

{dinary-1.2.0 → dinary-1.2.1}/tasks/imports/import_tasks.py

@@ -2,10 +2,12 @@
 
 import json as _json
 import sys
+from pathlib import Path
 from datetime import datetime as _dt
 
 from invoke import task
 
+from tasks.imports import income_original_export
 from tasks.imports import report_2d_3d as _report_2d_3d_module
 from tasks.reports import verify_budget, verify_income
 from tasks.ssh_utils import remote_snapshot_cmd, ssh_capture_bytes, ssh_json, ssh_run
@@ -248,6 +250,19 @@ def verify_income_equivalence_all(c, json=False):  # noqa: A002
     sys.exit(verify_income.exit_code_for_batch(results))
 
 
+@task(name="export-income-original")
+def export_income_original(c, output=""):
+    """Export income from all sheets in original currency (RUB/RSD) to a JSON file.
+
+    Reads every registered income source from .deploy/import_sources.json and
+    writes a flat list of {year, month, amount, currency} entries to JSON.
+    Default output path: data/income_original.json. Override with --output.
+    """
+    dest = Path(output) if output else income_original_export.DEFAULT_OUTPUT
+    count = income_original_export.export_to_file(dest)
+    print(f"Wrote {count} entries to {dest}")
+
+
 def _render_2d3d_locally(raw: bytes, *, as_csv: bool) -> None:
     """Render a JSON envelope produced by ``tasks.imports.report_2d_3d --json``.
 

{dinary-1.2.0 → dinary-1.2.1}/webapp/src/components/IncomeForm.vue

@@ -20,14 +20,17 @@ function today() {
   return new Date().toISOString().slice(0, 10);
 }
 
-function currentMonth() {
+function defaultIncomeMonth() {
   const now = new Date();
-  return `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, "0")}`;
+  // Salary for the previous month is paid on the 5th (or earlier if weekend),
+  // so on days 1–5 the income being entered is for the previous month.
+  const d = now.getDate() <= 5 ? new Date(now.getFullYear(), now.getMonth() - 1, 1) : now;
+  return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, "0")}`;
 }
 
 const amount = ref("");
 const selectedCurrency = ref("");
-const monthValue = ref(currentMonth());
+const monthValue = ref(defaultIncomeMonth());
 const dateValue = ref(today());
 const comment = ref("");
 const currencyPickerOpen = ref(false);
@@ -66,7 +69,7 @@ async function save() {
     currency.setLastUsed(code);
     amount.value = "";
     comment.value = "";
-    monthValue.value = currentMonth();
+    monthValue.value = defaultIncomeMonth();
     dateValue.value = today();
     emit("saved");
   } catch {

dinary-1.2.0/src/dinary/__about__.py

@@ -1 +0,0 @@
-__version__ = "1.2.0"