diff --git a/addons/account/__terp__.py b/addons/account/__terp__.py index 6faf8772a67..1fe6bd355bd 100644 --- a/addons/account/__terp__.py +++ b/addons/account/__terp__.py @@ -46,7 +46,17 @@ module named account_voucherss 'security/account_security.xml', 'security/ir.model.access.csv', 'account_menuitem.xml', + 'wizard/account_invoice_refund_view.xml', + 'wizard/account_period_close_view.xml', + 'wizard/account_fiscalyear_close_state.xml', + 'wizard/account_chart_view.xml', + 'wizard/account_move_bank_reconcile_view.xml', + 'wizard/account_move_line_reconcile_select_view.xml', + 'wizard/account_move_journal_view.xml', 'account_wizard.xml', + 'wizard/account_move_line_unreconcile_select_view.xml', + 'wizard/account_subscription_generate_view.xml', + 'project/wizard/project_account_analytic_line_view.xml', 'account_view.xml', 'account_end_fy.xml', 'account_invoice_view.xml', diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index c74868c342c..feeb38dd51b 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -153,7 +153,7 @@ + diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml index 260d14e38e8..37d539a4b25 100644 --- a/addons/account/account_menuitem.xml +++ b/addons/account/account_menuitem.xml @@ -24,3 +24,4 @@ + diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index e43b2249ae5..88462098852 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -668,9 +668,9 @@ - + @@ -1007,9 +1007,9 @@ - + @@ -1079,8 +1079,14 @@ groups="group_account_user"/> - - + + + + + + - + + + + + + + + @@ -21,8 +28,9 @@ type="wizard" sequence="1"/> - + + - + + @@ -57,19 +72,24 @@ - + + + diff --git a/addons/account/i18n/cs.po b/addons/account/i18n/cs.po index cdaf9f2aad9..faff571118c 100644 --- a/addons/account/i18n/cs.po +++ b/addons/account/i18n/cs.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-04-02 03:42+0000\n" +"X-Launchpad-Export-Date: 2010-04-03 03:54+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po index 67e71fd81a4..deca642f62a 100644 --- a/addons/account/i18n/de.po +++ b/addons/account/i18n/de.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-04-01 17:22+0000\n" +"PO-Revision-Date: 2010-04-02 07:16+0000\n" "Last-Translator: Ferdinand @ ChriCar \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-04-02 03:42+0000\n" +"X-Launchpad-Export-Date: 2010-04-03 03:54+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po index de27f983cc7..abc9d069167 100644 --- a/addons/account/i18n/ru.po +++ b/addons/account/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-03-02 15:44+0000\n" -"Last-Translator: Nikolay Chesnokov \n" +"PO-Revision-Date: 2010-04-03 16:42+0000\n" +"Last-Translator: Alexandr Mitev \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-03-30 04:03+0000\n" +"X-Launchpad-Export-Date: 2010-04-04 03:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -323,7 +323,7 @@ msgstr "Происхождение" #. module: account #: rml:account.analytic.account.journal:0 msgid "Move Name" -msgstr "" +msgstr "Имя перемещения" #. module: account #: xsl:account.transfer:0 @@ -355,7 +355,7 @@ msgstr "Налог" #. module: account #: rml:account.general.journal:0 msgid "Debit Trans." -msgstr "" +msgstr "Дебитовая сделка" #. module: account #: field:account.analytic.line,account_id:0 @@ -608,7 +608,7 @@ msgstr "" #. module: account #: view:account.journal:0 msgid "Entry Controls" -msgstr "" +msgstr "Контроль проводки" #. module: account #: help:account.model.line,sequence:0 @@ -642,7 +642,7 @@ msgstr "Условия платежа партнера" #. module: account #: view:account.move.reconcile:0 msgid "Account Entry Reconcile" -msgstr "" +msgstr "Согласование проводки по счету" #. module: account #: wizard_button:account.move.bank.reconcile,init,open:0 @@ -734,7 +734,7 @@ msgstr "Строки финансового документа" #. module: account #: model:process.transition,name:account.process_transition_supplieranalyticcost0 msgid "Analytic Invoice" -msgstr "" +msgstr "Аналитический счет" #. module: account #: field:account.journal.column,field:0 @@ -981,7 +981,7 @@ msgstr "Проводки по выражениям" #. module: account #: model:process.transition,name:account.process_transition_analyticinvoice0 msgid "analytic Invoice" -msgstr "" +msgstr "aналитический счет" #. module: account #: wizard_field:account.automatic.reconcile,init,period_id:0 diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml index e53047b8718..e0854f8d65d 100644 --- a/addons/account/project/project_view.xml +++ b/addons/account/project/project_view.xml @@ -204,10 +204,14 @@ form - + - + + Analytic Entries diff --git a/addons/account/project/wizard/__init__.py b/addons/account/project/wizard/__init__.py index 21a811ebe5f..f11fa936960 100644 --- a/addons/account/project/wizard/__init__.py +++ b/addons/account/project/wizard/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). # @@ -15,7 +15,7 @@ # 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 . +# along with this program. If not, see . # ############################################################################## @@ -25,7 +25,7 @@ import wizard_account_analytic_inverted_balance_report import wizard_account_analytic_cost_ledger_report import wizard_account_analytic_cost_ledger_for_journal_report import wizard_account_analytic_analytic_check -import wizard_account_analytic_line +import project_account_analytic_line import wizard_analytic_account_chart # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/project/wizard/project_account_analytic_line.py b/addons/account/project/wizard/project_account_analytic_line.py new file mode 100644 index 00000000000..d84c199ff40 --- /dev/null +++ b/addons/account/project/wizard/project_account_analytic_line.py @@ -0,0 +1,58 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2010 Tiny SPRL (). +# +# 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 . +# +############################################################################## +from osv import fields, osv +from tools.translate import _ + +class project_account_analytic_line(osv.osv_memory): + _name = "project.account.analytic.line" + _description = "Analytic Entries by line" + _columns = { + 'from_date': fields.date('From'), + 'to_date': fields.date('To'), + } + + def action_open_window(self, cr, uid, ids, context={}): + mod_obj =self.pool.get('ir.model.data') + domain = [] + for data in self.read(cr, uid, ids, context=context): + from_date = data['from_date'] + to_date = data['to_date'] + if from_date and to_date: + domain = [('date','>=',from_date), ('date','<=',to_date)] + elif from_date: + domain = [('date','>=',from_date)] + elif to_date: + domain = [('date','<=',to_date)] + result = mod_obj._get_id(cr, uid, 'account', 'view_account_analytic_line_filter') + id = mod_obj.read(cr, uid, result, ['res_id'], context=context) + return { + 'name': _('Analytic Entries by line'), + 'view_type': 'form', + "view_mode": 'tree,form', + 'res_model': 'account.analytic.line', + 'type': 'ir.actions.act_window', + 'domain': domain, + 'search_view_id': id['res_id'], + } + +project_account_analytic_line() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file diff --git a/addons/account/project/wizard/project_account_analytic_line_view.xml b/addons/account/project/wizard/project_account_analytic_line_view.xml new file mode 100644 index 00000000000..96d9186cfa8 --- /dev/null +++ b/addons/account/project/wizard/project_account_analytic_line_view.xml @@ -0,0 +1,36 @@ + + + + + + project.account.analytic.line.form + project.account.analytic.line + form + +
+ + + + + +