Merge branch 'dev_JSC_20240314_compensations'
No related branches found
No related tags found
Showing
- scipost_django/api/urls.py 2 additions, 2 deletionsscipost_django/api/urls.py
- scipost_django/apimail/migrations/0033_alter_storedmessage_read_by.py 22 additions, 0 deletions...go/apimail/migrations/0033_alter_storedmessage_read_by.py
- scipost_django/finances/admin.py 49 additions, 1 deletionscipost_django/finances/admin.py
- scipost_django/finances/migrations/0032_pubfrac.py 29 additions, 0 deletionsscipost_django/finances/migrations/0032_pubfrac.py
- scipost_django/finances/migrations/0033_populate_pubfracs.py 30 additions, 0 deletionsscipost_django/finances/migrations/0033_populate_pubfracs.py
- scipost_django/finances/migrations/0034_alter_worklog_content_type_alter_worklog_user.py 34 additions, 0 deletions...ons/0034_alter_worklog_content_type_alter_worklog_user.py
- scipost_django/finances/migrations/0035_pubfrac_cf_value.py 18 additions, 0 deletionsscipost_django/finances/migrations/0035_pubfrac_cf_value.py
- scipost_django/finances/migrations/0036_populate_pubfrac_cf_value.py 36 additions, 0 deletions...ngo/finances/migrations/0036_populate_pubfrac_cf_value.py
- scipost_django/finances/migrations/0037_pubfraccompensation_and_more.py 54 additions, 0 deletions.../finances/migrations/0037_pubfraccompensation_and_more.py
- scipost_django/finances/migrations/0038_alter_pubfrac_options.py 17 additions, 0 deletions..._django/finances/migrations/0038_alter_pubfrac_options.py
- scipost_django/finances/models/__init__.py 24 additions, 0 deletionsscipost_django/finances/models/__init__.py
- scipost_django/finances/models/periodic_report.py 46 additions, 0 deletionsscipost_django/finances/models/periodic_report.py
- scipost_django/finances/models/pubfrac.py 57 additions, 0 deletionsscipost_django/finances/models/pubfrac.py
- scipost_django/finances/models/pubfrac_compensation.py 33 additions, 0 deletionsscipost_django/finances/models/pubfrac_compensation.py
- scipost_django/finances/models/subsidy.py 118 additions, 0 deletionsscipost_django/finances/models/subsidy.py
- scipost_django/finances/models/subsidy_attachment.py 153 additions, 0 deletionsscipost_django/finances/models/subsidy_attachment.py
- scipost_django/finances/models/subsidy_payment.py 61 additions, 0 deletionsscipost_django/finances/models/subsidy_payment.py
- scipost_django/finances/models/work_log.py 41 additions, 0 deletionsscipost_django/finances/models/work_log.py
- scipost_django/finances/templates/finances/business_model.html 19 additions, 21 deletions...st_django/finances/templates/finances/business_model.html
- scipost_django/funders/migrations/0015_alter_grant_funder_alter_grant_recipient.py 32 additions, 0 deletions...grations/0015_alter_grant_funder_alter_grant_recipient.py
Loading
Please register or sign in to comment