Skip to content
Snippets Groups Projects
Commit 5be1fabc authored by Pariket Trivedi's avatar Pariket Trivedi Committed by Yannick Tivisse
Browse files

[IMP] account: Improve the onboarding for the invoicing process

- Fiscal position Form: no account tab (hidden for billing users)
- In reports > invoices:
	- remove following measures: volume, weight
	- rename Total Residual into Due Amount.
	- Only show Currency Rate if multi currencies
- Onboarding: Add tip to open planner once in the menu. "Make your system ready to invoice in a few steps."
parent 18abd7dc
No related branches found
No related tags found
No related merge requests found
......@@ -45,7 +45,7 @@ class AccountInvoiceReport(models.Model):
user_currency_price_total = fields.Float(string="Total Without Tax", compute='_compute_amounts_in_user_currency', digits=0)
price_average = fields.Float(string='Average Price', readonly=True, group_operator="avg")
user_currency_price_average = fields.Float(string="Average Price", compute='_compute_amounts_in_user_currency', digits=0)
currency_rate = fields.Float(string='Currency Rate', readonly=True, group_operator="avg")
currency_rate = fields.Float(string='Currency Rate', readonly=True, group_operator="avg", groups="base.group_multi_currency")
nbr = fields.Integer(string='# of Lines', readonly=True) # TDE FIXME master: rename into nbr_lines
type = fields.Selection([
('out_invoice', 'Customer Invoice'),
......@@ -65,11 +65,9 @@ class AccountInvoiceReport(models.Model):
account_id = fields.Many2one('account.account', string='Account', readonly=True, domain=[('deprecated', '=', False)])
account_line_id = fields.Many2one('account.account', string='Account Line', readonly=True, domain=[('deprecated', '=', False)])
partner_bank_id = fields.Many2one('res.partner.bank', string='Bank Account', readonly=True)
residual = fields.Float(string='Total Residual', readonly=True)
residual = fields.Float(string='Due Amount', readonly=True)
user_currency_residual = fields.Float(string="Total Residual", compute='_compute_amounts_in_user_currency', digits=0)
country_id = fields.Many2one('res.country', string='Country of the Partner Company')
weight = fields.Float(string='Gross Weight', readonly=True)
volume = fields.Float(string='Volume', readonly=True)
_order = 'date desc'
......@@ -96,7 +94,6 @@ class AccountInvoiceReport(models.Model):
SELECT sub.id, sub.date, sub.product_id, sub.partner_id, sub.country_id, sub.account_analytic_id,
sub.payment_term_id, sub.uom_name, sub.currency_id, sub.journal_id,
sub.fiscal_position_id, sub.user_id, sub.company_id, sub.nbr, sub.type, sub.state,
sub.weight, sub.volume,
sub.categ_id, sub.date_due, sub.account_id, sub.account_line_id, sub.partner_bank_id,
sub.product_qty, sub.price_total as price_total, sub.price_average as price_average,
COALESCE(cr.rate, 1) as currency_rate, sub.residual as residual, sub.commercial_partner_id as commercial_partner_id
......@@ -123,9 +120,7 @@ class AccountInvoiceReport(models.Model):
ai.residual_company_signed / (SELECT count(*) FROM account_invoice_line l where invoice_id = ai.id) *
count(*) * invoice_type.sign AS residual,
ai.commercial_partner_id as commercial_partner_id,
partner.country_id,
SUM(pr.weight * (invoice_type.sign*ail.quantity) / u.factor * u2.factor) AS weight,
SUM(pr.volume * (invoice_type.sign*ail.quantity) / u.factor * u2.factor) AS volume
partner.country_id
"""
return select_str
......
......@@ -50,7 +50,7 @@
</field>
</group>
</page>
<page name="account_mapping" string="Account Mapping">
<page name="account_mapping" string="Account Mapping" groups="account.group_account_user">
<group>
<field name="account_ids" widget="one2many_list" nolabel="1">
<tree string="Account Mapping" editable="bottom">
......@@ -173,7 +173,7 @@
<field name="groups_id" eval="[(4, ref('account.group_account_invoice'))]"/>
<field name="arch" type="xml">
<page name="sales_purchases" position="after">
<page string="Accounting" name="accounting" attrs="{'invisible': [('is_company','=',False),('parent_id','!=',False)]}">
<page string="Invoicing" name="accounting" attrs="{'invisible': [('is_company','=',False),('parent_id','!=',False)]}">
<group>
<group string="Sale" name="acc_sale">
<field name="property_payment_term_id" widget="selection"/>
......
......@@ -12,6 +12,14 @@ tour.register('account_accountant_tour', {
trigger: '.o_app[data-menu-xmlid="account.menu_finance"], .oe_menu_toggler[data-menu-xmlid="account.menu_finance"]',
content: _t('Ready to discover your new favorite <b>accounting app</b>? Get started by clicking here.'),
position: 'bottom',
}, {
trigger: ".o_menu_systray div.progress",
content: _t("Make your system ready to invoice in a few steps."),
position: "bottom"
}, {
trigger: ".o_planner_dialog .o_planner_close_block .fa-close",
content: _t("When you're ready, close this planner to continue the tour."),
position: "right"
}, {
trigger: ".o_invoice_new",
extra_trigger: '.o_account_kanban',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment