Merge PR #930 into 12.0

Signed-off-by JordiBForgeFlow
This commit is contained in:
OCA-git-bot
2020-01-22 10:57:36 +00:00
13 changed files with 44 additions and 20 deletions

View File

@@ -5,6 +5,7 @@
<field name="name">res.config.settings.view.form.inherit.account</field>
<field name="inherit_id" ref="account.res_config_settings_view_form"/>
<field name="model">res.config.settings</field>
<field name="priority" eval="100"/>
<field name="arch" type="xml">
<field name="module_account_asset" position="replace">
<field name="module_account_asset_management" class="oe_inline"/>

View File

@@ -119,15 +119,15 @@ class TestPayment(AccountingTestCase):
})
self.bank_journal.bank_account_id = self.partner_bank_id.id
def create_invoice(self, amount=100, type='out_invoice', currency_id=None):
def create_invoice(self, amount=100, inv_type='out_invoice', currency_id=None):
""" Returns an open invoice """
invoice = self.invoice_model.create({
'partner_id': self.partner_agrolait.id,
'currency_id': currency_id,
'name': type == 'out_invoice' and
'name': inv_type == 'out_invoice' and
'invoice to client' or 'invoice to supplier',
'account_id': self.account_receivable.id,
'type': type,
'type': inv_type,
'date_invoice': time.strftime('%Y-%m-%d'),
})
self.invoice_line_model.create({

View File

@@ -1,2 +1 @@
You just need to create date ranges associated to 'Fiscal Year' type.
You just need to create date ranges associated to 'Fiscal Year' type.

View File

@@ -1,2 +1 @@
* Benjamin Willig <benjamin.willig@acsone.eu>

View File

@@ -1 +1 @@
Display the fiscal year on journal entries/items.
Display the fiscal year on journal entries/items.

View File

@@ -1,2 +1 @@
You need to install account_fiscal_year.
You need to install account_fiscal_year.

View File

@@ -1,3 +1,2 @@
Go to Invoicing -> Configuration -> Date Ranges -> Fiscal Years to create a new
Fiscal Year.
Fiscal Year.

View File

@@ -80,10 +80,10 @@ class TestAccountMoveLinePurchaseInfo(common.TransactionCase):
})
return user.id
def _create_account_type(self, name, type):
def _create_account_type(self, name, account_type):
acc_type = self.acc_type_model.create({
'name': name,
'type': type
'type': account_type
})
return acc_type

View File

@@ -23,7 +23,7 @@ Account Move Template
:target: https://runbot.odoo-community.org/runbot/92/12.0
:alt: Try me on Runbot
|badge1| |badge2| |badge3| |badge4| |badge5|
|badge1| |badge2| |badge3| |badge4| |badge5|
The user can configure journal entries templates, useful for recurring entries.
The amount of each template line can be computed (through python code)
@@ -82,11 +82,18 @@ Authors
Contributors
~~~~~~~~~~~~
Module Authors
--------------
* Davide Corio <davide.corio@agilebg.com>
* Lorenzo Battistini <lorenzo.battistini@agilebg.com>
* Paolo Chiara <p.chiara@isa.it>
* Franco Tampieri <franco.tampieri@agilebg.com>
* Alexis de Lattre <alexis.delattre@akretion.com> (full re-write for v12)
Module Contributors
-------------------
* Jalal ZAHID <j.zahid@auriumtechnologies.com> (port to v10)
* Alex Comba <alex.comba@agilebg.com> (Port to V8)
* Guewen Baconnier <guewen.baconnier@camptocamp.com>

View File

@@ -8,8 +8,8 @@
'version': '12.0.1.0.0',
'category': 'Accounting',
'summary': "Templates for recurring Journal Entries",
'author': "Agile Business Group, Odoo Community Association (OCA), Aurium "
"Technologies, Vauxoo, Eficent, Akretion",
'author': "Agile Business Group, Aurium Technologies, Vauxoo, Eficent, "
"Akretion, Odoo Community Association (OCA)",
'website': 'https://github.com/OCA/account-financial-tools',
'license': 'AGPL-3',
'depends': [

View File

@@ -28,6 +28,8 @@ class AccountMoveTemplate(models.Model):
'This name is already used by another template!'
)]
@api.multi
@api.returns('self', lambda value: value.id)
def copy(self, default=None):
self.ensure_one()
default = dict(default or {}, name=_('%s (copy)') % self.name)

View File

@@ -1,8 +1,15 @@
Module Authors
--------------
* Davide Corio <davide.corio@agilebg.com>
* Lorenzo Battistini <lorenzo.battistini@agilebg.com>
* Paolo Chiara <p.chiara@isa.it>
* Franco Tampieri <franco.tampieri@agilebg.com>
* Alexis de Lattre <alexis.delattre@akretion.com> (full re-write for v12)
Module Contributors
-------------------
* Jalal ZAHID <j.zahid@auriumtechnologies.com> (port to v10)
* Alex Comba <alex.comba@agilebg.com> (Port to V8)
* Guewen Baconnier <guewen.baconnier@camptocamp.com>

View File

@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
<meta name="generator" content="Docutils 0.13.1: http://docutils.sourceforge.net/" />
<title>Account Move Template</title>
<style type="text/css">
@@ -382,8 +382,12 @@ the template to use and the amounts to fill.</p>
<li><a class="reference internal" href="#bug-tracker" id="id2">Bug Tracker</a></li>
<li><a class="reference internal" href="#credits" id="id3">Credits</a><ul>
<li><a class="reference internal" href="#authors" id="id4">Authors</a></li>
<li><a class="reference internal" href="#contributors" id="id5">Contributors</a></li>
<li><a class="reference internal" href="#maintainers" id="id6">Maintainers</a></li>
<li><a class="reference internal" href="#contributors" id="id5">Contributors</a><ul>
<li><a class="reference internal" href="#module-authors" id="id6">Module Authors</a></li>
<li><a class="reference internal" href="#module-contributors" id="id7">Module Contributors</a></li>
</ul>
</li>
<li><a class="reference internal" href="#maintainers" id="id8">Maintainers</a></li>
</ul>
</li>
</ul>
@@ -427,12 +431,19 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
</div>
<div class="section" id="contributors">
<h2><a class="toc-backref" href="#id5">Contributors</a></h2>
<div class="section" id="module-authors">
<h3><a class="toc-backref" href="#id6">Module Authors</a></h3>
<ul class="simple">
<li>Davide Corio &lt;<a class="reference external" href="mailto:davide.corio&#64;agilebg.com">davide.corio&#64;agilebg.com</a>&gt;</li>
<li>Lorenzo Battistini &lt;<a class="reference external" href="mailto:lorenzo.battistini&#64;agilebg.com">lorenzo.battistini&#64;agilebg.com</a>&gt;</li>
<li>Paolo Chiara &lt;<a class="reference external" href="mailto:p.chiara&#64;isa.it">p.chiara&#64;isa.it</a>&gt;</li>
<li>Franco Tampieri &lt;<a class="reference external" href="mailto:franco.tampieri&#64;agilebg.com">franco.tampieri&#64;agilebg.com</a>&gt;</li>
<li>Alexis de Lattre &lt;<a class="reference external" href="mailto:alexis.delattre&#64;akretion.com">alexis.delattre&#64;akretion.com</a>&gt; (full re-write for v12)</li>
</ul>
</div>
<div class="section" id="module-contributors">
<h3><a class="toc-backref" href="#id7">Module Contributors</a></h3>
<ul class="simple">
<li>Jalal ZAHID &lt;<a class="reference external" href="mailto:j.zahid&#64;auriumtechnologies.com">j.zahid&#64;auriumtechnologies.com</a>&gt; (port to v10)</li>
<li>Alex Comba &lt;<a class="reference external" href="mailto:alex.comba&#64;agilebg.com">alex.comba&#64;agilebg.com</a>&gt; (Port to V8)</li>
<li>Guewen Baconnier &lt;<a class="reference external" href="mailto:guewen.baconnier&#64;camptocamp.com">guewen.baconnier&#64;camptocamp.com</a>&gt;</li>
@@ -441,7 +452,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
</ul>
</div>
<div class="section" id="maintainers">
<h2><a class="toc-backref" href="#id6">Maintainers</a></h2>
<h2><a class="toc-backref" href="#id8">Maintainers</a></h2>
<p>This module is maintained by the OCA.</p>
<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose