Repository navigation
Conversation
|
Thank you, this is the shape we agreed: the record shape and checks in the base with no storage and no engine import, the OCA bridge writing its own records, and one plural accessor in the declaration framework. It also behaves well where we feared it might not:
It still needs changes before we can merge it. In order of importance: Blocking
Should fix
Minor
For planning: the Enterprise half (storage and guard on the Enterprise payslip, capture in its rule loop, records from the 12 social rules and the health overrides, refund adapter, mirrored tests) is about 4–6 days for us, of which 1.5–2 depend on which arithmetic changes from point 2 we take. We'll start once points 1–4 and 10 are settled. |
|
Thank you for checking stock OCA, Enterprise and an upgrade with retained data, and for the concrete counterexamples. The arithmetic changes did not belong in core A. I am separating them into a disclosed FIX contribution; they will need the agreed Enterprise mirror before acceptance. A will retain the exact current formulas, including their current OOP/cap order and rounding. The local instrumentation now asserts that each of the fourteen original rule ASTs is an unchanged prefix, and the tests compare complete payslip lines against fifteen frozen pre-PR rule bodies on sub-cent and negative inputs. The local A rewrite retains signed bases and signed charges. Recording is enabled only by an in-process capability carried by compute_sheet, so direct get_lines_dict/_get_payslip_lines calls (including forged JSON context flags) cannot rewrite evidence. Unsupported optional metadata remains missing rather than stopping native calculation. The new, never-upstream legacy columns/adapters are removed, as are the calendar/minimum-opt-out feature, source checks, absence facts, confirmation timestamp and the native refunded_id override. The original native manual credit-note test is restored unchanged. The bridge now stores one compact statutory profile per calculation, with no copied birth number, inputs, worked-day or absence payload. Rules are detected by emitted records, not by the structure's country. Refund pairing and direction are bridge hooks; the declaration framework no longer assumes OCA's refunded_id field. I am measuring the JSON size in the native tests. For point 10, I am following your newer policy explicitly: the framework decides original versus corrective handling, and invokes the accessor during the common totals collection. Missing or inconsistent evidence warns on an original and refuses a correction; access failures are not downgraded. There is no caller allow_fallback switch. Country declaration contributions can then consume the collected records without reimplementing the policy. The coherent revision is now published as 7fd622f. Clean stock OCA with all insurance forms passed 246 tests, followed by a 25-test target including the frozen-formula AST contract; the engine-free base passed 31 tests and OCA without the optional declaration framework passed 191. Native SK field/two-module error probes and CS references passed. An actual stock-upstream-to-core upgrade preserved every original line and two XML hashes without backfill, while a new calculation produced fourteen matching records. The JSON fixture is about 3.6 kB. Changelog sections, carry-over note, catalogs, docs and commit wording are updated; no calendar/day searches remain in A. Arithmetic fixes remain separate work. |
3004cf8 to
7fd622f
Compare
|
The separate OOP-before-maximum FIX is updated after the review: votrelec#2, now 6118abb on core #43/b581c64a. The guides/changelog include TAXBASE, INCOMETAX and NET effects: old-age DoPC at 17,100 has employee insurance +8, tax withheld -2.80 and NET -5.20; student DoBPS at 19,000 has NET -9.10 in the same 35% marginal tax band. Carry-over is under Unreleased, the generated README is preserved and the optional minimum-wage fixture fix comes from the updated core. Full clean stock OCA with the surcharge module and all four insurance declarations passed 306 tests with zero failures/errors. RST parsing passes. The five-rule arithmetic change remains separate from capture and calendar work. As agreed, please mirror those five Enterprise overrides in the coordinated merge; no Enterprise run is claimed here. I will forward this contribution upstream after the core source sync. |
|
Calendar contribution B is now separated from the evidence-only core and the monetary/codec changes: ready dependent contribution, commit 110c2d6 on #43 at 7fd622f. The fork base keeps the review diff limited to B; I will rebase and forward it here once #43 reaches public 19.0. It provides the engine-neutral reviewed calendar/source API, immutable revisions and company/concurrency guards. It distinguishes same-employer 2P from other-employer minimum opt-out and retains 2S strike facts with separate reviewed no-income/benefit intervals. Real bridge-field tests reject a disability conflict while accepting disability beginning within the month. No premium formula, fund-record shape or 514/601 wire format is changed. Independent base 61, clean stock OCA 251 and actual Slovak-default base 61 tests pass with zero failures/errors (overlapping). Native POT/SK has no missing entries. Ordinary HR-manager HTTP/UI review/revision/immutability and composed Slovak error pass twice without system-administrator/payroll-officer rights. EN/SK docs and 18.0 carry-over are included; Enterprise and the private guide generator were not run. Next public pieces remain the separate 514 codec/consumer and 601 rebase/source checks discussed in the reviews. The arithmetic fixes stay separate. If you prefer a different location for the factual calendar API, I can align those consumers before forwarding B. |
|
The separate statutory health-profile FIX is ready at dependent fork PR4, on this core at 7fd622f. It derives DoBPŠ and eligible pensioner DoVP/DoPČ exclusions, separates ordinary pensioner premiums from state-insuree minimum relief, and applies recognised-invalidity reduced rates without another ZTP checkbox. Individually selected other exclusions retain a dated basis and receive readable validation before rule evaluation. The final matrix on unchanged original production code reproduces 22 failing subcases across three tests, with zero errors. Corrected stock OCA 228, independent base 35 and actual Slovak-default base/OCA 201 tests pass (overlapping, four existing optional-framework/demo skips). Ordinary-officer HTTP passes twice for five profiles, including invalidity; rejected retries preserve the calculation. The original formula JSON stays unchanged, with twelve unaffected formulas pinned and independent output checks for the three changed health rules. Profile4 itself does not change OP rounding/proration, social OOP order, calendar monetary integration or declaration formats. Enterprise still needs the corresponding rule calls to the shared base predicates; it was not run here. After this core reaches public 19.0 I will forward the independent OOP2, calendars B3 and health-profile4 contributions here. The core branch remains evidence-only. The separate calendar calculation FIX5 is now also ready, against a merged B3/profile4 dependency base so its review diff excludes those prerequisites. It connects distinct OP/minimum days, upward OP cent rounding, concurrent employers/SZCO and disability-month rates; it preserves the native premium rounding and no-calendar PN workflow. Stock OCA273, base68 and actual Slovak-default246 tests pass (overlapping), plus ordinary-officer HTTP twice for ten profiles with readable errors and unchanged calculations after rejected retries. Please mirror the shared calculation API in Enterprise. I will forward5 here after its prerequisites are source-synced, then continue the separate514/601 consumers and explicit multi-source income allocation. No unrelated engine arithmetic is added to this evidence-only core. |
|
Thank you for the revision. It is a much smaller and clearer change than the first round: the base owns only the record shape, the OCA bridge records during What we verified
Test counts with sk_SK. "Full set" means every SK payroll module on the OCA side (surcharges, garnishment, income allocation/settlement, RLFO, annual and monthly tax reports, parity), 17 test tags:
The 3 CE errors and the 24 Enterprise ones present before the PR (parity scenarios and Blocking
A way out for corrections of older months
Should fix
Minor
What we will do at merge: cs.po for the new strings (the declaration base picked up four inherited fields that have no Czech translation yet), the guide/topics.yaml entry, the regenerated pages, and the Enterprise half as planned, starting once points 1 to 3 are in. We have seen your dependent fork PRs #3 (calendars), #4 (health profiles) and #5 (calendar calculation). We will review them once #43 is merged and they are forwarded here, in the order you propose. Our review of the arithmetic fix #2 is on that PR. |
Keep signed rule values and a single compact profile in the OCA bridge, generic validation in the base, and original/corrective policy in the declaration framework. Do not stop native calculation for optional metadata, rewrite evidence during rule reads, copy birth numbers, or introduce never-upstream legacy columns. Keep arithmetic fixes, calendar features and lifecycle controls separate. Validated clean stock OCA with all insurance forms: 246 tests, no failures/errors, one existing demo skip. Additional stock target: 25 tests. Engine-free base: 31 tests. Actual upstream-to-core upgrade preserves confirmed salary lines and two exact XML archives; new calculation records fourteen matching funds. Native SK field/error probes, POT/SK/CS catalogs and AST/runtime formula parity passed. Assisted-by: OpenAI Codex
…d wages Preserve unsupported-engine workflows, protect reasoned legacy approval, test optional wage top-ups and retain native translations. Assisted-by: OpenAI Codex
7fd622f to
b581c64
Compare
|
Follow-up to the second review of #43: updated at
Two actual HTTP passes under the native Payroll Officer verified rejection without approval, rejection of forged reviewer, review, idempotent retry, generation/XSD, unchanged original payslip and unchanged filed XML. The role is neither System Administrator nor Payroll Manager; stock OCA itself makes it imply HR Manager. Actual Slovak-default tests across the seven affected modules passed 253 tests, with loaded labels/errors and all four compiled forms checked. These suites overlap and are not summed. The generated root README files are restored. Accountant-facing EN/SK (and shared CS) guides now describe the retained values, warning and explicit review; protocol/capability details are in DEVELOPER. The original eight existing SK translations are restored and the native export merge preserves them. Changelog RST hierarchy was corrected and parsed with docutils; carry-over is under Unreleased and negative Changed claims were removed. Raw recorded precision is documented as requiring consumer statutory rounding, separate from arithmetic FIX contributions. The duplicate outer company check was removed; the explicit approval action checks company scope independently. The separate guide generator and Enterprise runtime were not available locally. Please proceed with the corresponding Enterprise mirror when this framework policy fits your integration. Dependent #2–#5 in the fork remain separate; I will forward/rebase them after source sync, with the same fixture correction and documented NET/TAXBASE/INCOMETAX impact in the OOP change. |
|
Health statement follow-up is ready at votrelec#8 (cf2dd96), on the reviewed calendar/calculation dependency. This supplies actual retained assessment/profile XML and published UTF-8 text514, historical insurer and per-insurer payer snapshots, complete registered-person/source coverage and the N/O retention workflow. The architecture keeps source semantics in the shared country base, invocation before new compute/capture in the engine, and wire/profile requirements in the form. It does not put an unconditional live-HR validator on historical profile reads. Missing exact coverage preserves known monetary evidence and follows the original-warning / explicitly audited legacy-O policy; the profile participates in the review digest. Frozen contract coverage prevents an employee-wide calendar from concealing a second unprocessed employment. The required Enterprise calls are documented for the mirror; I do not claim an Enterprise run. The final Community suite passes 385, actual Slovak 358, no-engine 115. Separate independent rollback probes, two new PayrollOfficer HTTP workflows and a real old1.2.3→final1.4 upgrade pass, preserving filed bytes and source salary/fund evidence. Eight-patch tree restoration also passes. The remaining cumulative-remuneration arithmetic and source/confirmation controls associated with #37 stay separate. The intention is cooperative calculation from native payslips and retained actual charges, with monthly OOP/caps applied once and no parallel payroll ledger or blanket ban on a second remuneration. I will forward the dependent statement/calendar contributions after the core/base source sync, removing duplicate dependency commits. |
|
The next declaration follow-up is prepared at votrelec#9. It adds full corrective MVP filings and shared validation of filing-type and period projections, using the existing framework and engine-owned records. The diff is limited to declaration base and MVP, with 50 selected native tests (one optional registry case skipped) and a separate 14-case automated retake. It is temporarily stacked over the reviewed monthly foundation; after the #43 source sync I will forward the focused follow-up here under CONTRIBUTING. Any architectural guidance on that common validation hook is welcome. |
|
A focused monthly tax-overview follow-up is ready for review: votrelec#10. It is stacked on votrelec#9 so the diff stays limited to the overview module. It adds signed bonus corrections, reviewed conditional form entries, retention of filed quarterly facts, and audited legacy filing chronology within the existing declaration workflow. A clean OCA Docker installation passes 37 tests, including the unchanged partial-order regression; the official XSD bytes are preserved. After #43 returns through the generated source sync, this can be forwarded as a focused upstream PR. |
|
A focused health-calendar follow-up is ready for review: votrelec#11. It is stacked on votrelec#9 and changes only nine health paths. Reviewed concurrent-employer minimum notices now apply to insured agreements without granting OP eligibility; a minimum-only derived key is kept outside retained profiles so older posted monthly predecessors remain usable. Two EUR 200 instalments retain the correct combined EUR 3 employee premium and EUR 0.23 minimum supplement, avoiding a reproduced EUR 47.23 overcharge. Fresh public OCA tests pass 51/0/0, native Slovak labels/errors pass, and the mail patches and complete bundle were actually restored. After #43 returns through the generated source sync, this can be forwarded as a focused upstream PR. |
|
Thank you. We applied both commits (23d95eb, b581c64) with What we verified
The errors are the same tests before and after (our parity scenarios and
One remaining point: a stale confirmation looks valid The digest covers every stored scalar field of the payslip's employee version. In Odoo 19 that includes the employee's private address, marital status, number of children, home-to-work distance, and the version's
Failing safe is right. But the accountant cannot tell from the message that the confirmation expired, or why. Please:
Narrowing the facts to the calculation inputs would be nicer still. But that list is engine-specific, so we would not ask for it here. Nits, no action needed for merge
What we will do at merge:
After the merge, we will take your fork #2 together with our Enterprise mirror of it, then #3–#11 in the order you propose once they are forwarded here. |
Assisted-by: OpenAI Codex
|
Addressed the remaining confirmation feedback in 93825ec. Audit timestamps no longer invalidate consent. An expired confirmation now shows a warning, hides its old actor/date, and generation explains who confirmed it and when. Reconfirmation preserves the filed original. Native stock OCA verification: 21 tests, 0 failures/errors, including the timestamp-only edit and changed-version/reconfirmation flow. Native POT export, preserved Slovak catalogs, all four loaded forms and the actual translated expiry error also passed. Chatter confirmation times are localized. Your proposed merge-time handling of #44 and the generated documentation is fine. |
|
Thank you, verified. On our current 19.0 the OCA suite passes 255/255 with Slovak loaded. The Enterprise run shows only a known error in our own Enterprise health tests, unrelated to this change. The expiry flow does what you describe. One small thing we'll handle at merge: the contract fingerprint still includes |
|
Merged into our 19.0 as 7e880561, your three commits unchanged. Where they met the #44 changelog and doc entries already on our branch, your versions went in as they were and the follow-up restores ours. On top of it (841e8f3d):
With sk_SK loaded, the OCA suite passes 256/256. The Enterprise run shows only the known error in our own Enterprise health tests. The change reaches this repository with the next sync. Closing here. The Enterprise writer and your stacked fork PRs can now be rebased on this. |
10 source commit(s) since 73d17127, 6 of which changed a module here. Added (1): l10n_sk_vehicle_tax * [IMP] payroll: record native fund evidence without changing premiums ece81c34 — l10n_cssk_payroll_declaration_base, l10n_sk_hr_payroll_base, l10n_sk_hr_payroll_mvp, l10n_sk_hr_payroll_oca Keep signed rule values and a single compact profile in the OCA bridge, generic validation in the base, and original/corrective policy in the declaration framework. Do not stop native calculation for optional metadata, rewrite evidence during rule reads, copy birth numbers, or introduce never-upstream legacy columns. Keep arithmetic fixes, calendar features and lifecycle controls separate. Validated clean stock OCA with all insurance forms: 246 tests, no failures/errors, one existing demo skip. Additional stock target: 25 tests. Engine-free base: 31 tests. Actual upstream-to-core upgrade preserves confirmed salary lines and two exact XML archives; new calculation records fourteen matching funds. Native SK field/error probes, POT/SK/CS catalogs and AST/runtime formula parity passed. * [FIX] payroll: review historical corrections without recomputing filed wages 11943eb8 — l10n_cssk_payroll_declaration_base, l10n_sk_hr_payroll_base, l10n_sk_hr_payroll_eldp, l10n_sk_hr_payroll_health, l10n_sk_hr_payroll_mvp, l10n_sk_hr_payroll_oca, l10n_sk_hr_payroll_vpp Preserve unsupported-engine workflows, protect reasoned legacy approval, test optional wage top-ups and retain native translations. * [FIX] Explain expired legacy fund confirmations 31f5985d — l10n_cssk_payroll_declaration_base, l10n_sk_hr_payroll_eldp, l10n_sk_hr_payroll_health, l10n_sk_hr_payroll_mvp, l10n_sk_hr_payroll_vpp * [IMP] payroll declarations: who saved a version no longer expires a confirmation; Czech catalogue, December stravné notes and pages as in cssk-public #43 841e8f3d — l10n_cssk_payroll_declaration_base, l10n_sk_hr_payroll_base, l10n_sk_hr_payroll_eldp, l10n_sk_hr_payroll_health, l10n_sk_hr_payroll_mvp, l10n_sk_hr_payroll_oca, l10n_sk_hr_payroll_vpp - l10n_cssk_payroll_declaration_base: the source digest of a legacy confirmation leaves out all four log-access columns of the contract version, not only the timestamps, so an unrelated save by a colleague (write_uid) does not expire it. Regression test in l10n_sk_hr_payroll_vpp. - l10n_cssk_payroll_declaration_base: Czech catalogue for the fund confirmation strings and the expired-confirmation note on the Czech page. - l10n_sk_hr_payroll_oca: the 19.0.1.24.6 December 2026 stravné section, its 18.0 carry-over line and the doc sections, which the contribution's base predated; DEVELOPER.md keeps the parameter and BASIC notes and adds the recording-integration section. - Generated pages and READMEs of the touched modules. * [ADD] l10n_sk_vehicle_tax: calendar-year DMVv25 for L/M1/N1 1c29116e — l10n_sk_vehicle_tax Slovak vehicle-tax returns from native fleet.vehicle facts, with dated liability, retained calculation snapshots and the published DMVv25 XML interface. The supported scope is the ordinary a/b taxpayer cases for L/M1/N1 vehicles; unsupported special cases are identified explicitly. Fleet import requires a documented actual holding/business-use start; Odoo's default acquisition date is not evidence of when tax liability began. The import adds prepared vehicles, lists every skipped plate with its reason in the chatter, keeps access errors as access errors and does not duplicate lines on repeat. The original XSD is pinned byte for byte. Statutory basis: zákon č. 361/2014 Z. z., §§ 2 and 8. * [IMP] l10n_sk_vehicle_tax: year without separator, Czech catalogue, guide entry, release section and pages as in cssk-public #26 29a267cd — account_financial_report_interactive, l10n_cssk_account_financial_report, l10n_cssk_accrual, l10n_cssk_cash_journal_base, l10n_cssk_core, l10n_cssk_mis_executive_summary, l10n_cssk_partner_balances, l10n_cz_account_cutoff, l10n_cz_cash_journal, l10n_cz_currency_revaluation, l10n_cz_fiscal_year_closing, l10n_cz_inventory_verification, l10n_cz_mis_reports, l10n_sk_account_cutoff, l10n_sk_base, l10n_sk_cash_journal, l10n_sk_currency_revaluation, l10n_sk_fiscal_year_closing, l10n_sk_inventory_verification, l10n_sk_mis_reports, l10n_sk_vehicle_tax, mis_builder_column_breakdown, mis_builder_kpi_details 207 modules in this repository. Co-authored-by: votrelec <votrelec@users.noreply.github.com>
4 source commit(s) since 0fed46f5, 1 of which changed a module here. * [REF] l10n_sk_hr_payroll_base, l10n_sk_hr_payroll_oca: share the engine-free fund recorder e6b02f6c — l10n_sk_hr_payroll_base, l10n_sk_hr_payroll_oca The Enterprise bridge is to record the same fund bases the OCA bridge has recorded since #43. Copying fund_capture.py would leave two finalisations to drift apart, and the declarations compare what both engines store, so the engine-free half moves to l10n_sk_hr_payroll_base (which depends only on hr): - fund_capture.py (pure Python): the _FundCapture capability, one class for both engines so the isinstance check holds; finalize_fund_rows, which compares each record with its native line, signs by side, refuses duplicates and missing or invalid records, and merges the health minimum top-up under the engine's own rule code; the writer token. - the mixin: salary facts, the statutory profile through each engine's _l10n_sk_version(), the evidence assembly and its private store, the create/write/default-context guard and a reader skeleton. The skeleton is deliberately not named _cssk_recorded_fund_bases, so an engine only becomes readable when its bridge says so. The OCA bridge keeps its capture hooks, _l10n_sk_can_record_funds, the compute_sheet wrapper, refund pairing and direction, its identity (contract_id as before) and the stored field. Its hooks now collect (code, record, native total) and finalise once in localdict_hook; the native total is still taken when the rule ran. The private store now passes the guard with an in-process token instead of super(FundCapturePayslip, ...), so the base can do it; no other module overrides hr.payslip.write. Nothing user-visible changes: evidence written before and after the upgrade on the same database, for nine profiles and a refund, is byte-identical (jsonb text), and the existing OCA and declaration tests are untouched and green. 207 modules in this repository.
This replaces #34 with the shared evidence core requested in #34/#37. It records actual fund-rule values without changing premium arithmetic. Updated for the second review of #43 and rebased onto public sync
afd668b6(l10n_cssk@653c353d).The base owns the signed shape and abstract identity/salary validation, without storage or an engine import. The OCA bridge owns one compact JSON field, records only within
compute_sheet, and retains native signed/subcent/manual-credit-note behavior. Direct evaluation, caller flags and forged JSON cannot rewrite confirmed evidence. One statutory profile is stored per calculation, without birth numbers or copied worked-day/input histories. The separate Enterprise mirror remains with the maintainer.MVP, VPP, health and ELDP use the framework's plural accessor. An engine without the recorder hook continues its original workflow, without a new warning or refusal. With a supported recorder, an original declaration names missing/inconsistent evidence and retains its existing gross-based calculation. A correction requires exact records by default. Access errors always propagate.
Old filed wages do not need recomputation just to prepare their correction. On a draft correction the accountant may record a reviewed reason and use the explicit confirmation action. The framework owns reviewer/time, source/input digest and chatter. Source, version, report-input or reason changes invalidate that approval; repeated approval is idempotent. Direct create/write/context-default forgery is rejected. The four insurance forms expose the warning and review action. Original payslips and filed XML remain unchanged. This is an audited review decision, not a claim that gross equals the historical statutory base.
Validation (overlapping suites are not summed):
2eca6caa, without #330/#332: the initial full suite passed 279 tests. The final public-base run with optional wage-surcharge rules is reported in the follow-up review reply. The reference fixture excludesMIN_WAGE_TOPUPonly from its own test structure; production rules are unchanged.Dependent OOP/cap ordering, health profiles/calendars and health calculation changes remain separate, to be forwarded after the corresponding source sync. Suggested guide topic:
Recorded rule bases->l10n_sk_hr_payroll_oca/doc/en.md#recorded-funds. No authority filing or acceptance is claimed.