lp://staging/~julie-w/unifield-server/US-7545

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp://staging/unifield-server

UniField Reviewer Team: Pending requested 2022-06-16

Diff: 719 lines (+290/-47) (has conflicts)

12 files modified

bin/addons/account_override/account.py (+23/-1)
bin/addons/analytic_override/analytic_account.py (+30/-9)
bin/addons/financing_contract/contract.py (+69/-16)
bin/addons/financing_contract/financing_contract_account_quadruplet.py (+104/-6)
bin/addons/financing_contract/financing_contract_view.xml (+1/-1)
bin/addons/financing_contract/format_line.py (+19/-3)
bin/addons/financing_contract/report/financing_interactive_xls.mako (+8/-0)
bin/addons/financing_contract/report/project_expenses_xls.mako (+1/-1)
bin/addons/financing_contract/report/report_interactive.py (+18/-2)
bin/addons/financing_contract/report/report_project_expenses.py (+6/-5)
bin/addons/financing_contract/wizard/wizard_interactive_report.py (+3/-2)
bin/addons/msf_profile/i18n/fr_MF.po (+8/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

5946. By Julie Nuguet on 2022-05-12

US-7545 [IMP] Financing Contracts: typo

5945. By Julie Nuguet on 2021-02-17

US-7545 [IMP] Analytic Accounts / get_cc_linked_to_fp: allow_all_cc is now a boolean instead of an instance

5944. By Julie Nuguet on 2021-02-16

US-7545 [MERGE] Merge with the latest version of the trunk lp:unifield-server

5943. By Julie Nuguet on 2021-02-16

US-7545 [IMP] Financing Contracts

1) Fix the following UC:
- add FP1 and PF to a contract
- create a reporting line with quadruplets for both FP
- remove FP1 and the CC from the contract
- all quads were reset, although those linked to PF were still valid

2) Add "TODO" for the remaining parts

5942. By Julie Nuguet on 2021-02-16

US-7545 [IMP] Financing Contracts: restrict the generation of quadruplets to:
1) if PF is selected => PF + all CC linked to the contract Prop. Instance
2) the other FP selected + the CC selected

5941. By Julie Nuguet on 2021-02-15

US-7545 [IMP] Financing Contracts: missing field in fields_to_fetch

5940. By Julie Nuguet on 2021-02-15

US-7545 [IMP] Financing Contracts: when PF is selected don't fill in the CC list automatically anymore but make the related combinations still usable

5939. By Julie Nuguet on 2021-02-15

US-7545 [IMP] Financing Contracts: by defaut display the contracts ordered by "Eligibility date to"

5938. By Julie Nuguet on 2021-02-12

US-7545 [IMP] Analytic Accounts get_cc_linked_to_fp: don't browse all CC for the UC where CC are selected in the FP form (perf)

5937. By Julie Nuguet on 2021-02-12

US-7545 [IMP] Financing Contracts / add_general_domain: remove "by reference" copy (avoid modifying "domain" in case "res" is modified)