Skip to content
GitLab
Commit b4974a92 authored by rex wu's avatar rex wu
Browse files

Merge branch 'deploy' into '15.0' 

# Conflicts:
#   extra-addons/kci-mrp/models/mrp_bom.py
parents bb063cad bbccbc70
1 merge request!4115.0
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 218982 deletions
+0 -218982
addons/account/demo/__init__.py deleted 100644 → 0
+ 0
- 3
View file @ bb063cad
# -*- coding: utf-8 -*-
from . import account_demo
addons/account/demo/account_demo.py deleted 100644 → 0
+ 0
- 358
View file @ bb063cad
# -*- coding: utf-8 -*-
import logging
import time
from datetime import timedelta
from dateutil.relativedelta import relativedelta
from odoo import api, fields, models, Command
from odoo.exceptions import UserError, ValidationError
from odoo.tools.misc import file_open
_logger = logging.getLogger(__name__)
class AccountChartTemplate(models.Model):
_inherit = "account.chart.template"
@api.model
def _get_demo_data(self):
"""Generate the demo data related to accounting."""
# This is a generator because data created here might be referenced by xml_id to data
# created later but defined in this same function.
yield self._get_demo_data_move()
yield self._get_demo_data_statement()
yield self._get_demo_data_reconcile_model()
yield self._get_demo_data_attachment()
yield self._get_demo_data_mail_message()
yield self._get_demo_data_mail_activity()
@api.model
def _get_demo_data_move(self):
cid = self.env.company.id
ref = self.env.ref
return ('account.move', {
f'{cid}_demo_invoice_1': {
'move_type': 'out_invoice',
'partner_id': ref('base.res_partner_12').id,
'invoice_user_id': ref('base.user_demo').id,
'invoice_payment_term_id': ref('account.account_payment_term_end_following_month').id,
'invoice_date': time.strftime('%Y-%m-01'),
'invoice_line_ids': [
Command.create({'product_id': ref('product.consu_delivery_02').id, 'quantity': 5}),
Command.create({'product_id': ref('product.consu_delivery_03').id, 'quantity': 5}),
],
},
f'{cid}_demo_invoice_2': {
'move_type': 'out_invoice',
'partner_id': ref('base.res_partner_2').id,
'invoice_user_id': False,
'invoice_date': time.strftime('%Y-%m-08'),
'invoice_line_ids': [
Command.create({'product_id': ref('product.consu_delivery_03').id, 'quantity': 5}),
Command.create({'product_id': ref('product.consu_delivery_01').id, 'quantity': 20}),
],
},
f'{cid}_demo_invoice_3': {
'move_type': 'out_invoice',
'partner_id': ref('base.res_partner_2').id,
'invoice_user_id': False,
'invoice_date': time.strftime('%Y-%m-08'),
'invoice_line_ids': [
Command.create({'product_id': ref('product.consu_delivery_01').id, 'quantity': 5}),
Command.create({'product_id': ref('product.consu_delivery_03').id, 'quantity': 5}),
],
},
f'{cid}_demo_invoice_followup': {
'move_type': 'out_invoice',
'partner_id': ref('base.res_partner_2').id,
'invoice_user_id': ref('base.user_demo').id,
'invoice_payment_term_id': ref('account.account_payment_term_immediate').id,
'invoice_date': (fields.Date.today() + timedelta(days=-15)).strftime('%Y-%m-%d'),
'invoice_line_ids': [
Command.create({'product_id': ref('product.consu_delivery_02').id, 'quantity': 5}),
Command.create({'product_id': ref('product.consu_delivery_03').id, 'quantity': 5}),
],
},
f'{cid}_demo_invoice_5': {
'move_type': 'in_invoice',
'partner_id': ref('base.res_partner_12').id,
'invoice_user_id': ref('base.user_demo').id,
'invoice_payment_term_id': ref('account.account_payment_term_end_following_month').id,
'invoice_date': time.strftime('%Y-%m-01'),
'invoice_line_ids': [
Command.create({'product_id': ref('product.product_delivery_01'), 'price_unit': 10.0, 'quantity': 1}),
Command.create({'product_id': ref('product.product_order_01'), 'price_unit': 4.0, 'quantity': 5}),
],
},
f'{cid}_demo_invoice_extract': {
'move_type': 'in_invoice',
'invoice_user_id': ref('base.user_demo').id,
},
f'{cid}_demo_invoice_equipment_purchase': {
'move_type': 'in_invoice',
'ref': 'INV/2018/0057',
'partner_id': ref('base.res_partner_12').id,
'invoice_user_id': False,
'invoice_date': '2018-09-17',
'invoice_line_ids': [
Command.create({'name': 'Redeem Reference Number: PO02529', 'quantity': 1, 'price_unit': 541.10}),
],
},
})
@api.model
def _get_demo_data_statement(self):
cid = self.env.company.id
ref = self.env.ref
return ('account.bank.statement', {
f'{cid}_demo_bank_statement_1': {
'journal_id': self.env['account.journal'].search([
('type', '=', 'bank'),
('company_id', '=', cid),
], limit=1).id,
'date': time.strftime('%Y')+'-01-01',
'balance_end_real': 9944.87,
'balance_start': 5103.0,
'line_ids': [
Command.create({
'payment_ref': time.strftime('INV/%Y/00002 and INV/%Y/00003'),
'amount': 1275.0,
'date': time.strftime('%Y-01-01'),
'partner_id': ref('base.res_partner_12').id
}),
Command.create({
'payment_ref': 'Bank Fees',
'amount': -32.58,
'date': time.strftime('%Y-01-01'),
}),
Command.create({
'payment_ref': 'Prepayment',
'amount': 650,
'date': time.strftime('%Y-01-01'),
'partner_id': ref('base.res_partner_12').id
}),
Command.create({
'payment_ref': time.strftime('First 2000 $ of invoice %Y/00001'),
'amount': 2000,
'date': time.strftime('%Y-01-01'),
'partner_id': ref('base.res_partner_12').id
}),
Command.create({
'payment_ref': 'Last Year Interests',
'amount': 102.78,
'date': time.strftime('%Y-01-01'),
}),
Command.create({
'payment_ref': time.strftime('INV/%Y/00002'),
'amount': 750,
'date': time.strftime('%Y-01-01'),
'partner_id': ref('base.res_partner_2').id
}),
Command.create({
'payment_ref': 'R:9772938 10/07 AX 9415116318 T:5 BRT: 100,00€ C/ croip',
'amount': 96.67,
'date': time.strftime('%Y-01-01'),
'partner_id': ref('base.res_partner_2').id
}),
]
},
})
@api.model
def _get_demo_data_reconcile_model(self):
cid = self.env.company.id
return ('account.reconcile.model', {
f'{cid}_reconcile_from_label': {
'name': 'Line with Bank Fees',
'rule_type': 'writeoff_suggestion',
'match_label': 'contains',
'match_label_param': 'BRT',
'decimal_separator': ',',
'line_ids': [
Command.create({
'label': 'Due amount',
'account_id': self._get_demo_account(
'income',
'account.data_account_type_revenue',
self.env.company,
).id,
'amount_type': 'regex',
'amount_string': r'BRT: ([\d,]+)',
}),
Command.create({
'label': 'Bank Fees',
'account_id': self._get_demo_account(
'cost_of_goods_sold',
'account.data_account_type_direct_costs',
self.env.company,
).id,
'amount_type': 'percentage',
'amount_string': '100',
}),
]
},
})
@api.model
def _get_demo_data_attachment(self):
cid = self.env.company.id
ref = self.env.ref
return ('ir.attachment', {
f'{cid}_ir_attachment_bank_statement_1': {
'type': 'binary',
'name': 'bank_statement_yourcompany_demo.pdf',
'res_model': 'account.bank.statement',
'res_id': ref(f'account.{cid}_demo_bank_statement_1').id,
'raw': file_open(
'account/static/demo/bank_statement_yourcompany_1.pdf', 'rb'
).read()
},
f'{cid}_ir_attachment_in_invoice_1': {
'type': 'binary',
'name': 'in_invoice_yourcompany_demo.pdf',
'res_model': 'account.move',
'res_id': ref(f'account.{cid}_demo_invoice_extract').id,
'raw': file_open(
'account/static/demo/in_invoice_yourcompany_demo_1.pdf', 'rb'
).read()
},
f'{cid}_ir_attachment_in_invoice_2': {
'type': 'binary',
'name': 'in_invoice_yourcompany_demo.pdf',
'res_model': 'account.move',
'res_id': ref(f'account.{cid}_demo_invoice_equipment_purchase').id,
'raw': file_open(
'account/static/demo/in_invoice_yourcompany_demo_2.pdf', 'rb'
).read()
},
})
@api.model
def _get_demo_data_mail_message(self):
cid = self.env.company.id
ref = self.env.ref
return ('mail.message', {
f'{cid}_mail_message_bank_statement_1': {
'model': 'account.bank.statement',
'res_id': ref(f'account.{cid}_demo_bank_statement_1').id,
'body': 'Bank statement attachment',
'message_type': 'comment',
'author_id': ref('base.partner_demo').id,
'attachment_ids': [Command.set([
ref(f'account.{cid}_ir_attachment_bank_statement_1').id
])]
},
f'{cid}_mail_message_in_invoice_1': {
'model': 'account.move',
'res_id': ref(f'account.{cid}_demo_invoice_extract').id,
'body': 'Vendor Bill attachment',
'message_type': 'comment',
'author_id': ref('base.partner_demo').id,
'attachment_ids': [Command.set([
ref(f'account.{cid}_ir_attachment_in_invoice_1').id
])]
},
f'{cid}_mail_message_in_invoice_2': {
'model': 'account.move',
'res_id': ref(f'account.{cid}_demo_invoice_equipment_purchase').id,
'body': 'Vendor Bill attachment',
'message_type': 'comment',
'author_id': ref('base.partner_demo').id,
'attachment_ids': [Command.set([
ref(f'account.{cid}_ir_attachment_in_invoice_2').id
])]
},
})
@api.model
def _get_demo_data_mail_activity(self):
cid = self.env.company.id
ref = self.env.ref
return ('mail.activity', {
f'{cid}_invoice_activity_1': {
'res_id': ref(f'account.{cid}_demo_invoice_3').id,
'res_model_id': ref('account.model_account_move').id,
'activity_type_id': ref('mail.mail_activity_data_todo').id,
'date_deadline': (fields.Datetime.today() + relativedelta(days=5)).strftime('%Y-%m-%d %H:%M'),
'summary': 'Follow-up on payment',
'create_uid': ref('base.user_admin').id,
'user_id': ref('base.user_admin').id,
},
f'{cid}_invoice_activity_2': {
'res_id': ref(f'account.{cid}_demo_invoice_2').id,
'res_model_id': ref('account.model_account_move').id,
'activity_type_id': ref('mail.mail_activity_data_call').id,
'date_deadline': fields.Datetime.today().strftime('%Y-%m-%d %H:%M'),
'create_uid': ref('base.user_admin').id,
'user_id': ref('base.user_admin').id,
},
f'{cid}_invoice_activity_3': {
'res_id': ref(f'account.{cid}_demo_invoice_1').id,
'res_model_id': ref('account.model_account_move').id,
'activity_type_id': ref('mail.mail_activity_data_todo').id,
'date_deadline': (fields.Datetime.today() + relativedelta(days=5)).strftime('%Y-%m-%d %H:%M'),
'summary': 'Include upsell',
'create_uid': ref('base.user_admin').id,
'user_id': ref('base.user_admin').id,
},
f'{cid}_invoice_activity_4': {
'res_id': ref(f'account.{cid}_demo_invoice_extract').id,
'res_model_id': ref('account.model_account_move').id,
'activity_type_id': ref('mail.mail_activity_data_todo').id,
'date_deadline': (fields.Datetime.today() + relativedelta(days=5)).strftime('%Y-%m-%d %H:%M'),
'summary': 'Update address',
'create_uid': ref('base.user_admin').id,
'user_id': ref('base.user_admin').id,
},
})
@api.model
def _post_create_demo_data(self, created):
cid = self.env.company.id
if created._name == 'account.move':
created = created.with_context(check_move_validity=False)
# We need to recompute some onchanges. Invoice lines VS journal items are already
# synchronized in the create, but the onchange were not applied on the invoice lines.
for move in created:
move._onchange_partner_id()
created.line_ids._onchange_product_id()
created.line_ids._onchange_account_id()
created.line_ids._onchange_price_subtotal()
created._recompute_dynamic_lines(
recompute_all_taxes=True,
recompute_tax_base_amount=True,
)
# the invoice_extract acts like a placeholder for the OCR to be ran and doesn't contain
# any lines yet
for move in created - self.env.ref(f'account.{cid}_demo_invoice_extract'):
try:
move.action_post()
except (UserError, ValidationError):
_logger.exception('Error while posting demo data')
elif created._name == 'account.bank.statement':
created.button_post()
@api.model
def _get_demo_account(self, xml_id, user_type_id, company):
"""Find the most appropriate account possible for demo data creation.
:param xml_id (str): the xml_id of the account template in the generic coa
:param user_type_id (str): the full xml_id of the account type wanted
:param company (Model<res.company>): the company for which we search the account
:return (Model<account.account>): the most appropriate record found
"""
return (
self.env['account.account'].browse(self.env['ir.model.data'].sudo().search([
('name', '=', '%d_%s' % (company.id, xml_id)),
('model', '=', 'account.account'),
('module', '=like', 'l10n%')
], limit=1).res_id)
or self.env['account.account'].search([
('user_type_id', '=', self.env.ref(user_type_id).id),
('company_id', '=', company.id)
], limit=1)
or self.env['account.account'].search([('company_id', '=', company.id)], limit=1)
)
addons/account/demo/account_demo.xml deleted 100644 → 0
+ 0
- 50
View file @ bb063cad
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data>
<!-- TAGS FOR RETRIEVING THE DEMO ACCOUNTS -->
<record id="demo_capital_account" model="account.account.tag">
<field name="name">Demo Capital Account</field>
</record>
<record id="demo_stock_account" model="account.account.tag">
<field name="name">Demo Stock Account</field>
</record>
<record id="demo_sale_of_land_account" model="account.account.tag">
<field name="name">Demo Sale of Land Account</field>
</record>
<record id="demo_ceo_wages_account" model="account.account.tag">
<field name="name">Demo CEO Wages Account</field>
</record>
<record id="demo_office_furniture_account" model="account.account.tag">
<field name="name">Office Furniture</field>
</record>
<!-- Payment Terms -->
<record id="account_payment_term_advance" model="account.payment.term">
<field name="name">30% Advance End of Following Month</field>
<field name="note">Payment terms: 30% Advance End of Following Month</field>
<field name="line_ids" eval="[(5, 0), (0, 0, {'value': 'percent', 'value_amount': 30.0, 'sequence': 400, 'days': 0, 'option': 'day_after_invoice_date'}),
(0, 0, {'value': 'balance', 'value_amount': 0.0, 'sequence': 500, 'days': 31, 'option': 'day_following_month'})]"/>
</record>
<record id="base.user_demo" model="res.users">
<field name="groups_id" eval="[(4,ref('account.group_account_invoice'))]"/>
</record>
<!-- Add Payment terms on some demo partners -->
<record id="base.res_partner_2" model="res.partner">
<field name="property_payment_term_id" ref="account.account_payment_term_30days"/>
</record>
<record id="base.res_partner_12" model="res.partner">
<field name="property_payment_term_id" ref="account.account_payment_term_end_following_month"/>
<field name="property_supplier_payment_term_id" ref="account.account_payment_term_end_following_month"/>
</record>
<record id="base.res_partner_4" model="res.partner">
<field name="property_supplier_payment_term_id" ref="account.account_payment_term_30days"/>
</record>
<record id="base.res_partner_1" model="res.partner">
<field name="property_supplier_payment_term_id" ref="account.account_payment_term_end_following_month"/>
</record>
</data>
</odoo>
addons/account/doc/account_anglo_saxon.ods deleted 100644 → 0
+ 0
- 0
View file @ bb063cad
File deleted
addons/account/doc/account_anglo_saxon.pdf deleted 100644 → 0
+ 0
- 0
View file @ bb063cad
File deleted
addons/account/i18n/account.pot deleted 100644 → 0
+ 0
- 15773
View file @ bb063cad
This diff is collapsed.
addons/account/i18n/af.po deleted 100644 → 0
+ 0
- 11443
View file @ bb063cad
This diff is collapsed.
addons/account/i18n/am.po deleted 100644 → 0
+ 0
- 11442
View file @ bb063cad
This diff is collapsed.
addons/account/i18n/ar.po deleted 100644 → 0
+ 0
- 16748
View file @ bb063cad
This diff is collapsed.
addons/account/i18n/az.po deleted 100644 → 0
+ 0
- 11750
View file @ bb063cad
This diff is collapsed.
addons/account/i18n/bg.po deleted 100644 → 0
+ 0
- 11447
View file @ bb063cad
This diff is collapsed.
addons/account/i18n/bn.po deleted 100644 → 0
+ 0
- 15858
View file @ bb063cad
This diff is collapsed.
addons/account/i18n/bs.po deleted 100644 → 0
+ 0
- 11845
View file @ bb063cad
This diff is collapsed.
addons/account/i18n/ca.po deleted 100644 → 0
+ 0
- 17087
View file @ bb063cad
This diff is collapsed.
addons/account/i18n/cs.po deleted 100644 → 0
+ 0
- 16597
View file @ bb063cad
This diff is collapsed.
addons/account/i18n/da.po deleted 100644 → 0
+ 0
- 16973
View file @ bb063cad
This diff is collapsed.
addons/account/i18n/de.po deleted 100644 → 0
+ 0
- 17037
View file @ bb063cad
This diff is collapsed.
addons/account/i18n/el.po deleted 100644 → 0
+ 0
- 16009
View file @ bb063cad
This diff is collapsed.
addons/account/i18n/en_GB.po deleted 100644 → 0
+ 0
- 11442
View file @ bb063cad
This diff is collapsed.
addons/account/i18n/es.po deleted 100644 → 0
+ 0
- 17120
View file @ bb063cad
This diff is collapsed.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment