[MERGE] Merged from the main trunk addons

bzr revid: dhs@tinyerp.com-20101020051624-3qsc1auxgmhyiy3u

addons/account/__openerp__.py

@@ -119,7 +119,7 @@ module named account_voucher.
         'project/project_demo.xml',
         'project/analytic_account_demo.xml',
         'demo/account_minimal.xml',
-        'account_unit_test.xml',
+        #'account_unit_test.xml',
     ],
     'test': [
         'test/account_customer_invoice.yml',
@@ -131,6 +131,8 @@ module named account_voucher.
         'test/account_use_model.yml',
         'test/account_validate_account_move.yml',
         'test/account_fiscalyear_close.yml',
+        'test/account_bank_statement.yml',
+        'test/account_cash_statement.yml',
         'test/account_report.yml',
     ],
     'installable': True,

addons/account/account.py

@@ -457,7 +457,9 @@ class account_account(osv.osv):
             if not ids:
                 ids = self.search(cr, user, [('name', operator, name)]+ args, limit=limit)
             if not ids and len(name.split()) >= 2:
-                ids = self.search(cr, user, [('code', operator, name.split()[0]), ('name', operator, name.split()[1])]+ args, limit=limit)
+                #Separating code and name of account for searching
+                operand1,operand2 = name.split(' ',1) #name can contain spaces e.g. OpenERP S.A. 
+                ids = self.search(cr, user, [('code', operator, operand1), ('name', operator, operand2)]+ args, limit=limit)
         else:
             ids = self.search(cr, user, args, context=context, limit=limit)
         return self.name_get(cr, user, ids, context=context)
@@ -1105,7 +1107,7 @@ class account_move(osv.osv):
             help='All manually created new journal entry are usually in the state \'Unposted\', but you can set the option to skip that state on the related journal. In that case, they will be behave as journal entries automatically created by the system on document validation (invoices, bank statements...) and will be created in \'Posted\' state.'),
         'line_id': fields.one2many('account.move.line', 'move_id', 'Entries', states={'posted':[('readonly',True)]}),
         'to_check': fields.boolean('To Review', help='Check this box if you are unsure of that journal entry and if you want to note it as \'to be reviewed\' by an accounting expert.'),
-        'partner_id': fields.related('line_id', 'partner_id', type="many2one", relation="res.partner", string="Partner"),
+        'partner_id': fields.related('line_id', 'partner_id', type="many2one", relation="res.partner", string="Partner", store=True),
         'amount': fields.function(_amount_compute, method=True, string='Amount', digits_compute=dp.get_precision('Account'), type='float', fnct_search=_search_amount),
         'date': fields.date('Date', required=True, states={'posted':[('readonly',True)]}),
         'narration':fields.text('Narration'),
@@ -1215,7 +1217,8 @@ class account_move(osv.osv):
     #
     # TODO: Check if period is closed !
     #
-    def create(self, cr, uid, vals, context={}):
+    def create(self, cr, uid, vals, context=None):
+        context = context or {}
         if 'line_id' in vals and context.get('copy'):
             for l in vals['line_id']:
                 if not l[0]:
@@ -1256,6 +1259,7 @@ class account_move(osv.osv):
         return result
 
     def copy(self, cr, uid, id, default={}, context={}):
+        context = context or {}
         default.update({
             'state':'draft',
             'name':'/',
@@ -1265,7 +1269,8 @@ class account_move(osv.osv):
         })
         return super(account_move, self).copy(cr, uid, id, default, context)
 
-    def unlink(self, cr, uid, ids, context={}, check=True):
+    def unlink(self, cr, uid, ids, context=None, check=True):
+        context = context or {}
         toremove = []
         obj_move_line = self.pool.get('account.move.line')
         for move in self.browse(cr, uid, ids, context):
@@ -1605,7 +1610,7 @@ class account_tax_code(osv.osv):
         if isinstance(ids, (int, long)):
             ids = [ids]
         reads = self.read(cr, uid, ids, ['name','code'], context, load='_classic_write')
-        return [(x['id'], (x['code'] and x['code'] + ' - ' or '') + x['name']) \
+        return [(x['id'], (x['code'] and (x['code'] + ' - ') or '') + x['name']) \
                 for x in reads]
 
     def _default_company(self, cr, uid, context={}):
@@ -2019,7 +2024,7 @@ class account_model(osv.osv):
     }
 
     _defaults = {
-        'legend': lambda self, cr, uid, context:_('You can specify year, month and date in the name of the model using the following labels:\n\n%(year)s : To Specify Year \n%(month)s : To Specify Month \n%(date)s : Current Date\n\ne.g. My model on %(date)s'),
+        'legend': lambda self, cr, uid, context:_('You can specify year, month and date in the name of the model using the following labels:\n\n%(year)s: To Specify Year \n%(month)s: To Specify Month \n%(date)s: Current Date\n\ne.g. My model on %(date)s'),
     }
     def generate(self, cr, uid, ids, datas={}, context=None):
         move_ids = []
@@ -2221,7 +2226,7 @@ class account_subscription_line(osv.osv):
 account_subscription_line()
 
 #  ---------------------------------------------------------------
-#   Account Templates : Account, Tax, Tax Code and chart. + Wizard
+#   Account Templates: Account, Tax, Tax Code and chart. + Wizard
 #  ---------------------------------------------------------------
 
 class account_tax_template(osv.osv):
@@ -2394,7 +2399,7 @@ class account_chart_template(osv.osv):
         'property_account_income_categ': fields.many2one('account.account.template','Income Category Account'),
         'property_account_expense': fields.many2one('account.account.template','Expense Account on Product Template'),
         'property_account_income': fields.many2one('account.account.template','Income Account on Product Template'),
-        'property_reserve_and_surplus_account': fields.many2one('account.account.template', 'Reserve and Profit/Loss Account', domain=[('type', '=', 'payable')], help='This Account is used for transferring Profit/Loss(If It is Profit : Amount will be added, Loss : Amount will be deducted.), Which is calculated from Profilt & Loss Report'),
+        'property_reserve_and_surplus_account': fields.many2one('account.account.template', 'Reserve and Profit/Loss Account', domain=[('type', '=', 'payable')], help='This Account is used for transferring Profit/Loss(If It is Profit: Amount will be added, Loss: Amount will be deducted.), Which is calculated from Profilt & Loss Report'),
     }
 
 account_chart_template()
@@ -2544,9 +2549,17 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         if ids:
             return ids[0]
         return False
+
+    def _get_default_accounts(self, cr, uid, context=None):
+        accounts = [{'acc_name':'Current','account_type':'bank'},
+                    {'acc_name':'Deposit','account_type':'bank'},
+                    {'acc_name':'Cash','account_type':'cash'}]
+        return accounts
+
     _defaults = {
         'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, [uid], c)[0].company_id.id,
         'chart_template_id': _get_chart,
+        'bank_accounts_id': _get_default_accounts,
         'code_digits': 6,
         'seq_journal': True
     }

addons/account/account_analytic_line.py

@@ -24,8 +24,6 @@ import time
 from osv import fields
 from osv import osv
 from tools.translate import _
-import tools
-from tools import config
 
 class account_analytic_line(osv.osv):
     _inherit = 'account.analytic.line'
@@ -82,12 +80,13 @@ class account_analytic_line(osv.osv):
             return {}
         product_obj = self.pool.get('product.product')
         analytic_journal_obj =self.pool.get('account.analytic.journal')
+        company_obj = self.pool.get('res.company')
+        product_price_type_obj = self.pool.get('product.price.type')
         j_id = analytic_journal_obj.browse(cr, uid, journal_id, context=context)
         prod = product_obj.browse(cr, uid, prod_id)
         if not company_id:
             company_id = j_id.company_id.id
         result = 0.0
-        is_purchase = False
 
         if j_id.type <> 'sale':
             a = prod.product_tmpl_id.property_account_expense.id
@@ -99,8 +98,6 @@ class account_analytic_line(osv.osv):
                                 'for this product: "%s" (id:%d)') % \
                                 (prod.name, prod.id,))
             amount_unit = prod.price_get('standard_price', context)[prod.id]
-            is_purchase = True
-
         else:
             a = prod.product_tmpl_id.property_account_income.id
             if not a:
@@ -113,7 +110,7 @@ class account_analytic_line(osv.osv):
             amount_unit = prod.price_get('list_price', context)[prod_id]
 
         if not company_id:
-            company_id=company_obj._company_default_get(cr, uid, 'account.analytic.line', context)
+            company_id = company_obj._company_default_get(cr, uid, 'account.analytic.line', context=context)
             flag = False
             # Compute based on pricetype
             product_price_type_ids = product_price_type_obj.search(cr, uid, [('field','=','standard_price')], context)
@@ -128,15 +125,14 @@ class account_analytic_line(osv.osv):
             if pricetype.field == 'list_price':
                 flag = True
             amount_unit = prod.price_get(pricetype.field, context)[prod.id]
-            amount = amount_unit*unit_amount or 1.0
             prec = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')
-            amount = amount_unit*unit_amount or 1.0
+            amount = amount_unit*unit or 1.0
             result = round(amount, prec)
             if not flag:
                 result *= -1
-            return {'value': {
-                'amount': result,
-                'general_account_id': a,
+        return {'value': {
+            'amount': result,
+            'general_account_id': a,
             }
         }
 

addons/account/account_bank_statement.py

@@ -86,7 +86,6 @@ class account_bank_statement(osv.osv):
     def _end_balance(self, cursor, user, ids, name, attr, context=None):
         res_currency_obj = self.pool.get('res.currency')
         res_users_obj = self.pool.get('res.users')
-
         res = {}
 
         company_currency_id = res_users_obj.browse(cursor, user, user,
@@ -216,10 +215,8 @@ class account_bank_statement(osv.osv):
 
     def create_move_from_st_line(self, cr, uid, st_line_id, company_currency_id, st_line_number, context=None):
         res_currency_obj = self.pool.get('res.currency')
-        res_users_obj = self.pool.get('res.users')
         account_move_obj = self.pool.get('account.move')
         account_move_line_obj = self.pool.get('account.move.line')
-        account_analytic_line_obj = self.pool.get('account.analytic.line')
         account_bank_statement_line_obj = self.pool.get('account.bank.statement.line')
         st_line = account_bank_statement_line_obj.browse(cr, uid, st_line_id, context)
         st = st_line.statement_id
@@ -378,7 +375,7 @@ class account_bank_statement(osv.osv):
                 self.create_move_from_st_line(cr, uid, st_line.id, company_currency_id, st_line_number, context)
 
             self.write(cr, uid, [st.id], {'name': st_number}, context=context)
-            self.log(cr, uid, st.id, 'Statement %s is confirmed and entries are created.' % st_number)
+            self.log(cr, uid, st.id, _('Statement %s is confirmed, journal items are created.') % (st_number,))
             done.append(st.id)
         return self.write(cr, uid, ids, {'state':'confirm'}, context=context)
 
@@ -395,8 +392,6 @@ class account_bank_statement(osv.osv):
         return self.write(cr, uid, done, {'state':'draft'}, context=context)
 
     def onchange_journal_id(self, cursor, user, statement_id, journal_id, context=None):
-        account_journal_obj = self.pool.get('account.journal')
-        res_users_obj = self.pool.get('res.users')
         cursor.execute('SELECT balance_end_real \
                 FROM account_bank_statement \
                 WHERE journal_id = %s AND NOT state = %s \
@@ -501,4 +496,4 @@ class account_bank_statement_line(osv.osv):
 
 account_bank_statement_line()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/account_cash_statement.py

@@ -19,6 +19,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 import time
 
 from osv import osv, fields
@@ -45,13 +46,13 @@ class account_cashbox_line(osv.osv):
             res[obj.id] = obj.pieces * obj.number
         return res
 
-    def on_change_sub(self, cr, uid, ids, pieces, number,*a):
+    def on_change_sub(self, cr, uid, ids, pieces, number, *a):
 
         """ Calculates Sub total on change of number
         @param pieces: Names of fields.
         @param number:
         """
-        sub=pieces*number
+        sub = pieces * number
         return {'value':{'subtotal': sub or 0.0}}
 
     _columns = {
@@ -61,6 +62,7 @@ class account_cashbox_line(osv.osv):
         'starting_id': fields.many2one('account.bank.statement',ondelete='cascade'),
         'ending_id': fields.many2one('account.bank.statement',ondelete='cascade'),
      }
+
 account_cashbox_line()
 
 class account_cash_statement(osv.osv):
@@ -74,7 +76,7 @@ class account_cash_statement(osv.osv):
         @param arg: User defined arguments
         @return: Dictionary of values.
         """
-        res ={}
+        res = {}
         for statement in self.browse(cr, uid, ids):
             amount_total = 0.0
 
@@ -96,10 +98,10 @@ class account_cash_statement(osv.osv):
         """
         res ={}
         for statement in self.browse(cr, uid, ids):
-            amount_total=0.0
+            amount_total = 0.0
             for line in statement.ending_details_ids:
-                amount_total+= line.pieces * line.number
-            res[statement.id]=amount_total
+                amount_total += line.pieces * line.number
+            res[statement.id] = amount_total
         return res
 
     def _get_sum_entry_encoding(self, cr, uid, ids, name, arg, context=None):
@@ -113,14 +115,13 @@ class account_cash_statement(osv.osv):
         for statement in self.browse(cr, uid, ids):
             encoding_total=0.0
             for line in statement.line_ids:
-               encoding_total+= line.amount
-            res2[statement.id]=encoding_total
+               encoding_total += line.amount
+            res2[statement.id] = encoding_total
         return res2
 
     def _end_balance(self, cursor, user, ids, name, attr, context=None):
         res_currency_obj = self.pool.get('res.currency')
         res_users_obj = self.pool.get('res.users')
-
         res = {}
 
         company_currency_id = res_users_obj.browse(cursor, user, user,
@@ -232,8 +233,8 @@ class account_cash_statement(osv.osv):
         'user_id':fields.many2one('res.users', 'Responsible', required=False),
     }
     _defaults = {
-        'state': lambda *a: 'draft',
-        'date': lambda *a:time.strftime("%Y-%m-%d %H:%M:%S"),
+        'state': 'draft',
+        'date': time.strftime("%Y-%m-%d %H:%M:%S"),
         'user_id': lambda self, cr, uid, context=None: uid,
         'starting_details_ids':_get_cash_open_box_lines,
         'ending_details_ids':_get_default_cash_close_box_lines
@@ -295,10 +296,8 @@ class account_cash_statement(osv.osv):
         @param journal_id: Changed journal_id
         @return:  Dictionary of changed values
         """
-
         cash_pool = self.pool.get('account.cashbox.line')
         statement_pool = self.pool.get('account.bank.statement')
-
         res = {}
         balance_start = 0.0
 
@@ -307,8 +306,7 @@ class account_cash_statement(osv.osv):
                 'balance_start': balance_start
             })
             return res
-        res = super(account_cash_statement, self).onchange_journal_id(cr, uid, statement_id, journal_id, context=context)
-        return res
+        return super(account_cash_statement, self).onchange_journal_id(cr, uid, statement_id, journal_id, context=context)
 
     def _equal_balance(self, cr, uid, cash_id, context=None):
         statement = self.browse(cr, uid, cash_id, context=context)
@@ -329,7 +327,6 @@ class account_cash_statement(osv.osv):
         """
         cash_pool = self.pool.get('account.cashbox.line')
         statement_pool = self.pool.get('account.bank.statement')
-
         statement = statement_pool.browse(cr, uid, ids[0])
         vals = {}
 
@@ -347,9 +344,7 @@ class account_cash_statement(osv.osv):
             'state':'open',
 
         })
-
-        self.write(cr, uid, ids, vals)
-        return True
+        return self.write(cr, uid, ids, vals)
 
     def balance_check(self, cr, uid, cash_id, journal_type='bank', context=None):
         if journal_type == 'bank':
@@ -363,7 +358,7 @@ class account_cash_statement(osv.osv):
             return super(account_cash_statement, self).statement_close(cr, uid, ids, journal_type, context)
         vals = {
             'state':'confirm',
-            'closing_date':time.strftime("%Y-%m-%d %H:%M:%S")
+            'closing_date': time.strftime("%Y-%m-%d %H:%M:%S")
         }
         return self.write(cr, uid, ids, vals, context=context)
 
@@ -386,4 +381,4 @@ class account_cash_statement(osv.osv):
 
 account_cash_statement()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/account_end_fy.xml

@@ -14,7 +14,7 @@
             action="action_account_period_tree"
             id="menu_action_account_period_close_tree"
             parent="account.menu_account_end_year_treatments"
-            sequence="0" groups="base.group_extended"/>
+            sequence="0" groups="base.group_extended,group_account_manager,group_account_user"/>
         
     </data>
 </openerp>

addons/account/account_invoice_view.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-
         <!--
         Invoices
         -->
@@ -151,7 +150,7 @@
                         <field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"/>
                         <field name="number" readonly="1"/>
                         <field name="type" invisible="1"/>
-                        <field name="currency_id" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
+                        <field name="currency_id" width="50"/>
                         <button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" groups="account.group_account_user"/>
                         <newline/>
                         <field string="Supplier" name="partner_id" domain="[('supplier','=', 1)]" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" context="{'default_customer': 0}"/>
@@ -260,7 +259,7 @@
                     <field name="journal_id" groups="base.group_user" on_change="onchange_journal_id(journal_id)" widget="selection"/>
                     <field name="number"/>
                     <field name="type" invisible="1"/>
-                    <field name="currency_id" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
+                    <field name="currency_id" width="50"/>
                     <button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" groups="account.group_account_user"/>
                     <newline/>
                     <field string="Customer" name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" groups="base.group_user"/>
@@ -431,9 +430,10 @@
             <field name="domain">[('type','=','out_invoice')]</field>
             <field name="context">{'type':'out_invoice', 'journal_type': 'sale'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
-            <field name="help">Most of customer invoices are automatically generated in draft mode by OpenERP flows, following a purchase order for instance. Review, confirm or cancel, pay or refund your customers' invoices here. A manual invoice can be created here.</field>
+            <field name="help">Customer Invoices allows you create and manage invoices issued to your customers. OpenERP generates draft of invoices automatically so that you only have to confirm them before sending them to your customers.</field>
         </record>
 
+
         <record id="action_invoice_tree1_view1" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
             <field name="view_mode">tree</field>
@@ -446,6 +446,7 @@
             <field name="view_id" ref="invoice_form"/>
             <field name="act_window_id" ref="action_invoice_tree1"/>
         </record>
+
         <menuitem action="action_invoice_tree1" id="menu_action_invoice_tree1" parent="menu_finance_receivables"/>
 
         <record id="action_invoice_tree2" model="ir.actions.act_window">
@@ -457,7 +458,7 @@
             <field name="domain">[('type','=','in_invoice')]</field>
             <field name="context">{'type':'in_invoice', 'journal_type': 'purchase'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
-            <field name="help">Proposal for supplier invoices are usually automatically generate by OpenERP, following a procurement order or a production order for instance. To consult and to check for, or to manually create a customer invoice, use this menu. You can review, confirm or cancel, pay or refund an invoice from the view from of the invoices.</field>
+            <field name="help">Supplier Invoices allows you to enter and manage invoices issued by your suppliers. OpenERP generates draft of supplier invoices automatically so that you can control what you received from your supplier according to what you purchased or received.</field>
         </record>
         <menuitem action="action_invoice_tree2" id="menu_action_invoice_tree2" parent="menu_finance_payables"/>
 
@@ -470,7 +471,7 @@
             <field name="domain">[('type','=','out_refund')]</field>
             <field name="context">{'type':'out_refund', 'journal_type': 'sale_refund'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
-            <field name="help">A customer refund is a credit note to your customer that cancel invoice or a part of it.</field>
+            <field name="help">Customer Refunds helps you manage the credit notes issued/to be issued for your customers. A refund invoice is a document that cancels an invoice or a part of it. You can easily generate refunds and reconcile them from the invoice form.</field>
         </record>
 
         <record id="action_invoice_tree3_view1" model="ir.actions.act_window.view">
@@ -509,22 +510,5 @@
            res_model="account.invoice"
            src_model="account.journal"/>
 
-        <act_window
-            domain="[('account_id.reconcile', '=', True)]"
-            context="{'search_default_unreconciled':True,'search_default_partner_id':[partner_id]}"
-            id="act_account_invoice_account_move_unreconciled"
-	    groups="base.group_extended"
-            name="Items to Reconcile"
-            res_model="account.move.line"
-            src_model="account.invoice"/>
-
-        <act_window
-            context="{'search_default_move_id':move_id, 'search_default_unreconciled':False,}"
-            id="act_account_invoice_account_move_invoice_link"
-            name="Invoice Items"
-	    groups="base.group_extended"
-            res_model="account.move.line"
-            src_model="account.invoice"/>
-
     </data>
 </openerp>

addons/account/account_invoice_workflow.xml

@@ -2,11 +2,6 @@
 <openerp>
     <data>
 
-        <record id="res_roles_invoice0" model="res.roles">
-            <field eval="&quot;&quot;&quot;Invoice&quot;&quot;&quot;" name="name"/>
-            <field name="description">Assign this role to the persons that should have the rights to confirm a draft invoice.</field>
-        </record>
-
         <record id="wkf" model="workflow">
             <field name="name">account.invoice.basic</field>
             <field name="osv">account.invoice</field>

addons/account/account_menuitem.xml

@@ -7,8 +7,8 @@
         <menuitem id="menu_finance_receivables" name="Customers" parent="menu_finance" sequence="1"/>
         <menuitem id="menu_finance_payables" name="Suppliers" parent="menu_finance" sequence="2"/>
         <menuitem id="menu_finance_bank_and_cash" name="Bank and Cash" parent="menu_finance" sequence="3"
-            groups="group_account_user"/>
-        <menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="menu_finance" sequence="8" groups="group_account_user"/>
+            groups="group_account_user,group_account_manager"/>
+        <menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="menu_finance" sequence="8" groups="group_account_user,group_account_manager"/>
         <!-- This menu is used in account_code module -->
         <menuitem id="menu_account_pp_statements" name="Statements" parent="menu_finance_periodical_processing" sequence="12"/>
         <menuitem id="periodical_processing_journal_entries_validation" name="Draft Entries" parent="menu_finance_periodical_processing"/>
@@ -21,16 +21,16 @@
         <menuitem id="menu_finance_management_belgian_reports" name="Belgian Reports" parent="menu_finance_reporting"/>
         <menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="13" groups="group_account_manager"/>
         <menuitem id="menu_finance_accounting" name="Financial Accounting" parent="menu_finance_configuration"/>
-        <menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration"/>
+        <menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration" groups="analytic.group_analytic_accounting"/>
         <menuitem id="menu_analytic" parent="menu_analytic_accounting" name="Accounts" groups="analytic.group_analytic_accounting"/>
-        <menuitem id="menu_low_level" name="Low Level" parent="menu_finance_accounting" groups="base.group_extended"/>
+        <menuitem id="menu_low_level" name="Low Level" parent="menu_finance_accounting" groups="base.group_extended,group_account_manager"/>
         <menuitem id="menu_configuration_misc" name="Miscellaneous" parent="menu_finance_configuration" sequence="30" groups="group_account_manager"/>
         <menuitem id="base.menu_action_currency_form" parent="menu_configuration_misc" sequence="20"/>
         <menuitem id="menu_finance_generic_reporting" name="Generic Reporting" parent="menu_finance_reporting" sequence="100"/>
-        <menuitem id="menu_finance_entries" name="Journal Entries" parent="menu_finance" sequence="4" groups="group_account_user"/>
-        <menuitem id="account.menu_finance_recurrent_entries" name="Recurring Entries" parent="menu_finance_periodical_processing" sequence="15" groups="base.group_extended"/>
+        <menuitem id="menu_finance_entries" name="Journal Entries" parent="menu_finance" sequence="4" groups="group_account_user,group_account_manager"/>
+        <menuitem id="account.menu_finance_recurrent_entries" name="Recurring Entries" parent="menu_finance_periodical_processing" sequence="15" groups="base.group_extended,group_account_manager,group_account_user"/>
 
-        <menuitem id="menu_account_end_year_treatments" name="End of Period" parent="menu_finance_periodical_processing" groups="group_account_manager" sequence="25"/>
+        <menuitem id="menu_account_end_year_treatments" name="End of Period" parent="menu_finance_periodical_processing" groups="group_account_manager,group_account_user" sequence="25"/>
         <menuitem id="menu_finance_periodical_processing_billing" name="Billing" parent="menu_finance_periodical_processing" sequence="35"/>
 
         <menuitem id="menu_finance_statistic_report_statement" name="Statistic Reports" parent="menu_finance_reporting" sequence="300"/>
@@ -43,7 +43,7 @@
         <menuitem
             parent="account.menu_finance_legal_statement"
             id="menu_journals_report"
-            groups="group_account_user"
+            groups="group_account_user,group_account_manager"
             name="Journals"/>
 
     </data>

addons/account/account_report.xml

@@ -45,7 +45,7 @@
         <menuitem
             id="menu_tax_report"
             name="Taxes"
-            groups="group_account_user"
+            groups="group_account_user,group_account_manager"
             parent="account.menu_finance_generic_reporting" sequence="3"/>
 
         <report id="account_account_balance_landscape"

addons/account/account_view.xml

@@ -23,8 +23,8 @@
                     <separator colspan="4" string="Periods"/>
                     <field colspan="4" name="period_ids" nolabel="1" widget="one2many_list">
                         <form string="Period">
-                            <field name="name" select="1"/>
-                            <field name="code" select="1"/>
+                            <field name="name"/>
+                            <field name="code"/>
                             <field name="date_start"/>
                             <field name="date_stop"/>
                             <field name="special"/>
@@ -59,7 +59,7 @@
                 <search string="Search Fiscalyear">
                     <group>
                         <filter string="Open" domain="[('state','=','draft')]" icon="terp-camera_test"/>
-                        <filter string="Closed" domain="[('state','=','done')]" icon="terp-dialog_close"/>
+                        <filter string="Closed" domain="[('state','=','done')]" icon="terp-dialog-close"/>
                         <separator orientation="vertical"/>
                         <field name="code"/>
                         <field name="name"/>
@@ -237,16 +237,16 @@
             </field>
         </record>
         <record id="view_treasory_graph" model="ir.ui.view">
-         	<field name="name">account.treasory.graph</field>
-         	<field name="model">account.account</field>
-         	<field name="type">graph</field>
-         	<field name="arch" type="xml">
-             	<graph string="Treasory Analysis" type="bar">
-                	<field name="name"/>
-                	<field name="balance" operator="+"/>
-             	</graph>
+           <field name="name">account.treasory.graph</field>
+           <field name="model">account.account</field>
+           <field name="type">graph</field>
+           <field name="arch" type="xml">
+               <graph string="Treasory Analysis" type="bar">
+                  <field name="name"/>
+                  <field name="balance" operator="+"/>
+               </graph>
          </field>
-    	</record>
+      </record>
         <record id="action_account_form" model="ir.actions.act_window">
             <field name="name">Accounts</field>
             <field name="res_model">account.account</field>
@@ -314,13 +314,33 @@
             </field>
         </record>
 
+        <record id="view_account_journal_view_search" model="ir.ui.view">
+            <field name="name">account.journal.view.search</field>
+            <field name="model">account.journal.view</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Journal View">
+                    <field name="name"/>
+                </search>
+            </field>
+        </record>
+        <record id="view_account_journal_view_tree" model="ir.ui.view">
+            <field name="name">account.journal.view.tree</field>
+            <field name="model">account.journal.view</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Journal View">
+                    <field name="name"/>
+                </tree>
+            </field>
+        </record>
         <record id="view_account_journal_view_form" model="ir.ui.view">
             <field name="name">account.journal.view.form</field>
             <field name="model">account.journal.view</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Journal View">
-                    <field name="name" select="1"/>
+                    <field name="name"/>
                     <field colspan="4" name="columns_id" nolabel="1" widget="one2many_list"/>
                 </form>
             </field>
@@ -330,7 +350,9 @@
             <field name="res_model">account.journal.view</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_account_journal_view_search"/>
         </record>
+
         <menuitem action="action_account_journal_view" id="menu_action_account_journal_view" parent="account.menu_low_level"/>
 
         <!--
@@ -369,8 +391,9 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
-                    <filter string="Type" context="{'group_by':'type'}" icon="terp-stock_effects-object-colorize"/>
                     <filter string="User" context="{'group_by':'user_id'}" icon="terp-personal"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Type" context="{'group_by':'type'}" icon="terp-stock_effects-object-colorize"/>
                     </group>
                 </tree>
             </field>
@@ -612,6 +635,7 @@
             <field name="domain">[('journal_id.type', '=', 'bank')]</field>
             <field name="context">{'journal_type':'bank'}</field>
             <field name="search_view_id" ref="view_bank_statement_search"/>
+            <field name="help">A bank statement is a summary of all financial transactions occurring over a given period of time on a deposit account, a credit card, or any other type of account. Start by encoding the starting and closing balance, then record all lines of your statement. When you are in the Payment column of the a line, you can press F1 to open the reconciliation form.</field>
         </record>
         <record model="ir.actions.act_window.view" id="action_bank_statement_tree_bank">
             <field name="sequence" eval="1"/>
@@ -664,6 +688,18 @@
         <!--
     Account Types
     -->
+        <record id="view_account_type_search" model="ir.ui.view">
+            <field name="name">account.account.type.search</field>
+            <field name="model">account.account.type</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Account Type">
+                    <field name="name"/>
+                    <field name="code"/>
+                </search>
+            </field>
+        </record>
+
         <record id="view_account_type_tree" model="ir.ui.view">
             <field name="name">account.account.type.tree</field>
             <field name="model">account.account.type</field>
@@ -705,8 +741,9 @@
             <field name="res_model">account.account.type</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_account_type_search"/>
         </record>
-        <menuitem action="action_account_type_form" groups="base.group_extended" id="menu_action_account_type_form" parent="menu_low_level"/>
+        <menuitem action="action_account_type_form" groups="base.group_extended,group_account_manager" id="menu_action_account_type_form" parent="menu_low_level"/>
         <!--
     Entries
     -->
@@ -754,6 +791,19 @@
         <!--
     Tax Codes
     -->
+        <record id="view_tax_code_search" model="ir.ui.view">
+            <field name="name">account.tax.code.search</field>
+            <field name="model">account.tax.code</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Account Tax Code">
+                    <field name="name"/>
+                    <field name="code"/>
+                    <field name="parent_id"/>
+                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                </search>
+            </field>
+        </record>
         <record id="view_tax_code_tree" model="ir.ui.view">
             <field name="name">account.tax.code.tree</field>
             <field name="model">account.tax.code</field>
@@ -777,10 +827,10 @@
             <field name="arch" type="xml">
                 <form string="Account Tax Code">
                     <group col="6" colspan="4">
-                        <field name="name" select="1"/>
-                        <field name="code" select="1"/>
-                        <field name="parent_id" select="1"/>
-                        <field name="company_id" select="1" groups="base.group_multi_company"/>
+                        <field name="name"/>
+                        <field name="code"/>
+                        <field name="parent_id"/>
+                        <field name="company_id" groups="base.group_multi_company"/>
                     </group>
                     <group colspan="2" col="2">
                         <separator string="Reporting Configuration" colspan="4"/>
@@ -803,6 +853,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_tax_code_tree"/>
+            <field name="search_view_id" ref="view_tax_code_search"/>
         </record>
        <menuitem id="next_id_27" name="Taxes" parent="account.menu_finance_accounting"/>
        <menuitem action="action_tax_code_list" id="menu_action_tax_code_list" parent="menu_low_level" sequence="12"/>
@@ -834,7 +885,6 @@
                         <field name="name"/>
                         <field name="description"/>
                     </group>
-                    <newline/>
                 </search>
             </field>
         </record>
@@ -845,9 +895,9 @@
             <field name="arch" type="xml">
                 <form string="Account Tax">
                     <group colspan="4" col="6">
-                        <field name="name" select="1"/>
-                        <field name="description" select="1"/>
-                  <field name="type_tax_use"/>
+                        <field name="name"/>
+                        <field name="description"/>
+                        <field name="type_tax_use"/>
                         <field name="price_include"/>
                         <field name="active"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
@@ -881,8 +931,8 @@
                         </page>
                         <page groups="base.group_extended" string="Special Computation">
                             <separator colspan="4" string="Applicability Options"/>
-                      <field name="applicable_type"/>
-                      <field name="domain"/>
+                            <field name="applicable_type"/>
+                            <field name="domain"/>
                             <separator colspan="4" string="Applicable Code (if type=code)"/>
                             <field colspan="4" name="python_applicable" nolabel="1" attrs="{'readonly':[('applicable_type','=','true')], 'required':[('applicable_type','=','code')]}"/>
                             <separator colspan="4" string="Compute Code (if type=code)"/>
@@ -907,7 +957,7 @@
             <field name="domain">[('parent_id','=',False)]</field>
             <field name="view_type">tree</field>
             <field name="view_id" ref="view_tax_code_tree"/>
-            <field name="help">Chart of Taxes is a tree view reflecting the structure of the Tax Cases (or tax codes) and shows the current tax situation. The tax chart represents the amount of each area of the tax declaration for your country. It’s presented in a hierarchical structure, which can be modified to fit your needs.</field>
+            <field name="help">The chart of taxes is used to generate your periodic tax statement. You will see here the taxes with codes related to your legal statement according to your country.</field>
         </record>
 
         <!--
@@ -1139,6 +1189,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_account_move_line_filter"/>
+            <field name="help">This view is used by accountants in order to record entries massively in OpenERP. If you want to record a supplier invoice, start by recording the line of the expense account, OpenERP will propose to you automatically the Tax related to this account and the counter-part "Account Payable".</field>
         </record>
 
         <menuitem
@@ -1227,24 +1278,24 @@
             <field name="arch" type="xml">
                 <form string="Journal Entries">
                     <group colspan="4" col="6">
-                        <field name="name" select="1" readonly="True"/>
-                        <field name="ref" select="1"/>
+                        <field name="name" readonly="True"/>
+                        <field name="ref"/>
                         <field name="to_check" groups="base.group_extended"/>
-                        <field name="journal_id" select="1"/>
+                        <field name="journal_id"/>
                         <field name="period_id"/>
-                        <field name="date" select="1"/>
+                        <field name="date"/>
                         <field name="company_id" required="1" groups="base.group_multi_company"/>
-                        <field name="partner_id" invisible="1" select="1"/>
-                        <field name="amount" invisible="1" select="1"/>
+                        <field name="partner_id" invisible="1"/>
+                        <field name="amount" invisible="1"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Journal Items">
                             <field colspan="4" name="line_id" nolabel="1" height="250" widget="one2many_list" default_get="{'lines':line_id ,'journal':journal_id }">
                                 <form string="Journal Item">
                                     <group col="6" colspan="4">
-                                        <field name="name" select="1"/>
+                                        <field name="name"/>
                                         <field name="ref"/>
-                                        <field name="partner_id" select="1" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
+                                        <field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
 
                                         <field name="journal_id"/>
                                         <field name="period_id"/>
@@ -1254,7 +1305,7 @@
                                         <page string="Information">
                                             <group col="2" colspan="2">
                                                 <separator colspan="2" string="Amount"/>
-                                                <field name="account_id" select="1" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                                                <field name="account_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                                                 <field name="debit"/>
                                                 <field name="credit"/>
                                                 <field name="quantity"/>
@@ -1269,7 +1320,7 @@
 
                                             <group col="2" colspan="2">
                                                 <separator colspan="2" string="Dates"/>
-                                                <field name="date" select="1"/>
+                                                <field name="date"/>
                                                 <field name="date_maturity"/>
                                                 <field name="date_created"/>
                                             </group>
@@ -1355,15 +1406,15 @@
                         <separator orientation="vertical"/>
                         <filter icon="terp-stock_zoom" string="To Review" domain="[('to_check','=',True)]" groups="base.group_extended" help="Journal Entries to Review"/>
                         <separator orientation="vertical"/>
-                        <field name="name" select="1"/>
-                        <field name="ref" select="1"/>
-                        <field name="partner_id" select='1'/>
-                        <field name="date" select='1'/>
+                        <field name="name"/>
+                        <field name="ref"/>
+                        <field name="partner_id"/>
+                        <field name="date"/>
                     </group>
                     <newline/>
                     <group col='8' colspan='4'>
-                        <field name="journal_id" widget="selection" select='1'/>
-                        <field name="period_id" select='1'/>
+                        <field name="journal_id" widget="selection"/>
+                        <field name="period_id"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="12" col="10">
@@ -1386,6 +1437,7 @@
             <field name="view_mode">tree,form,graph</field>
             <field name="view_id" ref="view_move_tree"/>
             <field name="search_view_id" ref="view_account_move_filter"/>
+            <field name="help">A journal entry consists of several journal items, each of which is either a debit or a credit. OpenERP creates automatically one journal entry per accounting document: invoices, refund, supplier payment, bank statements, etc.</field>
         </record>
 
         <menuitem
@@ -1393,7 +1445,7 @@
             action="action_move_journal_line"
             id="menu_action_move_journal_line_form"
             parent="account.menu_finance_entries"
-            groups="group_account_user"
+            groups="group_account_user,group_account_manager"
             sequence="5"/>
 
         <record id="action_move_line_form" model="ir.actions.act_window">
@@ -1471,7 +1523,7 @@
                                     <field name="type"/>
                                     <field name="partner_id" on_change="onchange_partner_id(partner_id, type, parent.currency)"/>
                                     <field domain="[('journal_id', '=', parent.journal_id)]" name="account_id"/>
-                                    <field name="analytic_account_id" groups="base.group_extended" />
+                                    <field name="analytic_account_id" groups="analytic.group_analytic_accounting" />
                                     <field name="amount"/>
                                     <field context="{'partner_id': partner_id, 'amount': amount, 'account_id': account_id, 'date':date}" name="reconcile_id"/>
                                 </form>
@@ -1603,9 +1655,9 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Journal Entry Model">
-                    <field name="name" select="1"/>
-                    <field name="journal_id" select="1"/>
-                    <field name="company_id" select="1" widget='selection' groups="base.group_multi_company"/>
+                    <field name="name"/>
+                    <field name="journal_id"/>
+                    <field name="company_id" widget='selection' groups="base.group_multi_company"/>
                     <field colspan="4" nolabel="1" name="lines_id" height="250" widget="one2many_list"/>
                     <separator string="Legend" colspan="4"/>
                     <field name="legend" colspan="4" nolabel="1"/>
@@ -1641,7 +1693,7 @@
                     <separator orientation="vertical"/>
                       <field name="name"/>
                       <field name="journal_id" widget="selection"/>
-                      <field name="company_id" groups="base.group_multi_company"/>
+                      <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
@@ -1660,7 +1712,7 @@
         </record>
         <menuitem
             action="action_model_form" id="menu_action_model_form" sequence="5"
-            parent="account.menu_configuration_misc" groups="base.group_extended"/>
+            parent="account.menu_configuration_misc" groups="base.group_extended,group_account_manager"/>
 
         <!--
             # Payment Terms
@@ -1723,6 +1775,18 @@
             </field>
         </record>
 
+        <record id="view_payment_term_search" model="ir.ui.view">
+            <field name="name">account.payment.term.search</field>
+            <field name="model">account.payment.term</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Payment Term">
+                    <field name="name"/>
+                    <field name="active"/>
+                </search>
+            </field>
+        </record>
+
         <record id="view_payment_term_form" model="ir.ui.view">
             <field name="name">account.payment.term.form</field>
             <field name="model">account.payment.term</field>
@@ -1745,6 +1809,7 @@
             <field name="res_model">account.payment.term</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_payment_term_search"/>
         </record>
         <menuitem action="action_payment_term_form"
             id="menu_action_payment_term_form" parent="menu_configuration_misc"
@@ -1862,7 +1927,7 @@
         </record>
         <menuitem
             name="Define Recurring Entries" action="action_subscription_form"
-            groups="base.group_extended"
+            groups="base.group_extended,group_account_manager,group_account_user"
             id="menu_action_subscription_form" sequence="1"
             parent="account.menu_finance_recurrent_entries"/>
 
@@ -1999,17 +2064,17 @@
             id="account_template_folder"
             name="Templates"
             parent="menu_finance_accounting"
-            groups="base.group_multi_company"/>
+            groups="base.group_multi_company,group_account_manager"/>
         <menuitem
             id="account_template_taxes"
             name="Taxes"
             parent="account_template_folder"
-            groups="base.group_multi_company" sequence="2"/>
+            groups="base.group_multi_company,group_account_manager" sequence="2"/>
         <menuitem
             id="account_template_accounts"
             name="Accounts"
             parent="account_template_folder"
-            groups="base.group_multi_company" sequence="1"/>
+            groups="base.group_multi_company,group_account_manager" sequence="1"/>
 
 
         <record id="view_account_template_form" model="ir.ui.view">
@@ -2084,6 +2149,7 @@
             <field name="res_model">account.account.template</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,search</field>
+            <field name="search_view_id" ref="view_account_template_search"/>
         </record>
 
         <menuitem action="action_account_template_form" id="menu_action_account_template_form" parent="account_template_accounts"/>
@@ -2243,7 +2309,6 @@
                         <filter icon="terp-sale" string="Sale" domain="[('type_tax_use','=','sale')]" help="Taxes used in Sales"/>
                         <filter icon="terp-purchase" string="Purchase" domain="[('type_tax_use','=','purchase')]" help="Taxes used in Purchases"/>
                         <separator orientation="vertical"/>
-                        <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="description"/>
                         <field name="chart_template_id"/>
@@ -2257,6 +2322,7 @@
             <field name="res_model">account.tax.template</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_account_tax_template_search"/>
         </record>
 
         <menuitem action="action_account_tax_template_form" id="menu_action_account_tax_template_form" parent="account_template_taxes" sequence="13"/>
@@ -2317,6 +2383,7 @@
             <field name="res_model">account.tax.code.template</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,search</field>
+            <field name="search_view_id" ref="view_tax_code_template_search"/>
         </record>
         <menuitem action="action_account_tax_code_template_form" id="menu_action_account_tax_code_template_form" parent="account_template_taxes" sequence="14"/>
 
@@ -2346,23 +2413,22 @@
                           <attribute name='string'></attribute>
                   </xpath>
                 <group string="res_config_contents" position="replace">
-                  <field name="company_id" widget="selection"/>
-                  <field name ="code_digits" />
-                  <field name="chart_template_id" widget="selection"/>
-                  <field name ="seq_journal" />
-                  <field colspan="4" mode="tree" name="bank_accounts_id"
-                         nolabel="1" widget="one2many_list">
-                    <form string="Bank Information">
-                      <field name="acc_name"/>
-                      <field name="account_type"/>
-                      <field name="currency_id" widget="selection"/>
-                    </form>
-                    <tree editable="bottom" string="Bank Information">
-                      <field name="acc_name"/>
-                      <field name="account_type"/>
-                      <field name="currency_id" widget="selection"/>
-                    </tree>
-                  </field>
+                    <field name="company_id" widget="selection"/>
+                    <field name ="code_digits" groups="base.group_extended"/>
+                    <field name="chart_template_id" widget="selection"/>
+                    <field name ="seq_journal" groups="base.group_extended"/>
+                    <field colspan="4" mode="tree" name="bank_accounts_id" nolabel="1" widget="one2many_list">
+                        <form string="Bank Information">
+                            <field name="acc_name"/>
+                            <field name="account_type"/>
+                            <field name="currency_id" widget="selection" groups="base.group_extended"/>
+                        </form>
+                        <tree editable="bottom" string="Bank Information">
+                            <field name="acc_name"/>
+                            <field name="account_type"/>
+                            <field name="currency_id" widget="selection" groups="base.group_extended"/>
+                        </tree>
+                    </field>
                 </group>
               </data>
             </field>
@@ -2377,10 +2443,29 @@
             <field name="view_mode">form</field>
             <field name="target">new</field>
         </record>
+        <record id="ir_actions_server_action_wizard_multi_chart" model="ir.actions.server">
+            <field name="type">ir.actions.server</field>
+            <field name="condition">True</field>
+            <field name="state">code</field>
+            <field name="model_id" ref="base.model_ir_actions_todo"/>
+            <field eval="5" name="sequence"/>
+            <field name="code">
+act_window_ids = self.pool.get('ir.actions.act_window').search(cr, uid,[('name', 'in', ('Accounting Chart Configuration', 'Generate Chart of Accounts from a Chart Template'))], context=context)
+todo_ids = self.pool.get('ir.actions.todo').search(cr, uid, [('action_id', 'in', act_window_ids)], context=context)
+self.pool.get('ir.actions.todo').write(cr, uid, todo_ids, {'state':'open'}, context=context)
+action = self.pool.get('res.config').next(cr, uid, [], context)
+</field>
+           <field name="name">New Company Financial Setting</field>
+        </record>
 
-        <menuitem name="New Company Financial Setting" parent="account.account_template_folder"
-            groups="group_account_manager"
-            action="account.action_account_configuration_installer" id="menu_wizard"/>
+
+        <record id="menu_act_ir_actions_bleble" model="ir.ui.menu">
+            <field name="name">New Company Financial Setting</field>
+            <field eval="1" name="sequence"/>
+            <field name="parent_id" ref="account.menu_finance_accounting"/>
+            <field name="icon">STOCK_JUSTIFY_FILL</field>
+            <field name="action" ref="ir_actions_server_action_wizard_multi_chart"/>
+        </record>
 
         <record id="account_account_graph" model="ir.ui.view">
             <field name="name">account.account.graph</field>
@@ -2396,13 +2481,24 @@
 
          <!-- Fiscal Position Templates -->
 
+        <record id="view_account_position_template_search" model="ir.ui.view">
+            <field name="name">account.fiscal.position.template.search</field>
+            <field name="model">account.fiscal.position.template</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Fiscal Position">
+                    <field name="name"/>
+                </search>
+            </field>
+        </record>
+
         <record id="view_account_position_template_form" model="ir.ui.view">
             <field name="name">account.fiscal.position.template.form</field>
             <field name="model">account.fiscal.position.template</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Fiscal Position Template">
-                    <field name="name" select="1"/>
+                    <field name="name"/>
                     <field name="chart_template_id"/>
                     <newline/>
                     <field name="tax_ids" colspan="4" nolabel="1">
@@ -2444,6 +2540,7 @@
             <field name="res_model">account.fiscal.position.template</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_account_position_template_search"/>
         </record>
 
         <menuitem
@@ -2599,6 +2696,7 @@
             <field name="search_view_id" ref="view_account_bank_statement_filter"/>
             <field name="domain">[('journal_id.type', '=', 'cash')]</field>
             <field name="context">{'journal_type':'cash'}</field>
+            <field name="help">Cash Register allows you to manage cash entries in your cash journals.</field>
         </record>
         <record model="ir.actions.act_window.view" id="act_cash_statement1_all">
             <field name="sequence" eval="1"/>
@@ -2619,7 +2717,7 @@
             <field name="act_window_id" ref="action_view_bank_statement_tree"/>
         </record>
         <menuitem action="action_view_bank_statement_tree" id="journal_cash_move_lines" parent="menu_finance_bank_and_cash"
-            groups="group_account_user"/>
+            groups="group_account_user,group_account_manager"/>
 
     </data>
 </openerp>

addons/account/board_account_view.xml

@@ -20,22 +20,22 @@
             <field name="view_mode">graph,tree</field>
             <field name="domain">[('type','=','income')]</field>
         </record>
-    	<record id="action_company_analysis_tree" model="ir.actions.act_window">
-        	<field name="name">Company Analysis</field>
-        	<field name="res_model">account.entries.report</field>
-        	<field name="view_type">form</field>
-        	<field name="view_mode">tree,graph</field>
-        	<field name="context">{'group_by':['user_type'], 'group_by_no_leaf':1}</field>
-            <field name="view_id" ref="account.view_company_analysis_tree"/>
-    	</record>
-    	<record id="action_treasory_graph" model="ir.actions.act_window">
-        	<field name="name">Treasory</field>
-        	<field name="res_model">account.account</field>
-        	<field name="view_type">form</field>
-        	<field name="view_mode">graph,tree</field>
+      <record id="action_company_analysis_tree" model="ir.actions.act_window">
+          <field name="name">Company Analysis</field>
+          <field name="res_model">account.entries.report</field>
+          <field name="view_type">form</field>
+          <field name="view_mode">tree,graph</field>
+          <field name="context">{'group_by':['user_type'], 'group_by_no_leaf':1}</field>
+            <field name="view_id" ref="account.view_account_entries_report_tree"/>
+      </record>
+      <record id="action_treasory_graph" model="ir.actions.act_window">
+          <field name="name">Treasory</field>
+          <field name="res_model">account.account</field>
+          <field name="view_type">form</field>
+          <field name="view_mode">graph,tree</field>
             <field name="domain">[('type','=','liquidity')]</field>
             <field name="view_id" ref="account.view_treasory_graph"/>
-    	</record>
+      </record>
         <record id="board_account_form" model="ir.ui.view">
             <field name="name">board.account.form</field>
             <field name="model">board.board</field>
@@ -44,7 +44,7 @@
                 <form string="Account Board">
                     <hpaned>
                         <child1>
-                            <action colspan="4" height="160" width="400" name="%(account.action_invoice_tree1)d" string="Draft Customer Invoices" domain="[('state','=','draft'),('type','=','out_invoice')]"/>
+                            <action colspan="4" height="160" width="400" name="%(account.action_invoice_tree1)d" string="Customer Invoices to Validate" domain="[('state','=','draft'),('type','=','out_invoice')]"/>
                             <action colspan="4" height="160" width="400" name="%(action_company_analysis_tree)d" string="Company Analysis" />
                         </child1>
                         <child2>
@@ -68,6 +68,8 @@
 
         <menuitem id="menu_dashboard_acc" name="Dashboard" sequence="2" parent="account.menu_finance_reporting" groups="group_account_user,group_account_manager"/>
         <menuitem action="open_board_account" icon="terp-graph" id="menu_board_account" parent="menu_dashboard_acc" sequence="1"/>
-        
+        <menuitem icon="terp-account" id="account.menu_finance" name="Accounting" sequence="13" action="open_board_account"/>
+
+
     </data>
 </openerp>

addons/account/company.py

@@ -33,7 +33,7 @@ class res_company(osv.osv):
             method=True,
             view_load=True,
             domain="[('type', '=', 'payable')]",
-            help="This Account is used for transferring Profit/Loss(If It is Profit : Amount will be added, Loss : Amount will be deducted.), Which is calculated from Profit & Loss Report"),
+            help="This Account is used for transferring Profit/Loss(If It is Profit: Amount will be added, Loss : Amount will be deducted.), Which is calculated from Profit & Loss Report"),
     }
 
     _defaults = {

addons/account/data/account_data2.xml

@@ -2,6 +2,11 @@
 <openerp>
     <data noupdate="1">
 
+        <record id="analytic_journal_sale" model="account.analytic.journal">
+            <field name="name">Sales</field>
+            <field name="type">sale</field>
+        </record>
+
         <!--
         Payment term
         -->
@@ -465,13 +470,42 @@
             <field eval="3" name="padding"/>
             <field name="prefix">SAJ/%(year)s/</field>
         </record>
+        <record id="sequence_refund_sales_journal" model="ir.sequence">
+            <field name="name">Sales Credit Note Journal</field>
+            <field name="code">account.journal</field>
+            <field eval="3" name="padding"/>
+            <field name="prefix">SCNJ/%(year)s/</field>
+        </record>
         <record id="sequence_purchase_journal" model="ir.sequence">
             <field name="name">Purchase Journal</field>
             <field name="code">account.journal</field>
             <field eval="3" name="padding"/>
             <field name="prefix">EXJ/%(year)s/</field>
         </record>
-
+        <record id="sequence_refund_purchase_journal" model="ir.sequence">
+            <field name="name">Expenses Credit Notes Journal</field>
+            <field name="code">account.journal</field>
+            <field eval="3" name="padding"/>
+            <field name="prefix">ECNJ/%(year)s/</field>
+        </record>
+        <record id="sequence_bank_journal" model="ir.sequence">
+            <field name="name">Bank Journal</field>
+            <field name="code">account.journal</field>
+            <field eval="3" name="padding"/>
+            <field name="prefix">BNK/%(year)s/</field>
+        </record>
+        <record id="sequence_check_journal" model="ir.sequence">
+            <field name="name">Checks Journal</field>
+            <field name="code">account.journal</field>
+            <field eval="3" name="padding"/>
+            <field name="prefix">CHK/%(year)s/</field>
+        </record>
+        <record id="sequence_cash_journal" model="ir.sequence">
+            <field name="name">Cash Journal</field>
+            <field name="code">account.journal</field>
+            <field eval="3" name="padding"/>
+            <field name="prefix">CSH/%(year)s/</field>
+        </record>
         <!--
         Account Statement Sequences
         -->

addons/account/demo/account_minimal.xml

@@ -357,7 +357,7 @@
             <field name="type">sale_refund</field>
             <field eval="True" name="refund_journal"/>
             <field name="view_id" ref="account_sp_refund_journal_view"/>
-            <field name="sequence_id" ref="sequence_sale_journal"/>
+            <field name="sequence_id" ref="sequence_refund_sales_journal"/>
             <field model="account.account" name="default_credit_account_id" ref="a_sale"/>
             <field model="account.account" name="default_debit_account_id" ref="a_sale"/>
             <field name="analytic_journal_id" ref="cose_journal_sale"/>
@@ -381,7 +381,7 @@
             <field name="type">purchase_refund</field>
             <field eval="True" name="refund_journal"/>
             <field name="view_id" ref="account_sp_refund_journal_view"/>
-            <field name="sequence_id" ref="sequence_purchase_journal"/>
+            <field name="sequence_id" ref="sequence_refund_purchase_journal"/>
             <field model="account.account" name="default_debit_account_id" ref="a_expense"/>
             <field model="account.account" name="default_credit_account_id" ref="a_expense"/>
             <field name="analytic_journal_id" ref="exp"/>
@@ -393,7 +393,7 @@
             <field name="code">BNK</field>
             <field name="type">bank</field>
             <field name="view_id" ref="account_journal_bank_view"/>
-            <field name="sequence_id" ref="sequence_journal"/>
+            <field name="sequence_id" ref="sequence_bank_journal"/>
             <field model="account.account" name="default_debit_account_id" ref="cash"/>
             <field model="account.account" name="default_credit_account_id" ref="cash"/>
             <field name="analytic_journal_id" ref="sit"/>
@@ -404,7 +404,7 @@
             <field name="code">CHK</field>
             <field name="type">bank</field>
             <field name="view_id" ref="account_journal_bank_view"/>
-            <field name="sequence_id" ref="sequence_journal"/>
+            <field name="sequence_id" ref="sequence_check_journal"/>
             <field model="account.account" name="default_debit_account_id" ref="cash"/>
             <field model="account.account" name="default_credit_account_id" ref="cash"/>
             <field name="analytic_journal_id" ref="sit"/>
@@ -415,7 +415,7 @@
             <field name="code">CSH</field>
             <field name="type">cash</field>
             <field name="view_id" ref="account_journal_bank_view"/>
-            <field name="sequence_id" ref="sequence_journal"/>
+            <field name="sequence_id" ref="sequence_cash_journal"/>
             <field model="account.account" name="default_debit_account_id" ref="cash"/>
             <field model="account.account" name="default_credit_account_id" ref="cash"/>
             <field name="analytic_journal_id" ref="sit"/>

addons/account/i18n/es_EC.po

@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-18 22:37+0000\n"
+"PO-Revision-Date: 2010-10-19 20:43+0000\n"
 "Last-Translator: Cristian Salamea (GnuThink) <ovnicraft@gmail.com>\n"
 "Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-10-20 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -2110,7 +2110,7 @@ msgstr "Proceso de factura de cliente"
 #. module: account
 #: rml:account.invoice:0
 msgid "Fiscal Mapping Remark :"
-msgstr ""
+msgstr "Posiciones Fiscales"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,period_id:0
@@ -3713,7 +3713,7 @@ msgstr "Secuencia"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
 msgid "Template for Fiscal Mapping"
-msgstr ""
+msgstr "Plantilla para posiciones fiscales"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -3820,7 +3820,7 @@ msgstr "Facturas borrador"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
 msgid "Template Tax Fiscal Mapping"
-msgstr ""
+msgstr "Plantilla para cambio de impuestos"
 
 #. module: account
 #: rml:account.invoice:0
@@ -4220,7 +4220,7 @@ msgstr "Realizado"
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
 msgid "Periods"
-msgstr ""
+msgstr "Periodos"
 
 #. module: account
 #: rml:account.invoice:0
@@ -4229,7 +4229,7 @@ msgstr ""
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "Factura"
 
 #. module: account
 #: selection:account.analytic.account,state:0
@@ -4237,30 +4237,32 @@ msgstr ""
 #: wizard_button:account.open_closed_fiscalyear,init,open:0
 #: wizard_button:account_use_models,create,open_move:0
 msgid "Open"
-msgstr ""
+msgstr "Abrir"
 
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_29
 msgid "Search Entries"
-msgstr ""
+msgstr "Buscar asientos"
 
 #. module: account
 #: model:process.node,note:account.process_node_analytic0
 #: model:process.node,note:account.process_node_analyticcost0
 msgid "Analytic costs to reinvoice purchases, timesheets, ..."
-msgstr ""
+msgstr "Costes analíticos para refacturar compras, hojas de servicios, ..."
 
 #. module: account
 #: field:account.account,tax_ids:0
 #: field:account.account.template,tax_ids:0
 msgid "Default Taxes"
-msgstr ""
+msgstr "Impuestos por defecto"
 
 #. module: account
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+"especial!"
 
 #. module: account
 #: help:account.account.type,sign:0
@@ -4269,11 +4271,13 @@ msgid ""
 "reports, so that you can see positive figures instead of negative ones in "
 "expenses accounts."
 msgstr ""
+"Permite cambiar el signo del saldo que se muestra en los informes, para que "
+"pueda ver cifras positivas en vez de negativas en cuentas de gastos."
 
 #. module: account
 #: help:account.config.wizard,code:0
 msgid "Name of the fiscal year as displayed in reports."
-msgstr ""
+msgstr "Nombre del ejercicio fiscal que se muestra en informes."
 
 #. module: account
 #: help:account.move.line,date_maturity:0
@@ -4281,26 +4285,28 @@ msgid ""
 "This field is used for payable and receivable entries. You can put the limit "
 "date for the payment of this entry line."
 msgstr ""
+"Este campo es usado en asientos a pagar y a cobrar. Puede definir la fecha "
+"límite de pago para este apunte."
 
 #. module: account
 #: rml:account.tax.code.entries:0
 msgid "Third party (Country)"
-msgstr ""
+msgstr "Terceros (país)"
 
 #. module: account
 #: field:account.account,parent_left:0
 msgid "Parent Left"
-msgstr ""
+msgstr "Padre izquierdo"
 
 #. module: account
 #: help:account.journal,sequence_id:0
 msgid "The sequence gives the display order for a list of journals"
-msgstr ""
+msgstr "La secuencia indica el orden a mostrar en una lista de diarios"
 
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
-msgstr ""
+msgstr "Controles de tipo"
 
 #. module: account
 #: field:account.analytic.account,name:0
@@ -4308,17 +4314,17 @@ msgstr ""
 #: rml:account.analytic.account.balance:0
 #: rml:account.central.journal:0
 msgid "Account Name"
-msgstr ""
+msgstr "Nombre de Cuenta"
 
 #. module: account
 #: wizard_field:account.invoice.pay,init,date:0
 msgid "Payment date"
-msgstr ""
+msgstr "Fecha de pago"
 
 #. module: account
 #: wizard_button:account_use_models,create,end:0
 msgid "Ok"
-msgstr ""
+msgstr "Aceptar"
 
 #. module: account
 #: rml:account.invoice:0

addons/account/i18n/hr.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-12 16:53+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-14 07:28+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\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-10-13 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -2506,13 +2506,13 @@ msgstr "Iznos u valuti dnevnika"
 #. module: account
 #: wizard_field:account.general.ledger.report,checktype,landscape:0
 msgid "Landscape Mode"
-msgstr "Položeni način"
+msgstr "Prosireni način"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_analyticinvoice0
 #: model:process.transition,note:account.process_transition_supplieranalyticcost0
 msgid "From analytic accounts, Create invoice."
-msgstr "Iz konta analitike, stvori račun."
+msgstr "Iz konta analitike, kreiraj račun."
 
 #. module: account
 #: wizard_button:account.account.balance.report,account_selection,end:0
@@ -2578,7 +2578,7 @@ msgstr "Naziv vrste konta"
 #: help:account.tax.template,ref_tax_code_id:0
 #: help:account.tax.template,tax_code_id:0
 msgid "Use this code for the VAT declaration."
-msgstr "Koristi u PDV obrazascu."
+msgstr "Koristi ovo za dekleraciju u PDV-a."
 
 #. module: account
 #: field:account.move.line,blocked:0
@@ -2626,7 +2626,8 @@ msgstr "Nalog za plaćanje"
 #: help:account.account.template,reconcile:0
 msgid ""
 "Check this option if you want the user to reconcile entries in this account."
-msgstr "Omogućuje zatvaranje stavaka za ovaj konto."
+msgstr ""
+"Cekirajte ovde da omogućuite korisniku zatvaranje stavaka za ovaj konto."
 
 #. module: account
 #: rml:account.analytic.account.journal:0
@@ -2818,6 +2819,10 @@ msgid ""
 "higher ones. The order is important if you have a tax that has several tax "
 "children. In this case, the evaluation order is important."
 msgstr ""
+"Sekvenciono polje se koristi da bi se poredjali porezi od najmanjeg do "
+"najveceg. Ovaj poredak je vazan, narocito ukoliko imate poreze koji, opet "
+"imaju nekoliko podredjenih poreza. U tom slucaju, ovaj evaluacioni poredak "
+"je vazan."
 
 #. module: account
 #: field:account.journal.column,view_id:0
@@ -2870,7 +2875,7 @@ msgstr "Nova izlazna faktura"
 #: wizard_button:account.move.line.reconcile,addendum,reconcile:0
 #: wizard_button:account.move.line.reconcile,init_full,reconcile:0
 msgid "Reconcile"
-msgstr "Zatvori"
+msgstr "Sravnjanje"
 
 #. module: account
 #: rml:account.overdue:0
@@ -2906,7 +2911,7 @@ msgstr "Konto poreza"
 #. module: account
 #: model:process.transition,note:account.process_transition_statemententries0
 msgid "From statement, create entries"
-msgstr "Stvori stavki iz izvoda"
+msgstr "Kreiraj stavku iz izvoda"
 
 #. module: account
 #: field:account.analytic.account,complete_name:0
@@ -3068,8 +3073,8 @@ msgid ""
 "If this box is checked, the system will try to group the accounting lines "
 "when generating them from invoices."
 msgstr ""
-"Označite za grupiranje stavki prilikom knjiženja računa. Istovrsne stavke se "
-"knjiže zbrojno, kao jedna."
+"Ako je cekirano, sistem ce probati da grupise konta prilikom generisanja iz "
+"racuna."
 
 #. module: account
 #: wizard_field:account.move.line.reconcile,init_full,trans_nbr:0
@@ -3192,7 +3197,7 @@ msgstr "Konto"
 #. module: account
 #: model:account.journal,name:account.bank_journal
 msgid "Journal de Banque CHF"
-msgstr ""
+msgstr "Dnevnik CHF Banke"
 
 #. module: account
 #: selection:account.account.balance.report,checktype,state:0
@@ -3559,7 +3564,7 @@ msgstr "3"
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_vat_declaration
 msgid "Taxes Report"
-msgstr "PDV obrazac"
+msgstr "Poreski Izvestaj"
 
 #. module: account
 #: selection:account.journal.period,state:0
@@ -5210,7 +5215,7 @@ msgstr "Primitak novca"
 #: field:account.fiscal.position.tax,tax_dest_id:0
 #: field:account.fiscal.position.tax.template,tax_dest_id:0
 msgid "Replacement Tax"
-msgstr "Zamjenski porez"
+msgstr "Promenljiv porez"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_invoicemanually0
@@ -5934,7 +5939,7 @@ msgstr "Uvjet plaćanja"
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
 msgid "Fiscal Mappings"
-msgstr ""
+msgstr "Fiskalna mapiranja"
 
 #. module: account
 #: model:process.process,name:account.process_process_statementprocess0
@@ -5958,7 +5963,7 @@ msgstr "Označite ovu kućicu"
 msgid ""
 "Check this if the price you use on the product and invoices includes this "
 "tax."
-msgstr ""
+msgstr "Označite ovu kućicu ako cena proizvoda i racuna sadrze ovaj porez"
 
 #. module: account
 #: field:account.journal.column,name:0
@@ -5983,6 +5988,7 @@ msgstr "Da"
 msgid ""
 "Check this if the user is allowed to reconcile entries in this account."
 msgstr ""
+"Označite ovu kućicu ako je dozvoljeno korisniku da ponisti stavke ovog racuna"
 
 #. module: account
 #: wizard_button:account.subscription.generate,init,generate:0

addons/account/i18n/it.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-29 11:28+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-10-19 14:39+0000\n"
+"Last-Translator: Lorenzo Battistini <lorenzo.battistini@domsense.com>\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-09-30 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-10-20 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -353,7 +353,7 @@ msgstr "Delta di Debito"
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
-msgstr "Imposte"
+msgstr "Tassa"
 
 #. module: account
 #: rml:account.general.journal:0

addons/account/i18n/mn.po

@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-12 07:43+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-10-18 06:38+0000\n"
+"Last-Translator: sugi <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-13 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-10-20 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -51,7 +51,7 @@ msgstr "Ноорогноос тайлан батлах."
 #. module: account
 #: model:account.account.type,name:account.account_type_asset
 msgid "Asset"
-msgstr "Үндсэн хөрөнгө"
+msgstr "Хөрөнгө"
 
 #. module: account
 #: constraint:ir.actions.act_window:0
@@ -152,7 +152,7 @@ msgstr "Алдаа! Мөчлөгийн үргэжлэх хугацаа буру
 #: model:ir.actions.act_window,name:account.action_move_line_form
 #: model:ir.ui.menu,name:account.menu_action_move_line_form
 msgid "Entries"
-msgstr "Ажил гүйлгээнүүд"
+msgstr "Ажил гүйлгээ"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
@@ -329,7 +329,7 @@ msgstr "Гүйлгээний нэр"
 #. module: account
 #: xsl:account.transfer:0
 msgid "Reference"
-msgstr "Ишлэл"
+msgstr "Дугаар"
 
 #. module: account
 #: wizard_view:account.subscription.generate,init:0
@@ -528,7 +528,7 @@ msgstr "Нийлүүлэгчийн нэхэмжлэл"
 #: model:process.transition,name:account.process_transition_reconcilepaid0
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
 msgid "Reconcile Paid"
-msgstr "Төлсөн гүйцэлтгэл"
+msgstr "Төлсөн тулгалт"
 
 #. module: account
 #: wizard_field:account.chart,init,target_move:0
@@ -724,7 +724,7 @@ msgstr "Татварын ангилалын тэмдэг"
 #. module: account
 #: help:res.partner,credit:0
 msgid "Total amount this customer owes you."
-msgstr "Энэ худалдан авагчаас авах нийт авлагын дүн."
+msgstr "Энэ үйлчлүүлэгчээс авах нийт авлагын дүн."
 
 #. module: account
 #: view:account.move.line:0
@@ -894,7 +894,7 @@ msgstr "Заавал бөглөх"
 #: field:product.category,property_account_expense_categ:0
 #: field:product.template,property_account_expense:0
 msgid "Expense Account"
-msgstr "Зарлагын данс"
+msgstr "Зардлын данс"
 
 #. module: account
 #: wizard_field:account.move.line.reconcile,addendum,journal_id:0
@@ -1159,7 +1159,7 @@ msgstr "wizard.multi.charts.accounts"
 #. module: account
 #: model:account.journal,name:account.sales_journal
 msgid "Journal de vente"
-msgstr "борлуулалтын журнал"
+msgstr "Борлуулалтын журнал"
 
 #. module: account
 #: help:account.model.line,amount_currency:0
@@ -1356,7 +1356,7 @@ msgstr "Төлөх нэхэмжлэл сонгох"
 #: selection:account.analytic.account,type:0
 #: field:account.journal,view_id:0
 msgid "View"
-msgstr "Дэлгэц"
+msgstr "Харах"
 
 #. module: account
 #: selection:account.account.balance.report,checktype,display_account:0
@@ -1401,7 +1401,7 @@ msgstr "Электроник файл"
 #. module: account
 #: view:res.partner:0
 msgid "Customer Credit"
-msgstr "Худалдан авагчийн кредит"
+msgstr "Үйлчлүүлэгчийн кредит"
 
 #. module: account
 #: field:account.invoice,tax_line:0
@@ -1707,7 +1707,7 @@ msgstr "Өртөг ба Орлого"
 #. module: account
 #: constraint:account.account:0
 msgid "Error ! You can not create recursive accounts."
-msgstr "Алдаа! Та цикл хэлбэрийн данс үүсгэх боломжгүй."
+msgstr "Алдаа ! Та цикл хэлбэрийн данс үүсгэх боломжтой."
 
 #. module: account
 #: rml:account.tax.code.entries:0
@@ -1881,7 +1881,7 @@ msgstr "Эхлэх огноо"
 #. module: account
 #: model:account.journal,name:account.refund_expenses_journal
 msgid "x Expenses Credit Notes Journal"
-msgstr ""
+msgstr "Зардлыг кредитийн журналд тэмдэглэх"
 
 #. module: account
 #: field:account.analytic.journal,type:0
@@ -1930,7 +1930,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_invoice_tree5
 #: model:ir.ui.menu,name:account.menu_invoice_draft
 msgid "Draft Customer Invoices"
-msgstr "Худалдан авагчийн ноорог нэхэмжлэл"
+msgstr "Үйлчлүүлэгчийн ноорог нэхэмжлэл"
 
 #. module: account
 #: model:ir.model,name:account.model_account_subscription_line
@@ -2020,7 +2020,7 @@ msgstr "Аналитик журналын тайлан"
 #: model:ir.actions.act_window,name:account.action_invoice_tree3
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree3
 msgid "Customer Refunds"
-msgstr "Худалдан авагчийн буцаалт"
+msgstr "Үйлчлүүлэгчийн буцаалт"
 
 #. module: account
 #: rml:account.vat.declaration:0
@@ -2096,7 +2096,7 @@ msgstr "Өгөгдлүүд"
 #. module: account
 #: model:process.process,name:account.process_process_invoiceprocess0
 msgid "Customer Invoice Process"
-msgstr "Худалдан авагчийн нэхэмжлэлийн явц"
+msgstr "Үйлчлүүлэгчийн нэхэмжлэлийн явц"
 
 #. module: account
 #: rml:account.invoice:0
@@ -2476,7 +2476,7 @@ msgstr "Журнал нээх"
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "KI"
-msgstr ""
+msgstr "KI"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.action_account_analytic_line
@@ -2502,7 +2502,7 @@ msgstr "Эхлэн"
 #: model:process.node,name:account.process_node_bankstatement0
 #: model:process.node,name:account.process_node_supplierbankstatement0
 msgid "Bank Statement"
-msgstr "Банкны хуулга"
+msgstr "Харилцахын орлого, зарлагын ордер"
 
 #. module: account
 #: wizard_view:account.invoice.pay,addendum:0
@@ -2732,7 +2732,7 @@ msgstr "-"
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "asgfas"
-msgstr ""
+msgstr "asgfas"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2
@@ -2882,7 +2882,7 @@ msgstr "Нийт кредит"
 #: model:ir.actions.act_window,name:account.action_invoice_tree1_new
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree1_new
 msgid "New Customer Invoice"
-msgstr "Шинэ худалдан авагчийн нэхэмжлэл"
+msgstr "Шинэ үйлчлүүлэгчийн нэхэмжлэл"
 
 #. module: account
 #: field:account.account,reconcile:0
@@ -3042,7 +3042,7 @@ msgstr "Гаралтын валютын ханш"
 #: model:ir.actions.act_window,name:account.action_invoice_tree10
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree10
 msgid "Draft Customer Refunds"
-msgstr "Худалдан авагчийн ноорог буцаалт"
+msgstr "Үйлчлүүлэгчийн ноорог буцаалт"
 
 #. module: account
 #: field:account.journal.column,readonly:0
@@ -3136,7 +3136,7 @@ msgstr "("
 #: view:account.period:0
 #: view:account.subscription:0
 msgid "Set to Draft"
-msgstr "Ноорог болгох"
+msgstr "Ноороглох"
 
 #. module: account
 #: help:account.invoice,origin:0
@@ -3300,7 +3300,7 @@ msgstr "Санхүүгийн менежмент"
 #: selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "None"
-msgstr "Аль нь ч биш"
+msgstr "Байхгүй"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_fiscalyear_close
@@ -3498,7 +3498,9 @@ msgstr "Өдрийн огноо"
 msgid ""
 "The amount expressed in an optional other currency if it is a multi-currency "
 "entry."
-msgstr "Өөр валютаар илэрхийлсэн дүн байна"
+msgstr ""
+"Хэрэв энэ гүйлгээ гадаад валютаар хийгдсэн бол гүйлгээний дүнг гадаад "
+"валютаар илэрхийлнэ."
 
 #. module: account
 #: field:account.tax,parent_id:0
@@ -3691,7 +3693,7 @@ msgstr ""
 #: field:account.tax.template,sequence:0
 #: field:fiscalyear.seq,sequence_id:0
 msgid "Sequence"
-msgstr "Дугаарлалт"
+msgstr "Дараалал"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
@@ -3840,7 +3842,7 @@ msgstr ""
 "    Харилцагчийн данс бүртгэл\n"
 "    Татварын менежмент\n"
 "    Төсөв\n"
-"    Харилцагчийн нэхэмжлэл\n"
+"    Үйлчлүүлэгчийн нэхэмжлэл\n"
 "    Банкны ажил гүйлгэ\n"
 "    "
 
@@ -3986,7 +3988,7 @@ msgstr "Код/Огноо"
 #: field:account.payment.term,active:0
 #: field:account.tax,active:0
 msgid "Active"
-msgstr "Идэвхитэй"
+msgstr "Актив"
 
 #. module: account
 #: model:process.node,note:account.process_node_electronicfile0
@@ -4001,7 +4003,7 @@ msgstr "Нэмэлт Талбарууд"
 #. module: account
 #: view:res.partner:0
 msgid "Customer Accounting Properties"
-msgstr "Худалдан авагчийн санхүү бүртгэл"
+msgstr "Үйлчлүүлэгчийн санхүү бүртгэл"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -4084,7 +4086,7 @@ msgstr "Ажил гүйлгээ"
 #: view:account.bank.statement:0
 #: field:account.bank.statement,line_ids:0
 msgid "Statement lines"
-msgstr "Тайлангийн цуваа"
+msgstr "Орлого, зарлагын гүйлгээ"
 
 #. module: account
 #: field:account.move.line,amount_taxed:0
@@ -4126,12 +4128,14 @@ msgid ""
 "You can check this box to mark the entry line as a litigation with the "
 "associated partner"
 msgstr ""
+"Журналын бичилт нь холбогдох харилцагчийн хувьд маргаантай гэж үзвэл энэ "
+"нүдийг сонгох хэрэгтэй"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree1
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree1
 msgid "Customer Invoices"
-msgstr "Худалдан авагчийн нэхэмжлэл"
+msgstr "Үйлчлүүлэгчийн нэхэмжлэл"
 
 #. module: account
 #: field:res.partner,debit_limit:0
@@ -4315,7 +4319,7 @@ msgstr "Татварууд:"
 #: model:ir.actions.act_window,name:account.action_invoice_tree7
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree7
 msgid "Unpaid Customer Invoices"
-msgstr "Худалдан авагчийн төлөгдөөгүй нэхэмжлэл"
+msgstr "Үйлчлүүлэгчийн төлөгдөөгүй нэхэмжлэл"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2
@@ -4407,7 +4411,7 @@ msgstr "банкны төлбөр"
 #. module: account
 #: selection:account.move,state:0
 msgid "Posted"
-msgstr "Батлагдсан"
+msgstr "Илгээсэн"
 
 #. module: account
 #: view:account.tax:0
@@ -4503,12 +4507,12 @@ msgstr "Балансын удирдлагын эхлэл төгсгөлийг т
 #. module: account
 #: wizard_view:account.wizard_paid_open,init:0
 msgid "Are you sure you want to open this invoice ?"
-msgstr ""
+msgstr "Энэ нэхэмжлэлийг нээхдээ та итгэлтэй байна уу?"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_3rdparty_ledger_other
 msgid "Partner Other Ledger"
-msgstr ""
+msgstr "Бусад харилцагчийн тооцооны дэвтэр"
 
 #. module: account
 #: view:res.partner:0
@@ -4542,7 +4546,7 @@ msgstr "Дансны бичилт"
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_partner_account_move_unreconciled
 msgid "Receivables & Payables"
-msgstr "Авлагын данс болон төлбөр"
+msgstr "Авлага & Өглөг"
 
 #. module: account
 #: rml:account.general.ledger:0
@@ -4625,7 +4629,7 @@ msgstr "Нийлүүлэгчийн санхүү бүртгэл"
 #. module: account
 #: view:account.analytic.account:0
 msgid "Analytic Account Statistics"
-msgstr ""
+msgstr "Аналитик санхүүгийн статистик"
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
@@ -4652,12 +4656,12 @@ msgstr "Ажил гүйлгээнүүд"
 #. module: account
 #: wizard_view:account.analytic.account.chart,init:0
 msgid "Analytic Account Charts"
-msgstr ""
+msgstr "Аналитик дансны мод"
 
 #. module: account
 #: wizard_field:account.aged.trial.balance,init,result_selection:0
 msgid "Filter on Partners"
-msgstr ""
+msgstr "Харилцагч дээр шүүлт хийх"
 
 #. module: account
 #: field:account.tax,price_include:0
@@ -4674,7 +4678,7 @@ msgstr "Аналитик бичилтүүд журналаар"
 #: model:process.transition,note:account.process_transition_suppliervalidentries0
 #: model:process.transition,note:account.process_transition_validentries0
 msgid "Valid entries from invoice"
-msgstr ""
+msgstr "Нэхэмжлэлийн хүчинтэй бичилт"
 
 #. module: account
 #: field:account.account,company_id:0
@@ -4704,7 +4708,7 @@ msgstr "Орлого"
 #. module: account
 #: selection:account.subscription,state:0
 msgid "Running"
-msgstr ""
+msgstr "Байнгын"
 
 #. module: account
 #: help:account.tax,include_base_amount:0
@@ -4728,7 +4732,7 @@ msgstr "Журналын нэр"
 #. module: account
 #: model:process.transition,note:account.process_transition_invoiceimport0
 msgid "Import invoice from statement"
-msgstr ""
+msgstr "Мэдэгдлээс нэхэмжлэл оруулж ирэх"
 
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
@@ -4745,13 +4749,13 @@ msgstr "Санхүүгийн жил"
 #. module: account
 #: model:process.node,note:account.process_node_importinvoice0
 msgid "Import from invoices or payments"
-msgstr ""
+msgstr "Нэхэмжлэл буюу төлөлтөөс оруулах"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_reconcile_select
 #: model:ir.ui.menu,name:account.menu_reconcile_select
 msgid "Reconcile entries"
-msgstr ""
+msgstr "Тулгах бичилт"
 
 #. module: account
 #: xsl:account.transfer:0
@@ -4815,7 +4819,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,state:0
 msgid "Cancelled"
-msgstr "Цуцалсан"
+msgstr "Цуцлагдсан"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
@@ -4837,7 +4841,7 @@ msgstr "А/к дугаар"
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree_month
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print_month
 msgid "Account cost and revenue by journal (This Month)"
-msgstr ""
+msgstr "Дансны өртөг, орлого журналаар"
 
 #. module: account
 #: selection:account.partner.balance.report,init,result_selection:0
@@ -4921,13 +4925,13 @@ msgstr "Борлуулалтын татварууд"
 #. module: account
 #: model:ir.model,name:account.model_account_move_reconcile
 msgid "Account Reconciliation"
-msgstr ""
+msgstr "Дансны тулгалт"
 
 #. module: account
 #: view:account.bank.statement:0
 #: selection:account.bank.statement,state:0
 msgid "Confirm"
-msgstr "Батлагдсан"
+msgstr "Батлах"
 
 #. module: account
 #: wizard_view:account.account.balance.report,account_selection:0
@@ -4953,12 +4957,12 @@ msgstr ""
 #: field:account.bank.statement.reconcile,total_amount:0
 #: field:account.bank.statement.reconcile,total_second_amount:0
 msgid "Payment amount"
-msgstr ""
+msgstr "Төлөлтийн хэмжээ"
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Analytic account"
-msgstr ""
+msgstr "Аналитик данс"
 
 #. module: account
 #: rml:account.invoice:0
@@ -4995,17 +4999,17 @@ msgstr "Дебит"
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_42
 msgid "All Months"
-msgstr ""
+msgstr "Бүх сарууд"
 
 #. module: account
 #: wizard_field:account.invoice.refund,init,date:0
 msgid "Operation date"
-msgstr ""
+msgstr "Ашиглалтын огноо"
 
 #. module: account
 #: field:account.invoice,invoice_line:0
 msgid "Invoice Lines"
-msgstr ""
+msgstr "Нэхэмжлэлийн мөр"
 
 #. module: account
 #: field:account.period,date_start:0
@@ -5020,7 +5024,7 @@ msgstr "Шинэ гүйлгээний нэр"
 #. module: account
 #: wizard_button:account_use_models,init_form,create:0
 msgid "Create Entries"
-msgstr ""
+msgstr "Бичилт үүсгэх"
 
 #. module: account
 #: field:account.tax,ref_tax_code_id:0
@@ -5031,17 +5035,17 @@ msgstr "Буцаалтын татварын ангилал"
 #. module: account
 #: field:account.invoice.tax,name:0
 msgid "Tax Description"
-msgstr ""
+msgstr "Татварын тайлбар"
 
 #. module: account
 #: help:account.invoice,move_id:0
 msgid "Link to the automatically generated account moves."
-msgstr ""
+msgstr "Дансны автомат үүссэн шилжилтүүд рүү холбох"
 
 #. module: account
 #: wizard_field:account.automatic.reconcile,reconcile,reconciled:0
 msgid "Reconciled transactions"
-msgstr ""
+msgstr "Тулгагдсан гүйлгээнүүд"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_reporting
@@ -5052,23 +5056,23 @@ msgstr "Тайлан"
 #: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "/"
-msgstr ""
+msgstr "/"
 
 #. module: account
 #: model:process.node,note:account.process_node_invoiceinvoice0
 #: model:process.node,note:account.process_node_supplierinvoiceinvoice0
 msgid "Have a number and entries are generated"
-msgstr ""
+msgstr "Үүсгэгдсэн тоо болон бичлэгүүдийг агуулж байна"
 
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
 msgid "Analytic Check -"
-msgstr ""
+msgstr "Аналитик шалгалт-"
 
 #. module: account
 #: rml:account.account.balance:0
 msgid "Account Balance -"
-msgstr ""
+msgstr "Дансны тэнцэл-"
 
 #. module: account
 #: field:account.journal,group_invoice_lines:0
@@ -5084,7 +5088,7 @@ msgstr "Тохиргоо"
 #: view:account.analytic.line:0
 #: view:account.invoice:0
 msgid "Total amount"
-msgstr ""
+msgstr "Нийт хэмжээ"
 
 #. module: account
 #: view:account.journal:0
@@ -5094,7 +5098,7 @@ msgstr "Журналын бүтэц"
 #. module: account
 #: view:account.subscription.line:0
 msgid "Subscription lines"
-msgstr ""
+msgstr "Бүртгэлийн мөрүүд"
 
 #. module: account
 #: field:account.chart.template,property_account_income:0
@@ -5111,7 +5115,7 @@ msgstr "Уг дансны гүйлгээг хөрвүүлж хадгалах в
 #: wizard_button:populate_statement_from_inv,go,end:0
 #: wizard_button:populate_statement_from_inv,init,end:0
 msgid "_Cancel"
-msgstr ""
+msgstr "Цуцлах"
 
 #. module: account
 #: wizard_view:account.general.ledger.report,checktype:0
@@ -5129,7 +5133,7 @@ msgstr "Тонгоруулсан аналитик баланс-"
 #: model:process.node,name:account.process_node_paidinvoice0
 #: model:process.node,name:account.process_node_supplierpaidinvoice0
 msgid "Paid invoice"
-msgstr ""
+msgstr "Нэхэмжлэл төлөх"
 
 #. module: account
 #: view:account.tax:0
@@ -5147,7 +5151,7 @@ msgstr "Татварын групп"
 #: model:ir.actions.act_window,name:account.action_invoice_tree3_new
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree3_new
 msgid "New Customer Refund"
-msgstr "Шинэ худалдан авагчийн буцаалт"
+msgstr "Шинэ Үйлчлүүлэгчийн буцаалт"
 
 #. module: account
 #: help:wizard.multi.charts.accounts,seq_journal:0
@@ -5161,7 +5165,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_populate_statement_from_inv
 msgid "Import invoices"
-msgstr ""
+msgstr "Нэхэмжлэл оруулж ирэх"
 
 #. module: account
 #: wizard_view:account.move.line.unreconcile,init:0
@@ -5195,7 +5199,7 @@ msgstr "Дансны өгөгдөл"
 #. module: account
 #: view:account.tax.code.template:0
 msgid "Account Tax Code Template"
-msgstr ""
+msgstr "Дансны татварын кодны загвар"
 
 #. module: account
 #: view:account.subscription:0
@@ -5205,7 +5209,7 @@ msgstr ""
 #. module: account
 #: model:process.node,name:account.process_node_manually0
 msgid "Manually"
-msgstr ""
+msgstr "Гараар"
 
 #. module: account
 #: view:account.invoice:0
@@ -5235,22 +5239,22 @@ msgstr "Нэхэмжлэлийн гүйлгээ"
 #. module: account
 #: wizard_field:account.invoice.pay,addendum,writeoff_journal_id:0
 msgid "Write-Off journal"
-msgstr ""
+msgstr "Журналаас хасалт хийх"
 
 #. module: account
 #: wizard_button:account.invoice.pay,init,writeoff_check:0
 msgid "Full Payment"
-msgstr ""
+msgstr "Бүтэн төлөлт"
 
 #. module: account
 #: selection:account.move,type:0
 msgid "Journal Purchase"
-msgstr ""
+msgstr "Худалдан авалтын журнал"
 
 #. module: account
 #: selection:account.move,type:0
 msgid "Cash Receipt"
-msgstr ""
+msgstr "Кассын баримт"
 
 #. module: account
 #: field:account.fiscal.position.tax,tax_dest_id:0
@@ -5295,7 +5299,7 @@ msgstr ""
 #. module: account
 #: wizard_view:account_use_models,create:0
 msgid "Use Model"
-msgstr ""
+msgstr "Модел ашиглах"
 
 #. module: account
 #: wizard_button:account.wizard_paid_open,init,end:0
@@ -5305,7 +5309,7 @@ msgstr "Үгүй"
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_partner_account_move
 msgid "All account entries"
-msgstr ""
+msgstr "Бүх дансны бичилт"
 
 #. module: account
 #: help:account.invoice.tax,tax_code_id:0
@@ -5323,7 +5327,7 @@ msgstr "Огноо шүүлт"
 #. module: account
 #: wizard_view:populate_statement_from_inv,init:0
 msgid "Choose Journal and Payment Date"
-msgstr ""
+msgstr "Журнал болон төлөлтийн огноо сонгох"
 
 #. module: account
 #: selection:account.analytic.account,state:0
@@ -5347,7 +5351,7 @@ msgstr "Төлсөн"
 #: model:ir.actions.act_window,name:account.action_invoice_tree11
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree11
 msgid "Unpaid Customer Refunds"
-msgstr "Худалдан авагчийн төлөгдөөгүй буцаалтууд"
+msgstr "Үйлчлүүлэгчийн төлөгдөөгүй буцаалтууд"
 
 #. module: account
 #: help:account.invoice,residual:0
@@ -5357,18 +5361,18 @@ msgstr ""
 #. module: account
 #: wizard_view:account.period.close,init:0
 msgid "Are you sure ?"
-msgstr ""
+msgstr "Итгэлтэй байна уу ?"
 
 #. module: account
 #: rml:account.invoice:0
 #: view:account.invoice:0
 msgid "PRO-FORMA"
-msgstr ""
+msgstr "PRO-FORMA"
 
 #. module: account
 #: field:account.move.reconcile,line_partial_ids:0
 msgid "Partial Entry lines"
-msgstr ""
+msgstr "Хэсэгчилсэн журналын бичилт"
 
 #. module: account
 #: help:account.move.line,statement_id:0
@@ -5378,7 +5382,7 @@ msgstr "Банкны гүйлгээ тулгалтанд хэрэглэгдэх
 #. module: account
 #: view:account.fiscalyear:0
 msgid "Fiscalyear"
-msgstr ""
+msgstr "Санхүүгийн жил"
 
 #. module: account
 #: wizard_button:account.analytic.line,init,open:0
@@ -5389,12 +5393,12 @@ msgstr ""
 #: selection:account.analytic.account,type:0
 #: selection:account.move.line,centralisation:0
 msgid "Normal"
-msgstr ""
+msgstr "Хэвийн"
 
 #. module: account
 #: model:process.process,name:account.process_process_supplierinvoiceprocess0
 msgid "Supplier Invoice Process"
-msgstr ""
+msgstr "Нийлүүлэгч нэхэмжлэх процесс"
 
 #. module: account
 #: rml:account.account.balance:0
@@ -5408,7 +5412,7 @@ msgstr ""
 #: rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 msgid "Page"
-msgstr ""
+msgstr "Хуудас"
 
 #. module: account
 #: view:account.move:0
@@ -5420,23 +5424,23 @@ msgstr "Туслах мэдээлэл"
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
-msgstr ""
+msgstr "Төлөлтийн нөхцөл"
 
 #. module: account
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Receivable and Payable"
-msgstr ""
+msgstr "Авлага болон өглөг"
 
 #. module: account
 #: rml:account.account.balance:0
 #: rml:account.general.journal:0
 msgid ":"
-msgstr ""
+msgstr ":"
 
 #. module: account
 #: field:account.bank.statement.line,reconcile_amount:0
 msgid "Amount reconciled"
-msgstr ""
+msgstr "Тулгагдсан хэмжээ"
 
 #. module: account
 #: selection:account.account,currency_mode:0
@@ -5474,7 +5478,7 @@ msgstr "Татварын хэрэглээ"
 #: model:ir.actions.act_window,name:account.action_subscription_form
 #: model:ir.ui.menu,name:account.menu_action_subscription_form
 msgid "Subscription Entries"
-msgstr ""
+msgstr "Баримтын бичилт"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree6
@@ -5502,7 +5506,7 @@ msgstr "Мөчлөгийн төгсгөл"
 #: view:account.move:0
 #: model:ir.model,name:account.model_account_move
 msgid "Account Entry"
-msgstr ""
+msgstr "Дансны бичилт"
 
 #. module: account
 #: rml:account.general.journal:0
@@ -5528,7 +5532,7 @@ msgstr "Ерөнхий журнал"
 #: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Balance"
-msgstr "Тэнцэл"
+msgstr "Баланс"
 
 #. module: account
 #: rml:account.invoice:0
@@ -5538,7 +5542,7 @@ msgstr "Буцааж төлөх"
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_tax
 msgid "Invoice Tax"
-msgstr ""
+msgstr "Татварын нэхэмжлэл"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_form
@@ -5600,7 +5604,7 @@ msgstr "Хаах"
 #. module: account
 #: field:account.bank.statement.line,move_ids:0
 msgid "Moves"
-msgstr "Шилжүүлэх"
+msgstr "Ажил гүйлгээ"
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -5664,7 +5668,7 @@ msgstr ""
 #. module: account
 #: field:account.model.line,date:0
 msgid "Current Date"
-msgstr ""
+msgstr "Одоогийн огноо"
 
 #. module: account
 #: selection:account.move,type:0
@@ -5718,7 +5722,7 @@ msgstr ""
 #: field:account.tax.code,info:0
 #: field:account.tax.code.template,info:0
 msgid "Description"
-msgstr "Тодорхойлолт"
+msgstr "Тайлбар"
 
 #. module: account
 #: help:product.template,property_account_income:0
@@ -5785,7 +5789,7 @@ msgstr "Мөчлөг нээж хаах"
 #. module: account
 #: rml:account.analytic.account.balance:0
 msgid "Analytic Balance -"
-msgstr ""
+msgstr "Аналитик тэнцэл"
 
 #. module: account
 #: wizard_field:account_use_models,init_form,model:0
@@ -5812,7 +5816,7 @@ msgstr "Мөчлөгийн төрөл"
 #. module: account
 #: view:product.category:0
 msgid "Accounting Properties"
-msgstr ""
+msgstr "Санхүүгийн бүрэлдэхүүн хэсгүүд"
 
 #. module: account
 #: model:ir.model,name:account.model_account_sequence_fiscalyear
@@ -5858,7 +5862,7 @@ msgstr "Солих данс"
 #. module: account
 #: rml:account.overdue:0
 msgid "Maturity"
-msgstr ""
+msgstr "Хугацаа"
 
 #. module: account
 #: field:account.fiscalyear,name:0
@@ -5894,12 +5898,12 @@ msgstr "Нийлүүлэгчийн буцаалт"
 #: model:process.transition,note:account.process_transition_entriesreconcile0
 #: model:process.transition,note:account.process_transition_supplierentriesreconcile0
 msgid "Reconcile Entries."
-msgstr ""
+msgstr "Бичилт тулгах"
 
 #. module: account
 #: field:account.subscription.line,move_id:0
 msgid "Entry"
-msgstr "Бичилт"
+msgstr "Ажил гүйлгээ"
 
 #. module: account
 #: model:process.node,note:account.process_node_paidinvoice0
@@ -5918,7 +5922,7 @@ msgstr ""
 #. module: account
 #: model:ir.module.module,shortdesc:account.module_meta_information
 msgid "Accounting and financial management"
-msgstr ""
+msgstr "Санхүү эдийн засгийн удирдлага"
 
 #. module: account
 #: view:account.fiscal.position.template:0
@@ -6044,7 +6048,7 @@ msgstr "Хэрэглэгч уг дансны гүйлгээг банкны ху
 #. module: account
 #: wizard_button:account.subscription.generate,init,generate:0
 msgid "Compute Entry Dates"
-msgstr ""
+msgstr "Гүйлгээний огноо тооцоолол"
 
 #. module: account
 #: view:board.board:0
@@ -6060,7 +6064,7 @@ msgstr "Ноорог нэхэмжлэл"
 #: model:ir.actions.act_window,name:account.open_board_account
 #: model:ir.ui.menu,name:account.menu_board_account
 msgid "Accounting Dashboard"
-msgstr ""
+msgstr "Санхүүгийн хянах самбар"
 
 #. module: account
 #: view:board.board:0
@@ -6077,7 +6081,7 @@ msgstr "Үнийн нэхэмжлэл"
 #. module: account
 #: view:board.board:0
 msgid "Aged receivables"
-msgstr "Насжилтын авлагын данс"
+msgstr "Авлагын насжилт"
 
 #. module: account
 #: model:ir.module.module,shortdesc:account.module_meta_information
@@ -6097,12 +6101,12 @@ msgstr "Эдийн засгийн үзүүлэлт"
 #. module: account
 #: view:board.board:0
 msgid "Account Board"
-msgstr ""
+msgstr "Дансны самбар"
 
 #. module: account
 #: view:board.board:0
 msgid "Aged income"
-msgstr ""
+msgstr "Насжилтын орлого"
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,show_columns:0
@@ -6164,7 +6168,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_account_balance_report
 msgid "Account balance-Compare Years"
-msgstr ""
+msgstr "Дансны тэнцлийг жилээр нь харьцуулах"
 
 #. module: account
 #: model:ir.module.module,description:account.module_meta_information
@@ -6196,7 +6200,7 @@ msgstr ""
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,landscape:0
 msgid "Show Report in Landscape Form"
-msgstr ""
+msgstr "Тайланг хөндлөнгөөр харуулах"
 
 #. module: account
 #: rml:account.account.balance.landscape:0
@@ -6296,7 +6300,7 @@ msgstr ""
 #. module: account
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Customize Report"
-msgstr ""
+msgstr "Хувийн тайлан"
 
 #. module: account
 #: field:report.aged.receivable,name:0
@@ -6326,7 +6330,7 @@ msgstr "Дансны төрлөөр"
 #. module: account
 #: model:ir.model,name:report_account.model_report_aged_receivable
 msgid "Aged Receivable Till Today"
-msgstr ""
+msgstr "Өнөөдрийг хүртэлх авлагын насжилт"
 
 #. module: account
 #: model:ir.model,name:report_account.model_report_account_receivable
@@ -6352,7 +6356,7 @@ msgstr "Санхүүгийн тайлан-Тайлан"
 #: model:ir.actions.act_window,name:report_account.action_account_receivable_graph
 #: model:ir.ui.menu,name:report_account.menu_account_receivable_graph
 msgid "Balance by Type of Account"
-msgstr ""
+msgstr "Дансны төрлийн тэнцэл"
 
 #. module: account
 #: field:report.account.receivable,name:0
@@ -6368,7 +6372,7 @@ msgstr "Үүсгэх огноо"
 #: model:ir.actions.act_window,name:report_account.action_aged_receivable_graph
 #: view:report.aged.receivable:0
 msgid "Aged Receivable"
-msgstr "Насжилтын авлага"
+msgstr "Авлагын насжилт"
 
 #. module: account
 #: view:report.invoice.created:0

addons/account/i18n/ru.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-04 06:51+0000\n"
+"PO-Revision-Date: 2010-10-18 09:52+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\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-10-05 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-10-20 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1348,7 +1348,7 @@ msgstr "Сообщение"
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaymentorder0
 msgid "Select invoices you want to pay and manages advances"
-msgstr ""
+msgstr "Выберите счета для оплаты и авансирования"
 
 #. module: account
 #: selection:account.account,type:0
@@ -1513,7 +1513,7 @@ msgstr ""
 #. module: account
 #: field:account.journal,refund_journal:0
 msgid "Refund Journal"
-msgstr ""
+msgstr "Журнал возвратов"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_income
@@ -4294,7 +4294,7 @@ msgstr "Период счета"
 #. module: account
 #: wizard_field:account.invoice.pay,init,journal_id:0
 msgid "Journal/Payment Mode"
-msgstr ""
+msgstr "Журнал/Форма оплаты"
 
 #. module: account
 #: rml:account.invoice:0

addons/account/installer.py

@@ -52,18 +52,17 @@ class account_installer(osv.osv_memory):
 
     _columns = {
         # Accounting
-        'charts':fields.selection(_get_charts, 'Chart of Accounts',
+        'charts': fields.selection(_get_charts, 'Chart of Accounts',
             required=True,
             help="Installs localized accounting charts to match as closely as "
                  "possible the accounting needs of your company based on your "
                  "country."),
         'date_start': fields.date('Start Date', required=True),
         'date_stop': fields.date('End Date', required=True),
-        'period':fields.selection([('month','Monthly'), ('3months','3 Monthly')],
-                                  'Periods', required=True),
-        'bank_accounts_id': fields.one2many('account.bank.accounts.wizard', 'bank_account_id', 'Your Bank and Cash Accounts',required=True),
-        'sale_tax':fields.float('Sale Tax(%)'),
-        'purchase_tax':fields.float('Purchase Tax(%)'),
+        'period': fields.selection([('month','Monthly'), ('3months','3 Monthly')], 'Periods', required=True),
+        'bank_accounts_id': fields.one2many('account.bank.accounts.wizard', 'bank_account_id', 'Your Bank and Cash Accounts'),
+        'sale_tax': fields.float('Sale Tax(%)'),
+        'purchase_tax': fields.float('Purchase Tax(%)'),
         'company_id': fields.many2one('res.company', 'Company'),
     }
 
@@ -91,16 +90,16 @@ class account_installer(osv.osv_memory):
     _defaults = {
         'date_start': lambda *a: time.strftime('%Y-01-01'),
         'date_stop': lambda *a: time.strftime('%Y-12-31'),
-        'period': lambda *a:'month',
-        'sale_tax': lambda *a:0.0,
-        'purchase_tax': lambda *a:0.0,
+        'period': 'month',
+        'sale_tax': 0.0,
+        'purchase_tax': 0.0,
         'company_id': _default_company,
         'bank_accounts_id': _get_default_accounts,
         'charts': _get_default_charts
     }
 
     def on_change_tax(self, cr, uid, id, tax):
-        return {'value':{'purchase_tax':tax}}
+        return {'value': {'purchase_tax': tax}}
 
     def on_change_start_date(self, cr, uid, id, start_date=False):
         if start_date:
@@ -163,10 +162,10 @@ class account_installer(osv.osv_memory):
             vals_tax = {
                 'name':tax.name,
                 'sequence': tax.sequence,
-                'amount':tax.amount,
-                'type':tax.type,
+                'amount': tax.amount,
+                'type': tax.type,
                 'applicable_type': tax.applicable_type,
-                'domain':tax.domain,
+                'domain': tax.domain,
                 'parent_id': tax.parent_id and ((tax.parent_id.id in tax_template_ref) and tax_template_ref[tax.parent_id.id]) or False,
                 'child_depend': tax.child_depend,
                 'python_compute': tax.python_compute,
@@ -220,7 +219,7 @@ class account_installer(osv.osv_memory):
                 'shortcut': account_template.shortcut,
                 'note': account_template.note,
                 'parent_id': account_template.parent_id and ((account_template.parent_id.id in acc_template_ref) and acc_template_ref[account_template.parent_id.id]) or False,
-                'tax_ids': [(6,0,tax_ids)],
+                'tax_ids': [(6, 0, tax_ids)],
                 'company_id': company_id.id,
             }
             new_account = obj_acc.create(cr, uid, vals)
@@ -239,8 +238,8 @@ class account_installer(osv.osv_memory):
                 }
                 bank_account = obj_acc.create(cr, uid, b_vals)
 
-                view_id_cash = self.pool.get('account.journal.view').search(cr,uid,[('name','=','Bank/Cash Journal View')])[0] #why fixed name here?
-                view_id_cur = self.pool.get('account.journal.view').search(cr,uid,[('name','=','Bank/Cash Journal (Multi-Currency) View')])[0] #Why Fixed name here?
+                view_id_cash = self.pool.get('account.journal.view').search(cr, uid, [('name', '=', 'Bank/Cash Journal View')])[0] #why fixed name here?
+                view_id_cur = self.pool.get('account.journal.view').search(cr, uid, [('name', '=', 'Bank/Cash Journal (Multi-Currency) View')])[0] #Why Fixed name here?
 
                 cash_result = mod_obj._get_id(cr, uid, 'account', 'conf_account_type_cash')
                 cash_type_id = mod_obj.read(cr, uid, [cash_result], ['res_id'])[0]['res_id']
@@ -256,17 +255,17 @@ class account_installer(osv.osv_memory):
                 vals_seq = {
                         'name': _('Bank Journal '),
                         'code': 'account.journal',
-                        'prefix': 'BAN/',
+                        'prefix': 'BNK/%(year)s/',
                         'padding': 5
                         }
-                seq_id = obj_sequence.create(cr,uid,vals_seq)
+                seq_id = obj_sequence.create(cr, uid, vals_seq)
 
                 #create the bank journals
-                analitical_bank_ids = analytic_journal_obj.search(cr,uid,[('type','=','situation')])
+                analitical_bank_ids = analytic_journal_obj.search(cr, uid, [('type','=','situation')])
                 analitical_journal_bank = analitical_bank_ids and analitical_bank_ids[0] or False
                 vals_journal = {}
-                vals_journal['name']= _('Bank Journal ')
-                vals_journal['code']= _('BNK')
+                vals_journal['name'] = _('Bank Journal ')
+                vals_journal['code'] = _('BNK')
                 vals_journal['sequence_id'] = seq_id
                 vals_journal['type'] = 'bank'
                 vals_journal['analytic_journal_id'] = analitical_journal_bank
@@ -277,20 +276,16 @@ class account_installer(osv.osv_memory):
                     vals_journal['view_id'] = view_id_cash
                 vals_journal['default_credit_account_id'] = new_account
                 vals_journal['default_debit_account_id'] = new_account
-                obj_journal.create(cr,uid,vals_journal)
+                obj_journal.create(cr, uid, vals_journal)
 
                 for val in record.bank_accounts_id:
-                    seq_prefix = None
                     seq_padding = 5
                     if val.account_type == 'cash':
                         type = cash_type_id
-                        seq_prefix = "CSH/"
                     elif val.account_type == 'bank':
                         type = bank_type_id
-                        seq_prefix = "BAN/"
                     elif val.account_type == 'check':
                         type = check_type_id
-                        seq_prefix = "CHK/"
                     else:
                         type = check_type_id
                         seq_padding = None
@@ -304,17 +299,17 @@ class account_installer(osv.osv_memory):
                         'company_id': company_id.id }
                     child_bnk_acc = obj_acc.create(cr, uid, vals_bnk)
                     vals_seq_child = {
-                        'name': _(vals_bnk['name']),
+                        'name': _(vals_bnk['name'] + ' ' + 'Journal'),
                         'code': 'account.journal',
-                        'prefix': seq_prefix,
+                        'prefix': _((vals_bnk['name'][:3].upper()) + '/%(year)s/'),
                         'padding': seq_padding
                         }
                     seq_id = obj_sequence.create(cr, uid, vals_seq_child)
 
                     #create the bank journal
                     vals_journal = {}
-                    vals_journal['name']= vals_bnk['name'] + ' Journal'
-                    vals_journal['code']= _(vals_bnk['name'][:3])
+                    vals_journal['name'] = vals_bnk['name'] + ' Journal'
+                    vals_journal['code'] = _(vals_bnk['name'][:3]).upper()
                     vals_journal['sequence_id'] = seq_id
                     vals_journal['type'] = 'cash'
                     if vals.get('currency_id', False):
@@ -328,7 +323,6 @@ class account_installer(osv.osv_memory):
                     obj_journal.create(cr,uid,vals_journal)
                     code_cnt += 1
 
-
         #reactivate the parent_store functionality on account_account
         self.pool._init = False
         self.pool.get('account.account')._parent_store_compute(cr)
@@ -352,20 +346,36 @@ class account_installer(osv.osv_memory):
             seq_sale = {
                         'name': 'Sale Journal',
                         'code': 'account.journal',
-                        'prefix': '%(year)s/',
+                        'prefix': 'SAJ/%(year)s/',
                         'padding': 3
                         }
             seq_id_sale = obj_sequence.create(cr, uid, seq_sale)
             seq_purchase = {
                         'name': 'Purchase Journal',
                         'code': 'account.journal',
-                        'prefix': '%(year)s/',
+                        'prefix': 'EXJ/%(year)s/',
                         'padding': 3
                         }
             seq_id_purchase = obj_sequence.create(cr, uid, seq_purchase)
+            seq_refund_sale = {
+                        'name': 'Sales Refund Journal',
+                        'code': 'account.journal',
+                        'prefix': 'SCNJ/%(year)s/',
+                        'padding': 3
+                        }
+            seq_id_sale_refund = obj_sequence.create(cr, uid, seq_refund_sale)
+            seq_refund_purchase = {
+                        'name': 'Purchase Refund Journal',
+                        'code': 'account.journal',
+                        'prefix': 'ECNJ/%(year)s/',
+                        'padding': 3
+                        }
+            seq_id_purchase_refund = obj_sequence.create(cr, uid, seq_refund_purchase)
         else:
             seq_id_sale = seq_id
             seq_id_purchase = seq_id
+            seq_id_sale_refund = seq_id
+            seq_id_purchase_refund = seq_id
 
         vals_journal['view_id'] = view_id
 
@@ -387,7 +397,7 @@ class account_installer(osv.osv_memory):
         obj_journal.create(cr,uid,vals_journal)
 
         # Purchase Journal
-        analitical_purchase_ids = analytic_journal_obj.search(cr,uid,[('type','=','purchase')])
+        analitical_purchase_ids = analytic_journal_obj.search(cr, uid, [('type','=','purchase')])
         analitical_journal_purchase = analitical_purchase_ids and analitical_purchase_ids[0] or False
 
         vals_journal['name'] = _('Purchase Journal')
@@ -408,9 +418,6 @@ class account_installer(osv.osv_memory):
         data = mod_obj.browse(cr, uid, data_id[0])
         view_id = data.res_id
 
-        seq_id_sale_refund = seq_id_sale
-        seq_id_purchase_refund = seq_id_purchase
-
         vals_journal['view_id'] = view_id
 
         #Sales Refund Journal
@@ -439,7 +446,7 @@ class account_installer(osv.osv_memory):
             vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.property_account_expense_categ.id]
             vals_journal['default_debit_account_id'] = acc_template_ref[obj_multi.property_account_expense_categ.id]
 
-        obj_journal.create(cr,uid,vals_journal)
+        obj_journal.create(cr, uid, vals_journal)
 
         # Bank Journals
         view_id_cash = self.pool.get('account.journal.view').search(cr, uid, [('name','=','Bank/Cash Journal View')])[0] #TOFIX: Why put fixed name ?
@@ -451,20 +458,20 @@ class account_installer(osv.osv_memory):
         fields_obj = self.pool.get('ir.model.fields')
 
         todo_list = [
-            ('property_account_receivable','res.partner','account.account'),
-            ('property_account_payable','res.partner','account.account'),
-            ('property_account_expense_categ','product.category','account.account'),
-            ('property_account_income_categ','product.category','account.account'),
-            ('property_account_expense','product.template','account.account'),
-            ('property_account_income','product.template','account.account'),
-            ('property_reserve_and_surplus_account','res.company','account.account'),
+            ('property_account_receivable', 'res.partner', 'account.account'),
+            ('property_account_payable', 'res.partner', 'account.account'),
+            ('property_account_expense_categ', 'product.category', 'account.account'),
+            ('property_account_income_categ', 'product.category', 'account.account'),
+            ('property_account_expense', 'product.template', 'account.account'),
+            ('property_account_income', 'product.template', 'account.account'),
+            ('property_reserve_and_surplus_account', 'res.company', 'account.account'),
         ]
 
         for record in todo_list:
             r = []
-            r = property_obj.search(cr, uid, [('name','=', record[0] ),('company_id','=',company_id.id)])
+            r = property_obj.search(cr, uid, [('name', '=', record[0]), ('company_id', '=', company_id.id)])
             account = getattr(obj_multi, record[0])
-            field = fields_obj.search(cr, uid, [('name','=',record[0]),('model','=',record[1]),('relation','=',record[2])])
+            field = fields_obj.search(cr, uid, [('name', '=', record[0]), ('model', '=', record[1]), ('relation', '=', record[2])])
             vals = {
                 'name': record[0],
                 'company_id': company_id.id,
@@ -529,8 +536,8 @@ class account_installer(osv.osv_memory):
                 obj_tax = self.pool.get('account.tax')
                 obj_product = self.pool.get('product.product')
                 ir_values = self.pool.get('ir.values')
-                s_tax = (res.get('sale_tax',0.0))/100
-                p_tax = (res.get('purchase_tax',0.0))/100
+                s_tax = (res.get('sale_tax', 0.0))/100
+                p_tax = (res.get('purchase_tax', 0.0))/100
                 tax_val = {}
                 default_tax = []
 
@@ -575,7 +582,7 @@ class account_installer(osv.osv_memory):
                     sale_taxcode_paid_parent_id = False
 
                 if s_tax*100 > 0.0:
-                    tax_account_ids = obj_acc.search(cr, uid, [('name','=','Tax Received')], context=context)
+                    tax_account_ids = obj_acc.search(cr, uid, [('name', '=', 'Tax Received')], context=context)
                     sales_tax_account_id = tax_account_ids and tax_account_ids[0] or False
                     vals_tax_code = {
                         'name': 'TAX%s%%'%(s_tax*100),
@@ -596,8 +603,7 @@ class account_installer(osv.osv_memory):
                     new_paid_tax_code = self.pool.get('account.tax.code').create(cr, uid, vals_paid_tax_code)
 
                     sales_tax = obj_tax.create(cr, uid,
-                                           {'name':'TAX%s%%'%(s_tax*100),
-                                            'description':'TAX%s%%'%(s_tax*100),
+                                           {'name':'TAX %s%%'%(s_tax*100),
                                             'amount':s_tax,
                                             'base_code_id':new_tax_code,
                                             'tax_code_id':new_paid_tax_code,
@@ -605,13 +611,13 @@ class account_installer(osv.osv_memory):
                                             'account_collected_id':sales_tax_account_id,
                                             'account_paid_id':sales_tax_account_id
                                             })
-                    default_account_ids = obj_acc.search(cr, uid, [('name','=','Product Sales')],context=context)
+                    default_account_ids = obj_acc.search(cr, uid, [('name', '=', 'Product Sales')],context=context)
                     if default_account_ids:
-                        obj_acc.write(cr, uid, default_account_ids, {'tax_ids':[(6,0,[sales_tax])]})
-                    tax_val.update({'taxes_id':[(6,0,[sales_tax])]})
-                    default_tax.append(('taxes_id',sales_tax))
+                        obj_acc.write(cr, uid, default_account_ids, {'tax_ids': [(6, 0, [sales_tax])]})
+                    tax_val.update({'taxes_id': [(6, 0, [sales_tax])]})
+                    default_tax.append(('taxes_id', sales_tax))
                 if p_tax*100 > 0.0:
-                    tax_account_ids = obj_acc.search(cr, uid, [('name','=','Tax Paid')], context=context)
+                    tax_account_ids = obj_acc.search(cr, uid, [('name', '=', 'Tax Paid')], context=context)
                     purchase_tax_account_id = tax_account_ids and tax_account_ids[0] or False
                     vals_tax_code = {
                         'name': 'TAX%s%%'%(p_tax*100),
@@ -632,20 +638,20 @@ class account_installer(osv.osv_memory):
                     new_paid_tax_code = self.pool.get('account.tax.code').create(cr, uid, vals_paid_tax_code)
 
                     purchase_tax = obj_tax.create(cr, uid,
-                                            {'name':'TAX%s%%'%(p_tax*100),
-                                             'description':'TAX%s%%'%(p_tax*100),
-                                             'amount':p_tax,
-                                             'base_code_id':new_tax_code,
-                                            'tax_code_id':new_paid_tax_code,
-                                            'type_tax_use':'purchase',
-                                            'account_collected_id':purchase_tax_account_id,
-                                            'account_paid_id':purchase_tax_account_id
+                                            {'name': 'TAX%s%%'%(p_tax*100),
+                                             'description': 'TAX%s%%'%(p_tax*100),
+                                             'amount': p_tax,
+                                             'base_code_id': new_tax_code,
+                                            'tax_code_id': new_paid_tax_code,
+                                            'type_tax_use': 'purchase',
+                                            'account_collected_id': purchase_tax_account_id,
+                                            'account_paid_id': purchase_tax_account_id
                                              })
-                    default_account_ids = obj_acc.search(cr, uid, [('name','=','Expenses')], context=context)
+                    default_account_ids = obj_acc.search(cr, uid, [('name', '=', 'Expenses')], context=context)
                     if default_account_ids:
-                        obj_acc.write(cr, uid, default_account_ids, {'tax_ids':[(6,0,[purchase_tax])]})
-                    tax_val.update({'supplier_taxes_id':[(6,0,[purchase_tax])]})
-                    default_tax.append(('supplier_taxes_id',purchase_tax))
+                        obj_acc.write(cr, uid, default_account_ids, {'tax_ids': [(6, 0, [purchase_tax])]})
+                    tax_val.update({'supplier_taxes_id': [(6 ,0, [purchase_tax])]})
+                    default_tax.append(('supplier_taxes_id', purchase_tax))
                 if tax_val:
                     product_ids = obj_product.search(cr, uid, [])
                     for product in obj_product.browse(cr, uid, product_ids):
@@ -654,7 +660,7 @@ class account_installer(osv.osv_memory):
                         ir_values.set(cr, uid, key='default', key2=False, name=name, models =[('product.product',False)], value=[value])
 
             if 'date_start' in res and 'date_stop' in res:
-                f_ids = fy_obj.search(cr, uid, [('date_start', '<=', res['date_start']), ('date_stop', '>=', res['date_stop']), ('company_id','=',res['company_id'])])
+                f_ids = fy_obj.search(cr, uid, [('date_start', '<=', res['date_start']), ('date_stop', '>=', res['date_stop']), ('company_id', '=', res['company_id'])])
                 if not f_ids:
                     name = code = res['date_start'][:4]
                     if int(name) != int(res['date_stop'][:4]):
@@ -690,13 +696,13 @@ class account_bank_accounts_wizard(osv.osv_memory):
 
     _columns = {
         'acc_name': fields.char('Account Name.', size=64, required=True),
-        'bank_account_id': fields.many2one('wizard.multi.charts.accounts', 'Bank Account', required=True),
+        'bank_account_id': fields.many2one('account.installer', 'Bank Account', required=True),
         'currency_id': fields.many2one('res.currency', 'Secondary Currency', help="Forces all moves for this account to have this secondary currency."),
         'account_type': fields.selection([('cash','Cash'),('check','Check'),('bank','Bank')], 'Account Type', size=32),
     }
 #    _defaults = {
 #        'currency_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.currency_id.id,
-#        }
+#    }
 
 account_bank_accounts_wizard()
 
@@ -705,17 +711,17 @@ class account_installer_modules(osv.osv_memory):
     _inherit = 'res.config.installer'
     _columns = {
         # Accounting
-        'account_analytic_plans':fields.boolean('Multiple Analytic Plans',
+        'account_analytic_plans': fields.boolean('Multiple Analytic Plans',
             help="Allows invoice lines to impact multiple analytic accounts "
                  "simultaneously."),
-        'account_payment':fields.boolean('Suppliers Payment Management',
+        'account_payment': fields.boolean('Suppliers Payment Management',
             help="Streamlines invoice payment and creates hooks to plug "
                  "automated payment systems in."),
-        'account_followup':fields.boolean('Followups Management',
+        'account_followup': fields.boolean('Followups Management',
             help="Helps you generate reminder letters for unpaid invoices, "
                  "including multiple levels of reminding and customized "
                  "per-partner policies."),
-        'account_voucher':fields.boolean('Voucher Management',
+        'account_voucher': fields.boolean('Voucher Management',
             help="Account Voucher module includes all the basic requirements of "
                  "Voucher Entries for Bank, Cash, Sales, Purchase, Expenses, Contra, etc... "),
         'account_anglo_saxon': fields.boolean('Anglo-Saxon Accounting',

addons/account/invoice.py

@@ -351,7 +351,7 @@ class account_invoice(osv.osv):
         if view_type == 'tree':
             doc = etree.XML(res['arch'])
             nodes = doc.xpath("//field[@name='partner_id']")
-            partner_string = 'Customer'
+            partner_string = _('Customer')
             if context.get('type', 'out_invoice') in ('in_invoice', 'in_refund'):
                 partner_string = _('Supplier')
             for node in nodes:
@@ -363,7 +363,7 @@ class account_invoice(osv.osv):
         try:
             res = super(account_invoice, self).create(cr, uid, vals, context)
             for inv_id, name in self.name_get(cr, uid, [res], context=context):
-                message = _('Invoice ') + " '" + name + "' "+ _("is waiting for validation.")
+                message = _("Invoice '%s' is waiting for validation.") % name
                 self.log(cr, uid, inv_id, message)
             return res
         except Exception, e:
@@ -375,6 +375,9 @@ class account_invoice(osv.osv):
 
     def confirm_paid(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state':'paid'}, context=context)
+        for inv_id, name in self.name_get(cr, uid, ids, context=context):
+            message = _("Invoice '%s' is paid.") % name
+            self.log(cr, uid, inv_id, message)
         return True
 
     def unlink(self, cr, uid, ids, context=None):
@@ -461,14 +464,6 @@ class account_invoice(osv.osv):
             result['value'].update(to_update['value'])
         return result
 
-    def onchange_currency_id(self, cr, uid, ids, curr_id, company_id):
-        if curr_id and company_id:
-            currency = self.pool.get('res.currency').browse(cr, uid, curr_id)
-            if currency.company_id.id != company_id:
-                raise osv.except_osv(_('Configuration Error !'),
-                        _('Can not select currency that is not related to current company.\nPlease select accordingly !.'))
-        return {}
-
     def onchange_journal_id(self, cr, uid, ids, journal_id=False):
         result = {}
         if journal_id:
@@ -674,7 +669,7 @@ class account_invoice(osv.osv):
         return (ref or '').replace('/','')
 
     def _get_analytic_lines(self, cr, uid, id):
-        inv = self.browse(cr, uid, [id])[0]
+        inv = self.browse(cr, uid, id)
         cur_obj = self.pool.get('res.currency')
 
         company_currency = inv.company_id.currency_id.id
@@ -690,6 +685,8 @@ class account_invoice(osv.osv):
                     ref = inv.reference
                 else:
                     ref = self._convert_ref(cr, uid, inv.number)
+                if not inv.journal_id.analytic_journal_id:
+                    raise osv.except_osv(_('No Analytic Journal !'),_("You have to define an analytic journal on the '%s' journal!") % (inv.journal_id.name,))
                 il['analytic_lines'] = [(0,0, {
                     'name': il['name'],
                     'date': inv['date_invoice'],
@@ -699,7 +696,7 @@ class account_invoice(osv.osv):
                     'product_id': il['product_id'],
                     'product_uom_id': il['uos_id'],
                     'general_account_id': il['account_id'],
-                    'journal_id': self._get_journal_analytic(cr, uid, inv.type),
+                    'journal_id': inv.journal_id.analytic_journal_id.id,
                     'ref': ref,
                 })]
         return iml
@@ -1218,12 +1215,13 @@ class account_invoice(osv.osv):
 
         inv_id, name = self.name_get(cr, uid, [invoice.id], context=context)[0]
         if (not round(total,self.pool.get('decimal.precision').precision_get(cr, uid, 'Account'))) or writeoff_acc_id:
-            self.log(cr, uid, inv_id, _('Invoice ') + " '" + name + "' "+ _("is totally paid."))
             self.pool.get('account.move.line').reconcile(cr, uid, line_ids, 'manual', writeoff_acc_id, writeoff_period_id, writeoff_journal_id, context)
         else:
             code = invoice.currency_id.code
-            amt = str(pay_amount) + code + ' on ' + str(invoice.amount_total) + code + ' (' + str(total) + code + ' remaining)'
-            self.log(cr, uid, inv_id, _('Invoice ') + " '" + name + "' "+ _("is paid partially: ") + amt)
+            # TODO: use currency's formatting function
+            msg = _("Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)") % \
+                    (name, pay_amount, code, invoice.amount_total, code, total, code)
+            self.log(cr, uid, inv_id,  msg)
             self.pool.get('account.move.line').reconcile_partial(cr, uid, line_ids, 'manual', context)
 
         # Update the stored value (fields.function), so we write to trigger recompute
@@ -1289,14 +1287,6 @@ class account_invoice_line(osv.osv):
         'price_unit': _price_unit_default,
     }
 
-    def product_id_change_unit_price_inv(self, cr, uid, tax_id, price_unit, qty, address_invoice_id, product, partner_id, context=None):
-        tax_obj = self.pool.get('account.tax')
-        if price_unit:
-            taxes = tax_obj.browse(cr, uid, tax_id)
-            for tax in tax_obj.compute_inv(cr, uid, taxes, price_unit, qty, address_invoice_id, product, partner_id):
-                price_unit = price_unit - tax['amount']
-        return {'price_unit': price_unit,'invoice_line_tax_id': tax_id}
-
     def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None):
         if context is None:
             context = {}
@@ -1361,7 +1351,7 @@ class account_invoice_line(osv.osv):
                 else:
                     app_acc_in = in_acc_cate
                     app_acc_exp = ex_acc_cate
-            if app_acc_in.company_id.id != company_id and app_acc_exp.company_id.id != company_id:
+            if app_acc_in and app_acc_in.company_id.id != company_id and app_acc_exp and app_acc_exp.company_id.id != company_id:
                 in_res_id = account_obj.search(cr, uid, [('name','=',app_acc_in.name),('company_id','=',company_id)])
                 exp_res_id = account_obj.search(cr, uid, [('name','=',app_acc_exp.name),('company_id','=',company_id)])
                 if not in_res_id and not exp_res_id:
@@ -1396,8 +1386,7 @@ class account_invoice_line(osv.osv):
             taxes = res.supplier_taxes_id and res.supplier_taxes_id or (a and self.pool.get('account.account').browse(cr, uid, a).tax_ids or False)
             tax_id = fpos_obj.map_tax(cr, uid, fpos, taxes)
         if type in ('in_invoice', 'in_refund'):
-            to_update = self.product_id_change_unit_price_inv(cr, uid, tax_id, price_unit or res.standard_price, qty, address_invoice_id, product, partner_id, context=context)
-            result.update(to_update)
+            result.update( {'price_unit': price_unit or res.standard_price,'invoice_line_tax_id': tax_id} )
         else:
             result.update({'price_unit': res.list_price, 'invoice_line_tax_id': tax_id})
 

addons/account/partner.py

@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 from operator import itemgetter
 
 from osv import fields, osv
@@ -58,8 +59,8 @@ class account_fiscal_position(osv.osv):
                 account_id = pos.account_dest_id.id
                 break
         return account_id
-account_fiscal_position()
 
+account_fiscal_position()
 
 class account_fiscal_position_tax(osv.osv):
     _name = 'account.fiscal.position.tax'
@@ -70,8 +71,8 @@ class account_fiscal_position_tax(osv.osv):
         'tax_src_id': fields.many2one('account.tax', 'Tax Source', required=True),
         'tax_dest_id': fields.many2one('account.tax', 'Replacement Tax')
     }
-account_fiscal_position_tax()
 
+account_fiscal_position_tax()
 
 class account_fiscal_position_account(osv.osv):
     _name = 'account.fiscal.position.account'
@@ -82,6 +83,7 @@ class account_fiscal_position_account(osv.osv):
         'account_src_id': fields.many2one('account.account', 'Account Source', domain=[('type','<>','view')], required=True),
         'account_dest_id': fields.many2one('account.account', 'Account Destination', domain=[('type','<>','view')], required=True)
     }
+
 account_fiscal_position_account()
 
 class res_partner(osv.osv):
@@ -89,7 +91,7 @@ class res_partner(osv.osv):
     _inherit = 'res.partner'
     _description = 'Partner'
 
-    def _credit_debit_get(self, cr, uid, ids, field_names, arg, context):
+    def _credit_debit_get(self, cr, uid, ids, field_names, arg, context=None):
         query = self.pool.get('account.move.line')._query_get(cr, uid, context=context)
         cr.execute("""SELECT l.partner_id, a.type, SUM(l.debit-l.credit)
                       FROM account_move_line l
@@ -184,6 +186,7 @@ class res_partner(osv.osv):
             'Companies that refers to partner'),
         'last_reconciliation_date': fields.datetime('Latest Reconciliation Date', help='Date on which the partner accounting entries were reconciled last time')
     }
+
 res_partner()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/product.py

@@ -19,8 +19,6 @@
 #
 ##############################################################################
 
-import time
-import netsvc
 from osv import fields, osv
 
 class product_category(osv.osv):
@@ -75,5 +73,7 @@ class product_template(osv.osv):
             view_load=True,
             help="This account will be used for invoices instead of the default one to value expenses for the current product"),
     }
+
 product_template()
 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/project/project.py

@@ -19,27 +19,25 @@
 #
 ##############################################################################
 
-import time
-import operator
-
 from osv import fields
 from osv import osv
 
 class account_analytic_journal(osv.osv):
     _name = 'account.analytic.journal'
     _columns = {
-        'name' : fields.char('Journal Name', size=64, required=True),
-        'code' : fields.char('Journal Code', size=8),
-        'active' : fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the analytic journal without removing it."),
+        'name': fields.char('Journal Name', size=64, required=True),
+        'code': fields.char('Journal Code', size=8),
+        'active': fields.boolean('Active', help="If the active field is set to true, 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', size=32, required=True, help="Gives the type of the analytic journal. When it needs for a document (eg: an invoice) to create analytic entries, OpenERP will look for a matching journal of the same type."),
-        'line_ids' : fields.one2many('account.analytic.line', 'journal_id', 'Lines'),
+        'line_ids': fields.one2many('account.analytic.line', 'journal_id', 'Lines'),
         'company_id': fields.many2one('res.company', 'Company', required=True),
     }
     _defaults = {
-        'active': lambda *a: True,
-        'type': lambda *a: 'general',
+        'active': True,
+        'type': 'general',
         'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
     }
+
 account_analytic_journal()
 
 class account_journal(osv.osv):
@@ -48,7 +46,7 @@ class account_journal(osv.osv):
     _columns = {
         'analytic_journal_id':fields.many2one('account.analytic.journal','Analytic Journal',help="Journal for analytic entries"),
     }
+
 account_journal()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/project/project_view.xml

@@ -14,6 +14,8 @@
                     <field name="quantity"/>
                     <field name="quantity_max"/>
                     <field name="date"/>
+                    <field name="user_id" invisible="1"/>
+                    <field name="parent_id" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -109,7 +111,7 @@
             <field name="view_id" ref="view_account_analytic_account_tree"/>
             <field name="search_view_id" ref="account.view_account_analytic_account_search"/>
         </record>
-        <menuitem action="action_account_analytic_account_form" id="account_analytic_def_account" parent="menu_analytic_accounting" groups="analytic.group_analytic_accounting"/>
+        <menuitem action="action_account_analytic_account_form" id="account_analytic_def_account" parent="menu_analytic_accounting" groups="analytic.group_analytic_accounting,group_account_manager"/>
 
         <record id="act_account_renew_view" model="ir.actions.act_window">
             <field name="name">Accounts to Renew</field>
@@ -127,10 +129,10 @@
             <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">Analytic Charts of Accounts allows you to access to reports by analytic accounts (or cost accounts) . From this menu you can access to analytic balance, a report that relates the analytic accounts to the general accounts. It is useful for analyzing the profitability of projects, giving you the profitability of a project for the different operations that you used to carry out the project.</field>
+            <field name="help">The normal chart of accounts has a structure defined by the legal requirement of the country. The analytic chart of account structure should reflect your own business needs in term of costs/revenues reporting. They are usually structured by contracts, projects, products or departements. Most of the OpenERP operations (invoices, timesheets, expenses, etc) generate analytic entries on the related account.</field>
         </record>
 
-        <menuitem groups="analytic.group_analytic_accounting" id="next_id_40" name="Analytic" parent="account.menu_finance_generic_reporting" sequence="4"/>
+        <menuitem groups="analytic.group_analytic_accounting,group_account_manager,group_account_user" id="next_id_40" name="Analytic" parent="account.menu_finance_generic_reporting" sequence="4"/>
 
         <record id="view_account_analytic_line_form" model="ir.ui.view">
             <field name="name">account.analytic.line.form</field>
@@ -337,7 +339,7 @@
             <field name="view_mode">tree,form,search</field>
             <field name="search_view_id" ref="view_analytic_journal_search" />
         </record>
-        <menuitem groups="analytic.group_analytic_accounting" action="action_account_analytic_journal_form" id="account_def_analytic_journal" parent="menu_analytic_accounting" sequence="5"/>
+        <menuitem groups="analytic.group_analytic_accounting,group_account_manager" action="action_account_analytic_journal_form" id="account_def_analytic_journal" parent="menu_analytic_accounting" sequence="5"/>
 
         #
         # Open journal entries
@@ -349,7 +351,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem groups="analytic.group_analytic_accounting" action="action_account_analytic_journal_open_form" id="account_analytic_journal_entries" parent="menu_finance_entries"/>
+        <menuitem groups="analytic.group_analytic_accounting,group_account_manager,group_account_user" action="action_account_analytic_journal_open_form" id="account_analytic_journal_entries" parent="menu_finance_entries"/>
 
         #
         # Reporting
@@ -361,7 +363,7 @@
             <field name="view_type">tree</field>
             <field name="help">To print an analytics (or costs) journal for a given period. The report give code, move name, account number, general amount and analytic amount.</field>
         </record>
-        <menuitem groups="analytic.group_analytic_accounting" action="action_account_analytic_journal_tree" id="account_analytic_journal_print" parent="account.next_id_40"/>
+        <menuitem groups="analytic.group_analytic_accounting,group_account_manager,group_account_user" action="action_account_analytic_journal_tree" id="account_analytic_journal_print" parent="account.next_id_40"/>
 
         #
         # Statistics

addons/account/project/wizard/account_analytic_chart_view.xml

@@ -39,7 +39,7 @@
             action="action_account_analytic_chart"
             id="menu_action_analytic_account_tree2"
             icon="STOCK_INDENT"
-            groups="analytic.group_analytic_accounting"/>
+            groups="analytic.group_analytic_accounting,group_account_manager,group_account_user"/>
 
     </data>
 </openerp>

addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml

@@ -8,18 +8,16 @@
 			<field name="type">form</field>
 			<field name="arch" type="xml">
                 <form string="Select period">
-	               <group width="450">
-	                   <separator string="Cost Ledger for period" colspan="4"/>
-	                   <field name="date1"/>
-	                   <field name="date2"/>
-	                   <separator string="and Journals" colspan="4"/>
-	                   <field name="journal" colspan="4" nolabel="1"/>
-	                   <separator colspan="4"/>
-	                   <group colspan="4" col="6">
-	                       <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-	                       <button name="check_report" string="Print" type="object" icon="gtk-print"/>
-	                   </group>
-	               </group>
+                   <separator string="Cost Ledger for period" colspan="4"/>
+                   <field name="date1"/>
+                   <field name="date2"/>
+                   <separator string="and Journals" colspan="4"/>
+                   <field name="journal" colspan="4" nolabel="1"/>
+                   <separator colspan="4"/>
+                   <group colspan="4" col="6">
+                       <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                       <button name="check_report" string="Print" type="object" icon="gtk-print"/>
+                   </group>
                 </form>
 			</field>
 		</record>

addons/account/report/account_aged_partner_balance.py

@@ -21,7 +21,6 @@
 
 import time
 
-import pooler
 import rml_parse
 from report import report_sxw
 from common_report_header import common_report_header
@@ -96,7 +95,7 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
                     OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
                     AND ' + self.query + '\
                     AND account_account.active\
-                    GROUP BY partner_id ', (tuple(move_state), tuple(self.ACCOUNT_TYPE), tuple(partner_ids), self.date_from))
+                    GROUP BY l.partner_id ', (tuple(move_state), tuple(self.ACCOUNT_TYPE), tuple(partner_ids), self.date_from))
         t = self.cr.fetchall()
         for i in t:
             totals[i[0]] = i[1]
@@ -137,7 +136,7 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
                 future_past[i[0]] = i[1]
 
         # Use one query per period and store results in history (a list variable)
-        # Each history will contain : history[1] = {'<partner_id>': <partner_debit-credit>}
+        # Each history will contain: history[1] = {'<partner_id>': <partner_debit-credit>}
         history = []
         for i in range(5):
             args_list = (tuple(move_state), tuple(self.ACCOUNT_TYPE), tuple(partner_ids),self.date_from,)

addons/account/report/account_analytic_entries_report_view.xml

@@ -61,7 +61,7 @@
                     <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Account" name="Account" icon="terp-folder-green" context="{'group_by':'account_id'}" groups="analytic.group_analytic_accounting"/>
-                    <filter string="General Account" icon="terp-folder-green" context="{'group_by':'general_account_id'}"/>
+                    <filter string="General Account" icon="terp-folder-orange" context="{'group_by':'general_account_id'}"/>
                     <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
@@ -73,17 +73,6 @@
                     <filter string="Month" name="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
                     <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                 </group>
-                <newline/>
-                <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                    <field name="currency_id" widget="selection"/>
-                    <field name="general_account_id" widget="selection"/>
-                    <field name="product_uom_id" widget="selection"/>
-                    <field name="journal_id" widget="selection"/>
-                    <separator orientation="vertical"/>
-                    <field name="name"/>
-                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
-                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                </group>
             </search>
         </field>
     </record>
@@ -111,7 +100,7 @@
 
     <menuitem action="action_analytic_entries_report" 
         id="menu_action_analytic_entries_report"
-        groups="analytic.group_analytic_accounting"
+        groups="analytic.group_analytic_accounting,group_account_manager"
         parent="account.menu_finance_statistic_report_statement" sequence="4"/>
 
 </data>

addons/account/report/account_balance_sheet.py

@@ -78,11 +78,9 @@ class report_balancesheet_horizontal(rml_parse.rml_parse, common_report_header):
         db_pool = pooler.get_pool(self.cr.dbname)
 
         #Getting Profit or Loss Balance from profit and Loss report
-        result_pl = self.obj_pl.get_data(data)
         self.res_bl = self.obj_pl.final_result()
 
         account_pool = db_pool.get('account.account')
-        year_pool = db_pool.get('account.fiscalyear')
 
         types = [
             'liability',
@@ -110,7 +108,7 @@ class report_balancesheet_horizontal(rml_parse.rml_parse, common_report_header):
         else:
             self.res_bl['type'] = 'Net Loss'
         pl_dict  = {
-            'code': False,
+            'code': self.res_bl['type'],
             'name': self.res_bl['type'],
             'level': False,
             'balance':self.res_bl['balance'],

addons/account/report/account_central_journal.py

@@ -72,15 +72,15 @@ class journal_print(report_sxw.rml_parse, common_report_header):
         if self.target_move == 'posted':
             move_state = ['posted']
 
-        self.cr.execute('SELECT a.currency_id ,a.code, a.name, c.code AS currency_code, l.currency_id, l.amount_currency, SUM(debit) AS debit, SUM(credit) AS credit  \
+        self.cr.execute('SELECT a.currency_id, a.code, a.name, c.symbol AS currency_code, l.currency_id, l.amount_currency, SUM(debit) AS debit, SUM(credit) AS credit  \
                         from account_move_line l  \
                         LEFT JOIN account_move am ON (l.move_id=am.id) \
                         LEFT JOIN account_account a ON (l.account_id=a.id) \
-                        LEFT JOIN res_currency c on (l.currency_id=c.id) WHERE am.state IN %s AND l.period_id=%s AND l.journal_id=%s '+self.query_get_clause+' GROUP BY a.id, a.code, a.name,l.amount_currency,c.code, a.currency_id,l.currency_id', (tuple(move_state), period_id, journal_id))
+                        LEFT JOIN res_currency c on (l.currency_id=c.id) WHERE am.state IN %s AND l.period_id=%s AND l.journal_id=%s '+self.query_get_clause+' GROUP BY a.id, a.code, a.name,l.amount_currency,c.symbol, a.currency_id,l.currency_id', (tuple(move_state), period_id, journal_id))
         return self.cr.dictfetchall()
 
     def _set_get_account_currency_code(self, account_id):
-        self.cr.execute("SELECT c.code as code "\
+        self.cr.execute("SELECT c.symbol as code "\
                 "FROM res_currency c,account_account as ac "\
                 "WHERE ac.id = %s AND ac.currency_id = c.id"%(account_id))
         result = self.cr.fetchone()

addons/account/report/account_entries_report.py

@@ -33,9 +33,9 @@ class account_entries_report(osv.osv):
         'date_created': fields.date('Date Created', readonly=True),
         'date_maturity': fields.date('Date Maturity', readonly=True),
         'ref': fields.char('Reference', size=64, readonly=True),
-        'nbr':fields.integer('# of Items', readonly=True),
-        'debit':fields.float('Debit', readonly=True),
-        'credit':fields.float('Credit', readonly=True),
+        'nbr': fields.integer('# of Items', readonly=True),
+        'debit': fields.float('Debit', readonly=True),
+        'credit': fields.float('Credit', readonly=True),
         'balance': fields.float('Balance', readonly=True),
         'day': fields.char('Day', size=128, readonly=True),
         'year': fields.char('Year', size=4, readonly=True),
@@ -77,14 +77,16 @@ class account_entries_report(osv.osv):
 
     def search(self, cr, uid, args, offset=0, limit=None, order=None,
             context=None, count=False):
+        fiscalyear_obj = self.pool.get('account.fiscalyear')
+        period_obj = self.pool.get('account.period')
         for arg in args:
             if arg[0] == 'period_id' and arg[2] == 'current_period':
-                current_period = self.pool.get('account.period').find(cr, uid)[0]
+                current_period = period_obj.find(cr, uid)[0]
                 args.append(['period_id','in',[current_period]])
                 break
             elif arg[0] == 'period_id' and arg[2] == 'current_year':
-                current_year = self.pool.get('account.fiscalyear').find(cr, uid)
-                ids = self.pool.get('account.fiscalyear').read(cr, uid, [current_year], ['period_ids'])[0]['period_ids']
+                current_year = fiscalyear_obj.find(cr, uid)
+                ids = fiscalyear_obj.read(cr, uid, [current_year], ['period_ids'])[0]['period_ids']
                 args.append(['period_id','in',ids])
         for a in [['period_id','in','current_year'], ['period_id','in','current_period']]:
             if a in args:
@@ -94,15 +96,17 @@ class account_entries_report(osv.osv):
 
     def read_group(self, cr, uid, domain, fields, groupby, offset=0, limit=None, context=None):
         todel=[]
+        fiscalyear_obj = self.pool.get('account.fiscalyear')
+        period_obj = self.pool.get('account.period')
         for arg in domain:
             if arg[0] == 'period_id' and arg[2] == 'current_period':
-                current_period = self.pool.get('account.period').find(cr, uid)[0]
+                current_period = period_obj.find(cr, uid)[0]
                 domain.append(['period_id','in',[current_period]])
                 todel.append(arg)
                 break
             elif arg[0] == 'period_id' and arg[2] == 'current_year':
-                current_year = self.pool.get('account.fiscalyear').find(cr, uid)
-                ids = self.pool.get('account.fiscalyear').read(cr, uid, [current_year], ['period_ids'])[0]['period_ids']
+                current_year = fiscalyear_obj.find(cr, uid)
+                ids = fiscalyear_obj.read(cr, uid, [current_year], ['period_ids'])[0]['period_ids']
                 domain.append(['period_id','in',ids])
                 todel.append(arg)
         for a in [['period_id','in','current_year'], ['period_id','in','current_period']]:

addons/account/report/account_entries_report_view.xml

@@ -87,19 +87,6 @@
                     <field name="journal_id" widget="selection"/>
                     <field name="period_id"/>
                 </group>
-                <newline/>
-                 <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                    <field name="fiscalyear_id"/>
-                    <separator orientation="vertical"/>
-                    <field name="product_id"/>
-                    <field name="partner_id"/>
-                    <separator orientation="vertical" groups="base.group_multi_company"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
-                    <newline/>
-                    <field name="date_created"/>
-                    <field name="date"/>
-                    <field name="date_maturity"/>
-                 </group>
                 <newline/>
                 <group expand="1" string="Group By...">
                     <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}"/>
@@ -119,6 +106,19 @@
                     <filter string="Period" icon="terp-go-month" name="group_period" context="{'group_by':'period_id'}"/>
                     <filter string="Fiscal Year" icon="terp-go-year" context="{'group_by':'fiscalyear_id'}"/>
                  </group>
+                 <newline/>
+                 <group expand="0" string="Extended Filters..." groups="base.group_extended">
+                    <field name="fiscalyear_id"/>
+                    <separator orientation="vertical"/>
+                    <field name="product_id"/>
+                    <field name="partner_id"/>
+                    <separator orientation="vertical" groups="base.group_multi_company"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
+                    <newline/>
+                    <field name="date_created"/>
+                    <field name="date"/>
+                    <field name="date_maturity"/>
+                 </group>
             </search>
         </field>
     </record>
@@ -127,6 +127,8 @@
         <field name="res_model">account.entries.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
+        <field name="search_view_id" ref="view_account_entries_report_search"/>
+        <field name="view_id" ref="view_account_entries_report_tree"/>
         <field name="context">{'group_by':[], 'search_default_usertype':1, 'search_default_thisyear':1, 'group_by_no_leaf':1}</field>
         <field name="help">A tool search lets you know statistics on your different financial accounts that match your needs.</field>
     </record>

addons/account/report/account_general_journal.py

@@ -87,19 +87,19 @@ class journal_print(report_sxw.rml_parse, common_report_header):
         move_state = ['draft','posted']
         if self.target_move == 'posted':
             move_state = ['posted']
-        self.cr.execute('SELECT j.code, j.name, l.amount_currency,c.code AS currency_code,l.currency_id , '
+        self.cr.execute('SELECT j.code, j.name, l.amount_currency,c.symbol AS currency_code,l.currency_id, '
                         'SUM(l.debit) AS debit, SUM(l.credit) AS credit '
                         'FROM account_move_line l '
                         'LEFT JOIN account_move am ON (l.move_id=am.id) '
                         'LEFT JOIN account_journal j ON (l.journal_id=j.id) '
                         'LEFT JOIN res_currency c on (l.currency_id=c.id)'
                         'WHERE am.state IN %s AND l.period_id=%s AND l.journal_id IN %s ' + self.query_get_clause + ' '
-                        'GROUP BY j.id, j.code, j.name, l.amount_currency, c.code, l.currency_id ',
+                        'GROUP BY j.id, j.code, j.name, l.amount_currency, c.symbol, l.currency_id ',
                         (tuple(move_state), period_id, tuple(self.journal_ids)))
         return self.cr.dictfetchall()
 
     def _set_get_account_currency_code(self, account_id):
-        self.cr.execute("SELECT c.code AS code "\
+        self.cr.execute("SELECT c.symbol AS code "\
                         "FROM res_currency c, account_account AS ac "\
                         "WHERE ac.id = %s AND ac.currency_id = c.id" % (account_id))
         result = self.cr.fetchone()
@@ -111,7 +111,7 @@ class journal_print(report_sxw.rml_parse, common_report_header):
     def _get_account(self, data):
         if data['model'] == 'account.journal.period':
             return self.pool.get('account.journal.period').browse(self.cr, self.uid, data['id']).company_id.name
-        return super(journal_print ,self)._get_account(data)
+        return super(journal_print, self)._get_account(data)
 
     def _get_fiscalyear(self, data):
         if data['model'] == 'account.journal.period':

addons/account/report/account_general_journal.rml

@@ -287,7 +287,7 @@
         <td><para style="terp_tblheader_Details_Right">Currency</para></td>
       </tr>
       <tr>
-        <td><para style="terp_default_Bold_9">Total:([[ company.currency_id.code]])</para></td>
+        <td><para style="terp_default_Bold_9">Total:</para></td>
         <td><para style="terp_default_Bold_9"><font color="white"> </font></para></td>
         <td><para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit()) ]]</para></td>
         <td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit()) ]]</para></td>

addons/account/report/account_general_ledger_landscape.rml

@@ -266,10 +266,10 @@
 	   	     		<tr>
 		    			<td><para style="Standard"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para></td>
 		    			<td><para style="Standard"></para></td>
-					  	<td alignment="right"><para style="P9b"><u>[[ formatLang(sum_debit_account(o), dp='Account') ]]</u></para></td>
-					  	<td alignment="right"><para style="P9b"><u>[[ formatLang(sum_credit_account(o), dp='Account') ]]</u></para></td>
-			  			<td><para style="P9b"><u>[[ formatLang(sum_balance_account(o), dp='Account') ]] [[ company.currency_id.symbol ]]</u></para></td>
-			  			<td><para style="P9b"><u>[[ o.currency_id and formatLang(sum_currency_amount_account(o), dp='Account') + o.currency_id.code or '' ]]</u></para></td>
+					  	<td alignment="right"><para style="P9b"><u>[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</u></para></td>
+					  	<td alignment="right"><para style="P9b"><u>[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</u></para></td>
+			  			<td><para style="P9b"><u>[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</u></para></td>
+			  			<td><para style="P9b"><u>[[ o.currency_id and formatLang(sum_currency_amount_account(o), digits=get_digits(dp='Account')) + o.currency_id.code or '' ]]</u></para></td>
 		   			</tr>
 	    		</blockTable>
 	    	</td>
@@ -292,9 +292,9 @@
 			<td><para style="P2_content">[[ line['move'] ]]</para></td>
 			<td><para style="P3_content">[[ line['lname'] ]]</para></td>
 			<td><para style="P3_content_center">[[ strip_name(line['line_corresp'].replace(', ',','),40) ]]</para></td>
-			<td><para style="P4_content">[[ formatLang(line['debit'], dp='Account') ]]</para></td>
-			<td><para style="P4_content">[[ formatLang(line['credit'], dp='Account') ]]</para></td>
-			<td><para style="P4_content">[[ formatLang(line['progress'], dp='Account') ]] [[ company.currency_id.symbol ]]</para></td>
+			<td><para style="P4_content">[[ formatLang(line['debit'], digits=get_digits(dp='Account')) ]]</para></td>
+			<td><para style="P4_content">[[ formatLang(line['credit'], digits=get_digits(dp='Account')) ]]</para></td>
+			<td><para style="P4_content">[[ formatLang(line['progress'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para></td>
 			<td><para style="P4_content"><font>[[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[  formatLang(line['amount_currency'])]] [[  line['currency_code'] or '']]</font></para></td>
 		</tr>
 	  </blockTable>
@@ -352,9 +352,9 @@
 				<td><para style="P2_content">[[ line['move'] ]]</para></td>
 				<td><para style="P3_content">[[ line['lname'] ]]</para></td>
 				<td><para style="P3_content_center">[[ strip_name(line['line_corresp'],15) ]]</para></td>
-				<td><para style="P4_content">[[ formatLang(line['debit'], dp='Account') ]] </para></td>
-				<td><para style="P4_content">[[ formatLang(line['credit'], dp='Account') ]]</para></td>
-				<td><para style="P4_content">[[ formatLang(line['progress'], dp='Account') ]] [[ company.currency_id.symbol ]]</para></td>
+				<td><para style="P4_content">[[ formatLang(line['debit'], digits=get_digits(dp='Account')) ]] </para></td>
+				<td><para style="P4_content">[[ formatLang(line['credit'], digits=get_digits(dp='Account')) ]]</para></td>
+				<td><para style="P4_content">[[ formatLang(line['progress'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para></td>
 			</tr>
 		</blockTable>
 

addons/account/report/account_invoice_report_view.xml

@@ -110,7 +110,7 @@
                 </group>
                 <newline/>
                 <group expand="1" string="Group By...">
-                    <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id','residual_visible':True}"/>
+                    <filter string="Partner" name="partner" icon="terp-partner" context="{'group_by':'partner_id','residual_visible':True}"/>
                     <filter string="Salesman" name='user' icon="terp-personal" context="{'group_by':'user_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id','set_visible':True,'residual_invisible':True}"/>
@@ -139,7 +139,7 @@
         <field name="res_model">account.invoice.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{'search_default_current':1,'search_default_customer':1, 'search_default_date': time.strftime('%Y-01-01'), 'group_by':[], 'group_by_no_leaf':1,}</field>
+        <field name="context">{'search_default_current':1, 'search_default_partner':1, 'search_default_customer':1, 'search_default_date': time.strftime('%Y-01-01'), 'group_by':[], 'group_by_no_leaf':1,}</field>
         <field name="search_view_id" ref="view_account_invoice_report_search"/>
         <field name="help">A tool search lets you know statistics on invoices that match your needs.</field>
 

addons/account/report/account_journal.py

@@ -45,8 +45,6 @@ class journal_print(report_sxw.rml_parse, common_report_header):
             'get_start_date': self._get_start_date,
             'get_end_date': self._get_end_date,
             'get_fiscalyear': self._get_fiscalyear,
-            'get_start_date':self._get_start_date,
-            'get_end_date':self._get_end_date,
             'display_currency':self._display_currency,
             'get_sortby': self._get_sortby,
             'get_target_move': self._get_target_move,
@@ -126,7 +124,7 @@ class journal_print(report_sxw.rml_parse, common_report_header):
         return obj_mline.browse(self.cr, self.uid, ids)
 
     def _set_get_account_currency_code(self, account_id):
-        self.cr.execute("SELECT c.code AS code "\
+        self.cr.execute("SELECT c.symbol AS code "\
                 "FROM res_currency c,account_account AS ac "\
                 "WHERE ac.id = %s AND ac.currency_id = c.id" % (account_id))
         result = self.cr.fetchone()

addons/account/report/account_partner_ledger.py

@@ -46,8 +46,6 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
             'get_start_date': self._get_start_date,
             'get_end_date': self._get_end_date,
             'get_fiscalyear': self._get_fiscalyear,
-            'get_start_date':self._get_start_date,
-            'get_end_date': self._get_end_date,
             'get_journal': self._get_journal,
             'get_partners':self._get_partners,
             'get_intial_balance':self._get_intial_balance,
@@ -58,6 +56,7 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
 
     def set_context(self, objects, data, ids, report_type=None):
         obj_move = self.pool.get('account.move.line')
+        obj_partner = self.pool.get('res.partner')
         self.query = obj_move._query_get(self.cr, self.uid, obj='l', context=data['form'].get('used_context', {}))
         ctx2 = data['form'].get('used_context',{}).copy()
         ctx2.update({'initial_bal': True})
@@ -100,7 +99,7 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
                     "AND l.account_id = account.id " \
                     "AND am.id = l.move_id " \
                     "AND am.state IN %s"
-                    "AND " + self.query +" " \
+#                    "AND " + self.query +" " \
                     "AND l.account_id IN %s " \
                     " " + PARTNER_REQUEST + " " \
                     "AND account.active ",
@@ -111,7 +110,7 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
             partner_to_use.append(res_line['partner_id'])
         new_ids = partner_to_use
         self.partner_ids = new_ids
-        objects = self.pool.get('res.partner').browse(self.cr, self.uid, new_ids)
+        objects = obj_partner.browse(self.cr, self.uid, new_ids)
         return super(third_party_ledger, self).set_context(objects, data, new_ids, report_type)
 
     def comma_me(self, amount):
@@ -139,7 +138,7 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
         else:
             RECONCILE_TAG = "AND l.reconcile_id IS NULL"
         self.cr.execute(
-            "SELECT l.id, l.date, j.code, acc.code as a_code, acc.name as a_name, l.ref, m.name as move_name, l.name, l.debit, l.credit, l.amount_currency, c.symbol AS currency_code " \
+            "SELECT l.id, l.date, j.code, acc.code as a_code, acc.name as a_name, l.ref, m.name as move_name, l.name, l.debit, l.credit, l.amount_currency,l.currency_id, c.symbol AS currency_code " \
             "FROM account_move_line l " \
             "LEFT JOIN account_journal j " \
                 "ON (l.journal_id = j.id) " \
@@ -170,7 +169,7 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
             "SELECT COALESCE(SUM(l.debit),0.0), COALESCE(SUM(l.credit),0.0), COALESCE(sum(debit-credit), 0.0) " \
             "FROM account_move_line AS l,  " \
             "account_move AS m "
-            "WHERE partner_id = %s " \
+            "WHERE l.partner_id = %s " \
             "AND m.id = l.move_id " \
             "AND m.state IN %s "
             "AND account_id IN %s" \
@@ -195,7 +194,7 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
                     "SELECT sum(debit) " \
                     "FROM account_move_line AS l, " \
                     "account_move AS m "
-                    "WHERE partner_id = %s" \
+                    "WHERE l.partner_id = %s" \
                         "AND m.id = l.move_id " \
                         "AND m.state IN %s "
                         "AND account_id IN %s" \
@@ -212,7 +211,7 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
                 "SELECT sum(debit) " \
                 "FROM account_move_line AS l, " \
                 "account_move AS m "
-                "WHERE partner_id = %s " \
+                "WHERE l.partner_id = %s " \
                     "AND m.id = l.move_id " \
                     "AND m.state IN %s "
                     "AND account_id IN %s" \
@@ -244,7 +243,7 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
                     "SELECT sum(credit) " \
                     "FROM account_move_line AS l, " \
                     "account_move AS m  "
-                    "WHERE partner_id = %s" \
+                    "WHERE l.partner_id = %s" \
                         "AND m.id = l.move_id " \
                         "AND m.state IN %s "
                         "AND account_id IN %s" \
@@ -261,7 +260,7 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
                 "SELECT sum(credit) " \
                 "FROM account_move_line AS l, " \
                 "account_move AS m "
-                "WHERE partner_id=%s " \
+                "WHERE l.partner_id=%s " \
                     "AND m.id = l.move_id " \
                     "AND m.state IN %s "
                     "AND account_id IN %s" \
@@ -286,7 +285,7 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
 #            return 0.0
 #        result_tmp = 0.0
 #        result_init = 0.0
-#        if self.reconcil :
+#        if self.reconcil:
 #            RECONCILE_TAG = " "
 #        else:
 #            RECONCILE_TAG = "AND reconcile_id IS NULL"
@@ -317,7 +316,7 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
 #                    "AND m.state IN %s "
 #                    "AND account_id IN %s" \
 #                    " " + RECONCILE_TAG + " " \
-#                    "AND " + self.query + " " ,
+#                    "AND " + self.query + " ",
 #                    (tuple(self.partner_ids), tuple(move_state) ,tuple(self.account_ids),))
 #        contemp = self.cr.fetchone()
 #        if contemp != None:
@@ -335,7 +334,7 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
 #            return 0.0
 #        result_tmp = 0.0
 #        result_init = 0.0
-#        if self.reconcil :
+#        if self.reconcil:
 #            RECONCILE_TAG = " "
 #        else:
 #            RECONCILE_TAG = "AND reconcile_id IS NULL"
@@ -366,7 +365,7 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
 #                    "AND m.state IN %s "
 #                    "AND account_id IN %s" \
 #                    " " + RECONCILE_TAG + " " \
-#                    "AND " + self.query + " " ,
+#                    "AND " + self.query + " ",
 #                    (tuple(self.partner_ids), tuple(move_state), tuple(self.account_ids),))
 #        contemp = self.cr.fetchone()
 #        if contemp != None:

addons/account/report/account_partner_ledger.rml

@@ -487,7 +487,7 @@
             <para style="terp_default_Right_9">[[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line['amount_currency'] or '') ]] [[ line['currency_code'] or '' ]]</para>
+            <para style="terp_default_Right_9"><font>[[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'] ) ]] [[ line['currency_code'] or '' ]]</font></para>
           </td>
         </tr>
       </blockTable>

addons/account/report/account_partner_ledger_other.rml

@@ -627,7 +627,7 @@
             <para style="terp_default_Right_9">[[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line['amount_currency'] or '') ]] [[ line['currency_code'] or '' ]]</para>
+            <para style="terp_default_Right_9"><font>[[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'] ) ]] [[ line['currency_code'] or '' ]]</font></para>
           </td>
         </tr>
       </blockTable>

addons/account/report/account_print_invoice.rml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Invoice" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="Invoices.pdf">
+  <template pageSize="(595.0,842.0)" title="Invoices" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="34.0" y1="28.0" width="530" height="786"/>
     </pageTemplate>
@@ -126,6 +126,7 @@
     <paraStyle name="terp_default_Note" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Table" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="User Index 10" rightIndent="0.0" leftIndent="127.0" fontName="Helvetica"/>
+    <paraStyle name="Preformatted Text" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
     <images/>
   </stylesheet>
   <story>
@@ -139,18 +140,18 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_8">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
-          <para style="terp_default_8">[[ o.address_invoice_id.street ]]</para>
-          <para style="terp_default_8">[[ o.address_invoice_id.street2 or removeParentNode('para') ]]</para>
-          <para style="terp_default_8">[[ o.address_invoice_id.zip or '' ]] [[ o.address_invoice_id.city or '' ]]</para>
-          <para style="terp_default_8">[[ o.address_invoice_id.state_id and o.address_invoice_id.state_id.name or removeParentNode('para') ]]</para>
-          <para style="terp_default_8">[[ o.address_invoice_id.country_id and o.address_invoice_id.country_id.name or '' ]]</para>
+          <para style="terp_default_8">[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]</para>
+          <para style="terp_default_8">[[ (o.address_invoice_id and o.address_invoice_id.street) or '' ]]</para>
+          <para style="terp_default_8">[[ (o.address_invoice_id and o.address_invoice_id.street2) or removeParentNode('para') ]]</para>
+          <para style="terp_default_8">[[ (o.address_invoice_id and o.address_invoice_id.zip) or '' ]] [[ (o.address_invoice_id and o.address_invoice_id.city) or '' ]]</para>
+          <para style="terp_default_8">[[ (o.address_invoice_id and o.address_invoice_id.state_id and o.address_invoice_id.state_id.name) or removeParentNode('para') ]]</para>
+          <para style="terp_default_8">[[ (o.address_invoice_id and o.address_invoice_id.country_id and o.address_invoice_id.country_id.name) or '' ]]</para>
           <para style="terp_default_8">
             <font color="white"> </font>
           </para>
-          <para style="terp_default_8">Tel. : [[ o.address_invoice_id.phone or removeParentNode('para') ]]</para>
-          <para style="terp_default_8">Fax : [[ o.address_invoice_id.fax or removeParentNode('para') ]]</para>
-          <para style="terp_default_8">VAT : [[ o.partner_id.vat or removeParentNode('para') ]]</para>
+          <para style="terp_default_8">Tel. : [[ (o.address_invoice_id and o.address_invoice_id.phone) or removeParentNode('para') ]]</para>
+          <para style="terp_default_8">Fax : [[ (o.address_invoice_id and o.address_invoice_id.fax) or removeParentNode('para') ]]</para>
+          <para style="terp_default_8">VAT : [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -186,14 +187,14 @@
           <para style="terp_default_Centre_9">[[ formatLang(o.date_invoice,date=True) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_9">[[ o.address_invoice_id.partner_id.ref or ' ' ]]</para>
+          <para style="terp_default_Centre_9">[[ (o.address_invoice_id and o.address_invoice_id.partner_id and o.address_invoice_id.partner_id.ref) or ' ' ]]</para>
         </td>
       </tr>
     </blockTable>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="219.0,87.0,56.0,56.0,51.0,62.0" style="Table7">
+    <blockTable colWidths="219.0,87.0,62.0,56.0,46.0,62.0" style="Table7">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Description</para>
@@ -205,19 +206,19 @@
           <para style="terp_tblheader_Details_Centre">Quantity</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Unit Price</para>
+          <para style="terp_tblheader_Details_Right">Unit Price </para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Disc.(%)</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Price</para>
+          <para style="terp_tblheader_Details_Right">Price</para>
         </td>
       </tr>
     </blockTable>
     <section>
       <para style="terp_default_2">[[ repeatIn(o.invoice_line,'l') ]]</para>
-      <blockTable colWidths="218.0,88.0,56.0,56.0,51.0,62.0" style="Table8">
+      <blockTable colWidths="218.0,88.0,62.0,55.0,46.0,62.0" style="Table8">
         <tr>
           <td>
             <para style="terp_default_9">[[ l.name ]]</para>
@@ -229,7 +230,7 @@
             <para style="terp_default_Right_9">[[ formatLang(l.quantity)]] [[ (l.uos_id and l.uos_id.name) or '' ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(l.price_unit) ]][[ o.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(l.price_unit) ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ formatLang(l.discount, digits=get_digits(dp='Account')) ]] </para>
@@ -281,7 +282,7 @@
           <para style="terp_default_9">Net Total:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed) ]] [[ o.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -307,21 +308,23 @@
           <para style="terp_tblheader_Details">Total:</para>
         </td>
         <td>
-          <para style="terp_default_Bold_Right_9">[[ formatLang(o.amount_total) ]] [[ o.currency_id.symbol ]]</para>
+          <para style="terp_default_Bold_Right_9">[[ formatLang(o.amount_total, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="Text body"/>
-    <blockTable colWidths="167.0,59.0,56.0,247.0" style="Table9">
+    <para style="Text body">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="206.0,51.0,49.0,225.0" style="Table9">
       <tr>
         <td>
-          <para style="terp_tblheader_Details">Tax</para>
+          <para style="terp_tblheader_Details">Tax [[ o.tax_line==[] and removeParentNode('blockTable') ]]</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Base</para>
+          <para style="terp_tblheader_Details_Right">Base </para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Amount</para>
+          <para style="terp_tblheader_Details_Right">Amount </para>
         </td>
         <td>
           <para style="terp_default_8">
@@ -332,7 +335,7 @@
     </blockTable>
     <section>
       <para style="terp_default_2">[[ repeatIn(o.tax_line,'t') ]]</para>
-      <blockTable colWidths="167.0,60.0,55.0,248.0" style="Table2">
+      <blockTable colWidths="205.0,52.0,49.0,224.0" style="Table2">
         <tr>
           <td>
             <para style="terp_default_8">[[ t.name ]]</para>
@@ -341,7 +344,7 @@
             <para style="terp_default_Right_8">[[ formatLang(t.base, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount) ]] [[ o.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
           </td>
           <td>
             <para style="terp_default_8">
@@ -351,21 +354,24 @@
         </tr>
       </blockTable>
     </section>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
     <para style="terp_default_9">[[ (o.comment and format(o.comment )) or removeParentNode('para') ]]</para>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_9">[[ (o.payment_term.note and format(o.payment_term and o.payment_term.note)) or removeParentNode('para') ]]</para>
+    <para style="terp_default_9">[[ (o.payment_term and o.payment_term.note and format(o.payment_term and o.payment_term.note)) or removeParentNode('para') ]]</para>
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
     <blockTable colWidths="120.0,410.0" style="Table1">
       <tr>
         <td>
-          <para style="terp_default_Bold_9">Fiscal Position: </para>
+          <para style="terp_default_Bold_9">Fiscal Position Remark : </para>
         </td>
         <td>
-          <para style="terp_default_9">[[ (o.fiscal_position.note and format(o.fiscal_position and o.fiscal_position.note)) or removeParentNode('blockTable') ]]</para>
+          <para style="terp_default_9">[[ (o.fiscal_position and o.fiscal_position.note and format(o.fiscal_position.note)) or removeParentNode('blockTable') ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -373,4 +379,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
+</document>

addons/account/report/account_print_overdue.rml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Overdue Payment" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Overdue Payments" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="42.0" y1="28.0" width="511" height="786"/>
     </pageTemplate>
@@ -97,7 +97,7 @@
           <para style="terp_default_9">[[ repeatIn(adr_get(o, 'invoice'),'addr') ]]</para>
         </td>
         <td>
-          <para style="terp_default_9">[[ o.name ]]</para>
+          <para style="terp_default_9">[[ o.title.name or '' ]] [[ o.name ]]</para>
           <para style="terp_default_9">[[ addr['street'] ]]</para>
           <para style="terp_default_9">[[ addr['street2'] or removeParentNode('para') ]]</para>
           <para style="terp_default_9">[[ addr['zip'] ]] [[ addr['city'] ]]</para>
@@ -138,7 +138,7 @@
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="56.0,136.0,51.0,72.0,54.0,56.0,66.0,18.0" style="Table1">
+    <blockTable colWidths="57.0,136.0,51.0,72.0,54.0,56.0,66.0,18.0" style="Table1">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Date</para>
@@ -168,7 +168,7 @@
     </blockTable>
     <section>
       <para style="terp_default_8">[[repeatIn(getLines(o), 'line') ]]</para>
-      <blockTable colWidths="56.0,136.0,52.0,71.0,55.0,56.0,66.0,17.0" style="Table3">
+      <blockTable colWidths="57.0,136.0,52.0,71.0,55.0,56.0,66.0,17.0" style="Table3">
         <tr>
           <td>
             <para style="terp_default_9">[[ formatLang(line['date'],date=True) ]]</para>
@@ -197,7 +197,7 @@
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="244.0,71.0,56.0,56.0,66.0,17.0" style="Table2">
+    <blockTable colWidths="245.0,71.0,56.0,56.0,66.0,17.0" style="Table2">
       <tr>
         <td>
           <para style="terp_default_8">

addons/account/report/account_report.py

@@ -22,11 +22,11 @@
 import time
 from datetime import datetime
 from dateutil.relativedelta import relativedelta
+
 import pooler
 import tools
 from osv import fields,osv
 
-
 def _code_get(self, cr, uid, context={}):
     acc_type_obj = self.pool.get('account.account.type')
     ids = acc_type_obj.search(cr, uid, [])
@@ -74,7 +74,7 @@ class temp_range(osv.osv):
     _description = 'A Temporary table used for Dashboard view'
 
     _columns = {
-        'name' : fields.char('Range',size=64)
+        'name': fields.char('Range',size=64)
     }
 
 temp_range()
@@ -177,7 +177,7 @@ class report_invoice_created(osv.osv):
             ('cancel','Cancelled')
         ],'State', readonly=True),
         'origin': fields.char('Source Document', size=64, readonly=True, help="Reference of the document that generated this invoice report."),
-        'create_date' : fields.datetime('Create Date', readonly=True)
+        'create_date': fields.datetime('Create Date', readonly=True)
     }
     _order = 'create_date'
 
@@ -283,5 +283,4 @@ class report_account_sales(osv.osv):
             )""")
 report_account_sales()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/report/account_tax_report.py

@@ -37,9 +37,26 @@ class tax_report(rml_parse.rml_parse):
             'get_company': self._get_company,
             'get_currency': self._get_currency,
             'get_lines': self._get_lines,
+            'get_years': self.get_years,
         })
 
 
+    def get_years(self,form):
+        res={}
+        fiscal_year_name = self.pool.get('account.fiscalyear').name_get(self.cr,self.uid,form['fiscalyear'])
+
+        if fiscal_year_name:
+            res['fname'] = fiscal_year_name[0][1]
+            res['periods'] = ''
+        if form['periods']:
+            periods_l = self.pool.get('account.period').read(self.cr, self.uid, form['periods'], ['name'])
+            for period in periods_l:
+                if res['periods']=='':
+                    res['periods'] = period['name']
+                else:
+                    res['periods'] += ", "+ period['name']
+        return res
+
     def _get_lines(self, based_on, period_list, company_id=False, parent=False, level=0, context={}):
         res = self._get_codes(based_on, company_id, parent, level, period_list, context=context)
 

addons/account/report/account_tax_report.rml

@@ -105,6 +105,16 @@
   </stylesheet>
   <story>
 	<para style="P2">Tax Statement</para>
+  <para style="P2"><font color="white"> </font></para>
+	<blockTable colWidths="538" style="Tableau1">
+      <tr>
+        <td><para style="P12">Year : [[ get_years(data['form'])['fname'] ]]</para></td>
+      </tr>
+      <tr>
+        <td><para style="P12">Periods : [[ get_years(data['form'])['periods'] or removeParentNode('tr')]]</para></td>
+      </tr>
+    </blockTable>
+  <para style="P2"><font color="white"> </font></para>    	
 	<blockTable colWidths="340.0,55.0,55.0,90.0" style="Table2" repeatRows="1">
 	  <tr>
 	    <td><para style="P12">Tax Name</para></td>

addons/account/security/account_security.xml

@@ -100,14 +100,14 @@
         <field name="name">Account fiscal Mapping company rule</field>
         <field model="ir.model" name="model_id" ref="model_account_fiscal_position"/>
         <field eval="True" name="global"/>
-        <field name="domain_force">[('company_id','=',user.company_id.id)]</field>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="account_model_comp_rule" model="ir.rule">
         <field name="name">Account model company rule</field>
         <field model="ir.model" name="model_id" ref="model_account_model"/>
         <field eval="True" name="global"/>
-        <field name="domain_force">[('company_id','=',user.company_id.id)]</field>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
 </data></openerp>

addons/account/security/ir.model.access.csv

@@ -31,7 +31,7 @@
 "access_account_chart_template","account.chart.template","model_account_chart_template","account.group_account_manager",1,1,1,1
 "access_account_tax_template","account.tax.template","model_account_tax_template","account.group_account_manager",1,1,1,1
 "access_account_bank_statement","account.bank.statement","model_account_bank_statement","account.group_account_user",1,0,0,0
-"access_account_bank_statement_line","account.bank.statement.line","model_account_bank_statement_line","account.group_account_user",1,0,0,0
+"access_account_bank_statement_line","account.bank.statement.line","model_account_bank_statement_line","account.group_account_user",1,1,1,1
 "access_account_analytic_line","account.analytic.line","model_account_analytic_line","account.group_account_user",1,1,1,1
 "access_account_analytic_line_manager","account.analytic.line manager","model_account_analytic_line","account.group_account_manager",1,0,0,0
 "access_account_analytic_account","account.analytic.account","analytic.model_account_analytic_account","base.group_user",1,0,0,0
@@ -39,17 +39,17 @@
 "access_account_invoice_uinvoice","account.invoice","model_account_invoice","account.group_account_invoice",1,1,1,1
 "access_account_invoice_line_uinvoice","account.invoice.line","model_account_invoice_line","account.group_account_invoice",1,1,1,1
 "access_account_invoice_tax_uinvoice","account.invoice.tax","model_account_invoice_tax","account.group_account_invoice",1,1,1,1
-"access_account_move_uinvoice","account.move","model_account_move","account.group_account_invoice",1,0,0,0
+"access_account_move_uinvoice","account.move","model_account_move","account.group_account_invoice",1,1,1,1
 "access_account_move_line_uinvoice","account.move.line invoice","model_account_move_line","account.group_account_invoice",1,1,1,1
 "access_account_move_reconcile_uinvoice","account.move.reconcile","model_account_move_reconcile","account.group_account_invoice",1,1,1,1
 "access_account_journal_period_uinvoice","account.journal.period","model_account_journal_period","account.group_account_invoice",1,1,1,1
 "access_account_payment_term_manager","account.payment.term","model_account_payment_term","account.group_account_manager",1,1,1,1
-"access_account_payment_term_line_manager","account.payment.term.line","model_account_payment_term_line","account.group_account_manager",1,0,0,0
+"access_account_payment_term_line_manager","account.payment.term.line","model_account_payment_term_line","account.group_account_manager",1,1,1,1
 "access_account_account_type_manager","account.account.type","model_account_account_type","account.group_account_manager",1,1,1,1
 "access_account_tax_manager","account.tax","model_account_tax","account.group_account_manager",1,1,1,1
 "access_account_account_manager","account.account","model_account_account","account.group_account_manager",1,1,1,1
 "access_account_journal_view_manager","account.journal.view","model_account_journal_view","account.group_account_manager",1,1,1,1
-"access_account_journal_column_manager","account.journal.column","model_account_journal_column","account.group_account_manager",1,0,0,0
+"access_account_journal_column_manager","account.journal.column","model_account_journal_column","account.group_account_manager",1,1,1,1
 "access_account_journal_manager","account.journal","model_account_journal","account.group_account_manager",1,1,1,1
 "access_account_journal_invoice","account.journal invoice","model_account_journal","account.group_account_invoice",1,0,0,0
 "access_account_period_manager","account.period","model_account_period","account.group_account_manager",1,1,1,1
@@ -77,8 +77,8 @@
 "access_account_fiscal_position_tax","account.fiscal.position.tax all","model_account_fiscal_position_tax","base.group_user",1,0,0,0
 "access_account_fiscal_position_account","account.fiscal.position all","model_account_fiscal_position_account","base.group_user",1,0,0,0
 "access_account_fiscal_position_template","account.fiscal.position.template","model_account_fiscal_position_template","account.group_account_manager",1,1,1,1
-"access_account_fiscal_position_tax_template","account.fiscal.position.tax.template","model_account_fiscal_position_tax_template","account.group_account_manager",1,0,0,0
-"access_account_fiscal_position_account_template","account.fiscal.position.account.template","model_account_fiscal_position_account_template","account.group_account_manager",1,0,0,0
+"access_account_fiscal_position_tax_template","account.fiscal.position.tax.template","model_account_fiscal_position_tax_template","account.group_account_manager",1,1,1,1
+"access_account_fiscal_position_account_template","account.fiscal.position.account.template","model_account_fiscal_position_account_template","account.group_account_manager",1,1,1,1
 "access_account_sequence_fiscal_year","account.sequence.fiscalyear","model_account_sequence_fiscalyear","account.group_account_user",1,1,1,1
 "access_account_sequence_fiscal_year_user","account.sequence.fiscalyear user","model_account_sequence_fiscalyear","base.group_user",1,0,0,0
 "access_report_account_receivable","report.account.receivable","model_report_account_receivable","account.group_account_manager",1,1,1,1
@@ -94,47 +94,12 @@
 "access_account_move_line_manager","account.move.line manager","model_account_move_line","account.group_account_manager",1,0,0,0
 "access_account_move_manager","account.move manager","model_account_move","account.group_account_manager",1,0,0,0
 "access_account_invoice_manager","account.invoice manager","model_account_invoice","account.group_account_manager",1,0,0,0
-"access_account_bank_statement_manager","account.bank.statement manager","model_account_bank_statement","account.group_account_manager",1,0,0,0
+"access_account_bank_statement_manager","account.bank.statement manager","model_account_bank_statement","account.group_account_manager",1,1,1,1
 "access_account_entries_report_manager","account.entries.report","model_account_entries_report","account.group_account_manager",1,1,1,1
 "access_analytic_entries_report_manager","analytic.entries.report","model_analytic_entries_report","account.group_account_manager",1,0,0,0
-"access_account_cashbox_line","account.cashbox.line","model_account_cashbox_line","account.group_account_manager",1,0,0,0
-"access_account_cashbox_line","account.cashbox.line","model_account_cashbox_line","account.group_account_user",1,0,0,0
-"access_account_move_line_system","account.move.line system","model_account_move_line","base.group_system",1,0,0,0
-"access_account_invoice_system","account.invoice system","model_account_invoice","base.group_system",1,0,0,0
-"access_account_bank_statement_system","account.bank.statement system","model_account_bank_statement","base.group_system",1,0,0,0
-"access_account_move_system","account.move system","model_account_move","base.group_system",1,0,0,0
-"access_account_analytic_line_system","account.analytic.line system","model_account_analytic_line","base.group_system",1,0,0,0
-"access_account_tax_code_system","account.tax.code system","model_account_tax_code","base.group_system",1,1,1,1
-"access_account_journal_system","account.journal system","model_account_journal","base.group_system",1,1,1,1
-"access_account_period_system","account.period system","model_account_period","base.group_system",1,1,1,1
-"access_account_journal_view_system","account.journal.view system","model_account_journal_view","base.group_system",1,1,1,1
-"access_account_account_type_system","account.account.type system","model_account_account_type","base.group_system",1,1,1,1
-"access_account_analytic_journal_system","account.analytic.journal system","model_account_analytic_journal","base.group_system",1,1,1,1
-"access_account_fiscalyear_system","account.fiscalyear system","model_account_fiscalyear","base.group_system",1,1,1,1
-"access_account_tax_system","account.tax system","model_account_tax","base.group_system",1,1,1,1
-"access_account_model_system","account.model system","model_account_model","base.group_system",1,1,1,1
-"access_account_subscription_system","account.subscription system","model_account_subscription","base.group_system",1,1,1,1
-"access_account_journal_column_system","account.journal.column system","model_account_journal_column","base.group_system",1,1,1,1
-"access_account_invoice_report_system","account.invoice.report system","model_account_invoice_report","base.group_system",1,0,0,0
-"access_account_entries_report_system","account.entries.report system","model_account_entries_report","base.group_system",1,0,0,0
-"access_analytic_entries_report_system","analytic.entries.report system","model_analytic_entries_report","base.group_system",1,0,0,0
-"access_account_journal_period_system","account.journal.period system","model_account_journal_period","base.group_system",1,0,0,0
-"access_account_invoice_tax_system","account.invoice.tax system","model_account_invoice_tax","base.group_system",1,0,0,0
-"access_account_tax_code_template_system","account.tax.code.template system","model_account_tax_code_template","base.group_system",1,1,1,1
-"access_account_sequence_fiscal_year_system","account.sequence.fiscalyear system","model_account_sequence_fiscalyear","base.group_system",1,1,1,1
-"access_account_fiscal_position_system","account.fiscal.position system","model_account_fiscal_position","base.group_system",1,1,1,1
-"access_account_move_reconcile_system","account.move.reconcile system","model_account_move_reconcile","base.group_system",1,0,0,0
-"access_account_account_system","account.account system","model_account_account","base.group_system",1,1,1,1
-"access_account_analytic_system","account.analytic.account system","analytic.model_account_analytic_account","base.group_system",1,1,1,1
-"access_account_model_line_system","account.model.line system","model_account_model_line","base.group_system",1,1,1,1
-"access_account_subscription_line_system","account.subscription.line system","model_account_subscription_line","base.group_system",1,1,1,1
-"access_account_payment_term_system","account.payment.term system","model_account_payment_term","base.group_system",1,1,1,1
-"access_account_payment_term_line_system","account.payment.term.line system","model_account_payment_term_line","base.group_system",1,1,1,1
-"access_report_account_receivable_system","report.account.receivable system","model_report_account_receivable","base.group_system",1,1,1,1
-"access_account_fiscal_position_tax_system","account.fiscal.position.tax system","model_account_fiscal_position_tax","base.group_system",1,1,1,1
-"access_account_fiscal_position_account_template_system","account.fiscal.position.account.template system","model_account_fiscal_position_account_template","base.group_system",1,1,1,1
+"access_account_cashbox_line","account.cashbox.line","model_account_cashbox_line","account.group_account_manager",1,1,1,1
+"access_account_cashbox_line","account.cashbox.line","model_account_cashbox_line","account.group_account_user",1,1,1,1
 "access_account_journal_view_invoice","account.journal.view invoice","model_account_journal_view","account.group_account_invoice",1,1,1,1
-"access_account_fiscal_position_account_system","account.fiscal.position.account system","model_account_fiscal_position_account","base.group_system",1,1,1,1
 "access_account_journal_column_invoice","account.journal.column invoice","model_account_journal_column","account.group_account_invoice",1,1,1,1
 "access_account_invoice_tax_manager","account.invoice.tax manager","model_account_invoice_tax","account.group_account_manager",1,0,0,0
 "access_account_invoice_tax_accountant","account.invoice.tax accountant","model_account_invoice_tax","account.group_account_user",1,0,0,0
@@ -145,7 +110,6 @@
 "access_account_invoice_line_manager","account.invoice.line manager","model_account_invoice_line","account.group_account_manager",1,0,0,0
 "access_account_account_invoice","account.account invoice","model_account_account","account.group_account_invoice",1,1,1,1
 "access_res_partner_address_invoice","res.partner.address invoice","base.model_res_partner_address","account.group_account_invoice",1,1,1,1
-"access_account_invoice_line_system","account.invoice.line system","model_account_invoice_line","base.group_system",1,0,0,0
 "access_account_analytic_accountant","account.analytic.account accountant","analytic.model_account_analytic_account","account.group_account_user",1,1,1,1
 "access_account_account_type_invoice","account.account.type invoice","model_account_account_type","account.group_account_invoice",1,1,1,1
 "access_report_account_receivable_invoice","report.account.receivable.invoice","model_report_account_receivable","account.group_account_invoice",1,1,1,1

addons/account/sequence.py

@@ -62,6 +62,7 @@ class ir_sequence(osv.osv):
                                                            context=context)
         return super(ir_sequence, self).get_id(cr, uid, sequence_id, test,
                                                context=context)
+
 ir_sequence()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/test/account_bank_statement.yml

@@ -0,0 +1,63 @@
+-
+  In order to test Bank Statement feature of account I create a bank statement line and confirm it and check it's move created
+-
+  I create a bank statement with Opening and Closing balance 0.
+-
+  !record {model: account.bank.statement, id: account_bank_statement_0}:
+    balance_end_real: 0.0
+    balance_start: 0.0
+    date: '2010-10-14'
+    journal_id: account.bank_journal
+    name: /
+    period_id: account.period_10
+    line_ids:
+      - account_id: account.a_recv
+        amount: 1000.0
+        date: '2010-10-14'
+        name: a
+        partner_id: base.res_partner_4
+        sequence: 0.0
+        type: general
+-
+  I check that Initially bank statement is in the "Draft" state
+-
+  !assert {model: account.bank.statement, id: account_bank_statement_0}:
+    - state == 'draft'
+-
+  I compute bank statement using Compute button
+-
+  !python {model: account.bank.statement}: |
+    self.button_dummy(cr, uid, [ref("account_bank_statement_0")], {"lang": "en_US",
+      "tz": False, "active_model": "ir.ui.menu", "journal_type": "bank", "section_id":
+      False, "period_id": 10, "active_ids": [ref("account.menu_bank_statement_tree")],
+      "active_id": ref("account.menu_bank_statement_tree"), })
+
+-
+  I modify the bank statement and set the Closing Balance.
+-
+  !record {model: account.bank.statement, id: account_bank_statement_0}:
+    balance_end_real: 1000.0
+
+-
+  I confirm the bank statement using Confirm button
+-
+  !python {model: account.bank.statement}: |
+    self.button_confirm_bank(cr, uid, [ref("account_bank_statement_0")], {"lang":
+      "en_US", "tz": False, "active_model": "ir.ui.menu", "journal_type": "bank",
+      "section_id": False, "period_id": 10, "active_ids": [ref("account.menu_bank_statement_tree")],
+      "active_id": ref("account.menu_bank_statement_tree"), })
+-
+  I check that bank statement state is now "Closed"
+-
+  !assert {model: account.bank.statement, id: account_bank_statement_0}:
+    - state == 'confirm'
+
+-
+  I check that move lines created for bank statement and move state is Posted
+-
+  !python {model: account.bank.statement}: |
+    move_line_obj = self.pool.get('account.move.line')
+    bank_data = self.browse(cr, uid, ref("account_bank_statement_0"))
+    assert bank_data.move_line_ids, "Move lines not created for bank statement"
+    for line in bank_data.move_line_ids:
+      assert line.move_id.state == 'posted', "Move state is not posted"

addons/account/test/account_cash_statement.yml

@@ -0,0 +1,82 @@
+-
+  In order to test Cash statement I create a Cash statement and and confirm it and check it's move created
+-
+ !record {model: account.bank.statement, id: account_bank_statement_1}:
+    date: '2010-10-16'
+    journal_id: account.cash_journal
+    name: /
+    period_id: account.period_10
+    user_id: base.user_root
+    starting_details_ids:
+      -  pieces: 10.0
+         number: 2
+         subtotal: 20.0
+      -  pieces: 100.0
+         number: 1
+         subtotal: 200.0
+    balance_start: 220.0
+    balance_end: 220.0
+-
+  I check that Initially bank statement is in the "Draft" state
+-
+  !assert {model: account.bank.statement, id: account_bank_statement_1}:
+    - state == 'draft'
+
+-
+  I clicked on Open CashBox button to open the cashbox
+-
+ !python {model: account.bank.statement}: |
+    self.button_open(cr, uid, [ref("account_bank_statement_1")], {"lang": "en_US", "tz": False, "active_model": "account.bank.statement", "active_ids": [ref("account_bank_statement_1")], "active_id": ref("account_bank_statement_1"), })
+
+-
+  I check that now bank statement is in the "Open" state
+-
+  !assert {model: account.bank.statement, id: account_bank_statement_1}:
+    - state == 'open'
+
+-
+  I enter values in Closing balance before close the cashbox
+-
+  !record {model: account.bank.statement, id: account_bank_statement_1}:
+    line_ids:
+      - account_id: account.a_recv
+        amount: 1000.0
+        date: '2010-10-16'
+        name: test
+        partner_id: base.res_partner_4
+        sequence: 0.0
+        type: general
+    balance_end: 1220.0
+    ending_details_ids:
+      -  pieces: 10.0
+         number: 2
+         subtotal: 20.0
+      -  pieces: 100.0
+         number: 1
+         subtotal: 200.0
+      -  pieces: 500.0
+         number: 2
+         subtotal: 1000.0
+    balance_end_cash: 1220.0
+
+-
+  I clicked on Close CashBox button to close the cashbox
+-
+ !python {model: account.bank.statement}: |
+      self.button_confirm_cash(cr, uid, [ref("account_bank_statement_1")], {"lang": "en_US", "tz": False, "active_model": "account.bank.statement", "active_ids": [ref("account_bank_statement_1")], "active_id": ref("account_bank_statement_1"), })
+
+-
+  I check that bank statement state is now "Closed"
+-
+  !assert {model: account.bank.statement, id: account_bank_statement_1}:
+    - state == 'confirm'
+
+-
+  I check that move lines created for bank statement and move state is Posted
+-
+  !python {model: account.bank.statement}: |
+    move_line_obj = self.pool.get('account.move.line')
+    bank_data = self.browse(cr, uid, ref("account_bank_statement_1"))
+    assert bank_data.move_line_ids, "Move lines not created for bank statement"
+    for line in bank_data.move_line_ids:
+      assert line.move_id.state == 'posted', "Move state is not posted"

addons/account/test/account_report.yml

@@ -65,21 +65,23 @@
 -
   !python {model: res.partner}: |
     import netsvc, tools, os, time
-    import datetime
-    from mx.DateTime import *
-	import warnings
-	warnings.filterwarnings('ignore',".*struct integer overflow masking is deprecated*")
-    start = datetime.date.fromtimestamp(time.mktime(time.strptime(time.strftime('%Y-%m-%d'), "%Y-%m-%d")))
-    start = DateTime(int(start.year), int(start.month), int(start.day))
+    from datetime import datetime
+    from dateutil.relativedelta import relativedelta
+    import warnings
+    import md5
+    import hashlib
+    warnings.filterwarnings('ignore',".*struct integer overflow masking is deprecated*")
+    start = datetime.fromtimestamp(time.mktime(time.strptime(time.strftime('%Y-%m-%d'), "%Y-%m-%d")))
+    start = datetime(int(start.year), int(start.month), int(start.day))
     res = {}
     for i in range(5)[::-1]:
-        stop = start - RelativeDateTime(days=30)
+        stop = start - relativedelta(days=30)
         res[str(i)] = {
             'name': (i!=0 and (str((5-(i+1)) * 30) + '-' + str((5-i) * 30)) or ('+'+str(4 * 30))),
             'stop': start.strftime('%Y-%m-%d'),
             'start': (i!=0 and stop.strftime('%Y-%m-%d') or False),
         }
-        start = stop - RelativeDateTime(days=1)
+        start = stop - relativedelta(days=1)
     obj_move = self.pool.get('account.move.line')
     ctx = {}
     fy_id = ref('account.data_fiscalyear')

addons/account/test/account_validate_account_move.yml

@@ -4,12 +4,8 @@
   !record {model: account.tax.code, id: account_tax_code_0}:
     name : Tax Code Test
     sign : 1.00
--
-
-
 -
   In order to test the 'Validate Journal Entries' wizard in OpenERP, I created an account move
-
 -
   !record {model: account.move, id: account_move_0}:
     date: '2010-06-07'

addons/account/wizard/account_automatic_reconcile.py

@@ -248,4 +248,4 @@ class account_automatic_reconcile(osv.osv_memory):
 
 account_automatic_reconcile()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/wizard/account_automatic_reconcile_view.xml

@@ -51,7 +51,7 @@
             action="action_account_automatic_reconcile"
             id="menu_automatic_reconcile"
             parent="periodical_processing_reconciliation"
-            groups="base.group_extended"/>
+            groups="base.group_extended,group_account_manager,group_account_user"/>
 
         <record id="account_automatic_reconcile_view1" model="ir.ui.view">
              <field name="name">Automatic reconcile unreconcile</field>

addons/account/wizard/account_change_currency.py

@@ -19,6 +19,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 from osv import osv, fields
 from tools.translate import _
 
@@ -34,7 +35,6 @@ class account_change_currency(osv.osv_memory):
         if context is None:
             context = {}
         if context.get('active_id',False):
-            state = obj_inv.browse(cr, uid, context['active_id']).state
             if obj_inv.browse(cr, uid, context['active_id']).state != 'draft':
                 raise osv.except_osv(_('Error'), _('You can only change currency for Draft Invoice !'))
             pass
@@ -43,7 +43,6 @@ class account_change_currency(osv.osv_memory):
         obj_inv = self.pool.get('account.invoice')
         obj_inv_line = self.pool.get('account.invoice.line')
         obj_currency = self.pool.get('res.currency')
-        invoice_ids = []
         if context is None:
             context = {}
         data = self.read(cr, uid, ids)[0]
@@ -77,4 +76,4 @@ class account_change_currency(osv.osv_memory):
 
 account_change_currency()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/wizard/account_chart.py

@@ -18,9 +18,9 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 import time
 from osv import fields, osv
-from tools.translate import _
 
 class account_chart(osv.osv_memory):
     """
@@ -38,12 +38,6 @@ class account_chart(osv.osv_memory):
                                         ('posted', 'All Posted Entries')], 'Target Moves', required = True),
     }
 
-    def _get_fiscalyear(self, cr, uid, context=None):
-        """Return default Fiscalyear value"""
-        now = time.strftime('%Y-%m-%d')
-        fiscalyears = self.pool.get('account.fiscalyear').search(cr, uid, [('date_start', '<', now), ('date_stop', '>', now)], limit=1 )
-        return fiscalyears and fiscalyears[0] or False
-
     def onchange_fiscalyear(self, cr, uid, ids, fiscalyear_id=False, context=None):
         res = {}
         res['value'] = {}
@@ -81,23 +75,24 @@ class account_chart(osv.osv_memory):
         """
         mod_obj = self.pool.get('ir.model.data')
         act_obj = self.pool.get('ir.actions.act_window')
+        period_obj = self.pool.get('account.period')
+        fy_obj = self.pool.get('account.fiscalyear')
         if context is None:
             context = {}
         data = self.read(cr, uid, ids, [], context=context)[0]
         result = mod_obj._get_id(cr, uid, 'account', 'action_account_tree')
         id = mod_obj.read(cr, uid, [result], ['res_id'], context=context)[0]['res_id']
         result = act_obj.read(cr, uid, [id], context=context)[0]
-        result['periods'] = [] 
+        result['periods'] = []
         if data['period_from'] and data['period_to']:
-            result['periods'] = self.pool.get('account.period').build_ctx_periods(cr, uid, data['period_from'], data['period_to'])
+            result['periods'] = period_obj.build_ctx_periods(cr, uid, data['period_from'], data['period_to'])
         result['context'] = str({'fiscalyear': data['fiscalyear'], 'periods': result['periods'], \
                                     'state': data['target_move']})
         if data['fiscalyear']:
-            result['name'] += ':' + self.pool.get('account.fiscalyear').read(cr, uid, [data['fiscalyear']], context=context)[0]['code']
+            result['name'] += ':' + fy_obj.read(cr, uid, [data['fiscalyear']], context=context)[0]['code']
         return result
 
     _defaults = {
-        'fiscalyear': _get_fiscalyear,
         'target_move': 'all'
     }
 

addons/account/wizard/account_chart_view.xml

@@ -31,6 +31,7 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_account_chart"/>
             <field name="target">new</field>
+            <field name="help">Display your company chart of accounts per fiscal year and filter by period. Have a complete tree view of all journal items per account code by clicking on an account.</field>
         </record>
 
         <menuitem icon="STOCK_INDENT" action="action_account_chart"

addons/account/wizard/account_fiscalyear_close.py

@@ -18,9 +18,9 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 from osv import fields, osv
 from tools.translate import _
-import tools
 
 class account_fiscalyear_close(osv.osv_memory):
     """
@@ -30,14 +30,14 @@ class account_fiscalyear_close(osv.osv_memory):
     _description = "Fiscalyear Close"
     _columns = {
        'fy_id': fields.many2one('account.fiscalyear', \
-                                 'Fiscal Year to close', required=True),
+                                 'Fiscal Year to close', required=True, help="Select a Fiscal year to close"),
        'fy2_id': fields.many2one('account.fiscalyear', \
                                  'New Fiscal Year', required=True),
        'journal_id': fields.many2one('account.journal', \
                                  'Opening Entries Journal', required=True, help='The best practice here is to use a journal dedicated to contain the opening entries of all fiscal years. Note that you should define it with default debit/credit accounts and with a centralized counterpart.'),
        'period_id': fields.many2one('account.period', \
                                  'Opening Entries Period', required=True),
-       'report_name': fields.char('Name of new entries',size=64, required=True),
+       'report_name': fields.char('Name of new entries',size=64, required=True, help="Give name of the new entries"),
     }
     _defaults = {
         'report_name':'End of Fiscal Year Entry',
@@ -57,7 +57,6 @@ class account_fiscalyear_close(osv.osv_memory):
         obj_acc_move_line = self.pool.get('account.move.line')
         obj_acc_account = self.pool.get('account.account')
         obj_acc_journal_period = self.pool.get('account.journal.period')
-        obj_rec = self.pool.get('account.move.reconcile')
 
         data =  self.read(cr, uid, ids, context=context)
 
@@ -222,4 +221,4 @@ class account_fiscalyear_close(osv.osv_memory):
 
 account_fiscalyear_close()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/wizard/account_fiscalyear_close_state.py

@@ -20,8 +20,6 @@
 ##############################################################################
 
 from osv import fields, osv
-from tools.translate import _
-import tools
 
 class account_fiscalyear_close_state(osv.osv_memory):
     """
@@ -31,7 +29,7 @@ class account_fiscalyear_close_state(osv.osv_memory):
     _description = "Fiscalyear Close state"
     _columns = {
        'fy_id': fields.many2one('account.fiscalyear', \
-                                 'Fiscal Year to close', required=True),
+                                 'Fiscal Year to close', required=True, help="Select a fiscal year to close"),
     }
 
     def data_save(self, cr, uid, ids, context=None):
@@ -63,4 +61,4 @@ class account_fiscalyear_close_state(osv.osv_memory):
 
 account_fiscalyear_close_state()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/wizard/account_fiscalyear_close_state.xml

@@ -7,13 +7,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Close states of Fiscal year and periods">
-                    <label string ="This wizard will definitelly close a fiscal year and its related periods. That means that no one will be able to create or modify journal entries in it." colspan="4"/>
-                    <field name="fy_id"  domain = "[('state','=','draft')]" colspan="4"/>
-                    <separator string="" colspan="4" />
-                    <group colspan="4" col="6">
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="terp-locked" string="Close Fiscalyear" name="data_save" type="object"/>
-                   </group>
+						<label string ="This wizard will definitelly close a fiscal year and its related periods. That means that no one will be able to create or modify journal entries in it." colspan="4"/>
+						<separator colspan="4" />
+						<field name="fy_id"  domain = "[('state','=','draft')]" colspan="4"/>
+						<separator colspan="4" />
+						<group colspan="4" col="6">
+						    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+						    <button icon="terp-locked" string="Close Fiscalyear" name="data_save" type="object"/>
+						</group>
                </form>
             </field>
         </record>

addons/account/wizard/account_fiscalyear_close_view.xml

@@ -6,21 +6,22 @@
             <field name="model">account.fiscalyear.close</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Generate Fiscal Year Opening Entries">
-                     <label string="This wizard will generate the end of year journal entries of selected fiscal year. Note that you can run this wizard many times for the same fiscal year: it will simply replace the old opening entries with the new ones." colspan="4"/>
-                    <field name="fy_id" domain = "[('state','=','draft')]"/>
-                    <field name="fy2_id" domain = "[('state','=','draft')]"/>
-                    <field name="journal_id"/>
-                    <field name="period_id" domain ="[('fiscalyear_id','=',fy2_id)]"/>
-                    <field name="report_name" colspan="4"/>
-                    <separator string="" colspan="4"/>
-                    <group colspan="4" col="6">
-                       <label string="" colspan="2"/>
-                       <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                       <button icon="gtk-execute" string="Create" name="data_save" type="object"/>
-                    </group>
-               </form>
-            </field>
+	            <form string="Generate Fiscal Year Opening Entries">
+	                <label string="This wizard will generate the end of year journal entries of selected fiscal year. Note that you can run this wizard many times for the same fiscal year: it will simply replace the old opening entries with the new ones." colspan="4"/>
+	                <separator colspan="4"/>
+	                <field name="fy_id" domain = "[('state','=','draft')]"/>
+	                <field name="fy2_id" domain = "[('state','=','draft')]"/>
+	                <field name="journal_id"/>
+	                <field name="period_id" domain ="[('fiscalyear_id','=',fy2_id)]" />
+	                <field name="report_name" colspan="4"/>
+	                <separator colspan="4"/>
+	                <group colspan="4" col="6">
+	                   <label string="" colspan="2"/>
+	                   <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+	                   <button icon="gtk-execute" string="Create" name="data_save" type="object"/>
+	                </group>
+				</form>
+			</field>
         </record>
 
         <record id="action_account_fiscalyear_close" model="ir.actions.act_window">

addons/account/wizard/account_invoice_refund.py

@@ -84,7 +84,7 @@ class account_invoice_refund(osv.osv_memory):
         wf_service = netsvc.LocalService('workflow')
         inv_tax_obj = self.pool.get('account.invoice.tax')
         inv_line_obj = self.pool.get('account.invoice.line')
-
+        res_users_obj = self.pool.get('res.users')
         if context is None:
             context = {}
 
@@ -93,7 +93,7 @@ class account_invoice_refund(osv.osv_memory):
             date = False
             period = False
             description = False
-            company = self.pool.get('res.users').browse(cr, uid, uid).company_id
+            company = res_users_obj.browse(cr, uid, uid).company_id
             journal_id = form.get('journal_id', False)
             for inv in inv_obj.browse(cr, uid, context.get('active_ids'), context=context):
                 if inv.state in ['draft', 'proforma2', 'cancel']:

addons/account/wizard/account_invoice_state.py

@@ -18,7 +18,8 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from osv import fields, osv
+
+from osv import osv
 from tools.translate import _
 import netsvc
 import pooler

addons/account/wizard/account_journal_select.py

@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from osv import fields, osv
+from osv import osv
 
 class account_journal_select(osv.osv_memory):
     """
@@ -45,8 +45,6 @@ class account_journal_select(osv.osv_memory):
             result['context'] = str({'journal_id': journal_id, 'period_id': period_id})
         return result
 
-
 account_journal_select()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/wizard/account_move_bank_reconcile.py

@@ -18,11 +18,10 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import tools
+
 from osv import fields, osv
 from tools.translate import _
 
-
 class account_move_bank_reconcile(osv.osv_memory):
     """
         Bank Reconciliation

addons/account/wizard/account_move_journal.py

@@ -19,9 +19,8 @@
 #
 ##############################################################################
 
-from osv import fields, osv
+from osv import osv
 from tools.translate import _
-import tools
 
 class account_move_journal(osv.osv_memory):
     _name = "account.move.journal"
@@ -31,7 +30,8 @@ class account_move_journal(osv.osv_memory):
         """
         Return  default account period value
         """
-        ids = self.pool.get('account.period').find(cr, uid, context=context)
+        account_period_obj = self.pool.get('account.period')
+        ids = account_period_obj.find(cr, uid, context=context)
         period_id = False
         if ids:
             period_id = ids[0]
@@ -119,6 +119,7 @@ class account_move_journal(osv.osv_memory):
         period_pool = self.pool.get('account.journal.period')
         data_pool = self.pool.get('ir.model.data')
         journal_pool = self.pool.get('account.journal')
+        account_period_obj = self.pool.get('account.period')
 
         if context is None:
             context = {}
@@ -132,7 +133,7 @@ class account_move_journal(osv.osv_memory):
 
             if not ids:
                 journal = journal_pool.browse(cr, uid, journal_id)
-                period = self.pool.get('account.period').browse(cr, uid, period_id)
+                period = account_period_obj.browse(cr, uid, period_id)
 
                 name = journal.name
                 state = period.state
@@ -169,4 +170,4 @@ class account_move_journal(osv.osv_memory):
 
 account_move_journal()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/wizard/account_move_journal_view.xml

@@ -20,6 +20,7 @@
             <field name="view_id" ref="view_account_move_journal_form"/>
             <field name="context">{'journal_type':'sale','view_mode':False}</field>
             <field name="target">new</field>
+            <field name="help">This view is used by accountants in order to record entries massively in OpenERP. If you want to record a customer invoice, select the journal and the period in the search toolbar. Then, start by recording the entry line of the income account. OpenERP will propose to you automatically the Tax related to this account and the counter-part "Account receivable".</field>
         </record>
         <menuitem action="action_account_moves_sale" sequence="16" id="menu_eaction_account_moves_sale"
             parent="menu_finance_receivables" icon="STOCK_JUSTIFY_FILL" groups="group_account_user,group_account_manager"/>
@@ -31,6 +32,7 @@
             <field name="view_id" ref="view_account_move_journal_form"/>
             <field name="context">{'journal_type':'purchase','view_mode':False}</field>
             <field name="target">new</field>
+            <field name="help">This view is used by accountants in order to record entries massively in OpenERP. If you want to record a supplier invoice, start by recording the line of the expense account, OpenERP will propose to you automatically the Tax related to this account and the counter-part "Account Payable".</field>
         </record>
         <menuitem action="action_account_moves_purchase"
             id="menu_eaction_account_moves_purchase"
@@ -46,6 +48,7 @@
             <field name="view_id" ref="view_account_move_journal_form"/>
             <field name="context">{'journal_type':'bank','view_mode':False}</field>
             <field name="target">new</field>
+            <field name="help">This view is used by accountants in order to record entries massively in OpenERP. Journal items are created by OpenERP if you use Bank Statements, Cash Registers, or Customer/Supplier payments.</field>
         </record>
 
         <menuitem

addons/account/wizard/account_move_line_reconcile_select.py

@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 from osv import fields, osv
 from tools.translate import _
 

addons/account/wizard/account_open_closed_fiscalyear.py

@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 from osv import fields, osv
 from tools.translate import _
 
@@ -30,15 +31,19 @@ class account_open_closed_fiscalyear(osv.osv_memory):
     }
 
     def remove_entries(self, cr, uid, ids, context={}):
+        fy_obj = self.pool.get('account.fiscalyear')
+        move_obj = self.pool.get('account.move')
+
         data = self.read(cr, uid, ids, [])[0]
-        data_fyear = self.pool.get('account.fiscalyear').browse(cr, uid, data['fyear_id'])
+        data_fyear = fy_obj.browse(cr, uid, data['fyear_id'])
         if not data_fyear.end_journal_period_id:
             raise osv.except_osv(_('Error'), _('No journal for ending writing has been defined for the fiscal year'))
         period_journal = data_fyear.end_journal_period_id
-        ids_move = self.pool.get('account.move').search(cr, uid, [('journal_id','=',period_journal.journal_id.id),('period_id','=',period_journal.period_id.id)])
+        ids_move = move_obj.search(cr, uid, [('journal_id','=',period_journal.journal_id.id),('period_id','=',period_journal.period_id.id)])
         if ids_move:
             cr.execute('delete from account_move where id IN %s', (tuple(ids_move),))
         return {}
 
 account_open_closed_fiscalyear()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/wizard/account_period_close.py

@@ -20,7 +20,6 @@
 ##############################################################################
 
 from osv import fields, osv
-from tools.translate import _
 
 class account_period_close(osv.osv_memory):
     """
@@ -39,6 +38,7 @@ class account_period_close(osv.osv_memory):
         @param uid: the current user’s ID for security checks,
         @param ids: account period close’s ID or list of IDs
          """
+        period_pool = self.pool.get('account.period')
 
         mode = 'done'
         for form in self.read(cr, uid, ids, context=context):
@@ -48,7 +48,6 @@ class account_period_close(osv.osv_memory):
                     cr.execute('update account_period set state=%s where id=%s', (mode, id))
 
                     # Log message for Period
-                    period_pool = self.pool.get('account.period')
                     for period_id, name in period_pool.name_get(cr, uid, [id]):
                         period_pool.log(cr, uid, period_id, "Period '%s' is closed, no more modification allowed for this period." % (name))
         return {}

addons/account/wizard/account_reconcile.py

@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 import time
 
 from osv import fields, osv
@@ -72,6 +73,7 @@ class account_move_line_reconcile(osv.osv_memory):
 
     def trans_rec_reconcile_full(self, cr, uid, ids, context=None):
         account_move_line_obj = self.pool.get('account.move.line')
+        period_obj = self.pool.get('account.period')
         date = False
         period_id = False
         journal_id= False
@@ -80,9 +82,8 @@ class account_move_line_reconcile(osv.osv_memory):
         if context is None:
             context = {}
 
-        data = self.read(cr, uid, ids, context=context)
         date = time.strftime('%Y-%m-%d')
-        ids = self.pool.get('account.period').find(cr, uid, dt=date, context=context)
+        ids = period_obj.find(cr, uid, dt=date, context=context)
         if ids:
             period_id = ids[0]
         #stop the reconciliation process by partner (manual reconciliation) only if there is nothing more to reconcile for this partner
@@ -148,6 +149,7 @@ class account_move_line_reconcile_writeoff(osv.osv_memory):
 
     def trans_rec_reconcile(self, cr, uid, ids, context=None):
         account_move_line_obj = self.pool.get('account.move.line')
+        period_obj = self.pool.get('account.period')
         if context is None:
             context = {}
         data = self.read(cr, uid, ids,context=context)[0]
@@ -160,7 +162,7 @@ class account_move_line_reconcile_writeoff(osv.osv_memory):
         if context['date_p']:
             date = context['date_p']
 
-        ids = self.pool.get('account.period').find(cr, uid, dt=date, context=context)
+        ids = period_obj.find(cr, uid, dt=date, context=context)
         if ids:
             period_id = ids[0]
 
@@ -171,4 +173,4 @@ class account_move_line_reconcile_writeoff(osv.osv_memory):
 
 account_move_line_reconcile_writeoff()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/wizard/account_reconcile_partner_process.py

@@ -18,10 +18,10 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 import time
 
 from osv import osv, fields
-from tools.translate import _
 
 class account_partner_reconcile_process(osv.osv_memory):
     _name = 'account.partner.reconcile.process'
@@ -29,15 +29,15 @@ class account_partner_reconcile_process(osv.osv_memory):
 
     def _get_to_reconcile(self, cr, uid, context=None):
         cr.execute("""
-                  SELECT p_id FROM (SELECT l.partner_id as p_id, SUM(l.debit) AS debit, SUM(l.credit) AS credit 
-                                    FROM account_move_line AS l LEFT JOIN account_account a ON (l.account_id = a.id) 
-                                                                LEFT JOIN res_partner p ON (p.id = l.partner_id) 
-                                    WHERE a.reconcile = 't' 
-                                    AND l.reconcile_id IS NULL 
-                                    AND  (%s >  to_char(p.last_reconciliation_date, 'YYYY-MM-DD') OR  p.last_reconciliation_date IS NULL ) 
-                                    AND  l.state <> 'draft' 
-                                    GROUP BY l.partner_id) AS tmp 
-                              WHERE debit > 0 
+                  SELECT p_id FROM (SELECT l.partner_id as p_id, SUM(l.debit) AS debit, SUM(l.credit) AS credit
+                                    FROM account_move_line AS l LEFT JOIN account_account a ON (l.account_id = a.id)
+                                                                LEFT JOIN res_partner p ON (p.id = l.partner_id)
+                                    WHERE a.reconcile = 't'
+                                    AND l.reconcile_id IS NULL
+                                    AND  (%s >  to_char(p.last_reconciliation_date, 'YYYY-MM-DD') OR  p.last_reconciliation_date IS NULL )
+                                    AND  l.state <> 'draft'
+                                    GROUP BY l.partner_id) AS tmp
+                              WHERE debit > 0
                               AND credit > 0
                 """,(time.strftime('%Y-%m-%d'),)
         )
@@ -55,7 +55,9 @@ class account_partner_reconcile_process(osv.osv_memory):
         return len(map(lambda x: x[0], cr.fetchall())) + 1
 
     def _get_partner(self, cr, uid, context=None):
-        partner = self.pool.get('account.move.line').get_next_partner_only(cr, uid, offset=1, context=context)
+        move_line_obj = self.pool.get('account.move.line')
+
+        partner = move_line_obj.get_next_partner_only(cr, uid, offset=1, context=context)
         if not partner:
             return False
         return partner[0]
@@ -71,9 +73,12 @@ class account_partner_reconcile_process(osv.osv_memory):
         return res
 
     def next_partner(self, cr, uid, ids, context=None):
-        partner_id = self.pool.get('account.move.line').read(cr, uid, context['active_id'], ['partner_id'])['partner_id']
+        move_line_obj = self.pool.get('account.move.line')
+        res_partner_obj = self.pool.get('res.partner')
+
+        partner_id = move_line_obj.read(cr, uid, context['active_id'], ['partner_id'])['partner_id']
         if partner_id:
-            self.pool.get('res.partner').write(cr, uid, partner_id[0], {'last_reconciliation_date': time.strftime('%Y-%m-%d')}, context)
+            res_partner_obj.write(cr, uid, partner_id[0], {'last_reconciliation_date': time.strftime('%Y-%m-%d')}, context)
         #TODO: we have to find a way to update the context of the current tab (we could open a new tab with the context but it's not really handy)
         #TODO: remove that comments when the client side dev is done
         return {}
@@ -93,4 +98,4 @@ class account_partner_reconcile_process(osv.osv_memory):
 
 account_partner_reconcile_process()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/wizard/account_reconcile_view.xml

@@ -8,22 +8,20 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Reconciliation">
-                    <group height="210" width="550">
-                        <separator string="Reconciliation transactions" colspan="4"/>
-                        <field name="trans_nbr"/>
-                        <newline/>
-                        <field name="credit"/>
-                        <field name="debit"/>
-                        <separator string="Write-Off" colspan="4"/>
-                        <field name="writeoff"/>
-                        <group colspan="4" col="6">
-                            <label string ="" colspan="2"/>
-                            <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                            <button icon="terp-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile_full" type="object" default_focus="1" attrs="{'invisible':[('writeoff','!=',0)]}"/>
-                            <button icon="gtk-ok" string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff" type="object" attrs="{'invisible':[('writeoff','==',0)]}"/>
-                            <button icon="gtk-ok" string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile" type="object" attrs="{'invisible':[('writeoff','==',0)]}"/>
-                       </group>
-                    </group>
+                    <separator string="Reconciliation transactions" colspan="4"/>
+                    <field name="trans_nbr"/>
+                    <newline/>
+                    <field name="credit"/>
+                    <field name="debit"/>
+                    <separator string="Write-Off" colspan="4"/>
+                    <field name="writeoff"/>
+                    <group colspan="4" col="6">
+                        <label string ="" colspan="2"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="terp-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile_full" type="object" default_focus="1" attrs="{'invisible':[('writeoff','!=',0)]}"/>
+                        <button icon="gtk-ok" string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff" type="object" attrs="{'invisible':[('writeoff','==',0)]}"/>
+                        <button icon="gtk-ok" string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile" type="object" attrs="{'invisible':[('writeoff','==',0)]}"/>
+                   </group>
                </form>
             </field>
         </record>

addons/account/wizard/account_report_balance_sheet.py

@@ -35,7 +35,7 @@ class account_bs_report(osv.osv_memory):
     _columns = {
         'display_type': fields.boolean("Landscape Mode"),
         'reserve_account_id': fields.many2one('account.account', 'Reserve & Profit/Loss Account',required = True,
-                                      help='This Account is used for trasfering Profit/Loss(If It is Profit : Amount will be added, Loss : Amount will be duducted.), Which is calculated from Profilt & Loss Report', domain = [('type','=','payable')]),
+                                      help='This Account is used for trasfering Profit/Loss(If It is Profit: Amount will be added, Loss : Amount will be duducted.), Which is calculated from Profilt & Loss Report', domain = [('type','=','payable')]),
     }
 
     _defaults={
@@ -44,7 +44,6 @@ class account_bs_report(osv.osv_memory):
     }
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-        mod_obj = self.pool.get('ir.model.data')
         res = super(account_bs_report, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=False)
         doc = etree.XML(res['arch'])
         nodes = doc.xpath("//field[@name='journal_ids']")

addons/account/wizard/account_report_balance_sheet_view.xml

@@ -30,7 +30,7 @@
        <menuitem icon="STOCK_PRINT"
             name="Balance Sheet"
             action="action_account_bs_report"
-            groups="group_account_user"
+            groups="group_account_user,group_account_manager"
             id="menu_account_bs_report"
             parent="final_accounting_reports"/>
 

addons/account/wizard/account_report_common.py

@@ -20,8 +20,6 @@
 ##############################################################################
 
 import time
-import datetime
-from datetime import timedelta
 from lxml import etree
 
 from osv import fields, osv
@@ -46,7 +44,6 @@ class account_common_report(osv.osv_memory):
         }
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-        mod_obj = self.pool.get('ir.model.data')
         res = super(account_common_report, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=False)
         if context.get('active_model', False) == 'account.account' and view_id:
             doc = etree.XML(res['arch'])
@@ -100,7 +97,7 @@ class account_common_report(osv.osv_memory):
         return self.pool.get('account.journal').search(cr, uid ,[])
 
     _defaults = {
-            'fiscalyear_id' : _get_fiscalyear,
+            'fiscalyear_id': _get_fiscalyear,
             'journal_ids': _get_all_journal,
             'filter': 'filter_no',
             'chart_account_id': _get_account,
@@ -111,8 +108,6 @@ class account_common_report(osv.osv_memory):
         if context is None:
             context = {}
         result = {}
-        period_obj = self.pool.get('account.period')
-        fiscal_obj = self.pool.get('account.fiscalyear')
         result['fiscalyear'] = 'fiscalyear_id' in data['form'] and data['form']['fiscalyear_id'] or False
         result['journal_ids'] = 'journal_ids' in data['form'] and data['form']['journal_ids'] or False
         result['chart_account_id'] = 'chart_account_id' in data['form'] and data['form']['chart_account_id'] or False
@@ -132,7 +127,6 @@ class account_common_report(osv.osv_memory):
     def check_report(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
-        obj_move = self.pool.get('account.move.line')
         data = {}
         data['ids'] = context.get('active_ids', [])
         data['model'] = context.get('active_model', 'ir.ui.menu')

addons/account/wizard/account_report_common_partner.py

@@ -28,7 +28,7 @@ class account_common_partner_report(osv.osv_memory):
     _columns = {
         'result_selection': fields.selection([('customer','Receivable Accounts'),
                                               ('supplier','Payable Accounts'),
-                                              ('customer_supplier' ,'Receivable and Payable Accounts')],
+                                              ('customer_supplier','Receivable and Payable Accounts')],
                                               "Partner's", required=True),
     }
 

addons/account/wizard/account_report_general_ledger_view.xml

@@ -56,7 +56,7 @@
             name="General Ledger"
             parent="account.final_accounting_reports"
             action="action_account_general_ledger_menu"
-            groups="group_account_manager"
+            groups="group_account_manager,group_account_user"
             id="menu_general_ledger"
            />
 

addons/account/wizard/account_report_partner_ledger_view.xml

@@ -34,7 +34,7 @@
         <menuitem icon="STOCK_PRINT"
             name="Partner Ledger"
             action="action_account_partner_ledger"
-            groups="group_account_manager"
+            groups="group_account_manager,group_account_user"
             id="menu_account_partner_ledger"
             parent="account.next_id_22"/>
 

addons/account/wizard/account_subscription_generate_view.xml

@@ -8,17 +8,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Subscription Compute">
-                    <group colspan="4" >
-                        <separator string="Generate entries before:" colspan="4"/>
-                        <field name="date"/>
-                    </group>
-                    <separator string="" colspan="4" />
-                    <group colspan="4" col="6">
-                        <label string ="" colspan="2"/>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel" />
-                        <button icon="gtk-execute" string="Generate Entries"
-                        name="action_generate" type="object" />
-                    </group>
+                    <separator string="Generate entries before:" colspan="4"/>
+                    <field name="date"/>
+                	<separator colspan="4" />
+                	<group colspan="4" col="6">
+                		<label string ="" colspan="2"/>
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel" />
+                    	<button icon="gtk-execute" string="Generate Entries"
+                    	name="action_generate" type="object" />
+                	</group>
                </form>
             </field>
         </record>

addons/account/wizard/account_tax_chart_view.xml

@@ -39,7 +39,7 @@
             action="action_account_tax_chart"
             id="menu_action_tax_code_tree"
             parent="menu_finance_charts"
-            groups="group_account_user"
+            groups="group_account_user,group_account_manager"
             sequence="12"/>
 
     </data>

addons/account/wizard/account_use_model_view.xml

@@ -38,12 +38,10 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Use Model">
-                    <group colspan="4" col="6" width="300" height="70">
-                        <label string = "Are you sure you want to create entries?" colspan="2"/>
-                        <newline/>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="gtk-execute" string="Ok" name="create_entries" type="object" default_focus='1'/>
-                   </group>
+                    <label string = "Are you sure you want to create entries?" colspan="2"/>
+                    <newline/>
+                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    <button icon="gtk-execute" string="Ok" name="create_entries" type="object" default_focus='1'/>
                </form>
             </field>
         </record>

addons/account/wizard/account_vat.py

@@ -24,13 +24,14 @@ from osv import osv, fields
 class account_vat_declaration(osv.osv_memory):
     _name = 'account.vat.declaration'
     _description = 'Account Vat Declaration'
-
+    _inherit = "account.common.account.report"
     _columns = {
-        'based_on': fields.selection([('invoices','Invoices'),
-                                     ('payments','Payments'),],
+	    'based_on': fields.selection([('invoices','Invoices'),
+                                      ('payments','Payments'),],
                                       'Based On', required=True),
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'periods': fields.many2many('account.period', 'vat_period_rel', 'vat_id', 'period_id', 'Periods', help="All periods if empty"),
+        'fiscalyear': fields.many2many('account.fiscalyear','vat_fiscal_rel','fiscal_id','Fiscal Year',required=True),
         }
 
     def _get_company(self, cr, uid, context={}):
@@ -38,14 +39,14 @@ class account_vat_declaration(osv.osv_memory):
         company_obj = self.pool.get('res.company')
         user = user_obj.browse(cr, uid, uid, context=context)
         if user.company_id:
-            return user.company_id.id
+    	    return user.company_id.id
         else:
             return company_obj.search(cr, uid, [('parent_id', '=', False)])[0]
 
     _defaults = {
-            'based_on': 'invoices',
-            'company_id': _get_company
-        }
+        'based_on': 'invoices',
+        'company_id': _get_company
+		}
 
     def create_vat(self, cr, uid, ids, context={}):
         if context is None:
@@ -57,8 +58,7 @@ class account_vat_declaration(osv.osv_memory):
             'type': 'ir.actions.report.xml',
             'report_name': 'account.vat.declaration',
             'datas': datas,
-            }
-
+        }
 account_vat_declaration()
 
 #vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/wizard/account_vat_view.xml

@@ -10,10 +10,12 @@
             <form string="Select Period">
                 <field name="company_id" groups="base.group_multi_company" widget='selection'/>
                 <newline/>
-                <field name="based_on" invisible="1"/>
+                <field name="based_on"/>
                 <newline/>
                 <separator string="Select Period(s)" colspan="4"/>
-                <field name="periods" nolabel="1" colspan="2"/>
+                	<field name="periods" nolabel="1" colspan="4"/>
+                <separator string="Select FiscalYear(s)" colspan="4"/>                	                
+                    <field name="fiscalyear" nolabel="1" colspan="4"/>
                 <group col="2" colspan="4">
                     <button icon='gtk-cancel' special="cancel"  string="Cancel" />
                     <button name="create_vat" string="Print Tax Statement" colspan="1" type="object" icon="gtk-ok"/>

addons/account_accountant/__openerp__.py

@@ -24,7 +24,7 @@
     "author" : "OpenERP SA",
     "category": 'Generic Modules/Accounting',
     "description": """
-Give access to the admin user to all accounting features like the journal
+This module gives the admin user the access to all the accounting features like the journal
 items and the chart of accounts.
     """,
     'website': 'http://www.openerp.com',
@@ -33,8 +33,8 @@ items and the chart of accounts.
     'update_xml': [
         'security/account_security.xml',
     ],
-    'demo_xml': [ ],
-    'test': [ ],
+    'demo_xml': [],
+    'test': [],
     'installable': True,
     'active': False,
     'certificate': '',

addons/account_accountant/i18n/account_accountant.pot

@@ -0,0 +1,22 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_accountant
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2010-10-18 17:46:01+0000\n"
+"PO-Revision-Date: 2010-10-18 17:46:01+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: account_accountant
+#: model:ir.module.module,shortdesc:account_accountant.module_meta_information
+msgid "Accountant"
+msgstr ""
+

addons/account_accountant/security/account_security.xml

@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <record id="base.user_admin" model="res.users">
+        <record id="base.user_root" model="res.users">
             <field name="groups_id" eval="[(4, ref('account.group_account_manager')),(4, ref('account.group_account_user'))]"/>
         </record>
 

addons/account_analytic_analysis/account_analytic_analysis.py

@@ -146,7 +146,7 @@ class account_analytic_account(osv.osv):
                             FROM account_analytic_line \
                             WHERE account_id IN %s \
                                 AND invoice_id IS NULL \
-                            GROUP BY account_analytic_line.account_id" ,(parent_ids,))
+                            GROUP BY account_analytic_line.account_id",(parent_ids,))
                     for account_id, lwd in cr.fetchall():
                         if account_id not in res:
                             res[account_id] = {}
@@ -656,7 +656,7 @@ class account_analytic_account_summary_month(osv.osv):
         if fields is None:
             fields = self._columns.keys()
         res_trans_obj = self.pool.get('ir.translation')
-        # construct a clause for the rules :
+        # construct a clause for the rules:
         d1, d2, tables= self.pool.get('ir.rule').domain_get(cr, user, self._name)
 
         # all inherited fields + all non inherited fields for which the attribute whose name is in load is True

addons/account_analytic_analysis/i18n/account_analytic_analysis.pot

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01:51+0000\n"
-"PO-Revision-Date: 2009-08-28 16:01:51+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46:02+0000\n"
+"PO-Revision-Date: 2010-10-18 17:46:02+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -21,13 +21,13 @@ msgid "Number of hours that can be invoiced plus those that already have been in
 msgstr ""
 
 #. module: account_analytic_analysis
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
-msgid "Hours summary by user"
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: field:account.analytic.account,last_invoice_date:0
-msgid "Last Invoice Date"
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -41,24 +41,9 @@ msgid "Computed using the formula: Maximum Quantity - Hours Tot."
 msgstr ""
 
 #. module: account_analytic_analysis
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all
-msgid "All Analytic Accounts"
-msgstr ""
-
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_open
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_to_valid_open
-msgid "My Current Accounts"
-msgstr ""
-
-#. module: account_analytic_analysis
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_analytic_analysis
-#: help:account.analytic.account,last_invoice_date:0
-msgid "Date of the last invoice created for this analytic account."
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:0
+#, python-format
+msgid "AccessError"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -67,8 +52,18 @@ msgid "Theorical Revenue"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
+#: field:account.analytic.account,last_invoice_date:0
+msgid "Last Invoice Date"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,last_invoice_date:0
+msgid "Date of the last invoice created for this analytic account."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -76,17 +71,6 @@ msgstr ""
 msgid "Computed using the formula: Theorial Revenue - Total Costs"
 msgstr ""
 
-#. module: account_analytic_analysis
-#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_new
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_new
-msgid "New Analytic Account"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,theorical_margin:0
 msgid "Theorical Margin"
@@ -97,17 +81,6 @@ msgstr ""
 msgid "Real Margin Rate (%)"
 msgstr ""
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_all_open
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all_open
-msgid "Current Analytic Accounts"
-msgstr ""
-
-#. module: account_analytic_analysis
-#: help:account.analytic.account,last_worked_date:0
-msgid "Date of the latest work done on this account."
-msgstr ""
-
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_invoiced_date:0
 msgid "If invoice from the costs, this is the date of the latest work or cost that have been invoiced."
@@ -115,7 +88,7 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_invoicing
-msgid "Invoicing"
+msgid "Billing"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -150,15 +123,8 @@ msgid "User"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_pending
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_to_valid_pending
-msgid "My Pending Accounts"
-msgstr ""
-
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_my
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_my
-msgid "My Uninvoiced Entries"
+#: field:account.analytic.account,ca_to_invoice:0
+msgid "Uninvoiced Amount"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -166,32 +132,19 @@ msgstr ""
 msgid "Computed using the formula: Invoiced Amount - Total Costs."
 msgstr ""
 
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_managed
-msgid "My Accounts"
-msgstr ""
-
-#. module: account_analytic_analysis
-#: model:ir.module.module,description:account_analytic_analysis.module_meta_information
-msgid "Modify account analytic view to show\n"
-"important data for project manager of services companies.\n"
-"Add menu to show relevant information for each manager."
-msgstr ""
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_non_invoiced:0
 msgid "Uninvoiced Hours"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: field:account.analytic.account,hours_quantity:0
-msgid "Hours Tot"
+#: help:account.analytic.account,last_worked_date:0
+msgid "Date of the latest work done on this account."
 msgstr ""
 
 #. module: account_analytic_analysis
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_account
-msgid "Analytic Accounts"
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -199,14 +152,20 @@ msgstr ""
 msgid "report_account_analytic"
 msgstr ""
 
+#. module: account_analytic_analysis
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
+msgid "Hours Summary by User"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_invoiced:0
 msgid "Invoiced Amount"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: model:ir.ui.menu,name:account_analytic_analysis.next_id_71
-msgid "Financial Project Management"
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:0
+#, python-format
+msgid "You try to bypass an access rule (Document type: %s)."
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -214,17 +173,6 @@ msgstr ""
 msgid "Date of Last Invoiced Cost"
 msgstr ""
 
-#. module: account_analytic_analysis
-#: field:account.analytic.account,ca_to_invoice:0
-msgid "Uninvoiced Amount"
-msgstr ""
-
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_all_pending
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all_pending
-msgid "Pending Analytic Accounts"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_invoiced:0
 msgid "Invoiced Hours"
@@ -295,6 +243,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: field:account_analytic_analysis.summary.month,account_id:0
 #: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
 msgid "Analytic Account"
 msgstr ""
 
@@ -310,6 +259,11 @@ msgstr ""
 msgid "All Uninvoiced Entries"
 msgstr ""
 
+#. module: account_analytic_analysis
+#: field:account.analytic.account,hours_quantity:0
+msgid "Hours Tot"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,total_cost:0
 msgid "Total of costs for this account. It includes real costs (from invoices) and indirect costs, like time spent on timesheets."

addons/account_analytic_analysis/i18n/sr.po

@@ -0,0 +1,352 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-10-14 07:30+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Serbian <sr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,hours_qtt_invoiced:0
+msgid ""
+"Number of hours that can be invoiced plus those that already have been "
+"invoiced."
+msgstr ""
+"Broj sati koji mogu biti fakturirani zajedno s onima koji su već fakturisana."
+
+#. module: account_analytic_analysis
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
+msgid "Hours summary by user"
+msgstr "Sati sumarno od strane korisnika"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,last_invoice_date:0
+msgid "Last Invoice Date"
+msgstr "Zadnji Datum fakture"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,remaining_ca:0
+msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
+msgstr "Izračunato pomoću formule: Max Cijena Iznos - Iznos dostavnice."
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,remaining_hours:0
+msgid "Computed using the formula: Maximum Quantity - Hours Tot."
+msgstr "Izračunato pomoću formule: Najveća količina - Ukupno vrijeme"
+
+#. module: account_analytic_analysis
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all
+msgid "All Analytic Accounts"
+msgstr "Svi analitički računi"
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_open
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_to_valid_open
+msgid "My Current Accounts"
+msgstr "Moji tekući računi"
+
+#. module: account_analytic_analysis
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,last_invoice_date:0
+msgid "Date of the last invoice created for this analytic account."
+msgstr "Datum zadnje fakture kreirana za ovaj analitički račun."
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,ca_theorical:0
+msgid "Theorical Revenue"
+msgstr "Prihodi teoretski"
+
+#. module: account_analytic_analysis
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Pogrešno ime modela u definiciji akcije."
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,theorical_margin:0
+msgid "Computed using the formula: Theorial Revenue - Total Costs"
+msgstr "Izračunato pomoću formule: Prihodi Teorijski - Ukupni troškovi"
+
+#. module: account_analytic_analysis
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ime objekta mora da počne sa x_ i ne sme da sadrži specijalne karaktere !"
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_new
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_new
+msgid "New Analytic Account"
+msgstr "Novi analitički račun"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,theorical_margin:0
+msgid "Theorical Margin"
+msgstr "Teoretska margina"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,real_margin_rate:0
+msgid "Real Margin Rate (%)"
+msgstr "Realna Stopa Margine (%)"
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_all_open
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all_open
+msgid "Current Analytic Accounts"
+msgstr "Tekući analitički računi"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,last_worked_date:0
+msgid "Date of the latest work done on this account."
+msgstr "Datum najnovijeg rada obavljenog na ovom računu."
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,last_worked_invoiced_date:0
+msgid ""
+"If invoice from the costs, this is the date of the latest work or cost that "
+"have been invoiced."
+msgstr ""
+"Ako račun od troškova, to je datum najnoviji rad ili cijene koje su "
+"fakturirane."
+
+#. module: account_analytic_analysis
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_invoicing
+msgid "Invoicing"
+msgstr "Fakturiranje"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,last_worked_date:0
+msgid "Date of Last Cost/Work"
+msgstr "Datum poslednjeg  Cena / Posao"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,total_cost:0
+msgid "Total Costs"
+msgstr "Ukupni troškovi"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,hours_quantity:0
+msgid ""
+"Number of hours you spent on the analytic account (from timesheet). It "
+"computes on all journal of type 'general'."
+msgstr ""
+"Broj sati provedenih na tom analitičkom račun (iz timesheet). Izračunava se "
+"iz svih dnevnih knjiga za tip 'Generalno'."
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,remaining_hours:0
+msgid "Remaining Hours"
+msgstr "Preostali Sati"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,ca_theorical:0
+msgid ""
+"Based on the costs you had on the project, what would have been the revenue "
+"if all these costs have been invoiced at the normal sale price provided by "
+"the pricelist."
+msgstr ""
+"Na temelju troškova koje ste imali na projektu, što bi bio prihod ako su svi "
+"ovi troškovi su obračunati po normalnoj prodajnoj cijeni proistekli iz "
+"cenovnika."
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,user_ids:0
+#: field:account_analytic_analysis.summary.user,user:0
+msgid "User"
+msgstr "Korisnik"
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_pending
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_to_valid_pending
+msgid "My Pending Accounts"
+msgstr "Moji računi na čekanju"
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_my
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_my
+msgid "My Uninvoiced Entries"
+msgstr "Moji nefakturirani Ulazi"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,real_margin:0
+msgid "Computed using the formula: Invoiced Amount - Total Costs."
+msgstr "Izračunato korištenjem formule: Fakturirani iznos - Ukupni troškovi."
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_managed
+msgid "My Accounts"
+msgstr "Moji računi"
+
+#. module: account_analytic_analysis
+#: model:ir.module.module,description:account_analytic_analysis.module_meta_information
+msgid ""
+"Modify account analytic view to show\n"
+"important data for project manager of services companies.\n"
+"Add menu to show relevant information for each manager."
+msgstr ""
+"Promeni prozor analitičkog prikaza računa da bi video\n"
+"važne podatke za projekt menadžer od usluznih kompanija.\n"
+"Dodaj meni da prikaze relevantne informacije za svakog menadžera."
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,hours_qtt_non_invoiced:0
+msgid "Uninvoiced Hours"
+msgstr "Nefakturirani sati"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,hours_quantity:0
+msgid "Hours Tot"
+msgstr "Ukupno sati"
+
+#. module: account_analytic_analysis
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_account
+msgid "Analytic Accounts"
+msgstr "Analitička konta"
+
+#. module: account_analytic_analysis
+#: model:ir.module.module,shortdesc:account_analytic_analysis.module_meta_information
+msgid "report_account_analytic"
+msgstr "izvestaj_analitickog_konta"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,ca_invoiced:0
+msgid "Invoiced Amount"
+msgstr "Fakturirani iznos"
+
+#. module: account_analytic_analysis
+#: model:ir.ui.menu,name:account_analytic_analysis.next_id_71
+msgid "Financial Project Management"
+msgstr "Finansijski Projekt Menadzment"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,last_worked_invoiced_date:0
+msgid "Date of Last Invoiced Cost"
+msgstr "Datum zadnje fakturiranog troška"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,ca_to_invoice:0
+msgid "Uninvoiced Amount"
+msgstr "Nefakturirani iznos"
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_all_pending
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all_pending
+msgid "Pending Analytic Accounts"
+msgstr "Analitički računi na čekanju"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,hours_qtt_invoiced:0
+msgid "Invoiced Hours"
+msgstr "Fakturirani sati"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,real_margin:0
+msgid "Real Margin"
+msgstr "Realna margina"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,ca_invoiced:0
+msgid "Total customer invoiced amount for this account."
+msgstr "Ukupni iznos izlaznih faktura za ovaj račun."
+
+#. module: account_analytic_analysis
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_month
+msgid "Hours summary by month"
+msgstr "Ukupno sati po mjesecu"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,real_margin_rate:0
+msgid "Computes using the formula: (Real Margin / Total Costs) * 100."
+msgstr ""
+"Računa se korištenjem formule: (Stvarna granica / Ukupni troškovi) * 100"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of hours (from journal of type 'general') that can be invoiced if you "
+"invoice based on analytic account."
+msgstr ""
+"Broj sati (iz dnevnika ' generalnog' tipa) koji mogu biti fakturirani ako "
+"fakturirate na osnovu analitičkog računa."
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Analytic accounts"
+msgstr "Analitički računi"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,remaining_ca:0
+msgid "Remaining Revenue"
+msgstr "Preostali prihod"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,ca_to_invoice:0
+msgid ""
+"If invoice from analytic account, the remaining amount you can invoice to "
+"the customer based on the total costs."
+msgstr ""
+"Ako fakturirate iz analitičkog računa, preostali iznos kojeg možete "
+"fakturirati kupcu je zasnovan na ukupnim troškovima."
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,revenue_per_hour:0
+msgid "Computed using the formula: Invoiced Amount / Hours Tot."
+msgstr "Izračunato korištenjem formule: Fakturirani iznos / Ukupno sati"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,revenue_per_hour:0
+msgid "Revenue per Hours (real)"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account_analytic_analysis.summary.month,unit_amount:0
+#: field:account_analytic_analysis.summary.user,unit_amount:0
+msgid "Total Time"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,month_ids:0
+#: field:account_analytic_analysis.summary.month,month:0
+msgid "Month"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_overpassed
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_managed_overpassed
+msgid "Overpassed Accounts"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_all
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_all
+msgid "All Uninvoiced Entries"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,total_cost:0
+msgid ""
+"Total of costs for this account. It includes real costs (from invoices) and "
+"indirect costs, like time spent on timesheets."
+msgstr ""

addons/account_analytic_analysis/security/ir.model.access.csv

@@ -1,5 +1,3 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_account_analytic_analysis_summary_user,account_analytic_analysis.summary.user,model_account_analytic_analysis_summary_user,account.group_account_manager,1,0,0,0
 access_account_analytic_analysis_summary_month,account_analytic_analysis.summary.month,model_account_analytic_analysis_summary_month,account.group_account_manager,1,0,0,0
-access_account_analytic_account_user,account.analytic.account.user,model_account_analytic_account,base.group_user,1,0,0,0
-access_account_analytic_account_system,account.analytic.account.system,model_account_analytic_account,base.group_system,1,0,0,0

addons/account_analytic_default/account_analytic_default.py

@@ -29,14 +29,14 @@ class account_analytic_default(osv.osv):
     _rec_name = "analytic_id"
     _order = "sequence"
     _columns = {
-        'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of analytic distribution."),
-        'analytic_id': fields.many2one('account.analytic.account', 'Analytic Account'),
-        'product_id': fields.many2one('product.product', 'Product', ondelete='cascade'),
-        'partner_id': fields.many2one('res.partner', 'Partner', ondelete='cascade'),
-        'user_id': fields.many2one('res.users', 'User', ondelete='cascade'),
-        'company_id': fields.many2one('res.company', 'Company', ondelete='cascade'),
-        'date_start': fields.date('Start Date'),
-        'date_stop': fields.date('End Date'),
+        'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of analytic distribution"),
+        'analytic_id': fields.many2one('account.analytic.account', 'Analytic Account' , help="Analytical Account"),
+        'product_id': fields.many2one('product.product', 'Product', ondelete='cascade', help="select a product which will use analytical account specified in analytic default (eg. create new cutomer invoice or Sale order if we select this product, it will automatically take this as an analytical account)"),
+        'partner_id': fields.many2one('res.partner', 'Partner', ondelete='cascade', help="select a partner which will use analytical account specified in analytic default (eg. create new cutomer invoice or Sale order if we select this partner, it will automatically take this as an analytical account)"),
+        'user_id': fields.many2one('res.users', 'User', ondelete='cascade', help="select a user which will use analytical account specified in analytic default"),
+        'company_id': fields.many2one('res.company', 'Company', ondelete='cascade', help="select a company which will use analytical account specified in analytic default (eg. create new cutomer invoice or Sale order if we select this company, it will automatically take this as an analytical account)"),
+        'date_start': fields.date('Start Date', help="Default start date for this Analytical Account"),
+        'date_stop': fields.date('End Date', help="Default end date for this Analytical Account"),
     }
 
     def account_get(self, cr, uid, product_id=None, partner_id=None, user_id=None, date=None, context=None):

addons/account_analytic_default/account_analytic_default_view.xml

@@ -6,7 +6,7 @@
             <field name="model">account.analytic.default</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Analytic Defaults">
+                <tree string="Analytic Defaults" colors="grey:date_stop and (date_stop &lt; datetime.date.today().strftime('%%Y-%%m-%%d'))" >
                     <field name="sequence"/>
                     <field name="analytic_id" required="0" domain="[('parent_id','!=',False)]" groups="analytic.group_analytic_accounting"/>
                     <field name="product_id"/>
@@ -44,11 +44,25 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Accounts">
+                    <group col="10" colspan="4">
+                    <filter icon="terp-go-month" string="Current" name = "current" help="Analytical defaults whose end date is greater then today or None" domain = "['|', ('date_stop', '&gt;', datetime.date.today().strftime('%%Y-%%m-%%d')), ('date_stop', '=', False)]" />
+                    <separator orientation="vertical"/>
                     <field name="analytic_id" groups="analytic.group_analytic_accounting"/>
                     <field name="product_id"/>
                     <field name="partner_id"/>
                     <field name="user_id"/>
                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By...">
+                        <filter string="User" icon="terp-personal" context="{'group_by':'user_id'}" help="User"/>
+						<filter string="Partner" icon="terp-partner"  context="{'group_by':'partner_id'}" help="Partner"/>
+						<separator orientation="vertical"/>
+						<filter string="Product" icon="terp-accessories-archiver"  context="{'group_by':'product_id'}" help="Product" />
+                        <filter string="Analytic Account" icon="terp-folder-green"  context="{'group_by':'analytic_id'}" help="Analytic Account" groups="analytic.group_analytic_accounting"/>
+                         <separator orientation="vertical"/>
+                        <filter string="Company" icon="terp-go-home"  context="{'group_by':'company_id'}"  help="Comapny" groups="base.group_multi_company" />
+                    </group>
                 </search>
             </field>
         </record>
@@ -59,6 +73,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_account_analytic_default_form_search"/>
+            <field name="context">{"search_default_current":1}</field>
         </record>
 
         <act_window

addons/account_analytic_default/i18n/account_analytic_default.pot

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01:51+0000\n"
-"PO-Revision-Date: 2009-08-28 16:01:51+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46:02+0000\n"
+"PO-Revision-Date: 2010-10-18 17:46:02+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -15,66 +15,51 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
-#. module: account_analytic_default
-#: view:account.analytic.default:0
-#: model:ir.actions.act_window,name:account_analytic_default.action_analytic_default_form
-#: model:ir.ui.menu,name:account_analytic_default.menu_analytic_defaul_form
-msgid "Analytic Defaults"
-msgstr ""
-
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
 msgid "Account Analytic Default"
 msgstr ""
 
-#. module: account_analytic_default
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: account_analytic_default
 #: constraint:ir.model:0
 msgid "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
+#. module: account_analytic_default
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
+
+#. module: account_analytic_default
+#: help:account.analytic.default,partner_id:0
+msgid "select a partner which will use analytical account specified in analytic default (eg. create new cutomer invoice or Sale order if we select this partner, it will automatically take this as an analytical account)"
+msgstr ""
+
+#. module: account_analytic_default
+#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
+#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_product
+#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_user
+msgid "Analytic Rules"
+msgstr ""
+
+#. module: account_analytic_default
+#: help:account.analytic.default,analytic_id:0
+msgid "Analytical Account"
+msgstr ""
+
 #. module: account_analytic_default
 #: view:account.analytic.default:0
-msgid "Seq"
+msgid "Current"
 msgstr ""
 
 #. module: account_analytic_default
-#: field:account.analytic.default,date_stop:0
-msgid "End Date"
+#: view:account.analytic.default:0
+msgid "Group By..."
 msgstr ""
 
 #. module: account_analytic_default
-#: field:account.analytic.default,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: account_analytic_default
-#: field:account.analytic.default,sequence:0
-msgid "Sequence"
-msgstr ""
-
-#. module: account_analytic_default
-#: field:account.analytic.default,product_id:0
-msgid "Product"
-msgstr ""
-
-#. module: account_analytic_default
-#: field:account.analytic.default,analytic_id:0
-msgid "Analytic Account"
-msgstr ""
-
-#. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distributions"
-msgstr ""
-
-#. module: account_analytic_default
-#: field:account.analytic.default,user_id:0
-msgid "User"
+#: help:account.analytic.default,date_stop:0
+msgid "Default end date for this Analytical Account"
 msgstr ""
 
 #. module: account_analytic_default
@@ -82,12 +67,109 @@ msgstr ""
 msgid "Invalid model name in the action definition."
 msgstr ""
 
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+msgid "Conditions"
+msgstr ""
+
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid "select a company which will use analytical account specified in analytic default (eg. create new cutomer invoice or Sale order if we select this company, it will automatically take this as an analytical account)"
+msgstr ""
+
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_sale_order_line
+msgid "Sale Order Line"
+msgstr ""
+
+#. module: account_analytic_default
+#: help:account.analytic.default,date_start:0
+msgid "Default start date for this Analytical Account"
+msgstr ""
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: field:account.analytic.default,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr ""
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: field:account.analytic.default,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: field:account.analytic.default,user_id:0
+msgid "User"
+msgstr ""
+
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.act_account_acount_move_line_open
 msgid "Entries"
 msgstr ""
 
 #. module: account_analytic_default
+#: field:account.analytic.default,date_stop:0
+msgid "End Date"
+msgstr ""
+
+#. module: account_analytic_default
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: account_analytic_default
+#: help:account.analytic.default,user_id:0
+msgid "select a user which will use analytical account specified in analytic default"
+msgstr ""
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: model:ir.actions.act_window,name:account_analytic_default.action_analytic_default_list
+#: model:ir.ui.menu,name:account_analytic_default.menu_analytic_default_list
+msgid "Analytic Defaults"
+msgstr ""
+
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid "select a product which will use analytical account specified in analytic default (eg. create new cutomer invoice or Sale order if we select this product, it will automatically take this as an analytical account)"
+msgstr ""
+
+#. module: account_analytic_default
+#: field:account.analytic.default,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: field:account.analytic.default,analytic_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+msgid "Accounts"
+msgstr ""
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
 #: field:account.analytic.default,partner_id:0
 msgid "Partner"
 msgstr ""
@@ -98,14 +180,7 @@ msgid "Start Date"
 msgstr ""
 
 #. module: account_analytic_default
-#: view:account.analytic.default:0
-msgid "Conditions"
-msgstr ""
-
-#. module: account_analytic_default
-#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
-#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_product
-#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_user
-msgid "Analytic Rules"
+#: help:account.analytic.default,sequence:0
+msgid "Gives the sequence order when displaying a list of analytic distribution"
 msgstr ""