Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 26 additions & 2 deletions om_account_accountant/static/description/index.html

Large diffs are not rendered by default.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified om_account_accountant/static/description/odoomates_apps.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion om_account_cash_forecast/__manifest__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
'name': 'Odoo 20 Cash Forecast',
'version': '1.0.1',
'version': '1.0.2',
'category': 'Accounting',
'summary': 'Forecast the cash balance by week or month from the invoices, bills and expected payments',
'description': """
Expand Down
14 changes: 12 additions & 2 deletions om_account_cash_forecast/report/report_cash_forecast.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,15 @@ class ReportCashForecast(models.AbstractModel):
_name = 'report.om_account_cash_forecast.report_cash_forecast'
_description = 'Cash Forecast Report'

@api.model
def _get_row_keys(self):
""" The rows of the receipts and of the payments, in their order. Other modules add theirs, with their
label in `_get_row_labels`.

:return: (receipt row keys, payment row keys)
"""
return list(RECEIPT_ROWS), list(PAYMENT_ROWS)

@api.model
def _get_row_labels(self):
return {
Expand Down Expand Up @@ -170,9 +179,10 @@ def column_of(date):
opening = currency.round(opening)

labels = self._get_row_labels()
receipt_rows, payment_rows = self._get_row_keys()
sections = []
for key, name, row_keys in (('receipts', _('Receipts'), RECEIPT_ROWS),
('payments', _('Payments'), PAYMENT_ROWS)):
for key, name, row_keys in (('receipts', _('Receipts'), receipt_rows),
('payments', _('Payments'), payment_rows)):
rows = []
for row_key in row_keys:
if row_key not in amounts:
Expand Down
417 changes: 417 additions & 0 deletions om_account_loan/README.rst

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions om_account_loan/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
from . import models
from . import wizard
from . import report
40 changes: 40 additions & 0 deletions om_account_loan/__manifest__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
'name': 'Loans and Leases',
'version': '1.0.0',
'category': 'Accounting',
'summary': 'Bank loans and leases: amortization schedule, drawdowns in tranches, instalments, early '
'repayment, floating rates, lease liability and lessor bills, withholding tax on the interest, '
'imported schedules, current and non-current reclassification, loan report',
'description': 'Loans received from banks and other lenders, and leases, with their amortization schedule '
'and entries.',
'author': 'Odoo Mates',
'maintainer': 'Odoo Mates',
'support': 'odoomates@gmail.com',
'license': 'LGPL-3',
'images': ['static/description/banner.gif'],
'depends': ['account'],
'data': [
'security/ir.access.csv',
'data/ir_sequence_data.xml',
'data/ir_cron_data.xml',
'views/account_loan_views.xml',
'views/account_move_views.xml',
'views/res_config_settings_views.xml',
'wizard/account_loan_drawdown_views.xml',
'wizard/account_loan_pay_views.xml',
'wizard/account_loan_repay_views.xml',
'wizard/account_loan_reclassify_views.xml',
'wizard/account_loan_import_views.xml',
'report/account_loan_report_views.xml',
'report/report_loan_templates.xml',
'report/account_loan_analysis_views.xml',
'views/menu.xml',
],
'demo': ['demo/account_loan_demo.xml'],
'assets': {
'web.assets_tests': [
'om_account_loan/static/tests/tours/**/*',
],
},
'application': False,
}
34 changes: 34 additions & 0 deletions om_account_loan/data/ir_cron_data.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>

<record id="ir_cron_lease_bills" model="ir.cron">
<field name="name">Leases: bill the lease payments due</field>
<field name="model_id" ref="model_account_loan_line"/>
<field name="state">code</field>
<field name="code">model._cron_create_lease_bills()</field>
<field name="user_id" ref="base.user_root"/>
<field name="interval_number">1</field>
<field name="interval_type">days</field>
</record>

<record id="ir_cron_loan_reclassify" model="ir.cron">
<field name="name">Loans: reclassify at the month end</field>
<field name="model_id" ref="model_account_loan"/>
<field name="state">code</field>
<field name="code">model._cron_reclassify()</field>
<field name="user_id" ref="base.user_root"/>
<field name="interval_number">1</field>
<field name="interval_type">days</field>
</record>

<record id="action_account_loan_line_create_bills" model="ir.actions.server">
<field name="name">Create Bills</field>
<field name="model_id" ref="model_account_loan_line"/>
<field name="binding_model_id" ref="model_account_loan_line"/>
<field name="binding_view_types">list</field>
<field name="group_ids" eval="[(4, ref('account.group_account_manager'))]"/>
<field name="state">code</field>
<field name="code">action = records.action_create_bills()</field>
</record>

</odoo>
22 changes: 22 additions & 0 deletions om_account_loan/data/ir_sequence_data.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo noupdate="1">

<record id="sequence_account_loan" model="ir.sequence">
<field name="name">Loans</field>
<field name="code">account.loan</field>
<field name="prefix">LOAN/%(year)s/</field>
<field name="padding">4</field>
<field name="use_date_range" eval="True"/>
<field name="company_id" eval="False"/>
</record>

<record id="sequence_account_loan_lease" model="ir.sequence">
<field name="name">Leases</field>
<field name="code">account.loan.lease</field>
<field name="prefix">LEASE/%(year)s/</field>
<field name="padding">4</field>
<field name="use_date_range" eval="True"/>
<field name="company_id" eval="False"/>
</record>

</odoo>
8 changes: 8 additions & 0 deletions om_account_loan/demo/account_loan_demo.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>

<!-- two bank loans and an office lease of the company: drawn, the past instalments paid or billed,
reclassified -->
<function model="account.loan" name="_load_demo_loan"/>

</odoo>
7 changes: 7 additions & 0 deletions om_account_loan/models/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
from . import account_loan
from . import account_loan_line
from . import account_loan_operation
from . import account_loan_rate
from . import account_move
from . import res_company
from . import res_config_settings
Loading
Loading