summaryrefslogtreecommitdiff
path: root/addons/analytic
diff options
context:
space:
mode:
Diffstat (limited to 'addons/analytic')
-rw-r--r--addons/analytic/__openerp__.py1
-rw-r--r--addons/analytic/analytic_report.xml10
-rw-r--r--addons/analytic/models/analytic.py8
-rw-r--r--addons/analytic/views/analytic_view.xml14
-rw-r--r--addons/analytic/wizard/__init__.py1
-rw-r--r--addons/analytic/wizard/account_analytic_journal_report.py72
-rw-r--r--addons/analytic/wizard/account_analytic_journal_report_view.xml44
7 files changed, 11 insertions, 139 deletions
diff --git a/addons/analytic/__openerp__.py b/addons/analytic/__openerp__.py
index 26ac96ebe8a..6306052d085 100644
--- a/addons/analytic/__openerp__.py
+++ b/addons/analytic/__openerp__.py
@@ -44,7 +44,6 @@ that have no counterpart in the general financial accounts.
'wizard/account_analytic_balance_report_view.xml',
'wizard/account_analytic_cost_ledger_view.xml',
'wizard/account_analytic_inverted_balance_report.xml',
- 'wizard/account_analytic_journal_report_view.xml',
'wizard/account_analytic_cost_ledger_for_journal_report_view.xml',
'wizard/account_analytic_chart_view.xml',
'views/report_analyticbalance.xml',
diff --git a/addons/analytic/analytic_report.xml b/addons/analytic/analytic_report.xml
index de2e2feee5a..88109e01fd6 100644
--- a/addons/analytic/analytic_report.xml
+++ b/addons/analytic/analytic_report.xml
@@ -11,16 +11,6 @@
menu="False"
/>
- <report
- id="action_report_analytic_journal"
- model="account.analytic.journal"
- string="Analytic Journal"
- report_type="qweb-pdf"
- name="account.report_analyticjournal"
- file="account.report_analyticjournal"
- menu="False"
- />
-
<report
id="action_report_analytic_balance"
model="account.analytic.account"
diff --git a/addons/analytic/models/analytic.py b/addons/analytic/models/analytic.py
index 88d4e4f56ec..157739da8a7 100644
--- a/addons/analytic/models/analytic.py
+++ b/addons/analytic/models/analytic.py
@@ -180,9 +180,9 @@ class account_analytic_account(osv.osv):
'child_ids': fields.one2many('account.analytic.account', 'parent_id', 'Child Accounts'),
'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'),
- 'balance': fields.function(_debit_credit_bal_qtty, type='float', string='Balance', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')),
- 'debit': fields.function(_debit_credit_bal_qtty, type='float', string='Debit', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')),
- 'credit': fields.function(_debit_credit_bal_qtty, type='float', string='Credit', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')),
+ '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'),
@@ -339,7 +339,7 @@ class account_analytic_line(osv.osv):
_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_compute=dp.get_precision('Account')),
+ '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'),
diff --git a/addons/analytic/views/analytic_view.xml b/addons/analytic/views/analytic_view.xml
index d04faa422b6..1a6550682a4 100644
--- a/addons/analytic/views/analytic_view.xml
+++ b/addons/analytic/views/analytic_view.xml
@@ -118,9 +118,9 @@
<field name="name" invisible="1"/>
<field name="complete_name"/>
<field name="code"/>
- <field name="debit"/>
- <field name="credit"/>
- <field name="balance"/>
+ <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"/>
@@ -197,7 +197,7 @@
<field name="company_id" groups="base.group_multi_company"/>
</group>
<group string="Amount">
- <field name="amount"/>
+ <field name="amount" widget="monetary"/>
</group>
<group string="Product Information" name="product_info">
<label for="unit_amount"/>
@@ -217,7 +217,7 @@
<field name="date"/>
<field name="name"/>
<field name="user_id"/>
- <field name="amount" sum="Total" invisible="context.get('to_invoice', False)"/>
+ <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"/>
@@ -296,7 +296,7 @@
<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"/>
+ <field name="amount" widget="monetary"/>
</group>
<group string="Product Information">
<label for="unit_amount"/>
@@ -374,7 +374,7 @@
#
<record id="action_account_analytic_journal_open_form" model="ir.actions.act_window">
- <field name="name">Analytic Journal Items</field>
+ <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>
diff --git a/addons/analytic/wizard/__init__.py b/addons/analytic/wizard/__init__.py
index 52606b42782..3969956f529 100644
--- a/addons/analytic/wizard/__init__.py
+++ b/addons/analytic/wizard/__init__.py
@@ -19,7 +19,6 @@
#
##############################################################################
-import account_analytic_journal_report
import account_analytic_balance_report
import account_analytic_inverted_balance_report
import account_analytic_cost_ledger_report
diff --git a/addons/analytic/wizard/account_analytic_journal_report.py b/addons/analytic/wizard/account_analytic_journal_report.py
deleted file mode 100644
index f86fc71b94a..00000000000
--- a/addons/analytic/wizard/account_analytic_journal_report.py
+++ /dev/null
@@ -1,72 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import time
-from openerp.osv import fields, osv
-
-
-class account_analytic_journal_report(osv.osv_memory):
- _name = 'account.analytic.journal.report'
- _description = 'Account Analytic Journal'
-
- _columns = {
- 'date1': fields.date('Start of period', required=True),
- 'date2': fields.date('End of period', required=True),
- 'analytic_account_journal_id': fields.many2many('account.analytic.journal', 'account_analytic_journal_name', 'journal_line_id', 'journal_print_id', 'Analytic Journals', 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]
- ids_list = []
- if context.get('active_id',False):
- ids_list.append(context.get('active_id',False))
- else:
- record = self.browse(cr,uid,ids[0],context=context)
- for analytic_record in record.analytic_account_journal_id:
- ids_list.append(analytic_record.id)
- datas = {
- 'ids': ids_list,
- 'model': 'account.analytic.journal',
- 'form': data
- }
- context2 = context.copy()
- context2['active_model'] = 'account.analytic.journal'
- context2['active_ids'] = ids_list
- return self.pool['report'].get_action(cr, uid, [], 'account.report_analyticjournal', data=datas, context=context2)
-
- def default_get(self, cr, uid, fields, context=None):
- if context is None:
- context = {}
- res = super(account_analytic_journal_report, self).default_get(cr, uid, fields, context=context)
- if not context.has_key('active_ids'):
- journal_ids = self.pool.get('account.analytic.journal').search(cr, uid, [], context=context)
- else:
- journal_ids = context.get('active_ids')
- if 'analytic_account_journal_id' in fields:
- res.update({'analytic_account_journal_id': journal_ids})
- return res
diff --git a/addons/analytic/wizard/account_analytic_journal_report_view.xml b/addons/analytic/wizard/account_analytic_journal_report_view.xml
deleted file mode 100644
index 3aaea712582..00000000000
--- a/addons/analytic/wizard/account_analytic_journal_report_view.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
- <data>
-
- <record id="account_analytic_journal_view" model="ir.ui.view">
- <field name="name">Account Analytic Journal</field>
- <field name="model">account.analytic.journal.report</field>
- <field name="arch" type="xml">
- <form string="Select Period">
- <group col="4">
- <field name="date1"/>
- <field name="date2"/>
- <field name="analytic_account_journal_id" widget="many2many_tags" class="oe_inline" required="1" colspan="4"/>
- </group>
- <footer>
- <button name="check_report" string="Print" type="object" class="oe_highlight"/>
- or
- <button string="Cancel" class="oe_link" special="cancel"/>
- </footer>
- </form>
- </field>
- </record>
-
- <record id="action_account_analytic_journal" model="ir.actions.act_window">
- <field name="name">Analytic Journal</field>
- <field name="type">ir.actions.act_window</field>
- <field name="res_model">account.analytic.journal.report</field>
- <field name="view_type">form</field>
- <field name="view_mode">form</field>
- <field name="view_id" ref="account_analytic_journal_view"/>
- <field name="target">new</field>
- </record>
-
- <record model="ir.values" id="account_analytic_journal_values">
- <field name="model_id" ref="analytic.model_account_analytic_journal" />
- <field name="name">Account Analytic Journal</field>
- <field name="key2">client_print_multi</field>
- <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_analytic_journal'))" />
- <field name="key">action</field>
- <field name="model">account.analytic.journal</field>
- </record>
-
- </data>
-</openerp>
generated by cgit v1.2.3 (git 2.25.1) at 2026-10-23 17:37:26 +0000