diff --git a/addons/analytic/__init__.py b/addons/analytic/__init__.py
index d84fb182e8f20d93f1076dfa9e5f61b160b5f4f0..11529f98733a4c32ded66ad613387f00addfd470 100644
--- a/addons/analytic/__init__.py
+++ b/addons/analytic/__init__.py
@@ -2,5 +2,4 @@
# Part of Odoo. See LICENSE file for full copyright and licensing details.
import models
-import report
import wizard
diff --git a/addons/analytic/__openerp__.py b/addons/analytic/__openerp__.py
index cdc13af2619412dc7070efa59a45004298d25d4d..31d781b26ffd7f77a445b06c3cd89742e063c948 100644
--- a/addons/analytic/__openerp__.py
+++ b/addons/analytic/__openerp__.py
@@ -21,25 +21,12 @@ that have no counterpart in the general financial accounts.
'data/analytic_sequence.xml',
'views/analytic_view.xml',
'data/analytic_data.xml',
- 'analytic_report.xml',
- 'wizard/account_analytic_balance_report_view.xml',
- 'wizard/account_analytic_cost_ledger_view.xml',
- 'wizard/account_analytic_inverted_balance_report.xml',
- 'wizard/account_analytic_cost_ledger_for_journal_report_view.xml',
'wizard/account_analytic_chart_view.xml',
- 'views/report_analyticbalance.xml',
- 'views/report_analyticjournal.xml',
- 'views/report_analyticcostledgerquantity.xml',
- 'views/report_analyticcostledger.xml',
- 'views/report_invertedanalyticbalance.xml',
],
'demo': [
'data/analytic_demo.xml',
'data/analytic_account_demo.xml',
],
- 'test': [
- 'test/analytic_hierarchy.yml',
- ],
'installable': True,
'auto_install': False,
}
diff --git a/addons/analytic/analytic_report.xml b/addons/analytic/analytic_report.xml
deleted file mode 100644
index 88109e01fd69fd5b66735c40584fb7ec143e5b13..0000000000000000000000000000000000000000
--- a/addons/analytic/analytic_report.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
- <data>
- <report
- id="action_account_analytic_account_inverted_balance"
- model="account.analytic.account"
- string="Inverted Analytic Balance"
- report_type="qweb-pdf"
- name="account.report_invertedanalyticbalance"
- file="account.report_invertedanalyticbalance"
- menu="False"
- />
-
- <report
- id="action_report_analytic_balance"
- model="account.analytic.account"
- string="Analytic Balance"
- report_type="qweb-pdf"
- name="account.report_analyticbalance"
- file="account.report_analyticbalance"
- menu="False"
- />
-
- <report
- id="action_report_cost_ledger"
- model="account.analytic.account"
- report_type="qweb-pdf"
- string="Cost Ledger"
- name="account.report_analyticcostledger"
- file="account.report_analyticcostledger"
- menu="False"
- />
-
- <report
- id="action_report_cost_ledgerquantity"
- model="account.analytic.account"
- report_type="qweb-pdf"
- string="Cost Ledger (Only quantities)"
- name="account.report_analyticcostledgerquantity"
- file="account.report_analyticcostledgerquantity"
- menu="False"
- />
- </data>
-</openerp>
diff --git a/addons/analytic/data/analytic_account_demo.xml b/addons/analytic/data/analytic_account_demo.xml
index 678afaf0dc2dc5679214d0a429314ae2b63e4f41..09ddaf96846641a785d3998a5612fd42eba3311a 100644
--- a/addons/analytic/data/analytic_account_demo.xml
+++ b/addons/analytic/data/analytic_account_demo.xml
@@ -1,235 +1,87 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data noupdate="1">
- <record id="analytic_root" model="account.analytic.account">
- <field name="name" model="res.company" use="name" search="[]"/>
- </record>
<record id="analytic_absences" model="account.analytic.account">
<field name="name">Leaves</field>
- <field name="type">view</field>
- <field name="parent_id" ref="analytic_root"/>
</record>
<record id="analytic_internal" model="account.analytic.account">
<field name="name">Internal</field>
- <field name="type">view</field>
- <field name="parent_id" ref="analytic_root"/>
</record>
<record id="analytic_our_super_product" model="account.analytic.account">
<field name="name">Our Super Product</field>
- <field name="state">open</field>
- <field name="type">view</field>
- <field name="parent_id" ref="analytic_root"/>
- </record>
- <record id="analytic_project_1" model="account.analytic.account">
- <field name="name">Project 1</field>
- <field name="type">view</field>
- <field name="parent_id" ref="analytic_root"/>
- </record>
- <record id="analytic_project_2" model="account.analytic.account">
- <field name="name">Project 2</field>
- <field name="type">view</field>
- <field name="parent_id" ref="analytic_root"/>
- </record>
- <record id="analytic_journal_trainings" model="account.analytic.account">
- <field name="name">Training</field>
- <field name="type">view</field>
- <field name="parent_id" ref="analytic_internal"/>
- </record>
- <record id="analytic_in_house" model="account.analytic.account">
- <field name="name">In House</field>
- <field name="type">normal</field>
- <field name="parent_id" ref="analytic_journal_trainings"/>
- </record>
- <record id="analytic_online" model="account.analytic.account">
- <field name="name">Online</field>
- <field name="type">normal</field>
- <field name="parent_id" ref="analytic_journal_trainings"/>
- </record>
- <record id="analytic_support" model="account.analytic.account">
- <field name="name">Support</field>
- <field name="type">view</field>
- <field name="parent_id" ref="analytic_our_super_product"/>
- </record>
- <record id="analytic_partners" model="account.analytic.account">
- <field name="name">Partners</field>
- <field name="type">view</field>
- <field name="parent_id" ref="analytic_support"/>
- </record>
- <record id="analytic_customers" model="account.analytic.account">
- <field name="name">Customers</field>
- <field name="type">view</field>
- <field name="parent_id" ref="analytic_support"/>
- </record>
- <record id="analytic_support_internal" model="account.analytic.account">
- <field name="name">Internal</field>
- <field name="type">contract</field>
- <field name="parent_id" ref="analytic_support"/>
- </record>
- <record id="analytic_integration" model="account.analytic.account">
- <field name="name">Integration</field>
- <field name="type">view</field>
- <field name="parent_id" ref="analytic_our_super_product"/>
- </record>
- <record id="analytic_consultancy" model="account.analytic.account">
- <field name="name">Consultancy</field>
- <field name="type">contract</field>
- <field name="parent_id" ref="analytic_our_super_product"/>
- </record>
- <record id="analytic_super_product_trainings" model="account.analytic.account">
- <field name="name">Training</field>
- <field name="type">contract</field>
- <field name="parent_id" ref="analytic_our_super_product"/>
- </record>
- <record id="analytic_seagate_p1" model="account.analytic.account">
- <field name="name">Seagate P1</field>
- <field name="parent_id" ref="analytic_integration"/>
- <field name="type">normal</field>
- <field name="state">open</field>
<field name="partner_id" ref="base.res_partner_2"/>
+ <field name="tag_ids" eval="[(6,0, (ref('analytic.tag_contract'),))]"/>
</record>
<record id="analytic_seagate_p2" model="account.analytic.account">
<field name="name">Seagate P2</field>
- <field name="type">normal</field>
- <field name="parent_id" ref="analytic_integration"/>
- <field name="state">open</field>
+ <field name="account_type">normal</field>
<field name="partner_id" ref="base.res_partner_2"/>
+ <field name="tag_ids" eval="[(6,0, (ref('analytic.tag_contract'),))]"/>
</record>
<record id="analytic_millennium_industries" model="account.analytic.account">
<field name="name">Millennium Industries</field>
- <field name="parent_id" ref="analytic_integration"/>
- <field name="type">normal</field>
+ <field name="account_type">normal</field>
<field name="partner_id" ref="base.res_partner_3"/>
+ <field name="tag_ids" eval="[(6,0, (ref('analytic.tag_contract'),))]"/>
</record>
<record id="analytic_integration_c2c" model="account.analytic.account">
<field name="name">CampToCamp</field>
- <field name="type">normal</field>
- <field eval="str(time.localtime()[0] - 1) + '-08-07'" name="date_start"/>
- <field eval="time.strftime('%Y-12-31')" name="date"/>
- <field name="parent_id" ref="analytic_integration"/>
+ <field name="account_type">normal</field>
<field name="partner_id" ref="base.res_partner_12"/>
- <field name="state">open</field>
+ <field name="tag_ids" eval="[(6,0, (ref('analytic.tag_contract'),))]"/>
</record>
<record id="analytic_agrolait" model="account.analytic.account">
<field name="name">Agrolait</field>
- <field name="parent_id" ref="analytic_customers"/>
- <field name="type">normal</field>
+ <field name="account_type">normal</field>
<field name="partner_id" ref="base.res_partner_2"/>
</record>
<record id="analytic_asustek" model="account.analytic.account">
<field name="name">Asustek</field>
- <field name="type">normal</field>
- <field name="parent_id" ref="analytic_customers"/>
+ <field name="account_type">normal</field>
<field name="partner_id" ref="base.res_partner_1"/>
</record>
<record id="analytic_deltapc" model="account.analytic.account">
<field name="name">Delta PC</field>
- <field name="parent_id" ref="analytic_customers"/>
- <field name="type">normal</field>
+ <field name="account_type">normal</field>
<field name="partner_id" ref="base.res_partner_4"/>
</record>
<record id="analytic_spark" model="account.analytic.account">
<field name="name">Spark Systems</field>
- <field eval="str(time.localtime()[0] - 1) + '-05-09'" name="date_start"/>
- <field eval="time.strftime('%Y-05-08')" name="date"/>
- <field name="parent_id" ref="analytic_partners"/>
- <field name="type">normal</field>
+ <field name="account_type">normal</field>
<field name="partner_id" ref="base.res_partner_1"/>
- <field name="state">open</field>
</record>
<record id="analytic_nebula" model="account.analytic.account">
<field name="name">Nebula</field>
- <field eval="time.strftime('%Y-02-01')" name="date_start"/>
- <field eval="time.strftime('%Y-07-01')" name="date"/>
- <field name="type">normal</field>
- <field name="parent_id" ref="analytic_partners"/>
+ <field name="account_type">normal</field>
<field name="partner_id" ref="base.res_partner_12"/>
- <field name="state">open</field>
</record>
<record id="analytic_luminous_technologies" model="account.analytic.account">
<field name="name">Luminous Technologies</field>
- <field eval="time.strftime('%Y-04-24')" name="date_start"/>
- <field eval="str(time.localtime()[0] + 1) + '-04-24'" name="date"/>
- <field name="type">normal</field>
- <field name="parent_id" ref="analytic_partners"/>
+ <field name="account_type">normal</field>
<field name="partner_id" ref="base.res_partner_3"/>
</record>
<record id="analytic_desertic_hispafuentes" model="account.analytic.account">
<field name="name">Desertic - Hispafuentes</field>
- <field eval="time.strftime('%Y-02-01')" name="date_start"/>
- <field eval="str(time.localtime()[0] + 1) + '-02-01'" name="date"/>
- <field name="type">normal</field>
- <field name="parent_id" ref="analytic_partners"/>
+ <field name="account_type">normal</field>
<field name="partner_id" ref="base.res_partner_12"/>
</record>
<record id="analytic_think_big_systems" model="account.analytic.account">
<field name="name">Think Big Systems</field>
- <field name="type">normal</field>
- <field name="parent_id" ref="analytic_partners"/>
+ <field name="account_type">normal</field>
<field name="partner_id" ref="base.res_partner_18"/>
</record>
<record id="analytic_partners_camp_to_camp" model="account.analytic.account">
<field name="name">Camp to Camp</field>
- <field eval="time.strftime('%Y-%m-%d', time.localtime(time.time() - 365 * 86400))" name="date_start"/>
- <field eval="time.strftime('%Y-%m-%d')" name="date"/>
- <field name="type">normal</field>
- <field name="parent_id" ref="analytic_partners"/>
+ <field name="account_type">normal</field>
<field name="partner_id" ref="base.res_partner_12"/>
- <field name="state">open</field>
- </record>
- <record id="analytic_project_2_support" model="account.analytic.account">
- <field name="name">Support</field>
- <field name="type">normal</field>
- <field name="parent_id" ref="analytic_project_2"/>
- </record>
- <record id="analytic_project_2_development" model="account.analytic.account">
- <field name="name">Development</field>
- <field name="type">normal</field>
- <field name="parent_id" ref="analytic_project_2"/>
- </record>
- <record id="analytic_project_1_trainings" model="account.analytic.account">
- <field name="name">Training</field>
- <field name="type">normal</field>
- <field name="parent_id" ref="analytic_project_1"/>
- </record>
- <record id="analytic_project_1_development" model="account.analytic.account">
- <field name="name">Development</field>
- <field name="type">normal</field>
- <field name="parent_id" ref="analytic_project_1"/>
</record>
<record id="analytic_administratif" model="account.analytic.account">
<field name="name">Administrative</field>
- <field name="type">normal</field>
- <field name="parent_id" ref="analytic_internal"/>
+ <field name="account_type">normal</field>
</record>
<record id="analytic_commercial_marketing" model="account.analytic.account">
<field name="name">Commercial & Marketing</field>
- <field name="type">normal</field>
- <field name="parent_id" ref="analytic_internal"/>
- </record>
- <record id="analytic_our_super_product_development" model="account.analytic.account">
- <field name="name">Our Super Product Development</field>
- <field name="type">view</field>
- <field name="parent_id" ref="analytic_internal"/>
- </record>
- <record id="analytic_stable" model="account.analytic.account">
- <field name="name">Stable</field>
- <field name="type">normal</field>
- <field name="parent_id" ref="analytic_our_super_product_development"/>
- </record>
- <record id="analytic_trunk" model="account.analytic.account">
- <field name="name">Trunk</field>
- <field name="type">normal</field>
- <field name="parent_id" ref="analytic_our_super_product_development"/>
- </record>
- <record id="analytic_paid" model="account.analytic.account">
- <field name="name">Paid</field>
- <field name="type">normal</field>
- <field name="parent_id" ref="analytic_absences"/>
- </record>
- <record id="analytic_unpaid" model="account.analytic.account">
- <field name="name">Unpaid</field>
- <field name="type">normal</field>
- <field name="parent_id" ref="analytic_absences"/>
+ <field name="account_type">normal</field>
</record>
</data>
</openerp>
diff --git a/addons/analytic/data/analytic_demo.xml b/addons/analytic/data/analytic_demo.xml
index 5ce34521b45e1f6d5948105a62093185cea6f844..7b8635d3c1b4552515cf1310a707e3c25fe1e242 100644
--- a/addons/analytic/data/analytic_demo.xml
+++ b/addons/analytic/data/analytic_demo.xml
@@ -1,15 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data noupdate="1">
- <record id="cose_journal_sale" model="account.analytic.journal">
- <field name="code">SAL</field>
- <field name="name">Sales</field>
- <field name="type">sale</field>
- </record>
- <record id="sit" model="account.analytic.journal">
- <field name="code">START</field>
- <field name="name">Miscellaneous Operation</field>
- <field name="type">situation</field>
+
+ <record id="tag_contract" model="account.analytic.tag">
+ <field name="name">Contracts</field>
</record>
+
</data>
</openerp>
diff --git a/addons/analytic/models/analytic.py b/addons/analytic/models/analytic.py
index 2583d015f935ac67bc15179c294ed16e8de79850..063bc5f9e38f98884908a400664dcd66f8ece51e 100644
--- a/addons/analytic/models/analytic.py
+++ b/addons/analytic/models/analytic.py
@@ -1,405 +1,119 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.
-import time
-from datetime import datetime
+from openerp import api, fields, models
-from openerp.osv import fields, osv
-from openerp import tools
-from openerp.tools.translate import _
-import openerp.addons.decimal_precision as dp
-from openerp.exceptions import UserError
-ANALYTIC_ACCOUNT_STATE = [
- ('template', 'Template'),
- ('draft','New'),
- ('open','In Progress'),
- ('pending','To Renew'),
- ('close','Closed'),
- ('cancelled', 'Cancelled')
-]
+class account_analytic_tag(models.Model):
+ _name = 'account.analytic.tag'
+ _description = 'Analytic Tags'
+ name = fields.Char(string='Analytic Tag', index=True, required=True)
-class account_analytic_account(osv.osv):
+
+class account_analytic_account(models.Model):
_name = 'account.analytic.account'
_inherit = ['mail.thread']
_description = 'Analytic Account'
+ _order = 'code, name asc'
- def _compute_level_tree(self, cr, uid, ids, child_ids, res, field_names, context=None):
- currency_obj = self.pool.get('res.currency')
- recres = {}
- def recursive_computation(account):
- result2 = res[account.id].copy()
- for son in account.child_ids:
- result = recursive_computation(son)
- for field in field_names:
- if (account.currency_id.id != son.currency_id.id) and (field!='quantity'):
- result[field] = currency_obj.compute(cr, uid, son.currency_id.id, account.currency_id.id, result[field], context=context)
- result2[field] += result[field]
- return result2
- for account in self.browse(cr, uid, ids, context=context):
- if account.id not in child_ids:
- continue
- recres[account.id] = recursive_computation(account)
- return recres
-
- def _debit_credit_bal_qtty(self, cr, uid, ids, fields, arg, context=None):
- res = {}
- if context is None:
- context = {}
- child_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)]))
- for i in child_ids:
- res[i] = {}
- for n in fields:
- res[i][n] = 0.0
-
- if not child_ids:
- return res
-
- where_date = ''
- where_clause_args = [tuple(child_ids)]
- if context.get('from_date', False):
- where_date += " AND l.date >= %s"
- where_clause_args += [context['from_date']]
- if context.get('to_date', False):
- where_date += " AND l.date <= %s"
- where_clause_args += [context['to_date']]
- cr.execute("""
- SELECT a.id,
- sum(
- CASE WHEN l.amount > 0
- THEN l.amount
- ELSE 0.0
- END
- ) as debit,
- sum(
- CASE WHEN l.amount < 0
- THEN -l.amount
- ELSE 0.0
- END
- ) as credit,
- COALESCE(SUM(l.amount),0) AS balance,
- COALESCE(SUM(l.unit_amount),0) AS quantity
- FROM account_analytic_account a
- LEFT JOIN account_analytic_line l ON (a.id = l.account_id)
- WHERE a.id IN %s
- """ + where_date + """
- GROUP BY a.id""", where_clause_args)
- for row in cr.dictfetchall():
- res[row['id']] = {}
- for field in fields:
- res[row['id']][field] = row[field]
- return self._compute_level_tree(cr, uid, ids, child_ids, res, fields, context)
-
- def name_get(self, cr, uid, ids, context=None):
- res = []
- if not ids:
- return res
- if isinstance(ids, (int, long)):
- ids = [ids]
- for id in ids:
- elmt = self.browse(cr, uid, id, context=context)
- res.append((id, self._get_one_full_name(elmt)))
- return res
-
- def _get_full_name(self, cr, uid, ids, name=None, args=None, context=None):
- if context == None:
- context = {}
- res = {}
- for elmt in self.browse(cr, uid, ids, context=context):
- res[elmt.id] = self._get_one_full_name(elmt)
- return res
-
- def _get_one_full_name(self, elmt, level=6):
- if level<=0:
- return '...'
- if elmt.parent_id and not elmt.type == 'template':
- parent_path = self._get_one_full_name(elmt.parent_id, level-1) + " / "
- else:
- parent_path = ''
- return parent_path + elmt.name
-
- def _child_compute(self, cr, uid, ids, name, arg, context=None):
- result = {}
- if context is None:
- context = {}
-
- for account in self.browse(cr, uid, ids, context=context):
- result[account.id] = map(lambda x: x.id, [child for child in account.child_ids if child.state != 'template'])
-
- return result
-
- def _get_analytic_account(self, cr, uid, ids, context=None):
- company_obj = self.pool.get('res.company')
- analytic_obj = self.pool.get('account.analytic.account')
- accounts = []
- for company in company_obj.browse(cr, uid, ids, context=context):
- accounts += analytic_obj.search(cr, uid, [('company_id', '=', company.id)])
- return accounts
-
- def _set_company_currency(self, cr, uid, ids, name, value, arg, context=None):
- if isinstance(ids, (int, long)):
- ids=[ids]
- for account in self.browse(cr, uid, ids, context=context):
- if account.company_id:
- if account.company_id.currency_id.id != value:
- raise UserError(_("If you set a company, the currency selected has to be the same as it's currency. \nYou can remove the company belonging, and thus change the currency, only on analytic account of type 'view'. This can be really useful for consolidation purposes of several companies charts with different currencies, for example."))
- if value:
- cr.execute("""update account_analytic_account set currency_id=%s where id=%s""", (value, account.id))
- self.invalidate_cache(cr, uid, ['currency_id'], [account.id], context=context)
-
- def _currency(self, cr, uid, ids, field_name, arg, context=None):
- result = {}
- for rec in self.browse(cr, uid, ids, context=context):
- if rec.company_id:
- result[rec.id] = rec.company_id.currency_id.id
+ @api.multi
+ def _compute_debit_credit_balance(self):
+ analytic_line_obj = self.env['account.analytic.line']
+ domain = [('account_id', 'in', self.mapped('id'))]
+ if self._context.get('from_date', False):
+ domain.append(('date', '>=', self._context['from_date']))
+ if self._context.get('to_date', False):
+ domain.append(('date', '<=', self._context['to_date']))
+
+ account_amounts = analytic_line_obj.search_read(domain, ['account_id', 'amount'])
+ account_ids = set([line['account_id'][0] for line in account_amounts])
+ data_debit = {account_id: 0.0 for account_id in account_ids}
+ data_credit = {account_id: 0.0 for account_id in account_ids}
+ for account_amount in account_amounts:
+ if account_amount['amount'] < 0.0:
+ data_debit[account_amount['account_id'][0]] += account_amount['amount']
else:
- result[rec.id] = rec.currency_id.id
- return result
+ data_credit[account_amount['account_id'][0]] += account_amount['amount']
- def _get_contract_type_selection(self, cr, uid, context=None):
- return [('regular', 'Regular'), ('prepaid', 'Prepaid Support Hours')]
+ for account in self:
+ account.debit = abs(data_debit.get(account.id, 0.0))
+ account.credit = data_credit.get(account.id, 0.0)
+ account.balance = account.credit - account.debit
- _contract_type_selection = lambda self, *args, **kwargs: self._get_contract_type_selection(*args, **kwargs)
+ @api.model
+ def _default_company(self):
+ return self.env.user.company_id.id
- _columns = {
- 'name': fields.char('Account/Contract Name', required=True, track_visibility='onchange'),
- 'complete_name': fields.function(_get_full_name, type='char', string='Full Name'),
- 'code': fields.char('Reference', select=True, track_visibility='onchange', copy=False),
- 'type': fields.selection([('view','Analytic View'), ('normal','Analytic Account'),('contract','Contract or Project'),('template','Template of Contract')], 'Type of Account', required=True,
- help="If you select the View Type, it means you won\'t allow to create journal entries using that account.\n"\
- "The type 'Analytic account' stands for usual accounts that you only want to use in accounting.\n"\
- "If you select Contract or Project, it offers you the possibility to manage the validity and the invoicing options for this account.\n"\
- "The special type 'Template of Contract' allows you to define a template with default data that you can reuse easily."),
- 'template_id': fields.many2one('account.analytic.account', 'Template of Contract', ondelete='restrict'),
- 'description': fields.text('Description'),
- 'parent_id': fields.many2one('account.analytic.account', 'Parent Analytic Account', select=2),
- 'child_ids': fields.one2many('account.analytic.account', 'parent_id', 'Child Accounts', copy=True),
- 'child_complete_ids': fields.function(_child_compute, relation='account.analytic.account', string="Account Hierarchy", type='many2many'),
- 'line_ids': fields.one2many('account.analytic.line', 'account_id', 'Analytic Entries', copy=False),
- 'balance': fields.function(_debit_credit_bal_qtty, type='float', string='Balance', multi='debit_credit_bal_qtty', digits=0),
- 'debit': fields.function(_debit_credit_bal_qtty, type='float', string='Debit', multi='debit_credit_bal_qtty', digits=0),
- 'credit': fields.function(_debit_credit_bal_qtty, type='float', string='Credit', multi='debit_credit_bal_qtty', digits=0),
- 'quantity': fields.function(_debit_credit_bal_qtty, type='float', string='Quantity', multi='debit_credit_bal_qtty'),
- 'quantity_max': fields.float('Prepaid Service Units', help='Sets the higher limit of time to work on the contract, based on the timesheet. (for instance, number of hours in a limited support contract.)'),
- 'partner_id': fields.many2one('res.partner', 'Customer'),
- 'user_id': fields.many2one('res.users', 'Project Manager', track_visibility='onchange'),
- 'manager_id': fields.many2one('res.users', 'Sales Rep', track_visibility='onchange'),
- 'date_start': fields.date('Start Date'),
- 'date': fields.date('Expiration Date', select=True, track_visibility='onchange'),
- 'company_id': fields.many2one('res.company', 'Company', required=False), #not required because we want to allow different companies to use the same chart of account, except for leaf accounts.
- 'state': fields.selection(ANALYTIC_ACCOUNT_STATE, 'Status', required=True,
- track_visibility='onchange', copy=False),
- 'currency_id': fields.function(_currency, fnct_inv=_set_company_currency, #the currency_id field is readonly except if it's a view account and if there is no company
- store = {
- 'res.company': (_get_analytic_account, ['currency_id'], 10),
- }, string='Currency', type='many2one', relation='res.currency'),
- 'contract_type': fields.selection(_contract_type_selection, 'Type of Contract', required=True),
- }
+ @api.model
+ def _default_user(self):
+ return self.env.user.id
- def create(self, cr, uid, vals, context=None):
- context = dict(context or {}, mail_create_nolog=True)
- if vals.get('type') == 'template' or vals.get('type') == 'contract':
- body = _('Contract Created')
- elif vals.get('type') == 'view':
- body = _('Analytic View Created')
- else:
- body = _('Analytic Account Created')
- analytic_account_id = super(account_analytic_account, self).create(cr, uid, vals, context=context)
- self.message_post(cr, uid, [analytic_account_id], body=body, context=context)
- return analytic_account_id
+ name = fields.Char(string='Analytic Account', index=True, required=True, track_visibility='onchange')
+ code = fields.Char(string='Reference', index=True, track_visibility='onchange', default=lambda s: s.env['ir.sequence'].next_by_code('account.analytic.account'))
+ account_type = fields.Selection([
+ ('normal', 'Analytic View')
+ ], string='Type of Account', required=True, default='normal')
- def on_change_template(self, cr, uid, ids, template_id, date_start=False, context=None):
- if not template_id:
- return {}
- res = {'value':{}}
- template = self.browse(cr, uid, template_id, context=context)
- if template.date_start and template.date:
- from_dt = datetime.strptime(template.date_start, tools.DEFAULT_SERVER_DATE_FORMAT)
- to_dt = datetime.strptime(template.date, tools.DEFAULT_SERVER_DATE_FORMAT)
- timedelta = to_dt - from_dt
- res['value']['date'] = datetime.strftime(datetime.now() + timedelta, tools.DEFAULT_SERVER_DATE_FORMAT)
- if not date_start:
- res['value']['date_start'] = fields.date.today()
- res['value']['quantity_max'] = template.quantity_max
- res['value']['parent_id'] = template.parent_id and template.parent_id.id or False
- res['value']['description'] = template.description
- res['value']['contract_type'] = template.contract_type
- return res
-
- def on_change_partner_id(self, cr, uid, ids,partner_id, name, context=None):
- res={}
- if partner_id:
- partner = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
- if partner.user_id:
- res['manager_id'] = partner.user_id.id
- if not name:
- res['name'] = _('Contract: ') + partner.name
- return {'value': res}
-
- def _default_company(self, cr, uid, context=None):
- user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
- if user.company_id:
- return user.company_id.id
- return self.pool.get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
-
- def _get_default_currency(self, cr, uid, context=None):
- user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
- return user.company_id.currency_id.id
-
- _defaults = {
- 'type': 'normal',
- 'company_id': _default_company,
- 'code' : lambda obj, cr, uid, context: obj.pool.get('ir.sequence').next_by_code(cr, uid, 'account.analytic.account'),
- 'state': 'open',
- 'user_id': lambda self, cr, uid, ctx: uid,
- 'partner_id': lambda self, cr, uid, ctx: ctx.get('partner_id', False),
- 'manager_id': lambda self, cr, uid, ctx: ctx.get('manager_id', False),
- 'date_start': lambda *a: time.strftime('%Y-%m-%d'),
- 'currency_id': _get_default_currency,
- 'contract_type': 'regular',
- }
-
- def check_recursion(self, cr, uid, ids, context=None, parent=None):
- return super(account_analytic_account, self)._check_recursion(cr, uid, ids, context=context, parent=parent)
-
- _order = 'code, name asc'
- _constraints = [
- (check_recursion, 'Error! You cannot create recursive analytic accounts.', ['parent_id']),
- ]
+ tag_ids = fields.Many2many('account.analytic.tag', 'account_analytic_account_tag_rel', 'account_id', 'tag_id', string='Tags', copy=True)
+ line_ids = fields.One2many('account.analytic.line', 'account_id', string="Analytic Lines")
- def name_create(self, cr, uid, name, context=None):
- raise UserError(_("Quick account creation disallowed."))
+ company_id = fields.Many2one('res.company', string='Company', required=True, default=_default_company)
+ partner_id = fields.Many2one('res.partner', string='Customer')
- def copy(self, cr, uid, id, default=None, context=None):
- """ executed only on the toplevel copied object of the hierarchy.
- Subobject are actually copied with copy_data"""
- if not default:
- default = {}
- analytic = self.browse(cr, uid, id, context=context)
- default['name'] = _("%s (copy)") % analytic['name']
- return super(account_analytic_account, self).copy(cr, uid, id, default, context=context)
+ balance = fields.Monetary(compute='_compute_debit_credit_balance', string='Balance')
+ debit = fields.Monetary(compute='_compute_debit_credit_balance', string='Debit')
+ credit = fields.Monetary(compute='_compute_debit_credit_balance', string='Credit')
- def on_change_company(self, cr, uid, id, company_id):
- if not company_id:
- return {}
- currency = self.pool.get('res.company').read(cr, uid, [company_id], ['currency_id'])[0]['currency_id']
- return {'value': {'currency_id': currency}}
+ currency_id = fields.Many2one(related="company_id.currency_id", string="Currency", readonly=True)
- def on_change_parent(self, cr, uid, id, parent_id):
- if not parent_id:
- return {}
- parent = self.read(cr, uid, [parent_id], ['partner_id','code'])[0]
- if parent['partner_id']:
- partner = parent['partner_id'][0]
- else:
- partner = False
- res = {'value': {}}
- if partner:
- res['value']['partner_id'] = partner
+ @api.multi
+ def name_get(self):
+ res = []
+ for analytic in self:
+ name = analytic.name
+ if analytic.code:
+ name = '['+analytic.code+'] '+name
+ if analytic.partner_id:
+ name = name +' - '+analytic.partner_id.commercial_partner_id.name
+ res.append((analytic.id, name))
return res
- def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=100):
- if not args:
- args=[]
- if context is None:
- context={}
- account_ids = []
- if name:
- account_ids = self.search(cr, uid, [('code', '=', name)] + args, limit=limit, context=context)
- if not account_ids:
- dom = []
- if '/' in name:
- for name2 in name.split('/'):
- # intermediate search without limit and args - could be expensive for large tables if `name` is not selective
- account_ids = self.search(cr, uid, dom + [('name', operator, name2.strip())], limit=None, context=context)
- if not account_ids: break
- dom = [('parent_id','in',account_ids)]
- if account_ids and args:
- # final filtering according to domain (args)4
- account_ids = self.search(cr, uid, [('id', 'in', account_ids)] + args, limit=limit, context=context)
- if not account_ids:
- return super(account_analytic_account, self).name_search(cr, uid, name, args, operator=operator, context=context, limit=limit)
- return self.name_get(cr, uid, account_ids, context=context)
+ @api.model
+ def name_search(self, name='', args=None, operator='ilike', limit=100):
+ args = args or []
+ recs = self.search(['|', '|', ('code', operator, name), ('partner_id', operator, name), ('name', operator, name)] + args, limit=limit)
+ return recs.name_get()
- def _track_subtype(self, cr, uid, ids, init_values, context=None):
- record = self.browse(cr, uid, ids[0], context=context)
- if 'state' in init_values and record.state == 'open':
+ @api.multi
+ def _track_subtype(self, init_values):
+ self.ensure_one()
+ if 'state' in init_values and self.state == 'open':
return 'analytic.mt_account_opened'
- elif 'state' in init_values and record.state == 'close':
+ elif 'state' in init_values and self.state == 'close':
return 'analytic.mt_account_closed'
- elif 'state' in init_values and record.state == 'pending':
+ elif 'state' in init_values and self.state == 'pending':
return 'analytic.mt_account_pending'
- return super(account_analytic_account, self)._track_subtype(cr, uid, ids, init_values, context=context)
+ return super(account_analytic_account, self)._track_subtype(init_values)
-class account_analytic_line(osv.osv):
+class account_analytic_line(models.Model):
_name = 'account.analytic.line'
_description = 'Analytic Line'
+ _order = 'date desc, id desc'
- _columns = {
- 'name': fields.char('Description', required=True),
- 'date': fields.date('Date', required=True, select=True),
- 'amount': fields.float('Amount', required=True, help='Calculated by multiplying the quantity and the price given in the Product\'s cost price. Always expressed in the company main currency.', digits=0),
- 'unit_amount': fields.float('Quantity', help='Specifies the amount of quantity to count.'),
- 'account_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True, ondelete='restrict', select=True, domain=[('type','<>','view')]),
- 'user_id': fields.many2one('res.users', 'User'),
- 'company_id': fields.related('account_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
- 'journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal', required=True, ondelete='restrict', select=True),
- 'partner_id': fields.related('account_id', 'partner_id', type='many2one', relation='res.partner', string='Partner', store=True),
-
- }
-
- def _get_default_date(self, cr, uid, context=None):
- return fields.date.context_today(self, cr, uid, context=context)
-
- def __get_default_date(self, cr, uid, context=None):
- return self._get_default_date(cr, uid, context=context)
-
- _defaults = {
- 'date': __get_default_date,
- 'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.analytic.line', context=c),
- 'amount': 0.00,
- 'user_id': lambda self, cr, uid, ctx: ctx.get('user_id') or uid,
- }
-
- _order = 'date desc'
-
- def _check_no_view(self, cr, uid, ids, context=None):
- analytic_lines = self.browse(cr, uid, ids, context=context)
- for line in analytic_lines:
- if line.account_id.type == 'view':
- return False
- return True
-
- _constraints = [
- (_check_no_view, 'You cannot create analytic line on view account.', ['account_id']),
- ]
+ @api.model
+ def _default_user(self):
+ return self.env.user.id
-class account_analytic_journal(osv.osv):
- _name = 'account.analytic.journal'
- _description = 'Analytic Journal'
- _columns = {
- 'name': fields.char('Journal Name', required=True),
- 'code': fields.char('Journal Code', size=8),
- 'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the analytic journal without removing it."),
- 'type': fields.selection(
- [('sale', 'Sale'), ('purchase', 'Purchase'), ('cash', 'Cash'),
- ('general', 'General'), ('situation', 'Situation')],
- 'Type', required=True, help="Gives the type of the analytic journal. When it needs for a document (eg: an invoice) to create analytic entries, Odoo will look for a matching journal of the same type."),
- 'line_ids': fields.one2many('account.analytic.line', 'journal_id', 'Lines'),
- 'company_id': fields.many2one('res.company', 'Company', required=True),
- }
- _defaults = {
- 'active': True,
- 'type': 'general',
- 'company_id': lambda self, cr, uid, c=None: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
- }
+ name = fields.Char('Description', required=True)
+ date = fields.Date('Date', required=True, index=True, default=fields.Date.context_today)
+ amount = fields.Monetary('Amount', required=True, default=0.0)
+ unit_amount = fields.Float('Quantity', default=0.0)
+ account_id = fields.Many2one('account.analytic.account', 'Analytic Account', required=True, ondelete='restrict', index=True)
+ partner_id = fields.Many2one('res.partner', string='Partner')
+ user_id = fields.Many2one('res.users', string='User', default=_default_user)
-class res_partner(osv.osv):
- """ Inherits partner and adds contract information in the partner form """
- _inherit = 'res.partner'
+ tag_ids = fields.Many2many('account.analytic.tag', 'account_analytic_line_tag_rel', 'line_id', 'tag_id', string='Tags', copy=True)
- _columns = {
- 'contract_ids': fields.one2many('account.analytic.account', \
- 'partner_id', 'Contracts', readonly=True),
- }
+ company_id = fields.Many2one(related='account_id.company_id', string='Company', store=True, readonly=True)
+ currency_id = fields.Many2one(related="company_id.currency_id", string="Currency", readonly=True)
diff --git a/addons/analytic/report/__init__.py b/addons/analytic/report/__init__.py
deleted file mode 100644
index 607960818194977ca0d9b9c97b4c428b5063f9fd..0000000000000000000000000000000000000000
--- a/addons/analytic/report/__init__.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-import analytic_journal
-import analytic_balance
-import analytic_inverted_balance
-import analytic_cost_ledger
-import analytic_quantity_cost_ledger
diff --git a/addons/analytic/report/analytic_balance.py b/addons/analytic/report/analytic_balance.py
deleted file mode 100644
index 54220de6dc68294c4923d749a8961db07ed557b5..0000000000000000000000000000000000000000
--- a/addons/analytic/report/analytic_balance.py
+++ /dev/null
@@ -1,137 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-import time
-from openerp.osv import osv
-from openerp.report import report_sxw
-
-
-class account_analytic_balance(report_sxw.rml_parse):
- def __init__(self, cr, uid, name, context):
- super(account_analytic_balance, self).__init__(cr, uid, name, context=context)
- self.localcontext.update( {
- 'time': time,
- 'get_objects': self._get_objects,
- 'lines_g': self._lines_g,
- 'move_sum': self._move_sum,
- 'sum_all': self._sum_all,
- 'sum_balance': self._sum_balance,
- 'move_sum_balance': self._move_sum_balance,
- })
- self.acc_ids = []
- self.read_data = []
- self.empty_acc = False
- self.acc_data_dict = {}# maintains a relation with an account with its successors.
- self.acc_sum_list = []# maintains a list of all ids
-
- def get_children(self, ids):
- read_data = self.pool.get('account.analytic.account').read(self.cr, self.uid, ids,['child_ids','code','complete_name','balance'])
- for data in read_data:
- if (data['id'] not in self.acc_ids):
- inculde_empty = True
- if (not self.empty_acc) and data['balance'] == 0.00:
- inculde_empty = False
- if inculde_empty:
- self.acc_ids.append(data['id'])
- self.read_data.append(data)
- if data['child_ids']:
- self.get_children(data['child_ids'])
- return True
-
- def _get_objects(self, empty_acc):
- if self.read_data:
- return self.read_data
- self.empty_acc = empty_acc
- self.read_data = []
- self.get_children(self.ids)
- return self.read_data
-
- def _lines_g(self, account_id, date1, date2):
- account_analytic_obj = self.pool.get('account.analytic.account')
- ids = account_analytic_obj.search(self.cr, self.uid,
- [('parent_id', 'child_of', [account_id])])
- self.cr.execute("SELECT aa.name AS name, aa.code AS code, \
- sum(aal.amount) AS balance, sum(aal.unit_amount) AS quantity \
- FROM account_analytic_line AS aal, account_account AS aa \
- WHERE (aal.general_account_id=aa.id) \
- AND (aal.account_id IN %s)\
- AND (date>=%s) AND (date<=%s) AND aa.active \
- GROUP BY aal.general_account_id, aa.name, aa.code, aal.code \
- ORDER BY aal.code", (tuple(ids), date1, date2))
- res = self.cr.dictfetchall()
-
- for r in res:
- if r['balance'] > 0:
- r['debit'] = r['balance']
- r['credit'] = 0.0
- elif r['balance'] < 0:
- r['debit'] = 0.0
- r['credit'] = -r['balance']
- else:
- r['balance'] == 0
- r['debit'] = 0.0
- r['credit'] = 0.0
- return res
-
- def _move_sum(self, account_id, date1, date2, option):
- if account_id not in self.acc_data_dict:
- account_analytic_obj = self.pool.get('account.analytic.account')
- ids = account_analytic_obj.search(self.cr, self.uid,[('parent_id', 'child_of', [account_id])])
- self.acc_data_dict[account_id] = ids
- else:
- ids = self.acc_data_dict[account_id]
-
- query_params = (tuple(ids), date1, date2)
- if option == "credit":
- self.cr.execute("SELECT COALESCE(-sum(amount),0.0) FROM account_analytic_line \
- WHERE account_id IN %s AND date>=%s AND date<=%s AND amount<0",query_params)
- elif option == "debit":
- self.cr.execute("SELECT COALESCE(sum(amount),0.0) FROM account_analytic_line \
- WHERE account_id IN %s\
- AND date>=%s AND date<=%s AND amount>0",query_params)
- elif option == "quantity":
- self.cr.execute("SELECT COALESCE(sum(unit_amount),0.0) FROM account_analytic_line \
- WHERE account_id IN %s\
- AND date>=%s AND date<=%s",query_params)
- return self.cr.fetchone()[0] or 0.0
-
- def _move_sum_balance(self, account_id, date1, date2):
- debit = self._move_sum(account_id, date1, date2, 'debit')
- credit = self._move_sum(account_id, date1, date2, 'credit')
- return (debit-credit)
-
- def _sum_all(self, accounts, date1, date2, option):
- account_analytic_obj = self.pool.get('account.analytic.account')
- ids = map(lambda x: x['id'], accounts)
- if not ids:
- return 0.0
-
- if not self.acc_sum_list:
- ids2 = account_analytic_obj.search(self.cr, self.uid,[('parent_id', 'child_of', ids)])
- self.acc_sum_list = ids2
- else:
- ids2 = self.acc_sum_list
-
- query_params = (tuple(ids2), date1, date2)
- if option == "debit":
- self.cr.execute("SELECT COALESCE(sum(amount),0.0) FROM account_analytic_line \
- WHERE account_id IN %s AND date>=%s AND date<=%s AND amount>0",query_params)
- elif option == "credit":
- self.cr.execute("SELECT COALESCE(-sum(amount),0.0) FROM account_analytic_line \
- WHERE account_id IN %s AND date>=%s AND date<=%s AND amount<0",query_params)
- elif option == "quantity":
- self.cr.execute("SELECT COALESCE(sum(unit_amount),0.0) FROM account_analytic_line \
- WHERE account_id IN %s AND date>=%s AND date<=%s",query_params)
- return self.cr.fetchone()[0] or 0.0
-
- def _sum_balance(self, accounts, date1, date2):
- debit = self._sum_all(accounts, date1, date2, 'debit') or 0.0
- credit = self._sum_all(accounts, date1, date2, 'credit') or 0.0
- return (debit-credit)
-
-
-class report_analyticbalance(osv.AbstractModel):
- _name = 'report.account.report_analyticbalance'
- _inherit = 'report.abstract_report'
- _template = 'analytic.report_analyticbalance'
- _wrapped_report_class = account_analytic_balance
diff --git a/addons/analytic/report/analytic_cost_ledger.py b/addons/analytic/report/analytic_cost_ledger.py
deleted file mode 100644
index 7c97fa8f9f90d2588b2920f584ef4bfc069e635b..0000000000000000000000000000000000000000
--- a/addons/analytic/report/analytic_cost_ledger.py
+++ /dev/null
@@ -1,91 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-import time
-from openerp.osv import osv
-from openerp.report import report_sxw
-
-
-class account_analytic_cost_ledger(report_sxw.rml_parse):
- def __init__(self, cr, uid, name, context):
- super(account_analytic_cost_ledger, self).__init__(cr, uid, name, context=context)
- self.localcontext.update( {
- 'time': time,
- 'lines_g': self._lines_g,
- 'lines_a': self._lines_a,
- 'account_sum_debit': self._account_sum_debit,
- 'account_sum_credit': self._account_sum_credit,
- 'account_sum_balance': self._account_sum_balance,
- 'sum_debit': self._sum_debit,
- 'sum_credit': self._sum_credit,
- 'sum_balance': self._sum_balance,
- })
- self.children = {} # a memo for the method _get_children
-
- def _get_children(self, accounts):
- """ return all children accounts of the given accounts
- :param accounts: list of browse records of 'account.analytic.account'
- :return: tuple of account ids
- """
- analytic_obj = self.pool.get('account.analytic.account')
- res = set()
- for account in accounts:
- if account.id not in self.children:
- self.children[account.id] = analytic_obj.search(self.cr, self.uid, [('parent_id', 'child_of', [account.id])])
- res.update(self.children[account.id])
- return tuple(res)
-
- def _lines_g(self, account, date1, date2):
- self.cr.execute("SELECT sum(aal.amount) AS balance, aa.code AS code, aa.name AS name, aa.id AS id \
- FROM account_account AS aa, account_analytic_line AS aal \
- WHERE (aal.account_id IN %s) AND (aal.date>=%s) AND (aal.date<=%s) AND (aal.general_account_id=aa.id) AND aa.active \
- GROUP BY aa.code, aa.name, aa.id ORDER BY aa.code", (self._get_children([account]), date1, date2))
- res = self.cr.dictfetchall()
- for r in res:
- r['debit'] = r['balance'] if r['balance'] > 0 else 0.0
- r['credit'] = -r['balance'] if r['balance'] < 0 else 0.0
- return res
-
- def _lines_a(self, general_account, account, date1, date2):
- self.cr.execute("SELECT aal.name AS name, aal.code AS code, aal.amount AS balance, aal.date AS date, aaj.code AS cj FROM account_analytic_line AS aal, account_analytic_journal AS aaj \
- WHERE (aal.general_account_id=%s) AND (aal.account_id IN %s) AND (aal.date>=%s) AND (aal.date<=%s) \
- AND (aal.journal_id=aaj.id) \
- ORDER BY aal.date, aaj.code, aal.code", (general_account['id'], self._get_children([account]), date1, date2))
- res = self.cr.dictfetchall()
- for r in res:
- r['debit'] = r['balance'] if r['balance'] > 0 else 0.0
- r['credit'] = -r['balance'] if r['balance'] < 0 else 0.0
- return res
-
- def _account_sum_debit(self, account, date1, date2):
- return self._sum_debit([account], date1, date2)
-
- def _account_sum_credit(self, account, date1, date2):
- return self._sum_credit([account], date1, date2)
-
- def _account_sum_balance(self, account, date1, date2):
- debit = self._account_sum_debit(account, date1, date2)
- credit = self._account_sum_credit(account, date1, date2)
- return (debit-credit)
-
- def _sum_debit(self, accounts, date1, date2):
- self.cr.execute("SELECT sum(amount) FROM account_analytic_line WHERE account_id IN %s AND date>=%s AND date<=%s AND amount>0",
- (self._get_children(accounts), date1, date2,))
- return self.cr.fetchone()[0] or 0.0
-
- def _sum_credit(self, accounts, date1, date2):
- self.cr.execute("SELECT -sum(amount) FROM account_analytic_line WHERE account_id IN %s AND date>=%s AND date<=%s AND amount<0",
- (self._get_children(accounts), date1, date2,))
- return self.cr.fetchone()[0] or 0.0
-
- def _sum_balance(self, accounts, date1, date2):
- debit = self._sum_debit(accounts, date1, date2)
- credit = self._sum_credit(accounts, date1, date2)
- return (debit-credit)
-
-
-class report_analyticcostledger(osv.AbstractModel):
- _name = 'report.account.report_analyticcostledger'
- _inherit = 'report.abstract_report'
- _template = 'analytic.report_analyticcostledger'
- _wrapped_report_class = account_analytic_cost_ledger
diff --git a/addons/analytic/report/analytic_inverted_balance.py b/addons/analytic/report/analytic_inverted_balance.py
deleted file mode 100644
index ca77d2dc795d94b072a2a5a1a2aeecc48dbcbe29..0000000000000000000000000000000000000000
--- a/addons/analytic/report/analytic_inverted_balance.py
+++ /dev/null
@@ -1,110 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-import time
-from openerp.osv import osv
-from openerp.report import report_sxw
-
-class account_inverted_analytic_balance(report_sxw.rml_parse):
- def __init__(self, cr, uid, name, context):
- super(account_inverted_analytic_balance, self).__init__(cr, uid, name, context=context)
- self.localcontext.update( {
- 'time': time,
- 'lines_g': self._lines_g,
- 'lines_a': self._lines_a,
- 'sum_debit': self._sum_debit,
- 'sum_credit': self._sum_credit,
- 'sum_balance': self._sum_balance,
- 'sum_quantity': self._sum_quantity,
- })
-
- def _lines_g(self, accounts, date1, date2):
- ids = map(lambda x: x.id, accounts)
- self.cr.execute("SELECT aa.name AS name, aa.code AS code, "
- "sum(aal.amount) AS balance, "
- "sum(aal.unit_amount) AS quantity, aa.id AS id \
- FROM account_analytic_line AS aal, account_account AS aa \
- WHERE (aal.general_account_id=aa.id) "
- "AND (aal.account_id IN %s) "
- "AND (date>=%s) AND (date<=%s) AND aa.active \
- GROUP BY aal.general_account_id, aa.name, aa.code, aal.code, aa.id "
- "ORDER BY aal.code",
- (tuple(ids), date1, date2))
- res = self.cr.dictfetchall()
- for r in res:
- if r['balance'] > 0:
- r['debit'] = r['balance']
- r['credit'] = 0.0
- elif r['balance'] < 0:
- r['debit'] = 0.0
- r['credit'] = -r['balance']
- else:
- r['debit'] = 0.0
- r['credit'] = 0.0
- return res
-
- def _lines_a(self, accounts, general_account_id, date1, date2):
- ids = map(lambda x: x.id, accounts)
- self.cr.execute("SELECT sum(aal.amount) AS balance, "
- "sum(aal.unit_amount) AS quantity, "
- "aaa.code AS code, aaa.name AS name, account_id \
- FROM account_analytic_line AS aal, "
- "account_analytic_account AS aaa \
- WHERE aal.account_id=aaa.id AND aal.account_id IN %s "
- "AND aal.general_account_id=%s AND aal.date>=%s "
- "AND aal.date<=%s \
- GROUP BY aal.account_id, general_account_id, aaa.code, aaa.name "
- "ORDER BY aal.account_id",
- (tuple(ids), general_account_id, date1, date2))
- res = self.cr.dictfetchall()
-
- aaa_obj = self.pool.get('account.analytic.account')
- res2 = aaa_obj.read(self.cr, self.uid, ids, ['complete_name'])
- complete_name = {}
- for r in res2:
- complete_name[r['id']] = r['complete_name']
- for r in res:
- r['complete_name'] = complete_name[r['account_id']]
- if r['balance'] > 0:
- r['debit'] = r['balance']
- r['credit'] = 0.0
- elif r['balance'] < 0:
- r['debit'] = 0.0
- r['credit'] = -r['balance']
- else:
- r['debit'] = 0.0
- r['credit'] = 0.0
- return res
-
- def _sum_debit(self, accounts, date1, date2):
- ids = map(lambda x: x.id, accounts)
- self.cr.execute("SELECT sum(amount) \
- FROM account_analytic_line \
- WHERE account_id IN %s AND date>=%s AND date<=%s AND amount>0", (tuple(ids),date1, date2,))
- return self.cr.fetchone()[0] or 0.0
-
- def _sum_credit(self, accounts, date1, date2):
- ids = map(lambda x: x.id, accounts)
- self.cr.execute("SELECT -sum(amount) \
- FROM account_analytic_line \
- WHERE account_id IN %s AND date>=%s AND date<=%s AND amount<0", (tuple(ids),date1, date2,))
- return self.cr.fetchone()[0] or 0.0
-
- def _sum_balance(self, accounts, date1, date2):
- debit = self._sum_debit(accounts, date1, date2)
- credit = self._sum_credit(accounts, date1, date2)
- return (debit-credit)
-
- def _sum_quantity(self, accounts, date1, date2):
- ids = map(lambda x: x.id, accounts)
- self.cr.execute("SELECT sum(unit_amount) \
- FROM account_analytic_line \
- WHERE account_id IN %s AND date>=%s AND date<=%s", (tuple(ids),date1, date2,))
- return self.cr.fetchone()[0] or 0.0
-
-
-class report_invertedanalyticbalance(osv.AbstractModel):
- _name = 'report.account.report_invertedanalyticbalance'
- _inherit = 'report.abstract_report'
- _template = 'analytic.report_invertedanalyticbalance'
- _wrapped_report_class = account_inverted_analytic_balance
diff --git a/addons/analytic/report/analytic_journal.py b/addons/analytic/report/analytic_journal.py
deleted file mode 100644
index 5e70d0a43cda96d7bc5109048754e3754e091572..0000000000000000000000000000000000000000
--- a/addons/analytic/report/analytic_journal.py
+++ /dev/null
@@ -1,48 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-import time
-from openerp.osv import osv
-from openerp.report import report_sxw
-
-
-#
-# Use period and Journal for selection or resources
-#
-class account_analytic_journal(report_sxw.rml_parse):
- def __init__(self, cr, uid, name, context):
- super(account_analytic_journal, self).__init__(cr, uid, name, context=context)
- self.localcontext.update( {
- 'time': time,
- 'lines': self._lines,
- 'lines_a': self._lines_a,
- 'sum_general': self._sum_general,
- 'sum_analytic': self._sum_analytic,
- })
-
- def _lines(self, journal_id, date1, date2):
- self.cr.execute('SELECT DISTINCT move_id FROM account_analytic_line WHERE (date>=%s) AND (date<=%s) AND (journal_id=%s) AND (move_id is not null)', (date1, date2, journal_id,))
- ids = map(lambda x: x[0], self.cr.fetchall())
- return self.pool.get('account.move.line').browse(self.cr, self.uid, ids)
-
- def _lines_a(self, move_id, journal_id, date1, date2):
- ids = self.pool.get('account.analytic.line').search(self.cr, self.uid, [('move_id','=',move_id), ('journal_id','=',journal_id), ('date','>=',date1), ('date','<=',date2)])
- if not ids:
- return []
- return self.pool.get('account.analytic.line').browse(self.cr, self.uid, ids)
-
- def _sum_general(self, journal_id, date1, date2):
- self.cr.execute('SELECT SUM(debit-credit) FROM account_move_line WHERE id IN (SELECT move_id FROM account_analytic_line WHERE (date>=%s) AND (date<=%s) AND (journal_id=%s) AND (move_id is not null))', (date1, date2, journal_id,))
- return self.cr.fetchall()[0][0] or 0
-
- def _sum_analytic(self, journal_id, date1, date2):
- self.cr.execute("SELECT SUM(amount) FROM account_analytic_line WHERE date>=%s AND date<=%s AND journal_id=%s", (date1, date2, journal_id))
- res = self.cr.dictfetchone()
- return res['sum'] or 0
-
-
-class report_analyticjournal(osv.AbstractModel):
- _name = 'report.account.report_analyticjournal'
- _inherit = 'report.abstract_report'
- _template = 'analytic.report_analyticjournal'
- _wrapped_report_class = account_analytic_journal
diff --git a/addons/analytic/report/analytic_quantity_cost_ledger.py b/addons/analytic/report/analytic_quantity_cost_ledger.py
deleted file mode 100644
index c6176a744fdae2367aa39f043ca7b12a11474d5d..0000000000000000000000000000000000000000
--- a/addons/analytic/report/analytic_quantity_cost_ledger.py
+++ /dev/null
@@ -1,107 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-import time
-from openerp.osv import osv
-from openerp.report import report_sxw
-
-
-class account_analytic_quantity_cost_ledger(report_sxw.rml_parse):
- def __init__(self, cr, uid, name, context):
- super(account_analytic_quantity_cost_ledger, self).__init__(cr, uid, name, context=context)
- self.localcontext.update( {
- 'time': time,
- 'lines_g': self._lines_g,
- 'lines_a': self._lines_a,
- 'sum_quantity': self._sum_quantity,
- 'account_sum_quantity': self._account_sum_quantity,
- })
-
- def _lines_g(self, account_id, date1, date2, journals):
- if not journals:
- self.cr.execute("SELECT sum(aal.unit_amount) AS quantity, \
- aa.code AS code, aa.name AS name, aa.id AS id \
- FROM account_account AS aa, account_analytic_line AS aal \
- WHERE (aal.account_id=%s) AND (aal.date>=%s) \
- AND (aal.date<=%s) AND (aal.general_account_id=aa.id) \
- AND aa.active \
- GROUP BY aa.code, aa.name, aa.id ORDER BY aa.code",
- (account_id, date1, date2))
- else:
- journal_ids = journals
- self.cr.execute("SELECT sum(aal.unit_amount) AS quantity, \
- aa.code AS code, aa.name AS name, aa.id AS id \
- FROM account_account AS aa, account_analytic_line AS aal \
- WHERE (aal.account_id=%s) AND (aal.date>=%s) \
- AND (aal.date<=%s) AND (aal.general_account_id=aa.id) \
- AND aa.active \
- AND (aal.journal_id IN %s ) \
- GROUP BY aa.code, aa.name, aa.id ORDER BY aa.code",
- (account_id, date1, date2, tuple(journal_ids)))
- res = self.cr.dictfetchall()
- return res
-
- def _lines_a(self, general_account_id, account_id, date1, date2, journals):
- if not journals:
- self.cr.execute("SELECT aal.name AS name, aal.code AS code, \
- aal.unit_amount AS quantity, aal.date AS date, \
- aaj.code AS cj \
- FROM account_analytic_line AS aal, \
- account_analytic_journal AS aaj \
- WHERE (aal.general_account_id=%s) AND (aal.account_id=%s) \
- AND (aal.date>=%s) AND (aal.date<=%s) \
- AND (aal.journal_id=aaj.id) \
- ORDER BY aal.date, aaj.code, aal.code",
- (general_account_id, account_id, date1, date2))
- else:
- journal_ids = journals
- self.cr.execute("SELECT aal.name AS name, aal.code AS code, \
- aal.unit_amount AS quantity, aal.date AS date, \
- aaj.code AS cj \
- FROM account_analytic_line AS aal, \
- account_analytic_journal AS aaj \
- WHERE (aal.general_account_id=%s) AND (aal.account_id=%s) \
- AND (aal.date>=%s) AND (aal.date<=%s) \
- AND (aal.journal_id=aaj.id) AND (aaj.id IN %s) \
- ORDER BY aal.date, aaj.code, aal.code",
- (general_account_id, account_id, date1, date2,tuple(journal_ids)))
- res = self.cr.dictfetchall()
- return res
-
- def _account_sum_quantity(self, account_id, date1, date2, journals):
- if not journals:
- self.cr.execute("SELECT sum(unit_amount) \
- FROM account_analytic_line \
- WHERE account_id=%s AND date>=%s AND date<=%s",
- (account_id, date1, date2))
- else:
- journal_ids = journals
- self.cr.execute("SELECT sum(unit_amount) \
- FROM account_analytic_line \
- WHERE account_id = %s AND date >= %s AND date <= %s \
- AND journal_id IN %s",
- (account_id, date1, date2, tuple(journal_ids),))
- return self.cr.fetchone()[0] or 0.0
-
- def _sum_quantity(self, accounts, date1, date2, journals):
- ids = map(lambda x: x.id, accounts)
- if not ids:
- return 0.0
- if not journals:
- self.cr.execute("SELECT sum(unit_amount) \
- FROM account_analytic_line \
- WHERE account_id IN %s AND date>=%s AND date<=%s",
- (tuple(ids), date1, date2,))
- else:
- journal_ids = journals
- self.cr.execute("SELECT sum(unit_amount) \
- FROM account_analytic_line \
- WHERE account_id IN %s AND date >= %s AND date <= %s \
- AND journal_id IN %s",(tuple(ids), date1, date2, tuple(journal_ids)))
- return self.cr.fetchone()[0] or 0.0
-
-
-class report_analyticcostledgerquantity(osv.AbstractModel):
- _name = 'report.account.report_analyticcostledgerquantity'
- _inherit = 'report.abstract_report'
- _template = 'analytic.report_analyticcostledgerquantity'
- _wrapped_report_class = account_analytic_quantity_cost_ledger
diff --git a/addons/analytic/security/analytic_security.xml b/addons/analytic/security/analytic_security.xml
index 43bf89de4062cb3045dd4f28382fd9e7b0b77fa8..c11cce92c5457e3c4424b0b7dad389f57b670ab1 100644
--- a/addons/analytic/security/analytic_security.xml
+++ b/addons/analytic/security/analytic_security.xml
@@ -15,14 +15,6 @@
<field eval="True" name="global"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record>
-
- <record id="analytic_journal_comp_rule" model="ir.rule">
- <field name="name">Analytic journal multi-company</field>
- <field name="model_id" ref="model_account_analytic_journal"/>
- <field name="global" eval="True"/>
- <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
- </record>
-
</data>
<data noupdate="0">
diff --git a/addons/analytic/security/ir.model.access.csv b/addons/analytic/security/ir.model.access.csv
index 9ca53cdff14324c1eb75777d488a0f6fac88d58b..32ee04d9f9d9f9b4dbb0337e2f42ae5403a15bd5 100644
--- a/addons/analytic/security/ir.model.access.csv
+++ b/addons/analytic/security/ir.model.access.csv
@@ -1,4 +1,4 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_account_analytic_account,access_account_analytic_account,model_account_analytic_account,group_analytic_accounting,1,0,0,0
-access_account_analytic_line,access_account_analytic_line,model_account_analytic_line,group_analytic_accounting,1,0,0,0
-access_account_analytic_journal,access_account_analytic_journal,model_account_analytic_journal,group_analytic_accounting,1,0,0,0
+access_account_analytic_account,access_account_analytic_account,model_account_analytic_account,group_analytic_accounting,1,1,1,1
+access_account_analytic_line,access_account_analytic_line,model_account_analytic_line,group_analytic_accounting,1,1,1,1
+access_account_analytic_tag,access_account_analytic_tag,model_account_analytic_tag,group_analytic_accounting,1,1,1,1
diff --git a/addons/analytic/test/analytic_hierarchy.yml b/addons/analytic/test/analytic_hierarchy.yml
deleted file mode 100644
index 222e03aa0628674b31981bc844621d55e9578f16..0000000000000000000000000000000000000000
--- a/addons/analytic/test/analytic_hierarchy.yml
+++ /dev/null
@@ -1,54 +0,0 @@
--
- We create a simple hierarchy like this
- Toplevel view account
- ├ Real analytic account 1
- â”” Real analytic account 2
--
- !record {model: account.analytic.account, id: analytic_account_view1}:
- name: 'Toplevel view account'
- type: 'view'
--
- !record {model: account.analytic.account, id: analytic_account1}:
- name: 'Real analytic account 1'
- type: 'normal'
- parent_id: analytic_account_view1
--
- !record {model: account.analytic.account, id: analytic_account2}:
- name: 'Real analytic account 2'
- type: 'normal'
- parent_id: analytic_account_view1
--
- We add analytic lines in real accounts and journal
--
- !record {model: account.analytic.journal, id: analytic_journal1}:
- name: 'Analytic journal'
--
- !record {model: account.analytic.line, id: analytic_line1}:
- name: 'Analytic line 1'
- account_id: analytic_account1
- journal_id: analytic_journal1
--
- !record {model: account.analytic.line, id: analytic_line2}:
- name: 'Analytic line 2'
- account_id: analytic_account2
- journal_id: analytic_journal1
--
- Now we copy the toplevel account
--
- !function {model: account.analytic.account, name: copy, id: analytic_account_view1}:
- - eval: "ref('analytic_account_view1')"
--
- !python {model: account.analytic.account}: |
- # the toplevel account has been copied with the (copy) suffix
- accounts = self.search(cr, uid, [('name', 'like', '%Toplevel view account%')])
- assert len(accounts) == 2, 'The toplevel account has not been copied'
- accounts = self.search(cr, uid, [('name', '=', 'Toplevel view account')])
- assert len(accounts) == 1, 'The toplevel account copy has a bad name'
- # the sub-accounts and sub-accounts have been copied without the (copy) suffix
- accounts = self.search(cr, uid, [('name', '=', 'Real analytic account 1')])
- assert len(accounts) == 2, 'The sub-account has not been copied'
- accounts = self.search(cr, uid, [('name', '=', 'Real analytic account 2')])
- assert len(accounts) == 2, 'The sub-account has not been copied'
- # the analytic lines should not be duplicated
- lines = self.pool.get('account.analytic.line').search(cr, uid, [('name', 'like', '%Analytic line %')])
- assert len(lines) == 2, "The analytic lines shouldn't have been copied"
diff --git a/addons/analytic/views/analytic_view.xml b/addons/analytic/views/analytic_view.xml
index d45e4ea960e61b502986383b1da6349732b34986..1df9757725462c9285b70cc43759e2a3364d90a9 100644
--- a/addons/analytic/views/analytic_view.xml
+++ b/addons/analytic/views/analytic_view.xml
@@ -1,6 +1,48 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
+ <record id="view_account_analytic_line_tree" model="ir.ui.view">
+ <field name="name">account.analytic.line.tree</field>
+ <field name="model">account.analytic.line</field>
+ <field name="arch" type="xml">
+ <tree string="Analytic Entries">
+ <field name="date"/>
+ <field name="name"/>
+ <field name="account_id"/>
+ <field name="currency_id" invisible="1"/>
+ <field name="company_id" groups="base.group_multi_company"/>
+ <field name="unit_amount" sum="Quantity"/>
+ <field name="amount" sum="Total"/>
+ </tree>
+ </field>
+ </record>
+
+ <record model="ir.actions.act_window" id="account_analytic_line_action">
+ <field name="context">{'search_default_group_date': 1, 'search_default_group_journal': 1, 'default_account_id': active_id}</field>
+ <field name="domain">[('account_id','=', active_id)]</field>
+ <field name="name">Costs & Revenues</field>
+ <field name="res_model">account.analytic.line</field>
+ <field name="view_mode">tree,form,graph,pivot</field>
+ <field name="view_id" ref="view_account_analytic_line_tree"/>
+ <field name="view_type">form</field>
+ <field name="help" type="html">
+ <p>
+ No activity yet on this account.
+ </p><p>
+ In Odoo, sale orders and projects are implemented using
+ analytic account. You can track costs and revenues to analyse
+ your margins easily.
+ </p><p>
+ Costs will be created automatically when you register supplier
+ invoices, expenses or timesheets.
+ </p><p>
+ Revenues will be created automatically when you create customer
+ invoices. Customer invoices can be created based on sale orders
+ (fixed price invoices), on timesheets (based on the work done) or
+ on expenses (e.g. reinvoicing of travel costs).
+ </p>
+ </field>
+ </record>
<record id="view_account_analytic_account_form" model="ir.ui.view">
<field name="name">analytic.analytic.account.form</field>
@@ -8,40 +50,31 @@
<field name="arch" type="xml">
<form string="Analytic Account">
<sheet string="Analytic Account">
- <div class="oe_button_box" name="button_box"/>
-
+ <div class="oe_button_box" name="button_box">
+ <button class="oe_stat_button" type="action" name="%(account_analytic_line_action)d"
+ icon="fa-usd" string="Cost/Revenue" widget="statinfo"/>
+ </div>
<div class="oe_title">
<label for="name" class="oe_edit_only"/>
<h1>
<field name="name" class="oe_inline"/>
</h1>
- <div name="project"/>
</div>
-
+ <div name="project"/>
<group name="main">
<group>
- <field name="partner_id" on_change="on_change_partner_id(partner_id, name)" attrs="{'invisible': [('type','in',['view','normal','template'])]}"/>
- <field name="manager_id" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'account.group_account_manager']}" attrs="{'invisible': [('type','in',['view','normal','template'])]}"/>
- <field name="contract_type" widget="radio" attrs="{'invisible': ['|',('template_id','!=',False),('type','in',['view','normal'])]}"/>
+ <field name="account_type" widget="radio"/>
+ <field name="partner_id"/>
</group>
<group>
- <field name="type" invisible="context.get('default_type', False)"/>
- <field name="template_id" on_change="on_change_template(template_id, date_start)" domain="[('type','=','template'),('state','=','open')]" attrs="{'invisible': [('type','in',['view', 'normal','template'])]}" context="{'default_type' : 'template'}"/>
- <field name="code" attrs="{'invisible': [('type','=','template')]}"/>
- <field name="parent_id" on_change="on_change_parent(parent_id)" attrs="{'invisible': [('type','in',['contract'])]}"/>
- <field name="currency_id" attrs="{'invisible': ['|',('type', '<>', 'view'), ('company_id', '<>', False)]}"/>
- <field name="company_id" on_change="on_change_company(company_id)" options="{'no_create': True}" groups="base.group_multi_company" attrs="{'required': [('type','<>','view')]}"/>
- <field name="date_start" attrs="{'invisible': [('type','in',['view','normal','template'])]}"/>
- <label for="date" string="End Date" attrs="{'invisible': [('type','in',['view','normal','template'])]}"/>
- <div name="duration" attrs="{'invisible': [('type','=','template')]}">
- <field name="date" class="oe_inline"/>
- </div>
+ <field name="code"/>
+ <field name="tag_ids" widget="many2many_tags"/>
+ <field name="company_id"/>
+ <field name="currency_id"/>
</group>
</group>
<notebook>
</notebook>
- <separator string="Terms and Conditions" name="description" attrs="{'invisible': [('type','in',['view','normal'])]}"/>
- <field name="description" attrs="{'invisible': [('type','in',['view','normal'])]}"/>
</sheet>
<div class="oe_chatter">
<field name="message_follower_ids" widget="mail_followers"/>
@@ -50,25 +83,21 @@
</form>
</field>
</record>
-
+
<record id="view_account_analytic_account_list" model="ir.ui.view">
<field name="name">account.analytic.account.list</field>
<field name="model">account.analytic.account</field>
<field eval="8" name="priority"/>
<field name="arch" type="xml">
- <tree toolbar="1" decoration-danger="state=='pending'" decoration-muted="state in ('cancelled','close')" decoration-info="type=='view'" string="Analytic Accounts">
- <field name="complete_name"/>
- <field name="partner_id"/>
+ <tree string="Analytic Accounts">
+ <field name="display_name"/>
<field name="code"/>
- <field name="date_start"/>
- <field name="date"/>
- <field name="user_id" invisible="1"/>
- <field name="manager_id"/>
- <field name="parent_id" invisible="1"/>
- <field name="state" invisible="1"/>
- <field name="type" invisible="1"/>
- <field name="template_id" invisible="1"/>
+ <field name="partner_id"/>
+ <field name="account_type" invisible="1"/>
<field name="company_id" groups="base.group_multi_company"/>
+ <field name="debit"/>
+ <field name="credit"/>
+ <field name="balance"/>
</tree>
</field>
</record>
@@ -79,92 +108,36 @@
<field name="arch" type="xml">
<search string="Analytic Account">
<field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Analytic Account"/>
- <field name="date"/>
- <field name="partner_id" operator="child_of"/>
- <field name="manager_id"/>
- <field name="parent_id"/>
- <field name="user_id"/>
- <filter string="Open" domain="[('state','=','open')]" help="Current Accounts"/>
- <filter string="Pending" domain="[('state','=','pending')]" help="Pending Accounts"/>
+ <field name="tag_ids"/>
+ <field name="partner_id"/>
<group expand="0" string="Group By...">
<filter string="Associated Partner" domain="[]" context="{'group_by':'partner_id'}"/>
- <filter string="Type" domain="[]" context="{'group_by':'type'}"/>
- <filter string="Template" domain="[]" context="{'group_by':'template_id'}"/>
- <filter string="Parent Account" domain="[]" context="{'group_by':'parent_id'}"/>
- <filter string="Status" domain="[]" context="{'group_by':'state'}" groups="base.group_no_one"/>
</group>
</search>
</field>
</record>
- <record id="view_account_analytic_account_tree" model="ir.ui.view">
- <field name="name">account.analytic.account.tree</field>
- <field name="model">account.analytic.account</field>
- <field name="field_parent">child_complete_ids</field>
- <field name="arch" type="xml">
- <tree decoration-info="state=='pending' or type=='view'" decoration-muted="state in ('close','cancelled')" string="Analytic account" toolbar="1">
- <field name="name" invisible="1"/>
- <field name="complete_name"/>
- <field name="code"/>
- <field name="debit" widget="monetary"/>
- <field name="credit" widget="monetary"/>
- <field name="balance" widget="monetary"/>
- <field name="state" invisible="1"/>
- <field name="currency_id" groups="base.group_multi_currency"/>
- <field name="date" invisible="1"/>
- <field name="user_id" invisible="1"/>
- <field name="partner_id" invisible="1"/>
- <field name="parent_id" invisible="1"/>
- <field name="type"/>
- <field name="company_id" groups="base.group_multi_company"/>
- <field name="template_id" invisible="1"/>
- </tree>
- </field>
- </record>
-
-
- <record id="action_account_analytic_account_form" model="ir.actions.act_window">
- <field name="name">Analytic Accounts</field>
- <field name="type">ir.actions.act_window</field>
+ <record id="action_analytic_account_form" model="ir.actions.act_window">
+ <field name="name">Chart of Analytic Accounts</field>
<field name="res_model">account.analytic.account</field>
- <field name="context">{}</field> <!-- repair invalid context by setting empty one -->
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
- <field name="view_id" ref="view_account_analytic_account_tree"/>
- <field name="search_view_id" ref="analytic.view_account_analytic_account_search"/>
+ <field name="search_view_id" ref="view_account_analytic_account_search"/>
+ <field name="view_id" ref="view_account_analytic_account_list"/>
+ <field name="help" type="html">
+ <p class="oe_view_nocontent_create">
+ Click to add an analytic account.
+ </p>
+ </field>
</record>
- <record id="act_account_renew_view" model="ir.actions.act_window">
- <field name="name">Accounts to Renew</field>
+ <record id="action_account_analytic_account_form" model="ir.actions.act_window">
+ <field name="name">Analytic Accounts</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">account.analytic.account</field>
+ <field name="context">{}</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
- <field name="domain">[('date','<',time.strftime('%Y-%m-%d %H:%M:%S'))]</field>
- <field name="filter" eval="True"/>
- </record>
-
- <record id="action_account_analytic_account_tree2" model="ir.actions.act_window">
- <field name="name">Chart of Analytic Accounts</field>
- <field name="res_model">account.analytic.account</field>
- <field name="view_type">tree</field>
- <field name="view_id" ref="view_account_analytic_account_tree"/>
- <field name="domain">[('parent_id','=',False)]</field>
- <field name="help" type="html">
- <p>
- Click to add a new analytic account.
- </p><p>
- The normal chart of accounts has a structure defined by the
- legal requirement of the country. The analytic chart of
- accounts structure should reflect your own business needs in
- term of costs/revenues reporting.
- </p><p>
- They are usually structured by contracts, projects, products or
- departements. Most of the Odoo operations (invoices,
- timesheets, expenses, etc) generate analytic entries on the
- related account.
- </p>
- </field>
</record>
@@ -173,200 +146,63 @@
<field name="model">account.analytic.line</field>
<field name="priority">1</field>
<field name="arch" type="xml">
- <form string="Analytic Entry" version="7.0">
- <group>
+ <form string="Analytic Entry">
+ <sheet string="Analytic Entry">
<group>
- <field name="name"/>
- <field name="account_id"/>
- <field name="user_id" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'account.group_account_invoice']}"/>
- </group>
- <group>
- <field name="date"/>
- <field name="company_id" groups="base.group_multi_company"/>
- </group>
- <group string="Amount">
- <field name="amount" widget="monetary"/>
- </group>
- <group string="Product Information" name="product_info">
- <label for="unit_amount"/>
- <div>
- <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" class="oe_inline"/>
- </div>
+ <group>
+ <field name="name"/>
+ <field name="account_id"/>
+ <field name="date"/>
+ <field name="company_id" groups="base.group_multi_company"/>
+ </group>
+ <group string="Amount">
+ <field name="amount"/>
+ <field name="unit_amount"/>
+ <field name="currency_id" invisible="1"/>
+ </group>
</group>
- </group>
+ </sheet>
</form>
</field>
</record>
- <record id="view_account_analytic_line_tree" model="ir.ui.view">
- <field name="name">account.analytic.line.tree</field>
- <field name="model">account.analytic.line</field>
- <field name="arch" type="xml">
- <tree string="Analytic Entries">
- <field name="date"/>
- <field name="name"/>
- <field name="user_id" invisible="1"/>
- <field name="amount" sum="Total" invisible="context.get('to_invoice', False)" widget="monetary"/>
- <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" sum="Total Quantity"/>
- <field domain="[('type','=','normal')]" name="account_id"/>
- <field name="company_id" groups="base.group_multi_company"/>
- </tree>
- </field>
- </record>
<record id="view_account_analytic_line_filter" model="ir.ui.view">
<field name="name">account.analytic.line.select</field>
<field name="model">account.analytic.line</field>
<field name="arch" type="xml">
<search string="Search Analytic Lines">
- <field name="name" string="Description"/>
+ <field name="name"/>
<field name="date"/>
- <filter string="My Entries" domain="[('user_id','=',uid)]"/>
- <field name="account_id" filter_domain="[('account_id','child_of',self)]"/>
- <field name="user_id"/>
- <group string="Group By..." expand="0">
+ <field name="account_id"/>
+ <field name="tag_ids" widget="many2many_tags"/>
+ <group string="Group By..." expand="0" name="groupby">
<filter string="Analytic Account" context="{'group_by':'account_id'}" name="account_id"/>
- <filter string="User" context="{'group_by':'user_id'}" name="user_id"/>
- <filter string="Tasks Month" context="{'group_by':'date'}" name="group_date" help="Invoice Tasks by Month"/>
+ <filter string="Tasks Month" context="{'group_by':'date'}" name="group_date"/>
</group>
</search>
</field>
</record>
- <record id="view_account_analytic_line_pivot" model="ir.ui.view">
- <field name="name">account.analytic.line.pivot</field>
+ <record id="view_account_analytic_line_graph" model="ir.ui.view">
+ <field name="name">account.analytic.line.graph</field>
<field name="model">account.analytic.line</field>
<field name="arch" type="xml">
- <pivot string="Analytic Entries" >
+ <graph string="Analytic Entries">
<field name="account_id" type="row"/>
- <field name="amount" type="measure"/>
<field name="unit_amount" type="measure"/>
- </pivot>
+ <field name="amount" type="measure"/>
+ </graph>
</field>
- </record>
-
- <record id="action_account_analytic_line_form" model="ir.actions.act_window">
- <field name="name">Analytic Entries</field>
- <field name="type">ir.actions.act_window</field>
- <field name="res_model">account.analytic.line</field>
- <field name="view_type">form</field>
- <field name="context">{"search_default_user_id":uid}</field>
- <field name="view_id" ref="view_account_analytic_line_tree"/>
</record>
-
- <!-- Entries by Line -->
-
- <record id="action_account_tree1" model="ir.actions.act_window">
- <field name="name">Analytic Items</field>
- <field name="res_model">account.analytic.line</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,form</field>
- <field name="domain">[('account_id','child_of',[active_id])]</field>
- <field name="context">{'account_id':active_id}</field>
- <field name="search_view_id" ref="view_account_analytic_line_filter"/>
- </record>
- <record id="ir_open_account_analytic_account" model="ir.values">
- <field eval="'tree_but_open'" name="key2"/>
- <field eval="'account.analytic.account'" name="model"/>
- <field name="name">Open Account Tree</field>
- <field eval="'ir.actions.act_window,%d'%action_account_tree1" name="value"/>
- </record>
-
- <record id="account_analytic_line_extended_form" model="ir.ui.view">
- <field name="name">account.analytic.line.extended_form</field>
+ <record id="view_account_analytic_line_pivot" model="ir.ui.view">
+ <field name="name">account.analytic.line.pivot</field>
<field name="model">account.analytic.line</field>
<field name="arch" type="xml">
- <form string="Project line" version="7.0">
- <group>
- <group>
- <field name="name"/>
- <field name="account_id"/>
- </group>
- <group>
- <field name="date" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
- <field name="company_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
- </group>
- <group string="Amount">
- <field name="amount" widget="monetary"/>
- </group>
- <group string="Product Information">
- <label for="unit_amount"/>
- <div>
- <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" class="oe_inline"/>
- </div>
- </group>
- </group>
- </form>
- </field>
- </record>
- <record id="action_account_analytic_account_line_extended_form" model="ir.actions.act_window">
- <field name="name">account.analytic.line.extended</field>
- <field name="type">ir.actions.act_window</field>
- <field name="res_model">account.analytic.line</field>
- <field name="view_type">form</field>
- <field name="view_id" ref="view_account_analytic_line_form"/>
- </record>
-
- #
- # Analytic Journal
- #
-
- <record id="view_account_analytic_journal_tree" model="ir.ui.view">
- <field name="name">account.analytic.journal.tree</field>
- <field name="model">account.analytic.journal</field>
- <field name="arch" type="xml">
- <tree string="Analytic Journal">
- <field name="code"/>
- <field name="name"/>
- <field name="type"/>
- </tree>
- </field>
- </record>
-
- <record id="view_analytic_journal_search" model="ir.ui.view">
- <field name="name">account.analytic.journal.search</field>
- <field name="model">account.analytic.journal</field>
- <field name="arch" type="xml">
- <search string="Analytic Journals">
- <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Analytic Journal"/>
- <field name="type"/>
- <group expand="0" string="Group By...">
- <filter string="Type" domain="[]" context="{'group_by':'type'}"/>
- </group>
- </search>
- </field>
- </record>
-
- <record id="view_account_analytic_journal_form" model="ir.ui.view">
- <field name="name">account.analytic.journal.form</field>
- <field name="model">account.analytic.journal</field>
- <field name="arch" type="xml">
- <form string="Analytic Journal" version="7.0">
- <group col="4">
- <field name="name"/>
- <field name="code"/>
- <field name="type"/>
- <field name="active"/>
- <field name="company_id" groups="base.group_multi_company"/>
- </group>
- </form>
+ <pivot string="Analytic Entries" >
+ <field name="account_id" type="row"/>
+ <field name="unit_amount" type="measure"/>
+ <field name="amount" type="measure"/>
+ </pivot>
</field>
</record>
- <record id="action_account_analytic_journal_form" model="ir.actions.act_window">
- <field name="name">Analytic Journals</field>
- <field name="res_model">account.analytic.journal</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,form</field>
- <field name="search_view_id" ref="view_analytic_journal_search" />
- </record>
-
- #
- # Open journal entries
- #
-
- <record id="action_account_analytic_journal_open_form" model="ir.actions.act_window">
- <field name="name">Analytic Entries</field>
- <field name="res_model">account.analytic.line</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,form,pivot</field>
- </record>
</data>
</openerp>
diff --git a/addons/analytic/views/report_analyticbalance.xml b/addons/analytic/views/report_analyticbalance.xml
deleted file mode 100644
index 09cd56fc83ff3c0c93c3fe3d653e46436f168588..0000000000000000000000000000000000000000
--- a/addons/analytic/views/report_analyticbalance.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data>
-<template id="report_analyticbalance">
- <t t-call="report.html_container">
- <t t-call="report.internal_layout">
- <div class="page">
- <h2>Analytic Balance - <span t-esc="res_company.currency_id.name"/></h2>
-
- <table class="table table-condensed">
- <thead>
- <tr>
- <th>Code</th>
- <th>Account Name</th>
- <th>Debit</th>
- <th>Credit</th>
- <th>Balance</th>
- <th>Quantity</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td colspan="2">Total</td>
- <td>
- <span t-esc="formatLang(sum_all(get_objects(data['form']['empty_acc']), data['form']['date1'], data['form']['date2'], 'debit'))"/>
- </td>
- <td>
- <span t-esc="formatLang(sum_all(get_objects(data['form']['empty_acc']), data['form']['date1'], data['form']['date2'], 'credit'))"/>
- </td>
- <td>
- <span t-esc="formatLang(sum_balance(get_objects(data['form']['empty_acc']), data['form']['date1'], data['form']['date2']),currency_obj=res_company.currency_id)"/>
- </td>
- <td>
- <span t-esc="formatLang(sum_all(get_objects(data['form']['empty_acc']), data['form']['date1'], data['form']['date2'], 'quantity'))"/>
- </td>
- </tr>
- <t t-foreach="get_objects(data['form']['empty_acc'])" t-as="o">
- <tr>
- <td><span t-esc="o['code']"/></td>
- <td><span t-esc="o['complete_name']"/></td>
- <td><span t-esc="formatLang(move_sum(o['id'], data['form']['date1'], data['form']['date2'], 'debit'))"/></td>
- <td><span t-esc="formatLang(move_sum(o['id'], data['form']['date1'], data['form']['date2'], 'credit'))"/></td>
- <td><span t-esc="formatLang(move_sum_balance(o['id'], data['form']['date1'], data['form']['date2']), currency_obj=res_company.currency_id)"/></td>
- <td><span t-esc="formatLang(move_sum(o['id'], data['form']['date1'], data['form']['date2'], 'quantity'))"/></td>
- </tr>
- <tr t-foreach="lines_g(o['id'], data['form']['date1'], data['form']['date2'])" t-as="move_g">
- <td><span t-esc="move_g['code']"/></td>
- <td><span t-esc="move_g['name']"/></td>
- <td><span t-esc="formatLang(move_g['debit'])"/></td>
- <td><span t-esc="formatLang(move_g['credit'])"/></td>
- <td><span t-esc="formatLang(move_g['balance'], currency_obj=res_company.currency_id)"/></td>
- <td><span t-esc="formatLang(move_g['quantity'])"/></td>
- </tr>
- </t>
- </tbody>
- </table>
- </div>
- </t>
- </t>
-</template>
-</data>
-</openerp>
diff --git a/addons/analytic/views/report_analyticcostledger.xml b/addons/analytic/views/report_analyticcostledger.xml
deleted file mode 100644
index cda37d4158feca5a7dfa35c82179d90af0577fba..0000000000000000000000000000000000000000
--- a/addons/analytic/views/report_analyticcostledger.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data>
-<template id="report_analyticcostledger">
- <t t-call="report.html_container">
- <t t-call="report.internal_layout">
- <div class="page">
- <h2>Cost Ledger</h2>
-
- <div class="row mt32 mb32">
- <div class="col-xs-3">
- <strong>Period From:</strong>
- <p t-esc="formatLang(data['form']['date1'], date=True)"/>
- </div>
- <div class="col-xs-3">
- <strong>Period To:</strong>
- <p t-esc="formatLang(data['form']['date2'], date=True)"/>
- </div>
- <div class="col-xs-3">
- <strong>Printing Date:</strong>
- <p t-esc="formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time=True)" />
- </div>
- </div>
-
- <table class="table table-condensed">
- <thead>
- <tr>
- <th>Date/Code</th>
- <th>J.C. /Move</th>
- <th>Name</th>
- <th>Debit</th>
- <th>Credit</th>
- <th>Balance</th>
- </tr>
- </thead>
- <tbody>
- <tr style="font-weight: bold;">
- <td>Total:</td>
- <td></td>
- <td></td>
- <td><span t-esc="formatLang(sum_debit(docs, data['form']['date1'], data['form']['date2']))"/></td>
- <td><span t-esc="formatLang(sum_credit(docs,data['form']['date1'],data['form']['date2']))"/></td>
- <td>
- <span t-esc="formatLang(sum_debit(docs, data['form']['date1'], data['form']['date2']) - sum_credit(docs, data['form']['date1'], data['form']['date2']), currency_obj=res_company.currency_id)"/>
- </td>
- </tr>
-
- <t t-foreach="docs" t-as="account">
- <tr style="font-weight: bold;">
- <td><span t-esc="account.code"/></td>
- <td></td>
- <td><span t-esc="account.complete_name"/></td>
- <td><span t-esc="formatLang(sum_debit([account], data['form']['date1'], data['form']['date2']))"/></td>
- <td><span t-esc="formatLang(sum_credit([account], data['form']['date1'], data['form']['date2']))"/></td>
- <td><span t-esc="formatLang(sum_debit([account], data['form']['date1'], data['form']['date2']) - sum_credit([account], data['form']['date1'], data['form']['date2']), currency_obj=res_company.currency_id)"/></td>
- </tr>
-
- <t t-foreach="lines_g(account, data['form']['date1'], data['form']['date2'])" t-as="move_g">
- <tr>
- <td><span t-esc="move_g['code']"/></td>
- <td></td>
- <td><span t-esc="move_g['name']"/></td>
- <td><span t-esc="move_g['debit']"/></td>
- <td><span t-esc="move_g['credit']"/></td>
- <td>
- <span t-esc="formatLang(move_g['balance'], currency_obj=res_company.currency_id)"/>
- </td>
- </tr>
- <tr t-foreach="lines_a(move_g, account, data['form']['date1'], data['form']['date2'])" t-as="move_a">
- <td>
- <t t-esc="formatLang(move_a['date'], date=True)"></t>
- </td>
- <td><span t-esc="move_a['cj']"/></td>
- <td><span t-esc="move_a['name']"/></td>
- <td><span t-esc="move_a['debit']"/></td>
- <td><span t-esc="move_a['credit']"/></td>
- <td>
- <span t-esc="formatLang(move_a['balance'], currency_obj=res_company.currency_id)"/>
- </td>
- </tr>
- </t>
- </t>
- </tbody>
- </table>
- </div>
- </t>
- </t>
-</template>
-</data>
-</openerp>
\ No newline at end of file
diff --git a/addons/analytic/views/report_analyticcostledgerquantity.xml b/addons/analytic/views/report_analyticcostledgerquantity.xml
deleted file mode 100644
index de49d4972e5fb3b76ec87e9e824abe1f008b0362..0000000000000000000000000000000000000000
--- a/addons/analytic/views/report_analyticcostledgerquantity.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data>
-<template id="report_analyticcostledgerquantity">
- <t t-call="report.html_container">
- <t t-call="report.internal_layout">
- <div class="page">
- <h2>Cost Ledger</h2>
-
- <div class="row mt32 mb32">
- <div class="col-xs-3">
- <strong>Period From:</strong>
- <p t-esc="formatLang(data['form']['date1'], date=True)"/>
- </div>
- <div class="col-xs-3">
- <strong>Period To:</strong>
- <p t-esc="formatLang(data['form']['date2'], date=True)"/>
- </div>
- <div class="col-xs-3">
- <strong>Printing Date:</strong>
- <p t-esc="formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time=True)" />
- </div>
- </div>
-
- <table class="table table-condensed">
- <thead>
- <tr>
- <th>Date/Code</th>
- <th>J.C./Move</th>
- <th>Name</th>
- <th>Quantity</th>
- <th>Total</th>
- </tr>
- </thead>
- <tbody>
- <tr style="font-weight:bold;">
- <td>Total:</td>
- <td></td>
- <td></td>
- <td></td>
- <td>
- <span t-esc="sum_quantity(docs, data['form']['date1'], data['form']['date2'], data['form']['journal'])"/>
- </td>
- </tr>
-
- <t t-foreach="docs" t-as="account">
- <tr style="font-weight:bold;">
- <td><span t-esc="account.code"/></td>
- <td><span t-esc="account.complete_name"/></td>
- <td></td>
- <td>
- <p t-if="account.quantity_max">
- Max quantity : <span t-esc="formatLang(account.quantity_max)"/>
- </p>
- </td>
- <td>
- <span t-esc="account_sum_quantity(account.id, data['form']['date1'], data['form']['date2'], data['form']['journal'])"/>
- </td>
- </tr>
-
- <t t-foreach="lines_g(account.id, data['form']['date1'], data['form']['date2'], data['form']['journal'])" t-as="move_g">
- <tr style="font-weight:bold;">
- <td><span t-esc="move_g['code']"/></td>
- <td colspan="2"><span t-esc="move_g['name']"/></td>
- <td></td>
- <td class="text-right"><span t-esc="move_g['quantity']"/></td>
- </tr>
-
- <t t-foreach="lines_a(move_g['id'], account.id, data['form']['date1'], data['form']['date2'], data['form']['journal'])" t-as="move_a">
- <tr style="font-weight:normal;">
- <td><span t-esc="formatLang(move_a['date'], date=True)"/></td>
- <td><span t-esc="move_a['cj']"/></td>
- <td><span t-esc="move_a['name']"/></td>
- <td></td>
- <td class="text-right"><span t-esc="move_a['quantity']"/></td>
- </tr>
- </t>
- </t>
- </t>
- </tbody>
- </table>
- </div>
- </t>
- </t>
-</template>
-</data>
-</openerp>
\ No newline at end of file
diff --git a/addons/analytic/views/report_analyticjournal.xml b/addons/analytic/views/report_analyticjournal.xml
deleted file mode 100644
index 1b3a4fda97c0f7fffee063889c451c7478924f6d..0000000000000000000000000000000000000000
--- a/addons/analytic/views/report_analyticjournal.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data>
-<template id="report_analyticjournal">
- <t t-call="report.html_container">
- <t t-foreach="docs" t-as="o">
- <t t-call="report.internal_layout">
- <div class="page">
- <h2>Analytic Journal</h2>
-
- <div class="row mt32 mb32">
- <div class="col-xs-3">
- <strong>Period From:</strong>
- <p t-esc="formatLang(data['form']['date1'], date=True)"/>
- </div>
- <div class="col-xs-3">
- <strong>Period To:</strong>
- <p t-esc="formatLang(data['form']['date2'], date=True)"/>
- </div>
- <div class="col-xs-3">
- <strong>Currency:</strong>
- <p t-field="res_company.currency_id" />
- </div>
- </div>
-
- <table class="table table-condensed">
- <thead>
- <tr>
- <th>Date</th>
- <th>Code</th>
- <th>Move Name</th>
- <th>Account n°</th>
- <th>General</th>
- <th>Analytic</th>
- </tr>
- <tr>
- <th colspan="4"><t t-if="o.code"><span t-esc="o.code"/></t> - <span t-esc="o.name"/></th>
- <th><span t-esc="formatLang(sum_general(o.id, data['form']['date1'], data['form']['date2']))"/></th>
- <th><span t-esc="formatLang(sum_analytic(o.id, data['form']['date1'], data['form']['date2']))"/></th>
- </tr>
- </thead>
- <tbody>
- <t t-foreach="lines(o.id, data['form']['date1'], data['form']['date2'])" t-as="move">
- <tr>
- <td></td>
- <td></td>
- <td>
- <span t-esc="move.name"/>
- </td>
- <td>
- <span t-esc="move.account_id.code"/>
- <span t-esc="move.account_id.name"/>
- </td>
- <td>
- <span t-esc="formatLang(move.debit-move.credit)"/>
- </td>
- <td></td>
- </tr>
- <tr t-foreach="lines_a(move.id, o.id, data['form']['date1'], data['form']['date2'])" t-as="move_a">
- <td>
- <span t-esc="formatLang(move_a.date,date = True)"/>
- </td>
- <td>
- <p t-if="move_a.code"><span t-esc="move_a.code"/></p>
- </td>
- <td>
- <span t-esc="move_a.name"/>
- </td>
- <td><span t-esc="move_a.account_id.code"/> - <span t-esc="move_a.account_id.name"/></td>
- <td></td>
- <td><span t-esc="formatLang(move_a.amount)"/></td>
- </tr>
- </t>
- <tr t-foreach="lines_a(False, o.id, data['form']['date1'], data['form']['date2'])" t-as="move_a">
- <td><span t-esc="formatLang(move_a.date,date = True)"/></td>
- <td><p t-if="move_a.code"><span t-esc="move_a.code"/></p></td>
- <td><span t-esc="move_a.name"/></td>
- <td><span t-esc="move_a.account_id.code"/> - <span t-esc="move_a.account_id.name"/></td>
- <td></td>
- <td><span t-esc="formatLang(move_a.amount)"/></td>
- </tr>
- </tbody>
- </table>
- </div>
- </t>
- </t>
- </t>
-</template>
-</data>
-</openerp>
diff --git a/addons/analytic/views/report_invertedanalyticbalance.xml b/addons/analytic/views/report_invertedanalyticbalance.xml
deleted file mode 100644
index e545ec8525b8fe5ddee7dc53c03d9560207d66c3..0000000000000000000000000000000000000000
--- a/addons/analytic/views/report_invertedanalyticbalance.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data>
-<template id="report_invertedanalyticbalance">
- <t t-call="report.html_container">
- <t t-call="report.internal_layout">
- <div class="page">
- <h2>Inverted Analytic Balance - <span t-esc="res_company.currency_id.name"/></h2>
-
- <table class="table table-condensed">
- <thead>
- <tr>
- <th>Code</th>
- <th>Account Name</th>
- <th>Debit</th>
- <th>Credit</th>
- <th>Balance</th>
- <th>Quantity</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td><strong>Total</strong></td>
- <td></td>
- <td><strong t-esc="formatLang(sum_debit(docs, data['form']['date1'], data['form']['date2']))"/></td>
- <td><strong t-esc="formatLang(sum_credit(docs, data['form']['date1'], data['form']['date2']))"/></td>
- <td>
- <strong t-esc="formatLang(sum_balance(docs, data['form']['date1'], data['form']['date2']), currency_obj=res_company.currency_id)"/>
- </td>
- <td><strong><span t-esc="formatLang(sum_quantity(docs, data['form']['date1'], data['form']['date2']))"/></strong></td>
- </tr>
- <t t-foreach="lines_g(docs, data['form']['date1'], data['form']['date2'])" t-as="move_g">
- <tr>
- <td>
- <strong t-esc="move_g['code']"/>
- </td>
- <td>
- <strong t-esc="move_g['name']"/>
- </td>
- <td class="text-right">
- <strong>
- <span t-esc="formatLang(move_g['debit'])"/>
- </strong>
- </td>
- <td class="text-right">
- <strong>
- <span t-esc="formatLang(move_g['credit'])"/>
- </strong>
- </td>
- <td class="text-right">
- <strong>
- <span t-esc="formatLang(move_g['balance'], currency_obj = res_company.currency_id)"/>
- </strong>
- </td>
- <td class="text-right">
- <strong>
- <span t-esc="formatLang(move_g['quantity'])"/>
- </strong>
- </td>
- </tr>
- <t t-foreach="lines_a(docs, move_g['id'], data['form']['date1'], data['form']['date2'])" t-as="move_a">
- <tr>
- <td>
- <span t-esc="move_a['code']"/>
- </td>
- <td>
- <span t-esc="move_a['complete_name']"/>
- </td>
- <td class="text-right">
- <span t-esc="formatLang(move_a['debit'])"/>
- </td>
- <td class="text-right">
- <span t-esc="formatLang(move_a['credit'])"/>
- </td>
- <td class="text-right">
- <span t-esc="formatLang(move_a['balance'], currency_obj = res_company.currency_id)"/>
- </td>
- <td class="text-right">
- <span t-esc="formatLang(move_a['quantity'])"/>
- </td>
- </tr>
- </t>
- </t>
- </tbody>
- </table>
- </div>
- </t>
- </t>
-</template>
-</data>
-</openerp>
diff --git a/addons/analytic/wizard/__init__.py b/addons/analytic/wizard/__init__.py
index 0059884cabfdb22aeeeb90f3a1d7796b52d1c2ce..2722b9f10a1bad31f7437bf8d61f0586872ae58b 100644
--- a/addons/analytic/wizard/__init__.py
+++ b/addons/analytic/wizard/__init__.py
@@ -1,8 +1,4 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.
-import account_analytic_balance_report
-import account_analytic_inverted_balance_report
-import account_analytic_cost_ledger_report
-import account_analytic_cost_ledger_for_journal_report
import account_analytic_chart
diff --git a/addons/analytic/wizard/account_analytic_balance_report.py b/addons/analytic/wizard/account_analytic_balance_report.py
deleted file mode 100644
index 283620ddc8117168eb82d0850e77fdb2833612c4..0000000000000000000000000000000000000000
--- a/addons/analytic/wizard/account_analytic_balance_report.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-import time
-from openerp.osv import fields, osv
-
-
-class account_analytic_balance(osv.osv_memory):
- _name = 'account.analytic.balance'
- _description = 'Account Analytic Balance'
-
- _columns = {
- 'date1': fields.date('Start of period', required=True),
- 'date2': fields.date('End of period', required=True),
- 'empty_acc': fields.boolean('Empty Accounts ? ', help='Check if you want to display Accounts with 0 balance too.'),
- }
-
- _defaults = {
- 'date1': lambda *a: time.strftime('%Y-01-01'),
- 'date2': lambda *a: time.strftime('%Y-%m-%d')
- }
-
- def check_report(self, cr, uid, ids, context=None):
- if context is None:
- context = {}
- data = self.read(cr, uid, ids)[0]
- datas = {
- 'ids': context.get('active_ids', []),
- 'model': 'account.analytic.account',
- 'form': data
- }
-
- datas['form']['active_ids'] = context.get('active_ids', False)
-
- return self.pool['report'].get_action(cr, uid, [], 'account.report_analyticbalance', data=datas, context=context)
diff --git a/addons/analytic/wizard/account_analytic_balance_report_view.xml b/addons/analytic/wizard/account_analytic_balance_report_view.xml
deleted file mode 100644
index 90fc65ced42f5e5be204ae495cfba31a46c04f3e..0000000000000000000000000000000000000000
--- a/addons/analytic/wizard/account_analytic_balance_report_view.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
- <data>
-
- <record id="account_analytic_balance_view" model="ir.ui.view">
- <field name="name">Account Analytic Balance</field>
- <field name="model">account.analytic.balance</field>
- <field name="arch" type="xml">
- <form string="Select Period">
- <header>
- <button name="check_report" string="Print" type="object" class="btn-primary"/>
- <button string="Cancel" class="btn-default" special="cancel"/>
- </header>
- <group col="4">
- <field name="date1"/>
- <field name="date2"/>
- <newline/>
- <field name="empty_acc"/>
- </group>
- </form>
- </field>
- </record>
-
- <record id="action_account_analytic_balance" model="ir.actions.act_window">
- <field name="name">Analytic Balance</field>
- <field name="type">ir.actions.act_window</field>
- <field name="res_model">account.analytic.balance</field>
- <field name="view_type">form</field>
- <field name="view_mode">form</field>
- <field name="view_id" ref="account_analytic_balance_view"/>
- <field name="target">new</field>
- </record>
-
- <record model="ir.values" id="account_analytic_balance_values">
- <field name="model_id" ref="analytic.model_account_analytic_account" />
- <field name="name">Account Analytic Balance</field>
- <field name="key2">client_print_multi</field>
- <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_analytic_balance'))" />
- <field name="key">action</field>
- <field name="model">account.analytic.account</field>
- </record>
-
- </data>
-</openerp>
-
diff --git a/addons/analytic/wizard/account_analytic_chart.py b/addons/analytic/wizard/account_analytic_chart.py
index b8ce27739975af6719b94d2e86ea94e4767bf3c0..acee07822d0d97613fb0077251541744cce5dae5 100644
--- a/addons/analytic/wizard/account_analytic_chart.py
+++ b/addons/analytic/wizard/account_analytic_chart.py
@@ -17,7 +17,7 @@ class account_analytic_chart(osv.osv_memory):
result_context = {}
if context is None:
context = {}
- result = mod_obj.get_object_reference(cr, uid, 'analytic', 'action_account_analytic_account_tree2')
+ result = mod_obj.get_object_reference(cr, uid, 'analytic', 'action_analytic_account_form')
id = result and result[1] or False
result = act_obj.read(cr, uid, [id], context=context)[0]
data = self.read(cr, uid, ids, [])[0]
diff --git a/addons/analytic/wizard/account_analytic_cost_ledger_for_journal_report.py b/addons/analytic/wizard/account_analytic_cost_ledger_for_journal_report.py
deleted file mode 100644
index 4fa4fff9f08173ed773f05da10bee97aa7c59152..0000000000000000000000000000000000000000
--- a/addons/analytic/wizard/account_analytic_cost_ledger_for_journal_report.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-import time
-from openerp.osv import fields, osv
-
-
-class account_analytic_cost_ledger_journal_report(osv.osv_memory):
- _name = 'account.analytic.cost.ledger.journal.report'
- _description = 'Account Analytic Cost Ledger For Journal Report'
-
- _columns = {
- 'date1': fields.date('Start of period', required=True),
- 'date2': fields.date('End of period', required=True),
- 'journal': fields.many2many('account.analytic.journal', 'ledger_journal_rel', 'ledger_id', 'journal_id', 'Journals'),
- }
-
- _defaults = {
- 'date1': lambda *a: time.strftime('%Y-01-01'),
- 'date2': lambda *a: time.strftime('%Y-%m-%d')
- }
-
- def check_report(self, cr, uid, ids, context=None):
- if context is None:
- context = {}
- data = self.read(cr, uid, ids)[0]
- datas = {
- 'ids': context.get('active_ids', []),
- 'model': 'account.analytic.account',
- 'form': data
- }
-
- datas['form']['active_ids'] = context.get('active_ids', False)
- return self.pool['report'].get_action(cr, uid, [], 'account.report_analyticcostledgerquantity', data=datas, context=context)
diff --git a/addons/analytic/wizard/account_analytic_cost_ledger_for_journal_report_view.xml b/addons/analytic/wizard/account_analytic_cost_ledger_for_journal_report_view.xml
deleted file mode 100644
index efa7339646ebeeae71565b7649ac2544ba60b187..0000000000000000000000000000000000000000
--- a/addons/analytic/wizard/account_analytic_cost_ledger_for_journal_report_view.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
- <data>
-
- <record id="account_analytic_cost_ledger_journal_view" model="ir.ui.view">
- <field name="name">Account Analytic Cost Ledger Journal</field>
- <field name="model">account.analytic.cost.ledger.journal.report</field>
- <field name="arch" type="xml">
- <form string="Select period">
- <header>
- <button name="check_report" string="Print" type="object" class="btn-primary"/>
- <button string="Cancel" class="btn-default" special="cancel"/>
- </header>
- <group string="Cost Ledger for Period" col="4">
- <field name="date1"/>
- <field name="date2"/>
- <field name="journal" colspan="4"/>
- </group>
- </form>
- </field>
- </record>
-
- <record id="action_account_analytic_cost_ledger_journal" model="ir.actions.act_window">
- <field name="name">Cost Ledger (Only quantities)</field>
- <field name="type">ir.actions.act_window</field>
- <field name="res_model">account.analytic.cost.ledger.journal.report</field>
- <field name="view_type">form</field>
- <field name="view_mode">form</field>
- <field name="view_id" ref="account_analytic_cost_ledger_journal_view"/>
- <field name="target">new</field>
- </record>
-
- <record model="ir.values" id="account_analytic_cost_ledger_journal_values">
- <field name="model_id" ref="analytic.model_account_analytic_account" />
- <field name="name">Account Analytic Cost Ledger Journal</field>
- <field name="key2">client_print_multi</field>
- <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_analytic_cost_ledger_journal'))" />
- <field name="key">action</field>
- <field name="model">account.analytic.account</field>
- </record>
-
- </data>
-</openerp>
diff --git a/addons/analytic/wizard/account_analytic_cost_ledger_report.py b/addons/analytic/wizard/account_analytic_cost_ledger_report.py
deleted file mode 100644
index 705ac22f0d58d796ddee093f96942a2a6cfccb40..0000000000000000000000000000000000000000
--- a/addons/analytic/wizard/account_analytic_cost_ledger_report.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-import time
-from openerp.osv import osv, fields
-
-
-class account_analytic_cost_ledger(osv.osv_memory):
- _name = 'account.analytic.cost.ledger'
- _description = 'Account Analytic Cost Ledger'
-
- _columns = {
- 'date1': fields.date('Start of period', required=True),
- 'date2': fields.date('End of period', required=True),
- }
-
- _defaults = {
- 'date1': lambda *a: time.strftime('%Y-01-01'),
- 'date2': lambda *a: time.strftime('%Y-%m-%d')
- }
-
- def check_report(self, cr, uid, ids, context=None):
- if context is None:
- context = {}
- data = self.read(cr, uid, ids)[0]
- datas = {
- 'ids': context.get('active_ids',[]),
- 'model': 'account.analytic.account',
- 'form': data
- }
-
- datas['form']['active_ids'] = context.get('active_ids', False)
-
- return self.pool['report'].get_action(cr, uid, [], 'account.report_analyticcostledger', data=datas, context=context)
diff --git a/addons/analytic/wizard/account_analytic_cost_ledger_view.xml b/addons/analytic/wizard/account_analytic_cost_ledger_view.xml
deleted file mode 100644
index 26b4d4bfd1607e226930e5a25d0c3645f479e8c9..0000000000000000000000000000000000000000
--- a/addons/analytic/wizard/account_analytic_cost_ledger_view.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
- <data>
-
- <record id="account_analytic_cost_view" model="ir.ui.view">
- <field name="name">Account Analytic Check</field>
- <field name="model">account.analytic.cost.ledger</field>
- <field name="arch" type="xml">
- <form string="Select Period">
- <header>
- <button name="check_report" string="Print" type="object" class="btn-primary"/>
- <button string="Cancel" class="btn-default" special="cancel"/>
- </header>
- <group col="4">
- <field name="date1"/>
- <field name="date2"/>
- </group>
- </form>
- </field>
- </record>
-
- <record id="action_account_analytic_cost" model="ir.actions.act_window">
- <field name="name">Cost Ledger</field>
- <field name="type">ir.actions.act_window</field>
- <field name="res_model">account.analytic.cost.ledger</field>
- <field name="view_type">form</field>
- <field name="view_mode">form</field>
- <field name="view_id" ref="account_analytic_cost_view"/>
- <field name="target">new</field>
- </record>
-
- <record model="ir.values" id="account_analytic_cost_values">
- <field name="model_id" ref="analytic.model_account_analytic_account" />
- <field name="name">Account Analytic Cost</field>
- <field name="key2">client_print_multi</field>
- <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_analytic_cost'))" />
- <field name="key">action</field>
- <field name="model">account.analytic.account</field>
- </record>
-
- </data>
-</openerp>
diff --git a/addons/analytic/wizard/account_analytic_inverted_balance_report.py b/addons/analytic/wizard/account_analytic_inverted_balance_report.py
deleted file mode 100644
index 4debee9ba9c389a0f1c095d1894ce2c2dc756939..0000000000000000000000000000000000000000
--- a/addons/analytic/wizard/account_analytic_inverted_balance_report.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-import time
-from openerp.osv import fields, osv
-
-
-class account_analytic_inverted_balance(osv.osv_memory):
- _name = 'account.analytic.inverted.balance'
- _description = 'Account Analytic Inverted Balance'
-
- _columns = {
- 'date1': fields.date('Start of period', required=True),
- 'date2': fields.date('End of period', required=True),
- }
-
- _defaults = {
- 'date1': lambda *a: time.strftime('%Y-01-01'),
- 'date2': lambda *a: time.strftime('%Y-%m-%d')
- }
-
- def check_report(self, cr, uid, ids, context=None):
- if context is None:
- context = {}
- data = self.read(cr, uid, ids)[0]
- datas = {
- 'ids': context.get('active_ids', []),
- 'model': 'account.analytic.account',
- 'form': data
- }
- datas['form']['active_ids'] = context.get('active_ids', False)
- return self.pool['report'].get_action(cr, uid, [], 'account.report_invertedanalyticbalance', data=datas, context=context)
diff --git a/addons/analytic/wizard/account_analytic_inverted_balance_report.xml b/addons/analytic/wizard/account_analytic_inverted_balance_report.xml
deleted file mode 100644
index a2d9408158ccf1b0d97f23031f687b8b32c4f5f3..0000000000000000000000000000000000000000
--- a/addons/analytic/wizard/account_analytic_inverted_balance_report.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
- <data>
-
- <record id="account_analytic_invert_balance_view" model="ir.ui.view">
- <field name="name">Account Analytic Inverted Balance</field>
- <field name="model">account.analytic.inverted.balance</field>
- <field name="arch" type="xml">
- <form string="Select Period">
- <header>
- <button name="check_report" string="Print" type="object" class="btn-primary"/>
- <button string="Cancel" class="btn-default" special="cancel"/>
- </header>
- <group col="4">
- <field name="date1"/>
- <field name="date2"/>
- </group>
- </form>
- </field>
- </record>
-
- <record id="action_account_analytic_invert_balance" model="ir.actions.act_window">
- <field name="name">Inverted Analytic Balance</field>
- <field name="type">ir.actions.act_window</field>
- <field name="res_model">account.analytic.inverted.balance</field>
- <field name="view_type">form</field>
- <field name="view_mode">form</field>
- <field name="view_id" ref="account_analytic_invert_balance_view"/>
- <field name="target">new</field>
- </record>
-
- <record model="ir.values" id="account_analytic_invert_balance_values">
- <field name="model_id" ref="analytic.model_account_analytic_account" />
- <field name="name">Account Analytic Inverted Balance</field>
- <field name="key2">client_print_multi</field>
- <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_analytic_invert_balance'))" />
- <field name="key">action</field>
- <field name="model">account.analytic.account</field>
- </record>
-
- </data>
-</openerp>