diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index d28748b4efb..b0bdeebbb89 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1008,6 +1008,7 @@
+
@@ -1080,6 +1081,7 @@
groups="group_account_user"/>
+
diff --git a/addons/account/wizard/account_chart.py b/addons/account/wizard/account_chart.py
index b83b477596d..f30efa1fe27 100644
--- a/addons/account/wizard/account_chart.py
+++ b/addons/account/wizard/account_chart.py
@@ -41,10 +41,11 @@ class account_chart(osv.osv_memory):
def _account_chart_open_window(self, cr, uid, ids, context):
"""
- cr is the current row, from the database cursor,
- uid is the current user’s ID for security checks,
- ID is the account chart’s ID or list of IDs if we want more than one
- This function Open account chart window on given fiscalyear and all Entries or posted entries
+
+ @param cr: the current row, from the database cursor,
+ @param uid: the current user’s ID for security checks,
+ @param id: the account chart’s ID or list of IDs if we want more than one
+ @return: dictionary of Open account chart window on given fiscalyear and all Entries or posted entries
"""
for form in self.read(cr, uid, ids):
mod_obj = self.pool.get('ir.model.data')
diff --git a/addons/account/wizard/account_chart_view.xml b/addons/account/wizard/account_chart_view.xml
new file mode 100644
index 00000000000..a3838a5483c
--- /dev/null
+++ b/addons/account/wizard/account_chart_view.xml
@@ -0,0 +1,33 @@
+
+
+
+
+ account.chart.form
+ account.chart
+ form
+
+
+
+
+
+ Chart of Accounts
+ account.chart
+ form
+ tree,form
+
+ new
+
+
+
diff --git a/addons/account/wizard/account_fiscalyear_close_state.py b/addons/account/wizard/account_fiscalyear_close_state.py
new file mode 100644
index 00000000000..a1cc37663ef
--- /dev/null
+++ b/addons/account/wizard/account_fiscalyear_close_state.py
@@ -0,0 +1,63 @@
+# -*- 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 .
+#
+##############################################################################
+import wizard
+import netsvc
+import pooler
+import time
+from tools.translate import _
+import tools
+from osv import fields, osv
+
+class account_fiscalyear_close_state(osv.osv_memory):
+ """
+ close Account Fiscalyear
+ """
+ _name = "account.fiscalyear.close.state"
+ _description = "Fiscalyear Close state"
+ _columns = {
+ 'fy_id':fields.many2one('account.fiscalyear', 'Fiscal Year to close', required=True),
+ 'sure':fields.boolean('Check this box', required=False)
+ }
+
+ def _data_save(self, cr, uid, ids, context):
+ """
+ This function close account fiscalyear
+ @param cr: the current row, from the database cursor,
+ @param uid: the current user’s ID for security checks,
+ @param id: account fiscalyear close state’s ID or list of IDs if we want more than one
+
+ """
+ for form in self.read(cr, uid, ids):
+ if not form['sure']:
+ raise osv.except_osv(_('UserError'), _('Closing of states cancelled, please check the box !'))
+ fy_id = form['fy_id']
+
+ cr.execute('UPDATE account_journal_period ' \
+ 'SET state = %s ' \
+ 'WHERE period_id IN (SELECT id FROM account_period WHERE fiscalyear_id = %s)',
+ ('done',fy_id))
+ cr.execute('UPDATE account_period SET state = %s ' \
+ 'WHERE fiscalyear_id = %s', ('done',fy_id))
+ cr.execute('UPDATE account_fiscalyear ' \
+ 'SET state = %s WHERE id = %s', ('done', fy_id))
+ return {}
+
+account_fiscalyear_close_state()
diff --git a/addons/account/wizard/account_fiscalyear_close_state.xml b/addons/account/wizard/account_fiscalyear_close_state.xml
new file mode 100644
index 00000000000..19acf3fe567
--- /dev/null
+++ b/addons/account/wizard/account_fiscalyear_close_state.xml
@@ -0,0 +1,34 @@
+
+
+
+
+ account.fiscalyear.close.state.form
+ account.fiscalyear.close.state
+ form
+
+
+
+
+
+ Close a Fiscal Year
+ account.fiscalyear.close.state
+ form
+ tree,form
+
+ new
+
+
+
+
diff --git a/addons/account/wizard/account_invoice_refund.py b/addons/account/wizard/account_invoice_refund.py
index acd85d4f7ef..be2fa002b12 100644
--- a/addons/account/wizard/account_invoice_refund.py
+++ b/addons/account/wizard/account_invoice_refund.py
@@ -40,9 +40,9 @@ class account_invoice_refund(osv.osv_memory):
def _compute_refund(self, cr, uid, ids, mode, context):
"""
- cr is the current row, from the database cursor,
- uid is the current user’s ID for security checks,
- ID is the account invoice refund’s ID or list of IDs if we want more than one
+ @param cr: the current row, from the database cursor,
+ @param uid: the current user’s ID for security checks,
+ @param id: the account invoice refund’s ID or list of IDs if we want more than one
"""
diff --git a/addons/account/wizard/account_invoice_refund_view.xml b/addons/account/wizard/account_invoice_refund_view.xml
new file mode 100644
index 00000000000..1efb63a9ff1
--- /dev/null
+++ b/addons/account/wizard/account_invoice_refund_view.xml
@@ -0,0 +1,37 @@
+
+
+
+
+ account.invoice.refund.form
+ account.invoice.refund
+ form
+
+
+
+
+
+ Credit Note
+ account.invoice.refund
+ form
+ tree,form
+
+ new
+
+
+
\ No newline at end of file
diff --git a/addons/account/wizard/account_move_bank_reconcile.py b/addons/account/wizard/account_move_bank_reconcile.py
index 4dd3e1354c2..faa154c950c 100644
--- a/addons/account/wizard/account_move_bank_reconcile.py
+++ b/addons/account/wizard/account_move_bank_reconcile.py
@@ -37,10 +37,10 @@ class account_move_bank_reconcile(osv.osv_memory):
}
def _action_open_window(self, cr, uid, ids, context):
"""
- cr is the current row, from the database cursor,
- uid is the current user’s ID for security checks,
- ID is the account move bank reconcile’s ID or list of IDs if we want more than one
- This function Open account move line on given journal_id.
+ @param cr: the current row, from the database cursor,
+ @param uid: the current user’s ID for security checks,
+ @param id: account move bank reconcile’s ID or list of IDs if we want more than one
+ @return:dictionary of Open account move line on given journal_id.
"""
for form in self.read(cr, uid, ids):
cr.execute('select default_credit_account_id from account_journal where id=%s', (form['journal_id'],))
diff --git a/addons/account/wizard/account_move_bank_reconcile_view.xml b/addons/account/wizard/account_move_bank_reconcile_view.xml
new file mode 100644
index 00000000000..6750d2d143a
--- /dev/null
+++ b/addons/account/wizard/account_move_bank_reconcile_view.xml
@@ -0,0 +1,31 @@
+
+
+
+
+ account.move.bank.reconcile.form
+ account.move.bank.reconcile
+ form
+
+
+
+
+
+ Bank reconciliation
+ account.move.bank.reconcile
+ form
+ tree,form
+
+ new
+
+
+
diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py
index cc74f663677..1e6645c5b27 100644
--- a/addons/account/wizard/account_move_journal.py
+++ b/addons/account/wizard/account_move_journal.py
@@ -41,10 +41,12 @@ class account_move_journal(osv.osv_memory):
def _action_open_window(self, cr, uid, ids, context={}):
"""
- cr is the current row, from the database cursor,
- uid is the current user’s ID for security checks,
- ID is the account move journal’s ID or list of IDs if we want more than one
This function Open action move line window on given period and Journal/Payment Mode
+ @param cr: the current row, from the database cursor,
+ @param uid: the current user’s ID for security checks,
+ @param id: account move journal’s ID or list of IDs if we want more than one
+ @return:dictionary of Open action move line window on given period and Journal/Payment Mode
+
"""
for form in self.read(cr, uid, ids,['journal_id', 'period_id']):
cr.execute('select id,name from ir_ui_view where model=%s and type=%s', ('account.move.line', 'form' ))
diff --git a/addons/account/wizard/account_move_journal_view.xml b/addons/account/wizard/account_move_journal_view.xml
new file mode 100644
index 00000000000..691539952b6
--- /dev/null
+++ b/addons/account/wizard/account_move_journal_view.xml
@@ -0,0 +1,33 @@
+
+
+
+
+ account.move.journal.form
+ account.move.journal
+ form
+
+
+
+
+
+ Making Entries by Line
+ account.move.journal
+ form
+ tree,form
+
+ new
+
+
+
diff --git a/addons/account/wizard/account_move_line_reconcile_select.py b/addons/account/wizard/account_move_line_reconcile_select.py
index 5c100b38ac0..5286b2b70a4 100644
--- a/addons/account/wizard/account_move_line_reconcile_select.py
+++ b/addons/account/wizard/account_move_line_reconcile_select.py
@@ -35,10 +35,12 @@ class account_move_line_reconcile_select(osv.osv_memory):
def _action_open_window(self, cr, uid, ids, context):
"""
- cr is the current row, from the database cursor,
- uid is the current user’s ID for security checks,
- ID is the account move line reconcile select’s ID or list of IDs if we want more than one
- This function Open account move line window for reconcile on given account id
+ This function Open account move line window for reconcile on given account id
+ @param cr: the current row, from the database cursor,
+ @param uid: the current user’s ID for security checks,
+ @param id: account move line reconcile select’s ID or list of IDs if we want more than one
+ @return:dictionary of Open account move line window for reconcile on given account id
+
"""
for data in self.read(cr, uid, ids):
diff --git a/addons/account/wizard/account_move_line_reconcile_select_view.xml b/addons/account/wizard/account_move_line_reconcile_select_view.xml
new file mode 100644
index 00000000000..3b1d4537a6b
--- /dev/null
+++ b/addons/account/wizard/account_move_line_reconcile_select_view.xml
@@ -0,0 +1,32 @@
+
+
+
+
+ account.move.line.reconcile.select.form
+ account.move.line.reconcile.select
+ form
+
+
+
+
+
+ Reconcile entries
+ account.move.line.reconcile.select
+ form
+ tree,form
+
+ new
+
+
+
+
diff --git a/addons/account/wizard/account_period_close.py b/addons/account/wizard/account_period_close.py
index 4df4e652ec5..4aaf773ce80 100644
--- a/addons/account/wizard/account_period_close.py
+++ b/addons/account/wizard/account_period_close.py
@@ -37,10 +37,12 @@ class account_period_close(osv.osv_memory):
def _data_save(self, cr, uid, ids, context):
"""
- cr is the current row, from the database cursor,
- uid is the current user’s ID for security checks,
- ID is the account period close’s ID or list of IDs if we want more than one
- This function close period
+ This function close period
+ @param cr: the current row, from the database cursor,
+ @param uid: the current user’s ID for security checks,
+ @param id:account period close’s ID or list of IDs if we want more than one
+
+
"""
mode = 'done'
diff --git a/addons/account/wizard/account_period_close_view.xml b/addons/account/wizard/account_period_close_view.xml
new file mode 100644
index 00000000000..35e05f4586c
--- /dev/null
+++ b/addons/account/wizard/account_period_close_view.xml
@@ -0,0 +1,33 @@
+
+
+
+
+ account.period.close.form
+ account.period.close
+ form
+
+
+
+
+
+ Close a Period
+ account.period.close
+ form
+ tree,form
+
+ new
+
+
+
+
\ No newline at end of file