pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] accounting : several misc improvements

Browse Source 
- open accounts in a full view instead of a modal
- ability to reverse entries at their own accounting date
- don't create draft closing entries and reminder if no configuration for tax groups
- reordered account menus
- improved invoice form view

Task ID : 2209497

closes odoo/odoo#48355

Related: odoo/upgrade#1001
Related: odoo/enterprise#9485
Signed-off-by: oco-odoo <oco-odoo@users.noreply.github.com>
This commit is contained in:
Benjamin Frantzen (bfr)
2020-03-31 11:15:11 +00:00
parent 69686efcd5
commit def8817d72
18 changed files with 94 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/__manifest__.py
+1 -1
View File
@@ -22,7 +22,6 @@ You could use this simplified accounting in case you work with an (external) acc
'data/data_account_type.xml',
'data/account_data.xml',
'data/digest_data.xml',
'views/account_menuitem.xml',
'views/account_payment_view.xml',
'wizard/account_accrual_accounting_view.xml',
'wizard/account_unreconcile_view.xml',
@@ -66,6 +65,7 @@ You could use this simplified accounting in case you work with an (external) acc
'report/account_hash_integrity_templates.xml',
'wizard/account_transfer_wizard.xml',
'views/res_currency.xml',
'views/account_menuitem.xml',
],
'demo': [
'demo/account_demo.xml',
addons/account/models/account.py
+7 -1
View File
@@ -715,7 +715,6 @@ class AccountAccount(models.Model):
'view_mode': 'form',
'res_model': 'account.account',
'res_id': self.id,
'target': 'new',
}
def action_duplicate_accounts(self):
@@ -1430,6 +1429,13 @@ class AccountTaxGroup(models.Model):
property_tax_receivable_account_id = fields.Many2one('account.account', company_dependent=True, string='Tax current account (receivable)')
property_advance_tax_payment_account_id = fields.Many2one('account.account', company_dependent=True, string='Advance Tax payment account')
def _any_is_configured(self, company_id):
domain = expression.OR([[('property_tax_payable_account_id', '!=', False)],
[('property_tax_receivable_account_id', '!=', False)],
[('property_advance_tax_payment_account_id', '!=', False)]])
group_with_config = self.with_company(company_id).search_count(domain)
return group_with_config > 0
class AccountTax(models.Model):
_name = 'account.tax'
addons/account/report/account_invoice_report_view.xml
-2
View File
@@ -125,7 +125,5 @@
<field name="help">From this report, you can have an overview of the amount invoiced to your customers. The search tool can also be used to personalise your Invoices reports and so, match this analysis to your needs.</field>
</record>
<menuitem name="Invoices" action="action_account_invoice_report_all" id="menu_action_account_invoice_report_all" parent="account.account_reports_management_menu" sequence="1"/>
</data>
</odoo>
addons/account/views/account_analytic_view.xml
-25
View File
@@ -69,30 +69,5 @@
</field>
</record>
<menuitem
name="Analytic Items"
parent="account.menu_finance_entries_management"
action="analytic.account_analytic_line_action_entries"
id="menu_action_analytic_lines_tree"
sequence="35"
groups="analytic.group_analytic_accounting"/>
<menuitem action="analytic.action_account_analytic_account_form" id="account_analytic_def_account"
parent="menu_analytic_accounting"
groups="analytic.group_analytic_accounting" sequence="0"/>
<menuitem
id="account_analytic_tag_menu"
name="Analytic Tags"
parent="menu_analytic_accounting"
action="analytic.account_analytic_tag_action"
groups="analytic.group_analytic_tags"/>
<menuitem
id="account_analytic_group_menu"
name="Analytic Account Groups"
parent="menu_analytic_accounting"
action="analytic.account_analytic_group_action"
groups="analytic.group_analytic_accounting"/>
</data>
</odoo>
addons/account/views/account_cash_rounding_view.xml
-3
View File
@@ -58,8 +58,5 @@
</field>
</record>
<!-- Menu -->
<menuitem id="menu_action_rounding_form_view" action="rounding_list_action"
groups="account.group_cash_rounding" parent="account_management_menu" sequence="4"/>
</data>
</odoo>
addons/account/views/account_incoterms_view.xml
-2
View File
@@ -57,7 +57,5 @@
</field>
</record>
<menuitem action="action_incoterms_tree" id="menu_action_incoterm_open"
parent="account.account_invoicing_menu" sequence="4" groups="account.group_account_manager"/>
</data>
</odoo>
addons/account/views/account_journal_dashboard_view.xml
-1
View File
@@ -372,5 +372,4 @@
</field>
</record>
<menuitem id="menu_board_journal_1" name="Overview" action="open_account_journal_dashboard_kanban" parent="menu_finance" sequence="1" groups="account.group_account_readonly"/>
</odoo>
addons/account/views/account_menuitem.xml
+47 -7
View File
@@ -9,30 +9,70 @@
web_icon="account,static/description/icon.png"
sequence="40"/>
<menuitem id="menu_board_journal_1" name="Overview" parent="menu_finance" action="open_account_journal_dashboard_kanban" groups="account.group_account_readonly" sequence="1"/>
<menuitem id="menu_finance_receivables" name="Customers" parent="menu_finance" sequence="2"/>
<menuitem id="menu_action_move_out_invoice_type" parent="account.menu_finance_receivables" action="action_move_out_invoice_type" sequence="1"/>
<menuitem id="menu_action_move_out_refund_type" parent="account.menu_finance_receivables" action="action_move_out_refund_type" sequence="2"/>
<menuitem id="menu_action_move_out_receipt_type" parent="account.menu_finance_receivables" action="action_move_out_receipt_type" groups="account.group_sale_receipts" sequence="3"/>
<menuitem id="menu_action_account_payments_receivable" parent="account.menu_finance_receivables" action="action_account_payments" sequence="15"/>
<menuitem id="product_product_menu_sellable" name="Products" parent="account.menu_finance_receivables" action="product_product_action_sellable" sequence="100"/>
<menuitem id="menu_account_customer" name="Customers" parent="account.menu_finance_receivables" action="res_partner_action_customer" sequence="110"/>
<menuitem id="menu_finance_payables" name="Vendors" parent="menu_finance" sequence="3"/>
<menuitem id="menu_action_move_in_invoice_type" parent="account.menu_finance_payables" action="action_move_in_invoice_type" sequence="1"/>
<menuitem id="menu_action_move_in_refund_type" parent="account.menu_finance_payables" action="action_move_in_refund_type" sequence="2"/>
<menuitem id="menu_action_move_in_receipt_type" parent="account.menu_finance_payables" action="action_move_in_receipt_type" groups="account.group_purchase_receipts" sequence="3"/>
<menuitem id="menu_action_account_payments_payable" parent="account.menu_finance_payables" action="action_account_payments_payable" sequence="20"/>
<menuitem id="product_product_menu_purchasable" name="Products" parent="account.menu_finance_payables" action="product_product_action_purchasable" sequence="100"/>
<menuitem id="menu_account_supplier" name="Vendors" parent="account.menu_finance_payables" action="account.res_partner_action_supplier" sequence="200"/>
<menuitem id="menu_finance_entries" name="Accounting" parent="menu_finance" sequence="4" groups="account.group_account_readonly"/>
<!-- Adviser sub-menus -->
<menuitem id="menu_finance_entries_accounting_miscellaneous" name="Miscellaneous" parent="account.menu_finance_entries" sequence="1"/>
<menuitem id="menu_action_account_moves_all" parent="account.menu_finance_entries_accounting_miscellaneous" action="action_account_moves_all" groups="base.group_no_one" sequence="10"/>
<menuitem id="menu_action_move_journal_line_form" parent="account.menu_finance_entries_accounting_miscellaneous" action="action_move_journal_line" groups="account.group_account_readonly" sequence="1"/>
<menuitem id="menu_finance_entries_accounting_journals" name="Journals" parent="account.menu_finance_entries" sequence="2"/>
<menuitem id="menu_action_account_moves_journal_sales" parent="account.menu_finance_entries_accounting_journals" action="action_account_moves_journal_sales" groups="account.group_account_readonly" sequence="1"/>
<menuitem id="menu_action_account_moves_journal_purchase" parent="account.menu_finance_entries_accounting_journals" action="action_account_moves_journal_purchase" groups="account.group_account_readonly" sequence="2"/>
<menuitem id="menu_action_account_moves_journal_bank_cash" parent="account.menu_finance_entries_accounting_journals" action="action_account_moves_journal_bank_cash" groups="account.group_account_readonly" sequence="3"/>
<menuitem id="menu_action_account_moves_journal_misc" parent="account.menu_finance_entries_accounting_journals" action="action_account_moves_journal_misc" groups="account.group_account_readonly" sequence="4"/>
<menuitem id="menu_finance_entries_accounting_ledgers" name="Ledgers" parent="account.menu_finance_entries" sequence="3"/>
<menuitem id="menu_action_account_moves_ledger_general" parent="account.menu_finance_entries_accounting_ledgers" action="action_account_moves_ledger_general" groups="account.group_account_readonly" sequence="1"/>
<menuitem id="menu_action_account_moves_ledger_partner" parent="account.menu_finance_entries_accounting_ledgers" action="action_account_moves_ledger_partner" groups="account.group_account_readonly" sequence="2"/>
<menuitem id="menu_finance_entries_management" name="Management" parent="menu_finance_entries" sequence="10" groups="account.group_account_invoice,account.group_account_readonly"/>
<menuitem id="menu_finance_entries_actions" name="Actions" parent="account.menu_finance_entries" sequence="11" groups="account.group_account_user"/>
<menuitem id="menu_action_tax_adjustment" parent="account.menu_finance_entries_actions" action="tax_adjustments_form" groups="base.group_no_one" sequence="45"/>
<menuitem id="menu_finance_entries_generate_entries" name="Generate Entries" parent="account.menu_finance_entries"/>
<menuitem id="menu_finance_reports" name="Reporting" parent="menu_finance" sequence="20" groups="account.group_account_readonly,account.group_account_invoice"/>
<!-- Reporting sub-menus -->
<menuitem id="account_reports_management_menu" name="Management" parent="account.menu_finance_reports" sequence="4"/>
<menuitem id="menu_action_account_invoice_report_all" name="Invoice Analysis" parent="account.account_reports_management_menu" action="action_account_invoice_report_all" sequence="1"/>
<menuitem id="account_reports_legal_statements_menu" name="Generic Statements" parent="account.menu_finance_reports" sequence="1" groups="account.group_account_readonly"/>
<menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="35" groups="account.group_account_manager"/>
<!-- Configuration Sub-Menu -->
<menuitem id="account_invoicing_menu" name="Invoicing" parent="account.menu_finance_configuration" sequence="1" groups="account.group_account_invoice,account.group_account_readonly"/>
<menuitem id="root_payment_menu" name="Payments" parent="account.menu_finance_configuration" sequence="2" groups="account.group_account_manager"/>
<menuitem id="account_account_menu" name="Accounting" parent="account.menu_finance_configuration" sequence="3" groups="account.group_account_manager"/>
<menuitem id="menu_action_currency_form" action="base.action_currency_form" name="Currencies" parent="account_account_menu" sequence="1" groups="base.group_multi_currency"/>
<menuitem id="account_management_menu" name="Management" parent="account.menu_finance_configuration" sequence="4" groups="account.group_account_manager"/>
<menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration" groups="analytic.group_analytic_accounting,analytic.group_analytic_tags" sequence="5"/>
<menuitem id="menu_account_config" name="Settings" parent="menu_finance_configuration" action="action_account_config" groups="base.group_system" sequence="0"/>
<menuitem id="account_invoicing_menu" name="Invoicing" parent="account.menu_finance_configuration" groups="account.group_account_invoice,account.group_account_readonly" sequence="1"/>
<menuitem id="menu_action_payment_term_form" parent="account_invoicing_menu" action="action_payment_term_form" sequence="1"/>
<menuitem id="menu_action_incoterm_open" parent="account.account_invoicing_menu" action="action_incoterms_tree" groups="account.group_account_manager" sequence="3"/>
<menuitem id="account_banks_menu" name="Banks" parent="account.menu_finance_configuration" groups="account.group_account_manager" sequence="2"/>
<menuitem id="menu_action_account_bank_journal_form" parent="account_banks_menu" action="action_new_bank_setting" groups="account.group_account_manager" sequence="1"/>
<menuitem id="action_account_reconcile_model_menu" parent="account.account_banks_menu" action="account.action_account_reconcile_model" sequence="3" />
<menuitem id="account_account_menu" name="Accounting" parent="account.menu_finance_configuration" groups="account.group_account_manager" sequence="3"/>
<menuitem id="menu_action_account_form" parent="account.account_account_menu" action="action_account_form" groups="account.group_account_readonly" sequence="1"/>
<menuitem id="menu_action_tax_form" parent="account_account_menu" action="action_tax_form" sequence="2"/>
<menuitem id="menu_action_account_journal_form" parent="account_account_menu" action="action_account_journal_form" groups="account.group_account_manager" sequence="3"/>
<menuitem id="account_report_folder" name="Reporting" parent="account_account_menu" groups="account.group_account_readonly" sequence="4"/>
<menuitem id="menu_action_currency_form" action="base.action_currency_form" name="Currencies" parent="account_account_menu" groups="base.group_multi_currency" sequence="4"/>
<menuitem id="menu_action_account_fiscal_position_form" parent="account_account_menu" action="action_account_fiscal_position_form" sequence="5"/>
<menuitem id="menu_action_account_journal_group_list" parent="account_account_menu" action="action_account_journal_group_list" groups="account.group_account_manager" sequence="7"/>
<menuitem id="root_payment_menu" name="Payments" parent="account.menu_finance_configuration" groups="account.group_account_manager" sequence="4"/>
<menuitem id="account_management_menu" name="Management" parent="account.menu_finance_configuration" groups="account.group_account_manager" sequence="5"/>
<menuitem id="menu_action_rounding_form_view" parent="account_management_menu" action="rounding_list_action" groups="account.group_cash_rounding" sequence="4"/>
<menuitem id="menu_configure_tax_report" name="Tax Report" parent="account.account_management_menu" action="account.action_configure_tax_report" groups="base.group_no_one" sequence="5"/>
<menuitem id="menu_action_analytic_lines_tree" name="Analytic Items" parent="account.menu_finance_entries_management" action="analytic.account_analytic_line_action_entries" groups="analytic.group_analytic_accounting" sequence="35"/>
<menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration" groups="analytic.group_analytic_accounting,analytic.group_analytic_tags" sequence="6"/>
<menuitem id="account_analytic_def_account" parent="menu_analytic_accounting" action="analytic.action_account_analytic_account_form" groups="analytic.group_analytic_accounting" sequence="1"/>
<menuitem id="account_analytic_tag_menu" name="Analytic Tags" parent="menu_analytic_accounting" action="analytic.account_analytic_tag_action" groups="analytic.group_analytic_tags"/>
<menuitem id="account_analytic_group_menu" name="Analytic Account Groups" parent="menu_analytic_accounting" action="analytic.account_analytic_group_action" groups="analytic.group_analytic_accounting" sequence="2"/>
</data>
</odoo>
addons/account/views/account_move_views.xml
+25 -116
View File
@@ -608,7 +608,13 @@
options='{"always_reload": True, "no_quick_create": True}'
attrs="{'invisible': [('move_type', 'not in', ('out_invoice', 'out_refund', 'in_invoice', 'in_refund', 'out_receipt', 'in_receipt'))]}"/>
<field name="ref"/>
<div class="o_td_label">
<label for="ref"
attrs="{'invisible':[('move_type', 'in', ('in_invoice', 'in_receipt', 'in_refund'))]}" />
<label for="ref" string="Bill Reference"
attrs="{'invisible':[('move_type', 'not in', ('in_invoice', 'in_receipt', 'in_refund'))]}" />
</div>
<field name="ref" nolabel="1"/>
<field name="invoice_vendor_bill_id"
attrs="{'invisible': ['|', ('state', '!=', 'draft'), ('move_type', '!=', 'in_invoice')]}"
domain="[('company_id', '=', company_id), ('partner_id','child_of', [partner_id]), ('move_type','=','in_invoice')]"
@@ -630,17 +636,16 @@
attrs="{'invisible': [('move_type', 'in', ('out_invoice', 'out_refund', 'out_receipt'))]}"/>
<!-- Invoice payment terms (only invoices) + due date (only invoices / receipts) -->
<label for="invoice_payment_term_id"
<label for="invoice_payment_term_id" string="Due Date"
attrs="{'invisible': [('move_type', 'not in', ('out_invoice', 'out_refund', 'in_invoice', 'in_refund', 'out_receipt', 'in_receipt'))]}"/>
<div class="d-flex" attrs="{'invisible': [('move_type', 'not in', ('out_invoice', 'out_refund', 'in_invoice', 'in_refund', 'out_receipt', 'in_receipt'))]}">
<field name="invoice_payment_term_id"
placeholder="Terms"
attrs="{'invisible': [('move_type', 'not in', ('out_invoice', 'out_refund', 'in_invoice', 'in_refund', 'out_receipt', 'in_receipt'))]}"/>
<span class="o_form_label mx-3 oe_edit_only"
attrs="{'invisible': [ '|', '|', ('state', '!=', 'draft'), ('invoice_payment_term_id', '!=', False), ('move_type', 'not in', ('out_invoice', 'out_refund', 'in_invoice', 'in_refund', 'out_receipt', 'in_receipt'))]}"> or </span>
<field name="invoice_date_due" force_save="1"
placeholder="Date"
attrs="{'invisible': ['|', ('invoice_payment_term_id', '!=', False), ('move_type', 'not in', ('out_invoice', 'out_refund', 'in_invoice', 'in_refund', 'out_receipt', 'in_receipt'))]}"/>
attrs="{'invisible': [('invoice_payment_term_id', '!=', False)]}"/>
<span class="o_form_label mx-3 oe_edit_only"
attrs="{'invisible': ['|', ('state', '!=', 'draft'), ('invoice_payment_term_id', '!=', False)]}"> or </span>
<field name="invoice_payment_term_id"
placeholder="Terms"/>
</div>
<field name="journal_id"
@@ -651,6 +656,12 @@
<field name="company_id" groups="base.group_multi_company"/>
<field name="invoice_payment_ref"
attrs="{'invisible': [('move_type', 'not in', ('out_invoice', 'out_refund', 'in_invoice', 'in_refund', 'out_receipt', 'in_receipt'))], 'readonly': [('state', '!=', 'draft')]}"/>
<field name="invoice_partner_bank_id"
context="{'default_partner_id': commercial_partner_id}"
domain="[('partner_id', '=', bank_partner_id)]"
attrs="{'invisible': [('move_type', 'not in', ('in_invoice', 'in_refund', 'in_receipt'))], 'readonly': [('state', '!=', 'draft')]}"/>
<field name="currency_id"
groups="base.group_multi_currency"
attrs="{'invisible': [('move_type', 'not in', ('out_invoice', 'out_refund', 'in_invoice', 'in_refund'))]}"/>
@@ -977,8 +988,13 @@
name="sale_info_group"
attrs="{'invisible': [('move_type', 'not in', ('out_invoice', 'out_refund'))]}">
<field name="invoice_user_id" domain="[('share', '=', False)]"/>
<field name="invoice_origin" force_save="1" string="Source Document"
<field name="invoice_origin" string="Source Document" force_save="1"
attrs="{'invisible': [('invoice_origin', '=', False)]}"/>
<field name="invoice_partner_bank_id"
context="{'default_partner_id': commercial_partner_id}"
domain="[('partner_id', '=', bank_partner_id)]"
attrs="{'invisible': [('move_type', 'not in', ('out_invoice', 'out_refund', 'out_receipt'))], 'readonly': [('state', '!=', 'draft')]}"/>
<field name="qr_code_method" attrs="{'invisible': [('display_qr_code', '=', False)]}"/>
</group>
<group string="Accounting"
name="accounting_info_group"
@@ -993,17 +1009,6 @@
attrs="{'invisible': [('move_type', '!=', 'in_invoice')], 'readonly': ['|',('reversed_entry_id', '!=', False),('state','!=','draft')]}"/>
<field name="to_check"/>
</group>
<group string="Payments"
name="payments_info_group"
attrs="{'invisible': [('move_type', 'not in', ('out_invoice', 'out_refund', 'in_invoice', 'in_refund'))]}">
<field name="invoice_payment_ref"
attrs="{'readonly': [('state', '!=', 'draft')]}"/>
<field name="invoice_partner_bank_id"
context="{'default_partner_id': commercial_partner_id}"
domain="[('partner_id', '=', bank_partner_id)]"
attrs="{'readonly': [('state', '!=', 'draft')]}"/>
<field name="qr_code_method" attrs="{'invisible': [('display_qr_code', '=', False)]}"/>
</group>
</group>
</page>
<page id="other_tab_entry" string="Other Info" name="other_info"
@@ -1422,101 +1427,5 @@ if records:
</field>
</record>
<!-- MENUS -->
<menuitem
id="menu_action_move_out_invoice_type"
action="action_move_out_invoice_type"
parent="account.menu_finance_receivables"
sequence="1"/>
<menuitem
id="menu_action_move_out_refund_type"
action="action_move_out_refund_type"
parent="account.menu_finance_receivables"
sequence="1"/>
<menuitem
id="menu_action_move_out_receipt_type"
action="action_move_out_receipt_type"
parent="account.menu_finance_receivables"
groups="account.group_sale_receipts"
sequence="1"/>
<menuitem
id="menu_action_move_in_invoice_type"
action="action_move_in_invoice_type"
parent="account.menu_finance_payables"
sequence="1"/>
<menuitem
id="menu_action_move_in_refund_type"
action="action_move_in_refund_type"
parent="account.menu_finance_payables"
sequence="1"/>
<menuitem
id="menu_action_move_in_receipt_type"
action="action_move_in_receipt_type"
parent="account.menu_finance_payables"
groups="account.group_purchase_receipts"
sequence="1"/>
<menuitem
id="menu_action_account_moves_all"
action="action_account_moves_all"
parent="account.menu_finance_entries_accounting_miscellaneous"
groups="base.group_no_one"
sequence="10"/>
<menuitem
id="menu_action_move_journal_line_form"
action="action_move_journal_line"
parent="account.menu_finance_entries_accounting_miscellaneous"
groups="account.group_account_readonly"
sequence="1"/>
<menuitem
id="menu_action_account_moves_journal_sales"
action="action_account_moves_journal_sales"
parent="account.menu_finance_entries_accounting_journals"
groups="account.group_account_readonly"
sequence="1"/>
<menuitem
id="menu_action_account_moves_journal_purchase"
action="action_account_moves_journal_purchase"
parent="account.menu_finance_entries_accounting_journals"
groups="account.group_account_readonly"
sequence="1"/>
<menuitem
id="menu_action_account_moves_journal_bank_cash"
action="action_account_moves_journal_bank_cash"
parent="account.menu_finance_entries_accounting_journals"
groups="account.group_account_readonly"
sequence="1"/>
<menuitem
id="menu_action_account_moves_journal_misc"
action="action_account_moves_journal_misc"
parent="account.menu_finance_entries_accounting_journals"
groups="account.group_account_readonly"
sequence="1"/>
<menuitem
id="menu_action_account_moves_ledger_general"
action="action_account_moves_ledger_general"
parent="account.menu_finance_entries_accounting_ledgers"
groups="account.group_account_readonly"
sequence="1"/>
<menuitem
id="menu_action_account_moves_ledger_partner"
action="action_account_moves_ledger_partner"
parent="account.menu_finance_entries_accounting_ledgers"
groups="account.group_account_readonly"
sequence="1"/>
</data>
</odoo>
addons/account/views/account_payment_view.xml
-3
View File
@@ -316,9 +316,6 @@
</field>
</record>
<menuitem action="action_account_payments" id="menu_action_account_payments_receivable" parent="account.menu_finance_receivables" sequence="15"/>
<menuitem action="action_account_payments_payable" id="menu_action_account_payments_payable" parent="account.menu_finance_payables" sequence="20"/>
<record id="view_account_payment_invoice_form" model="ir.ui.view">
<field name="name">account.payment.invoice.form</field>
<field name="model">account.payment</field>
addons/account/views/account_tax_report_views.xml
-2
View File
@@ -118,7 +118,5 @@
<field name="view_id" ref="account_tax_report_tree"/>
</record>
<menuitem id="menu_configure_tax_report" name="Tax Report" parent="account.account_management_menu" action="account.action_configure_tax_report" groups="base.group_no_one"/>
</data>
</odoo>
addons/account/views/account_view.xml
-30
View File
@@ -146,8 +146,6 @@
<field name="context">{'search_default_activeacc': True}</field>
</record>
<menuitem action="action_account_form" id="menu_action_account_form" parent="account.account_account_menu" groups="account.group_account_readonly" sequence="1"/>
<record id="action_duplicate_account" model="ir.actions.server">
<field name="name">Duplicate</field>
<field name="model_id" ref="model_account_account"/>
@@ -370,8 +368,6 @@ action = model.setting_init_bank_account_action()
</field>
</record>
<menuitem action="action_new_bank_setting" id="menu_action_account_bank_journal_form" parent="root_payment_menu" groups="account.group_account_manager" sequence="1"/>
<record id="action_account_journal_form" model="ir.actions.act_window">
<field name="name">Journals</field>
<field name="res_model">account.journal</field>
@@ -389,7 +385,6 @@ action = model.setting_init_bank_account_action()
</p>
</field>
</record>
<menuitem action="action_account_journal_form" id="menu_action_account_journal_form" parent="account_invoicing_menu" sequence="5" groups="account.group_account_manager"/>
<record id="action_account_journal_group_list" model="ir.actions.act_window">
<field name="name">Journal Groups</field>
@@ -402,7 +397,6 @@ action = model.setting_init_bank_account_action()
</p>
</field>
</record>
<menuitem action="action_account_journal_group_list" id="menu_action_account_journal_group_list" parent="account_account_menu" sequence="2" groups="account.group_account_manager"/>
<!-- Tags -->
<record id="account_tag_view_form" model="ir.ui.view">
@@ -984,15 +978,6 @@ action = model.setting_init_bank_account_action()
</p>
</field>
</record>
<menuitem id="action_account_reconcile_model_menu" parent="account.account_account_menu"
action="account.action_account_reconcile_model" sequence="4" />
<menuitem
id="account_report_folder"
name="Reporting"
parent="account_account_menu"
groups="account.group_account_readonly"
sequence="4"/>
<!-- Account Types -->
<record id="view_account_type_search" model="ir.ui.view">
@@ -1229,7 +1214,6 @@ action = model.setting_init_bank_account_action()
</p>
</field>
</record>
<menuitem action="action_tax_form" id="menu_action_tax_form" parent="account_invoicing_menu" sequence="2"/>
<!-- Tax group -->
<record id="view_tax_group_tree" model="ir.ui.view">
@@ -1403,8 +1387,6 @@ action = model.setting_init_bank_account_action()
<field name="search_view_id" ref="view_payment_term_search"/>
</record>
<menuitem action="action_payment_term_form"
id="menu_action_payment_term_form" parent="account_invoicing_menu" sequence="1"/>
<!-- Account Templates -->
@@ -1740,10 +1722,6 @@ action = model.setting_init_bank_account_action()
</field>
</record>
<menuitem id="menu_account_customer" name="Customers"
parent="account.menu_finance_receivables"
action="res_partner_action_customer" sequence="110"/>
<record id="product_template_view_tree" model="ir.ui.view">
<field name="name">product.template.tree</field>
<field name="model">product.template</field>
@@ -1787,14 +1765,6 @@ action = model.setting_init_bank_account_action()
</field>
</record>
<menuitem id="product_product_menu_sellable" name="Products" action="product_product_action_sellable" parent="account.menu_finance_receivables" sequence="100"/>
<menuitem id="product_product_menu_purchasable" name="Products" action="product_product_action_purchasable" parent="account.menu_finance_payables" sequence="100"/>
<menuitem id="menu_account_supplier" name="Vendors"
parent="account.menu_finance_payables"
action="account.res_partner_action_supplier" sequence="200"/>
<record id="view_account_group_form" model="ir.ui.view">
<field name="name">account.group.form</field>
<field name="model">account.group</field>
addons/account/views/partner_view.xml
-5
View File
@@ -135,11 +135,6 @@
</field>
</record>
<menuitem
action="action_account_fiscal_position_form"
id="menu_action_account_fiscal_position_form"
parent="account_invoicing_menu" sequence="3"/>
<!--
Partners Extension
-->
addons/account/views/res_config_settings_views.xml
-2
View File
@@ -588,7 +588,5 @@
<field name="context">{'module' : 'account'}</field>
</record>
<menuitem id="menu_account_config" name="Settings" parent="menu_finance_configuration"
sequence="0" action="action_account_config" groups="base.group_system"/>
</data>
</odoo>
addons/account/views/tax_adjustments.xml
-1
View File
@@ -6,5 +6,4 @@
<field name="view_mode">form</field>
<field name="target">new</field>
</record>
<menuitem action="tax_adjustments_form" id="menu_action_tax_adjustment" parent="account.menu_finance_entries_actions" sequence="45" groups="base.group_no_one" />
</odoo>
addons/account/wizard/account_move_reversal.py
+9 -4
View File
@@ -14,7 +14,11 @@ class AccountMoveReversal(models.TransientModel):
move_ids = fields.Many2many('account.move', 'account_move_reversal_move', 'reversal_id', 'move_id', domain=[('state', '=', 'posted')])
new_move_ids = fields.Many2many('account.move', 'account_move_reversal_new_move', 'reversal_id', 'new_move_id')
date = fields.Date(string='Reversal date', default=fields.Date.context_today, required=True)
date_mode = fields.Selection(selection=[
('custom', 'Specific'),
('entry', 'Journal Entry Date')
], required=True, default='custom')
date = fields.Date(string='Reversal date', default=fields.Date.context_today)
reason = fields.Char(string='Reason')
refund_method = fields.Selection(selection=[
('refund', 'Partial Refund'),
@@ -51,14 +55,15 @@ class AccountMoveReversal(models.TransientModel):
record.move_type = move_ids.move_type if len(move_ids) == 1 else (any(move.move_type in ('in_invoice', 'out_invoice') for move in move_ids) and 'some_invoice' or False)
def _prepare_default_reversal(self, move):
reverse_date = self.date if self.date_mode == 'custom' else move.date
return {
'ref': _('Reversal of: %s, %s') % (move.name, self.reason) if self.reason else _('Reversal of: %s') % (move.name),
'date': self.date or move.date,
'date': reverse_date,
'invoice_date': move.is_invoice(include_receipts=True) and (self.date or move.date) or False,
'journal_id': self.journal_id and self.journal_id.id or move.journal_id.id,
'invoice_payment_term_id': None,
'auto_post': True if self.date > fields.Date.context_today(self) else False,
'invoice_user_id': move.invoice_user_id.id,
'auto_post': True if reverse_date > fields.Date.context_today(self) else False,
}
def reverse_moves(self):
@@ -81,7 +86,7 @@ class AccountMoveReversal(models.TransientModel):
moves_vals_list = []
for move in moves.with_context(include_business_fields=True):
moves_vals_list.append(move.copy_data({
'date': self.date or move.date,
'date': self.date if self.date_mode == 'custom' else move.date,
})[0])
new_moves = self.env['account.move'].create(moves_vals_list)
elif self.refund_method == 'refund':
addons/account/wizard/account_move_reversal_view.xml
+3 -2
View File
@@ -31,11 +31,12 @@
<group>
<group>
<field name="reason" attrs="{'invisible': [('move_type', '==', 'entry')], 'reason': [('move_type', '==', 'entry')]}"/>
<field name="date" string="Refund Date" attrs="{'invisible': [('move_type', 'not in', ('out_invoice', 'in_invoice'))]}"/>
<field name="date" attrs="{'invisible': [('move_type', 'in', ('out_invoice', 'in_invoice'))]}"/>
<field name="date_mode" string="Reversal Date" widget="radio"/>
</group>
<group>
<field name="journal_id"/>
<field name="date" string="Refund Date" attrs="{'invisible': ['|', ('move_type', 'not in', ('out_invoice', 'in_invoice')), ('date_mode', '!=', 'custom')], 'required':[('date_mode', '=', 'custom')]}"/>
<field name="date" attrs="{'invisible': ['|', ('move_type', 'in', ('out_invoice', 'in_invoice')), ('date_mode', '!=', 'custom')], 'required':[('date_mode', '=', 'custom')]}"/>
</group>
</group>
<footer>
addons/account_analytic_default/views/account_analytic_default_view.xml
+2 -2
View File
@@ -95,7 +95,7 @@
</record>
<record id="action_analytic_default_list" model="ir.actions.act_window">
<field name="name">Analytic Defaults</field>
<field name="name">Analytic Defaults Rules</field>
<field name="res_model">account.analytic.default</field>
<field name="view_mode">tree,kanban,form</field>
<field name="search_view_id" ref="view_account_analytic_default_form_search"/>
@@ -108,7 +108,7 @@
<field name="context">{'search_default_product_id': [active_id], 'default_product_id': active_id}</field>
</record>
<menuitem id="menu_analytic_default_list"
<menuitem id="menu_analytic_default_list" sequence="3"
action="action_analytic_default_list"
parent="account.menu_analytic_accounting"/>