diff --git a/base_accounting_kit/__manifest__.py b/base_accounting_kit/__manifest__.py index 7218bb6fb..a469517bb 100644 --- a/base_accounting_kit/__manifest__.py +++ b/base_accounting_kit/__manifest__.py @@ -22,13 +22,13 @@ { 'name': 'Odoo 13 Full Accounting Kit', - 'version': '13.0.1.4.2', + 'version': '13.0.2.4.1', 'category': 'Accounting', - 'summary': """ Asset and Budget Management, - Accounting Reports, PDC, Lock dates, - Credit Limit, Follow Ups, - Day-Bank-Cash book reports.""", - 'description': """ + 'summary': """ Asset and Budget Management, + Accounting Reports, PDC, Lock dates, + Credit Limit, Follow Ups, + Day-Bank-Cash book reports.""", + 'description': """ Odoo 13 Accounting,Accounting Reports, Odoo 13 Accounting PDF Reports, Asset Management, Budget Management, Customer Credit Limit, Recurring Payment, @@ -47,7 +47,7 @@ 'depends': ['base', 'account', 'sale', 'account_check_printing'], 'data': [ 'security/ir.model.access.csv', - 'security/account_asset_security.xml', + 'security/security.xml', 'data/account_financial_report_data.xml', 'data/cash_flow_data.xml', 'data/account_pdc_data.xml', @@ -100,4 +100,4 @@ 'installable': True, 'auto_install': False, 'application': True, -} \ No newline at end of file +} diff --git a/base_accounting_kit/data/account_pdc_data.xml b/base_accounting_kit/data/account_pdc_data.xml index 54ec4ca7f..d604303e0 100755 --- a/base_accounting_kit/data/account_pdc_data.xml +++ b/base_accounting_kit/data/account_pdc_data.xml @@ -13,7 +13,13 @@ outbound - + + + + + Account + + \ No newline at end of file diff --git a/base_accounting_kit/models/account_account.py b/base_accounting_kit/models/account_account.py index 2a2521b61..b99560434 100644 --- a/base_accounting_kit/models/account_account.py +++ b/base_accounting_kit/models/account_account.py @@ -46,6 +46,4 @@ class CashFlow(models.Model): if self._origin.cash_flow_type.ids: for rec in self._origin.cash_flow_type: # remove old record - rec.write({ - 'account_ids': [(3, self._origin.id)] - }) + rec.write({'account_ids': [(3, self._origin.id)]}) diff --git a/base_accounting_kit/models/account_asset.py b/base_accounting_kit/models/account_asset.py index b71fbfcfc..91317cd8e 100644 --- a/base_accounting_kit/models/account_asset.py +++ b/base_accounting_kit/models/account_asset.py @@ -53,13 +53,11 @@ class AccountAssetCategory(models.Model): string='Depreciation Entries: Expense Account', required=True, domain=[ ('internal_type', '=', 'other'), ('deprecated', '=', False)], - oldname='account_income_recognition_id', help="Account used in the periodical entries, to record a part of the asset as expense.") journal_id = fields.Many2one('account.journal', string='Journal', required=True) company_id = fields.Many2one('res.company', string='Company', - required=True, default=lambda self: self.env[ - 'res.company']._company_default_get('account.asset.category')) + required=True, default=lambda self: self.env.user.company_id) method = fields.Selection( [('linear', 'Linear'), ('degressive', 'Degressive')], string='Computation Method', required=True, default='linear', @@ -122,8 +120,7 @@ class AccountAssetAsset(models.Model): code = fields.Char(string='Reference', size=32, readonly=True, states={'draft': [('readonly', False)]}) value = fields.Float(string='Gross Value', required=True, readonly=True, - digits=0, states={'draft': [('readonly', False)]}, - oldname='purchase_value') + digits=0, states={'draft': [('readonly', False)]}) currency_id = fields.Many2one('res.currency', string='Currency', required=True, readonly=True, states={'draft': [('readonly', False)]}, @@ -132,9 +129,7 @@ class AccountAssetAsset(models.Model): company_id = fields.Many2one('res.company', string='Company', required=True, readonly=True, states={'draft': [('readonly', False)]}, - default=lambda self: self.env[ - 'res.company']._company_default_get( - 'account.asset.asset')) + default=lambda self: self.env.user.company_id) note = fields.Text() category_id = fields.Many2one('account.asset.category', string='Category', required=True, change_default=True, @@ -142,8 +137,7 @@ class AccountAssetAsset(models.Model): states={'draft': [('readonly', False)]}) date = fields.Date(string='Date', required=True, readonly=True, states={'draft': [('readonly', False)]}, - default=fields.Date.context_today, - oldname="purchase_date") + default=fields.Date.context_today) state = fields.Selection( [('draft', 'Draft'), ('open', 'Running'), ('close', 'Close')], 'Status', required=True, copy=False, default='draft', @@ -348,9 +342,6 @@ class AccountAssetAsset(models.Model): # purchase month in other cases if self.method_period >= 12: if self.company_id.fiscalyear_last_month: - print(self.company_id.fiscalyear_last_month) - print(self.company_id.fiscalyear_last_day) - print(self.date) asset_date = date(year=int(self.date.year), month=int( self.company_id.fiscalyear_last_month), diff --git a/base_accounting_kit/models/account_followup.py b/base_accounting_kit/models/account_followup.py index d3e5c3665..e96f321c3 100644 --- a/base_accounting_kit/models/account_followup.py +++ b/base_accounting_kit/models/account_followup.py @@ -20,7 +20,7 @@ # ############################################################################# -from odoo import fields, api, models, _ +from odoo import fields, models class Followup(models.Model): @@ -28,14 +28,12 @@ class Followup(models.Model): _description = 'Account Follow-up' _rec_name = 'name' - followup_line_ids = fields.One2many('followup.line', 'followup_id', 'Follow-up', copy=True) + followup_line_ids = fields.One2many('followup.line', 'followup_id', + 'Follow-up', copy=True) company_id = fields.Many2one('res.company', 'Company', - default=lambda self: self.env['res.company']._company_default_get( - 'account_followup.followup')) + default=lambda self: self.env.user.company_id) name = fields.Char(related='company_id.name', readonly=True) - _sql_constraints = [('company_uniq', 'unique(company_id)', 'Only one follow-up per company is allowed')] - class FollowupLine(models.Model): _name = 'followup.line' @@ -43,22 +41,11 @@ class FollowupLine(models.Model): _order = 'delay' name = fields.Char('Follow-Up Action', required=True, translate=True) - sequence = fields.Integer(help="Gives the sequence order when displaying a list of follow-up lines.") + sequence = fields.Integer( + help="Gives the sequence order when displaying a list of follow-up lines.") delay = fields.Integer('Due Days', required=True, help="The number of days after the due date of the invoice" " to wait before sending the reminder." " Could be negative if you want to send a polite alert beforehand.") - followup_id = fields.Many2one('account.followup', 'Follow Ups', ondelete="cascade") - - _sql_constraints = [('days_uniq', 'unique(followup_id, delay)', 'Days of the follow-up levels must be different')] - - @api.constrains('description') - def _check_description(self): - for line in self: - if line.description: - try: - line.description % {'partner_name': '', 'date': '', 'user_signature': '', 'company_name': ''} - except: - raise Warning(_( - 'Your description is invalid, use the right legend' - ' or %% if you want to use the percent character.')) + followup_id = fields.Many2one('account.followup', 'Follow Ups', + ondelete="cascade") diff --git a/base_accounting_kit/models/account_journal.py b/base_accounting_kit/models/account_journal.py index 8a3b4120b..698a590a1 100755 --- a/base_accounting_kit/models/account_journal.py +++ b/base_accounting_kit/models/account_journal.py @@ -28,9 +28,10 @@ class AccountJournal(models.Model): @api.depends('outbound_payment_method_ids') def _compute_check_printing_payment_method_selected(self): - self.check_printing_payment_method_selected = any( - pm.code in ['check_printing', 'pdc'] for pm in - self.outbound_payment_method_ids) + for journal in self: + journal.check_printing_payment_method_selected = any( + pm.code in ['check_printing', 'pdc'] for pm in + journal.outbound_payment_method_ids) @api.model def _enable_pdc_on_bank_journals(self): @@ -42,7 +43,7 @@ class AccountJournal(models.Model): pdcout = self.env.ref('base_accounting_kit.account_payment_method_pdc_out') bank_journals = self.search([('type', '=', 'bank')]) for bank_journal in bank_journals: - # bank_journal._create_check_sequence() + bank_journal._create_check_sequence() bank_journal.write({ 'inbound_payment_method_ids': [(4, pdcin.id, None)], 'outbound_payment_method_ids': [(4, pdcout.id, None)], diff --git a/base_accounting_kit/models/account_move.py b/base_accounting_kit/models/account_move.py index 240e05a38..7ccbb1e68 100644 --- a/base_accounting_kit/models/account_move.py +++ b/base_accounting_kit/models/account_move.py @@ -90,7 +90,7 @@ class AccountInvoiceLine(models.Model): store=True) asset_mrr = fields.Float(string='Monthly Recurring Revenue', compute='_get_asset_date', - readonly=True, digits=dp.get_precision('Account'), + readonly=True, digits='Account', store=True) @api.depends('asset_category_id', 'move_id.invoice_date') @@ -145,7 +145,7 @@ class AccountInvoiceLine(models.Model): elif self.move_id.type == 'in_invoice' and self.asset_category_id: self.account_id = self.asset_category_id.account_asset_id.id - @api.onchange('uom_id') + @api.onchange('product_uom_id') def _onchange_uom_id(self): result = super(AccountInvoiceLine, self)._onchange_uom_id() self.onchange_asset_category_id() diff --git a/base_accounting_kit/models/recurring_payments.py b/base_accounting_kit/models/recurring_payments.py index cd2979b3b..7627e0efc 100644 --- a/base_accounting_kit/models/recurring_payments.py +++ b/base_accounting_kit/models/recurring_payments.py @@ -34,6 +34,7 @@ class FilterRecurringEntries(models.Model): class RecurringPayments(models.Model): _name = 'account.recurring.payments' + _description = 'Accounting Recurring Payment' def _get_next_schedule(self): if self.date: diff --git a/base_accounting_kit/report/account_asset_report.py b/base_accounting_kit/report/account_asset_report.py index 309986beb..7917958c5 100644 --- a/base_accounting_kit/report/account_asset_report.py +++ b/base_accounting_kit/report/account_asset_report.py @@ -3,6 +3,7 @@ from odoo import api, fields, models, tools + class AssetAssetReport(models.Model): _name = "asset.asset.report" _description = "Assets Analysis" diff --git a/base_accounting_kit/report/account_bank_book.py b/base_accounting_kit/report/account_bank_book.py index 11c6d5695..3c80e0f9e 100644 --- a/base_accounting_kit/report/account_bank_book.py +++ b/base_accounting_kit/report/account_bank_book.py @@ -27,6 +27,7 @@ from odoo.exceptions import UserError class ReportBankBook(models.AbstractModel): _name = 'report.base_accounting_kit.report_bank_book' + _description = 'Bank Book Report' def _get_account_move_entry(self, accounts, init_balance, sortby, display_account): diff --git a/base_accounting_kit/report/account_cash_book.py b/base_accounting_kit/report/account_cash_book.py index 21699234c..686c98d3d 100644 --- a/base_accounting_kit/report/account_cash_book.py +++ b/base_accounting_kit/report/account_cash_book.py @@ -27,6 +27,7 @@ from odoo.exceptions import UserError class ReportCashBook(models.AbstractModel): _name = 'report.base_accounting_kit.report_cash_book' + _description = 'Cash Book Report' def _get_account_move_entry(self, accounts, init_balance, sortby, display_account): diff --git a/base_accounting_kit/report/account_day_book.py b/base_accounting_kit/report/account_day_book.py index f9285ea65..9a5fa6c55 100644 --- a/base_accounting_kit/report/account_day_book.py +++ b/base_accounting_kit/report/account_day_book.py @@ -28,6 +28,7 @@ from odoo.exceptions import UserError class DayBookPdfReport(models.AbstractModel): _name = 'report.base_accounting_kit.day_book_report_template' + _description = 'Day Book Report' def _get_account_move_entry(self, accounts, form_data, pass_date): cr = self.env.cr diff --git a/base_accounting_kit/report/account_report_common_account.py b/base_accounting_kit/report/account_report_common_account.py index cfb34bb5d..1c359e24e 100644 --- a/base_accounting_kit/report/account_report_common_account.py +++ b/base_accounting_kit/report/account_report_common_account.py @@ -30,10 +30,9 @@ class AccountCommonAccountReport(models.TransientModel): display_account = fields.Selection( [('all', 'All'), ('movement', 'With movements'), - ('not_zero', 'With balance is not equal to 0'), ], + ('not_zero', 'With balance is not equal to 0')], string='Display Accounts', required=True, default='movement') - @api.model def pre_print_report(self, data): data['form'].update(self.read(['display_account'])[0]) return data diff --git a/base_accounting_kit/report/cash_flow_report.py b/base_accounting_kit/report/cash_flow_report.py index f8758a270..0341e0cfd 100644 --- a/base_accounting_kit/report/cash_flow_report.py +++ b/base_accounting_kit/report/cash_flow_report.py @@ -28,6 +28,7 @@ from odoo.exceptions import UserError class ReportFinancial(models.AbstractModel): _name = 'report.base_accounting_kit.report_cash_flow' + _description = 'Cash Flow Report' def _compute_account_balance(self, accounts): mapping = { diff --git a/base_accounting_kit/report/general_ledger_report.py b/base_accounting_kit/report/general_ledger_report.py index 59794fe3a..ea39a2fc6 100644 --- a/base_accounting_kit/report/general_ledger_report.py +++ b/base_accounting_kit/report/general_ledger_report.py @@ -28,6 +28,7 @@ from odoo.exceptions import UserError class ReportGeneralLedger(models.AbstractModel): _name = 'report.base_accounting_kit.report_general_ledger' + _description = 'General Ledger Report' def _get_account_move_entry(self, accounts, init_balance, sortby, display_account): diff --git a/base_accounting_kit/report/report_aged_partner.py b/base_accounting_kit/report/report_aged_partner.py index ec08547b8..745a6c912 100644 --- a/base_accounting_kit/report/report_aged_partner.py +++ b/base_accounting_kit/report/report_aged_partner.py @@ -32,6 +32,7 @@ from odoo.tools import float_is_zero class ReportAgedPartnerBalance(models.AbstractModel): _name = 'report.base_accounting_kit.report_agedpartnerbalance' + _description = 'Aged Partner Balance Report' def _get_partner_move_lines(self, account_type, date_from, target_move, period_length): diff --git a/base_accounting_kit/report/report_journal_audit.py b/base_accounting_kit/report/report_journal_audit.py index 9bad3deae..b6723155a 100644 --- a/base_accounting_kit/report/report_journal_audit.py +++ b/base_accounting_kit/report/report_journal_audit.py @@ -28,6 +28,7 @@ from odoo.exceptions import UserError class ReportJournal(models.AbstractModel): _name = 'report.base_accounting_kit.report_journal_audit' + _description = 'Journal Report' def lines(self, target_move, journal_ids, sort_selection, data): if isinstance(journal_ids, int): diff --git a/base_accounting_kit/report/report_partner_ledger.py b/base_accounting_kit/report/report_partner_ledger.py index 23319b441..6e8951abf 100644 --- a/base_accounting_kit/report/report_partner_ledger.py +++ b/base_accounting_kit/report/report_partner_ledger.py @@ -28,6 +28,7 @@ from odoo.exceptions import UserError class ReportPartnerLedger(models.AbstractModel): _name = 'report.base_accounting_kit.report_partnerledger' + _description = 'Partner Ledger Report' def _lines(self, data, partner): full_account = [] diff --git a/base_accounting_kit/report/report_tax.py b/base_accounting_kit/report/report_tax.py index 0f746bb82..329096c93 100644 --- a/base_accounting_kit/report/report_tax.py +++ b/base_accounting_kit/report/report_tax.py @@ -28,6 +28,7 @@ from odoo.exceptions import UserError class ReportTax(models.AbstractModel): _name = 'report.base_accounting_kit.report_tax' + _description = 'Tax Report' @api.model def _get_report_values(self, docids, data=None): diff --git a/base_accounting_kit/report/report_trial_balance.py b/base_accounting_kit/report/report_trial_balance.py index cfade6637..305271b78 100644 --- a/base_accounting_kit/report/report_trial_balance.py +++ b/base_accounting_kit/report/report_trial_balance.py @@ -28,6 +28,7 @@ from odoo.exceptions import UserError class ReportTrialBalance(models.AbstractModel): _name = 'report.base_accounting_kit.report_trial_balance' + _description = 'Trial Balance Report' def _get_accounts(self, accounts, display_account): """ compute the balance, debit and credit for the provided accounts diff --git a/base_accounting_kit/security/ir.model.access.csv b/base_accounting_kit/security/ir.model.access.csv index 13c83e941..6ff07f18b 100644 --- a/base_accounting_kit/security/ir.model.access.csv +++ b/base_accounting_kit/security/ir.model.access.csv @@ -1,12 +1,11 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink access_financial_report_user,account_fin_rep_name_user,model_account_financial_report,account.group_account_user,1,1,1,1 access_financial_report_manager,account_fin_rep_name_manager,model_account_financial_report,account.group_account_manager,1,1,1,1 -access_account_report_general_ledger_user,account_account_report_general_ledger_id_user,model_account_report_general_ledger,account.group_account_user,1,1,1,1 -access_account_report_general_ledger_manager,account_account_report_general_ledger_id_manager,model_account_report_general_ledger,account.group_account_manager,1,1,1,1 access_generate_recurring_entries,generate.recurring.entries.user,model_account_recurring_payments,account.group_account_user,1,1,1,1 -access_generate_recurring_entries_wizard,generate.recurring.entries.user.wizard,model_recurring_payments_wizard,account.group_account_user,1,1,1,1 -access_account_followup,account.followup,model_account_followup,account.group_account_manager,1,1,1,1 +access_account_followup_manager,account.followup.manager,model_account_followup,account.group_account_manager,1,1,1,1 +access_account_followup_user,account.followup.user,model_account_followup,account.group_account_user,1,1,1,1 access_followup_line,followup.line,model_followup_line,account.group_account_manager,1,1,0,0 +access_account_followup_line_user,account.followup.line.user,model_followup_line,account.group_account_user,1,1,0,0 access_account_asset_category,account.asset.category,model_account_asset_category,account.group_account_user,1,0,0,0 access_account_asset_asset,account.asset.asset,model_account_asset_asset,account.group_account_user,1,0,0,0 diff --git a/base_accounting_kit/security/account_asset_security.xml b/base_accounting_kit/security/security.xml similarity index 53% rename from base_accounting_kit/security/account_asset_security.xml rename to base_accounting_kit/security/security.xml index 02320b922..01fdbc9a7 100644 --- a/base_accounting_kit/security/account_asset_security.xml +++ b/base_accounting_kit/security/security.xml @@ -14,6 +14,18 @@ ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + + + Accountant + + + + + + Chief Accountant + + + diff --git a/base_accounting_kit/views/accounting_menu.xml b/base_accounting_kit/views/accounting_menu.xml index 09673cd02..006fb5348 100644 --- a/base_accounting_kit/views/accounting_menu.xml +++ b/base_accounting_kit/views/accounting_menu.xml @@ -1,14 +1,29 @@ + Accounting - + + res.config.settings.view.form.inherit.kit + res.config.settings + + +
+ Accounting + Accounting +
+
+
+ - + -
\ No newline at end of file diff --git a/base_accounting_kit/views/credit_limit_view.xml b/base_accounting_kit/views/credit_limit_view.xml index 657609bc9..91d9ee223 100644 --- a/base_accounting_kit/views/credit_limit_view.xml +++ b/base_accounting_kit/views/credit_limit_view.xml @@ -31,15 +31,11 @@ - @@ -59,15 +55,11 @@ - diff --git a/base_accounting_kit/views/followup_report.xml b/base_accounting_kit/views/followup_report.xml index f30e15be0..bb4794ebb 100644 --- a/base_accounting_kit/views/followup_report.xml +++ b/base_accounting_kit/views/followup_report.xml @@ -5,7 +5,7 @@ customer.statements.followup res.partner -
+
@@ -113,7 +113,7 @@ + groups="account.group_account_user"/> diff --git a/base_accounting_kit/wizard/__init__.py b/base_accounting_kit/wizard/__init__.py index 4a56577ab..1463cb0e0 100644 --- a/base_accounting_kit/wizard/__init__.py +++ b/base_accounting_kit/wizard/__init__.py @@ -24,7 +24,6 @@ from . import account_bank_book_wizard from . import account_cash_book_wizard from . import account_day_book_wizard from . import account_lock_date -from . import account_report_common_account from . import account_report_common_partner from . import aged_partner from . import asset_depreciation_confirmation_wizard diff --git a/base_accounting_kit/wizard/account_bank_book_wizard.py b/base_accounting_kit/wizard/account_bank_book_wizard.py index 1f8531567..bb03ca478 100644 --- a/base_accounting_kit/wizard/account_bank_book_wizard.py +++ b/base_accounting_kit/wizard/account_bank_book_wizard.py @@ -27,13 +27,13 @@ from odoo.exceptions import UserError class BankBookWizard(models.TransientModel): _name = 'account.bank.book.report' + _description = 'Account Bank Book Report' company_id = fields.Many2one('res.company', string='Company', readonly=True, default=lambda self: self.env.user.company_id) target_move = fields.Selection([('posted', 'All Posted Entries'), - ('all', 'All Entries'), - ], string='Target Moves', required=True, + ('all', 'All Entries')], string='Target Moves', required=True, default='posted') date_from = fields.Date(string='Start Date', default=date.today(), requred=True) @@ -41,7 +41,7 @@ class BankBookWizard(models.TransientModel): requred=True) display_account = fields.Selection( [('all', 'All'), ('movement', 'With movements'), - ('not_zero', 'With balance is not equal to 0'), ], + ('not_zero', 'With balance is not equal to 0')], string='Display Accounts', required=True, default='movement') sortby = fields.Selection( [('sort_date', 'Date'), ('sort_journal_partner', 'Journal & Partner')], diff --git a/base_accounting_kit/wizard/account_bank_book_wizard_view.xml b/base_accounting_kit/wizard/account_bank_book_wizard_view.xml index 7f85bf0b8..8f0f62f14 100644 --- a/base_accounting_kit/wizard/account_bank_book_wizard_view.xml +++ b/base_accounting_kit/wizard/account_bank_book_wizard_view.xml @@ -38,6 +38,6 @@ + parent="base_accounting_kit.account_reports_daily_reports"/> \ No newline at end of file diff --git a/base_accounting_kit/wizard/account_cash_book_wizard.py b/base_accounting_kit/wizard/account_cash_book_wizard.py index 3698b6fef..9b3634743 100644 --- a/base_accounting_kit/wizard/account_cash_book_wizard.py +++ b/base_accounting_kit/wizard/account_cash_book_wizard.py @@ -27,13 +27,13 @@ from odoo.exceptions import UserError class CashBookWizard(models.TransientModel): _name = 'account.cash.book.report' + _description = 'Account Cash Book Report' company_id = fields.Many2one('res.company', string='Company', readonly=True, default=lambda self: self.env.user.company_id) target_move = fields.Selection([('posted', 'All Posted Entries'), - ('all', 'All Entries'), - ], string='Target Moves', required=True, + ('all', 'All Entries')], string='Target Moves', required=True, default='posted') date_from = fields.Date(string='Start Date', default=date.today(), requred=True) @@ -41,7 +41,7 @@ class CashBookWizard(models.TransientModel): requred=True) display_account = fields.Selection( [('all', 'All'), ('movement', 'With movements'), - ('not_zero', 'With balance is not equal to 0'), ], + ('not_zero', 'With balance is not equal to 0')], string='Display Accounts', required=True, default='movement') sortby = fields.Selection( [('sort_date', 'Date'), ('sort_journal_partner', 'Journal & Partner')], diff --git a/base_accounting_kit/wizard/account_cash_book_wizard_view.xml b/base_accounting_kit/wizard/account_cash_book_wizard_view.xml index d1851036a..d2ae177fd 100644 --- a/base_accounting_kit/wizard/account_cash_book_wizard_view.xml +++ b/base_accounting_kit/wizard/account_cash_book_wizard_view.xml @@ -38,6 +38,6 @@ + parent="base_accounting_kit.account_reports_daily_reports"/> \ No newline at end of file diff --git a/base_accounting_kit/wizard/account_day_book_wizard.py b/base_accounting_kit/wizard/account_day_book_wizard.py index 487cb9d29..1657f9816 100644 --- a/base_accounting_kit/wizard/account_day_book_wizard.py +++ b/base_accounting_kit/wizard/account_day_book_wizard.py @@ -26,6 +26,7 @@ from odoo import models, fields class DayBookWizard(models.TransientModel): _name = 'account.day.book.report' + _description = 'Account Day Book Report' company_id = fields.Many2one('res.company', string='Company', readonly=True, @@ -35,8 +36,7 @@ class DayBookWizard(models.TransientModel): default=lambda self: self.env[ 'account.journal'].search([])) target_move = fields.Selection([('posted', 'All Posted Entries'), - ('all', 'All Entries'), - ], string='Target Moves', required=True, + ('all', 'All Entries')], string='Target Moves', required=True, default='posted') account_ids = fields.Many2many('account.account', diff --git a/base_accounting_kit/wizard/account_day_book_wizard_view.xml b/base_accounting_kit/wizard/account_day_book_wizard_view.xml index e6eddd815..cdb74b2b2 100644 --- a/base_accounting_kit/wizard/account_day_book_wizard_view.xml +++ b/base_accounting_kit/wizard/account_day_book_wizard_view.xml @@ -35,6 +35,6 @@ + parent="base_accounting_kit.account_reports_daily_reports"/> \ No newline at end of file diff --git a/base_accounting_kit/wizard/account_report_common_account.py b/base_accounting_kit/wizard/account_report_common_account.py deleted file mode 100644 index af50bb5c2..000000000 --- a/base_accounting_kit/wizard/account_report_common_account.py +++ /dev/null @@ -1,38 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################# -# -# Cybrosys Technologies Pvt. Ltd. -# -# Copyright (C) 2019-TODAY Cybrosys Technologies() -# Author: Cybrosys Techno Solutions() -# -# You can modify it under the terms of the GNU LESSER -# GENERAL PUBLIC LICENSE (LGPL v3), Version 3. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU LESSER GENERAL PUBLIC LICENSE (LGPL v3) for more details. -# -# You should have received a copy of the GNU LESSER GENERAL PUBLIC LICENSE -# (LGPL v3) along with this program. -# If not, see . -# -############################################################################# - -from odoo import fields, models - - -class AccountCommonAccountReport(models.TransientModel): - _name = 'account.common.account.report' - _description = 'Account Common Account Report' - _inherit = "account.common.report" - - display_account = fields.Selection( - [('all', 'All'), ('movement', 'With movements'), - ('not_zero', 'With balance is not equal to 0'), ], - string='Display Accounts', required=True, default='movement') - - def pre_print_report(self, data): - data['form'].update(self.read(['display_account'])[0]) - return data diff --git a/base_accounting_kit/wizard/cash_flow_report.py b/base_accounting_kit/wizard/cash_flow_report.py index ecb440a38..85b402111 100644 --- a/base_accounting_kit/wizard/cash_flow_report.py +++ b/base_accounting_kit/wizard/cash_flow_report.py @@ -49,8 +49,8 @@ class AccountingReport(models.TransientModel): filter_cmp = fields.Selection( [('filter_no', 'No Filters'), ('filter_date', 'Date')], string='Filter by', required=True, default='filter_no') - date_from_cmp = fields.Date(string='Start Date') - date_to_cmp = fields.Date(string='End Date') + date_from_cmp = fields.Date(string='Date Start') + date_to_cmp = fields.Date(string='Date End') debit_credit = fields.Boolean(string='Display Debit/Credit Columns', help="This option allows you to get more details about the way your balances are computed. Because it is space consuming, we do not allow to use it while doing a comparison.") diff --git a/base_accounting_kit/wizard/financial_report.py b/base_accounting_kit/wizard/financial_report.py index 585fde0c8..fe82ca3ff 100644 --- a/base_accounting_kit/wizard/financial_report.py +++ b/base_accounting_kit/wizard/financial_report.py @@ -48,11 +48,6 @@ class FinancialReport(models.TransientModel): enable_filter = fields.Boolean( string='Enable Comparison', default=False) - target_move = fields.Selection([ - ('all', 'All'), - ('posted', 'Posted')], - string="Type", - default='all') account_report_id = fields.Many2one( 'account.financial.report', string='Account Reports', @@ -382,6 +377,7 @@ class ProfitLossPdf(models.AbstractModel): """ Abstract model for generating PDF report value and send to template """ _name = 'report.base_accounting_kit.report_financial' + _description = 'Financial Report' @api.model def _get_report_values(self, docids, data=None): diff --git a/base_accounting_kit/wizard/journal_audit.py b/base_accounting_kit/wizard/journal_audit.py index 3126470ad..4bfadabc5 100644 --- a/base_accounting_kit/wizard/journal_audit.py +++ b/base_accounting_kit/wizard/journal_audit.py @@ -29,7 +29,7 @@ class AccountPrintJournal(models.TransientModel): _description = "Account Print Journal" sort_selection = fields.Selection( - [('date', 'Date'), ('move_name', 'Journal Entry Number'), ], + [('date', 'Date'), ('move_name', 'Journal Entry Number')], 'Entries Sorted by', required=True, default='move_name') journal_ids = fields.Many2many('account.journal', string='Journals', required=True, diff --git a/base_accounting_kit/wizard/recurring_payments.py b/base_accounting_kit/wizard/recurring_payments.py index c81976162..6bb1f64ca 100644 --- a/base_accounting_kit/wizard/recurring_payments.py +++ b/base_accounting_kit/wizard/recurring_payments.py @@ -29,6 +29,7 @@ from odoo.exceptions import UserError class RecurringPaymentsWizard(models.TransientModel): _name = 'recurring.payments.wizard' + _description = 'Recurring Payment Wizard' recurring_lines = fields.One2many('account.recurring.entries.line', 'p_id') date_from = fields.Date('Starting Date', default=date.today()) @@ -131,6 +132,7 @@ class RecurringPaymentsWizard(models.TransientModel): class GetAllRecurringEntries(models.TransientModel): _name = 'account.recurring.entries.line' + _description = 'Account Recurring Entries Line' date = fields.Date('Date') template_name = fields.Char('Name') diff --git a/base_accounting_kit/wizard/recurring_payments_wizard.xml b/base_accounting_kit/wizard/recurring_payments_wizard.xml index 7ca46ee91..4df1ceb05 100644 --- a/base_accounting_kit/wizard/recurring_payments_wizard.xml +++ b/base_accounting_kit/wizard/recurring_payments_wizard.xml @@ -50,22 +50,13 @@ new - - - - - - - + parent="account.menu_finance_receivables" sequence="16" + groups="account.group_account_user,account.group_account_manager"/> + parent="account.menu_finance_payables" sequence="20" + groups="account.group_account_user,account.group_account_manager"/> diff --git a/hr_payroll_account_community/static/description/index.html b/hr_payroll_account_community/static/description/index.html new file mode 100644 index 000000000..b0191a47a --- /dev/null +++ b/hr_payroll_account_community/static/description/index.html @@ -0,0 +1 @@ +Enables payroll accounting features in odoo 13. \ No newline at end of file