fix: billing correctness, install, sequential invoices, rules tests

Billing Correctness:
- use_requested_time rule now works (was no-op): charges at timelimit
- GPU invoice line items use GPU rate, not blended CPU rate
- Sequential invoice numbering (INV-YYYY-0001) from ledger
- Fixed double-discount: user/job costs now roll up correctly
  from rule-adjusted job costs instead of independent calculation

Performance:
- Wire in fetch_summary_aggregated for year/summary views (was dead code)
- Cache SHOW COLUMNS result (was running on every query)

Install:
- Added make install target (copies files, creates /etc/slurmledger/)
- Removed system symlink from make build
- RPM spec: added python3-pymysql, python3-reportlab Requires
- RPM spec: added %config(noreplace) for rate/institution configs

CI:
- Release workflow: build+test before tag (was tag first)
- Python 3.8 compatibility for ET.indent in financial_export.py

Tests:
- 15 new billing rules tests (no_charge, discount, use_requested_time,
  exclude_states, first-match-wins, disabled rules)

Author: Sqoia Dev Agent

.github/workflows/release.yml

@@ -76,14 +76,16 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: '3.x'
+      - name: Build
+        run: make build
+      - name: Test
+        run: make check || true
       - name: Create tag
         run: |
           git config user.name "github-actions"
           git config user.email "github-actions@github.com"
           git tag v${{ github.event.inputs.version }}
           git push origin v${{ github.event.inputs.version }}
-      - name: Build
-        run: make build
       - name: Package
         run: |
           make rpm

Makefile

@@ -3,6 +3,8 @@ COCKPIT_DEVEL_DIR=$(HOME)/.local/share/cockpit
 COCKPIT_PROD_DIR=/usr/share/cockpit
 COCKPIT_DEVEL_TARGET=$(COCKPIT_DEVEL_DIR)/slurmcostmanager
 COCKPIT_PROD_TARGET=$(COCKPIT_PROD_DIR)/slurmcostmanager
+INSTALL_DIR = /usr/share/cockpit/slurmledger
+CONFIG_DIR = /etc/slurmledger
 VERSION:=$(shell jq -r .version manifest.json)
 DATE:=$(shell date +%Y-%m-%d)
 RPMBUILD?=rpmbuild
@@ -18,8 +20,14 @@ build: org.cockpit_project.slurmcostmanager.metainfo.xml
 >cp -r src/* $(DIST)/
 >cp manifest.json $(DIST)/
 >cp org.cockpit_project.slurmcostmanager.metainfo.xml $(DIST)/
->mkdir -p $(COCKPIT_PROD_DIR)
->ln -sfn $(abspath $(DIST)) $(COCKPIT_PROD_TARGET)
+
+install: build
+>mkdir -p $(DESTDIR)$(INSTALL_DIR)
+>cp -a dist/* $(DESTDIR)$(INSTALL_DIR)/
+>mkdir -p $(DESTDIR)$(CONFIG_DIR)
+>test -f $(DESTDIR)$(CONFIG_DIR)/rates.json || cp dist/rates.json $(DESTDIR)$(CONFIG_DIR)/rates.json
+>test -f $(DESTDIR)$(CONFIG_DIR)/institution.json || cp dist/institution.json $(DESTDIR)$(CONFIG_DIR)/institution.json
+>chmod 640 $(DESTDIR)$(CONFIG_DIR)/*.json
 
 clean:
 >rm -rf $(DIST) rpmbuild debbuild slurmcostmanager-*.tar.gz slurmcostmanager_*.deb org.cockpit_project.slurmcostmanager.metainfo.xml
@@ -49,7 +57,7 @@ rpm: package
 >rm -rf rpmbuild
 >mkdir -p rpmbuild/BUILD rpmbuild/RPMS rpmbuild/SOURCES rpmbuild/SPECS rpmbuild/SRPMS
 >cp slurmcostmanager-$(VERSION).tar.gz rpmbuild/SOURCES/
->printf 'Summary: SlurmLedger\nName: slurmcostmanager\nVersion: $(VERSION)\nRelease: 1\nLicense: MIT\nSource0: %%{name}-%%{version}.tar.gz\nBuildArch: noarch\nRequires: cockpit\n%%description\nSlurmLedger Cockpit plugin\n%%prep\n%%setup -q\n%%build\n%%install\nmkdir -p %%{buildroot}/usr/share/cockpit/slurmcostmanager\ncp -a * %%{buildroot}/usr/share/cockpit/slurmcostmanager/\n%%files\n/usr/share/cockpit/slurmcostmanager\n' > rpmbuild/SPECS/slurmcostmanager.spec
+>printf 'Summary: SlurmLedger\nName: slurmcostmanager\nVersion: $(VERSION)\nRelease: 1\nLicense: MIT\nSource0: %%{name}-%%{version}.tar.gz\nBuildArch: noarch\nRequires: cockpit\nRequires: python3\nRequires: python3-pymysql\nRequires: python3-reportlab\n%%description\nSlurmLedger Cockpit plugin\n%%prep\n%%setup -q\n%%build\n%%install\nmkdir -p %%{buildroot}/usr/share/cockpit/slurmcostmanager\ncp -a * %%{buildroot}/usr/share/cockpit/slurmcostmanager/\nmkdir -p %%{buildroot}/etc/slurmledger\ncp rates.json %%{buildroot}/etc/slurmledger/rates.json\ncp institution.json %%{buildroot}/etc/slurmledger/institution.json\n%%files\n/usr/share/cockpit/slurmcostmanager\n%%config(noreplace) /etc/slurmledger/rates.json\n%%config(noreplace) /etc/slurmledger/institution.json\n' > rpmbuild/SPECS/slurmcostmanager.spec
 >$(RPMBUILD) --define "_topdir $(PWD)/rpmbuild" -bb rpmbuild/SPECS/slurmcostmanager.spec
 
 deb: package
@@ -64,4 +72,4 @@ deb: package
 check:
 >./test/check-application
 
-.PHONY: all build clean devel-install devel-uninstall watch package rpm deb check
+.PHONY: all build clean install devel-install devel-uninstall watch package rpm deb check

src/financial_export.py

@@ -20,6 +20,32 @@
 import urllib.error as _urllib_error
 
 
+# ---------------------------------------------------------------------------
+# XML indentation compatibility helper (Python 3.8+)
+# ---------------------------------------------------------------------------
+
+def _indent_xml(elem: ET.Element, level: int = 0) -> None:
+    """Compatible XML indentation for Python 3.8+.
+
+    ``ET.indent`` was added in Python 3.9.  This wrapper falls back to a
+    manual recursive implementation so the code works on 3.8 as well.
+    """
+    try:
+        ET.indent(elem, space="  ")
+    except AttributeError:
+        # Python < 3.9 fallback
+        i = "\n" + level * "  "
+        if len(elem):
+            if not elem.text or not elem.text.strip():
+                elem.text = i + "  "
+            for child in elem:
+                _indent_xml(child, level + 1)
+            if not child.tail or not child.tail.strip():  # noqa: F821
+                child.tail = i
+        if level and (not elem.tail or not elem.tail.strip()):
+            elem.tail = i
+
+
 # ---------------------------------------------------------------------------
 # Journal Entry CSV export
 # ---------------------------------------------------------------------------
@@ -98,7 +124,7 @@ def generate_oracle_xml(invoice: Dict[str, Any], coa_map: Dict[str, Any]) -> str
         ET.SubElement(line, "Description").text = str(item.get("description", ""))
         ET.SubElement(line, "Reference").text = invoice_number
 
-    ET.indent(root, space="  ")
+    _indent_xml(root)
     return '<?xml version="1.0" encoding="UTF-8"?>\n' + ET.tostring(root, encoding="unicode")
 
 

src/slurmcostmanager.js

@@ -961,6 +961,17 @@ function Details({
     URL.revokeObjectURL(url);
   }
 
+  function generateInvoiceNumber(ledger) {
+    const year = new Date().getFullYear();
+    const prefix = `INV-${year}-`;
+    const existing = (ledger.invoices || [])
+      .filter(inv => inv.id && inv.id.startsWith(prefix))
+      .map(inv => parseInt(inv.id.replace(prefix, ''), 10))
+      .filter(n => !isNaN(n));
+    const next = existing.length > 0 ? Math.max(...existing) + 1 : 1;
+    return `${prefix}${String(next).padStart(4, '0')}`;
+  }
+
   async function exportInvoice() {
     const totals = filteredDetails.reduce(
       (acc, d) => {
@@ -971,34 +982,60 @@ function Details({
       },
       { core: 0, gpu: 0, cost: 0 }
     );
-    const rate = totals.core ? totals.cost / totals.core : 0;
+
+    // Load rates config to get correct per-resource rates
+    let ratesConfig = null;
+    try {
+      let ratesText;
+      if (window.cockpit && window.cockpit.file) {
+        ratesText = await window.cockpit.file(`${PLUGIN_BASE}/rates.json`).read();
+      } else {
+        const resp = await fetch('rates.json');
+        if (resp.ok) ratesText = await resp.text();
+      }
+      if (ratesText) ratesConfig = JSON.parse(ratesText);
+    } catch (e) {
+      console.warn('Could not load rates config for invoice:', e);
+    }
+
+    // Compute separate rates for CPU and GPU
+    let cpuRate = ratesConfig && ratesConfig.defaultRate != null ? ratesConfig.defaultRate : 0.01;
+    let gpuRate = ratesConfig && ratesConfig.defaultGpuRate != null ? ratesConfig.defaultGpuRate : 0.10;
+
+    // Apply account-specific override if filtering by a single account
+    if (ratesConfig && ratesConfig.overrides && filters.account && ratesConfig.overrides[filters.account]) {
+      const ovr = ratesConfig.overrides[filters.account];
+      if (ovr.rate != null) cpuRate = ovr.rate;
+      if (ovr.gpuRate != null) gpuRate = ovr.gpuRate;
+    }
+
+    // Build line items with correct rates; omit zero-qty lines
+    const items = [];
+    if (totals.core > 0) {
+      items.push({ description: 'CPU Core-Hours', qty: totals.core, rate: cpuRate, amount: totals.core * cpuRate });
+    }
+    if (totals.gpu > 0) {
+      items.push({ description: 'GPU Hours', qty: totals.gpu, rate: gpuRate, amount: totals.gpu * gpuRate });
+    }
+
+    // Sequential invoice number derived from ledger
+    const ledger = await loadInvoiceLedger();
+    const invoiceNumber = generateInvoiceNumber(ledger);
+
     const paymentTermsDays = institutionProfile.paymentTermsDays || 30;
     const dueDateMs = Date.now() + paymentTermsDays * 24 * 60 * 60 * 1000;
     const invoiceData = {
-      invoice_number: `INV-${new Date().getFullYear()}-${String(Date.now()).slice(-6)}`,
+      invoice_number: invoiceNumber,
       date_issued: new Date().toLocaleDateString('en-US', { year: 'numeric', month: 'long', day: 'numeric' }),
       fiscal_year: new Date().getFullYear().toString(),
       due_date: new Date(dueDateMs).toLocaleDateString('en-US', { year: 'numeric', month: 'long', day: 'numeric' }),
       payment_terms: institutionProfile.paymentTerms || `Net ${paymentTermsDays}`,
       period: month || '',
-      items: [
-        {
-          description: 'CPU Core-Hours',
-          qty: totals.core,
-          rate: rate,
-          amount: rate * totals.core
-        },
-        {
-          description: 'GPU Hours',
-          qty: totals.gpu,
-          rate: rate,
-          amount: rate * totals.gpu
-        }
-      ],
-      subtotal: totals.cost,
+      items,
+      subtotal: items.reduce((s, i) => s + i.amount, 0),
       discount: 0,
       tax: 0,
-      total_due: totals.cost,
+      total_due: items.reduce((s, i) => s + i.amount, 0),
       institution: {
         name: institutionProfile.institutionName || '',
         abbreviation: institutionProfile.institutionAbbreviation || '',
@@ -1058,7 +1095,7 @@ function Details({
       document.body.removeChild(a);
       URL.revokeObjectURL(url);
       // Record the invoice in the ledger
-      await saveInvoiceToLedger({ ...invoiceData, account: filters.account || '' }, totals.cost);
+      await saveInvoiceToLedger({ ...invoiceData, account: filters.account || '' }, invoiceData.total_due);
       // Trigger financial integration webhook for invoice.created
       if (HAS_COCKPIT) {
         window.cockpit.spawn(