[MERGE] from trunk

bzr revid: xmo@openerp.com-20121003080711-d8g4kcdpeet3ovne

addons/account/__openerp__.py

@@ -63,6 +63,8 @@ for a particular financial year and for preparation of vouchers there is a modul
         'wizard/account_use_model_view.xml',
         'account_installer.xml',
         'wizard/account_period_close_view.xml',
+        'wizard/account_reconcile_view.xml',
+        'wizard/account_unreconcile_view.xml',
         'account_view.xml',
         'account_report.xml',
         'account_financial_report_data.xml',
@@ -85,14 +87,12 @@ for a particular financial year and for preparation of vouchers there is a modul
         'wizard/account_journal_select_view.xml',
         'wizard/account_change_currency_view.xml',
         'wizard/account_validate_move_view.xml',
-        'wizard/account_unreconcile_view.xml',
         'wizard/account_report_general_ledger_view.xml',
         'wizard/account_invoice_state_view.xml',
         'wizard/account_report_partner_balance_view.xml',
         'wizard/account_report_account_balance_view.xml',
         'wizard/account_report_aged_partner_balance_view.xml',
         'wizard/account_report_partner_ledger_view.xml',
-        'wizard/account_reconcile_view.xml',
         'wizard/account_reconcile_partner_process_view.xml',
         'wizard/account_automatic_reconcile_view.xml',
         'wizard/account_financial_report_view.xml',
@@ -126,6 +126,14 @@ for a particular financial year and for preparation of vouchers there is a modul
         'res_config_view.xml',
         'account_pre_install.yml'
     ],
+    'js': [
+        'static/src/js/account_move_reconciliation.js',
+    ],
+    'qweb' : [
+        "static/src/xml/account_move_reconciliation.xml",
+    ],
+    'css':['static/src/css/account_move_reconciliation.css'
+    ],
     'demo': [
         'demo/account_demo.xml',
         'project/project_demo.xml',
@@ -151,6 +159,5 @@ for a particular financial year and for preparation of vouchers there is a modul
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '0080331923549',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/account.py

@@ -31,7 +31,7 @@ import decimal_precision as dp
 from tools.translate import _
 from tools.float_utils import float_round
 from openerp import SUPERUSER_ID
-
+import tools
 
 _logger = logging.getLogger(__name__)
 
@@ -182,7 +182,7 @@ class account_account_type(osv.osv):
  'Balance' will generally be used for cash accounts.
  'Detail' will copy each existing journal item of the previous year, even the reconciled ones.
  'Unreconciled' will copy only the journal items that were unreconciled on the first day of the new fiscal year."""),
-        'report_type': fields.function(_get_current_report_type, fnct_inv=_save_report_type, type='selection', string='P&L / BS Category',
+        'report_type': fields.function(_get_current_report_type, fnct_inv=_save_report_type, type='selection', string='P&L / BS Category', store=True,
             selection= [('none','/'),
                         ('income', _('Profit & Loss (Income account)')),
                         ('expense', _('Profit & Loss (Expense account)')),
@@ -228,7 +228,7 @@ class account_account(osv.osv):
         while pos < len(args):
 
             if args[pos][0] == 'code' and args[pos][1] in ('like', 'ilike') and args[pos][2]:
-                args[pos] = ('code', '=like', str(args[pos][2].replace('%', ''))+'%')
+                args[pos] = ('code', '=like', tools.ustr(args[pos][2].replace('%', ''))+'%')
             if args[pos][0] == 'journal_id':
                 if not args[pos][2]:
                     del args[pos]
@@ -596,13 +596,13 @@ class account_account(osv.osv):
             res.append((record['id'], name))
         return res
 
-    def copy(self, cr, uid, id, default={}, context=None, done_list=[], local=False):
+    def copy(self, cr, uid, id, default=None, context=None, done_list=None, local=False):
+        default = {} if default is None else default.copy()
+        if done_list is None:
+            done_list = []
         account = self.browse(cr, uid, id, context=context)
         new_child_ids = []
-        if not default:
-            default = {}
-        default = default.copy()
-        default['code'] = (account['code'] or '') + '(copy)'
+        default.update(code=_("%s (copy)") % (account['code'] or ''))
         if not local:
             done_list = []
         if account.id in done_list:
@@ -683,7 +683,7 @@ class account_journal_view(osv.osv):
     _name = "account.journal.view"
     _description = "Journal View"
     _columns = {
-        'name': fields.char('Journal View', size=64, required=True),
+        'name': fields.char('Journal View', size=64, required=True, translate=True),
         'columns_id': fields.one2many('account.journal.column', 'view_id', 'Columns')
     }
     _order = "name"
@@ -778,14 +778,15 @@ class account_journal(osv.osv):
         (_check_currency, 'Configuration error!\nThe currency chosen should be shared by the default accounts too.', ['currency','default_debit_account_id','default_credit_account_id']),
     ]
 
-    def copy(self, cr, uid, id, default={}, context=None, done_list=[], local=False):
+    def copy(self, cr, uid, id, default=None, context=None, done_list=None, local=False):
+        default = {} if default is None else default.copy()
+        if done_list is None:
+            done_list = []
         journal = self.browse(cr, uid, id, context=context)
-        if not default:
-            default = {}
-        default = default.copy()
-        default['code'] = (journal['code'] or '') + '(copy)'
-        default['name'] = (journal['name'] or '') + '(copy)'
-        default['sequence_id'] = False
+        default.update(
+            code=_("%s (copy)") % (journal['code'] or ''),
+            name=_("%s (copy)") % (journal['name'] or ''),
+            sequence_id=False)
         return super(account_journal, self).copy(cr, uid, id, default, context=context)
 
     def write(self, cr, uid, ids, vals, context=None):
@@ -837,6 +838,10 @@ class account_journal(osv.osv):
 
         @return: Returns a list of tupples containing id, name
         """
+        if not ids:
+            return []
+        if isinstance(ids, (int, long)):
+            ids = [ids]
         result = self.browse(cr, user, ids, context=context)
         res = []
         for rs in result:
@@ -1174,7 +1179,8 @@ class account_fiscalyear(osv.osv):
         'end_journal_period_id':fields.many2one('account.journal.period','End of Year Entries Journal', readonly=True),
     }
 
-    def copy(self, cr, uid, id, default={}, context=None):
+    def copy(self, cr, uid, id, default=None, context=None):
+        default = {} if default is None else default.copy()
         default.update({
             'period_ids': [],
             'end_journal_period_id': False
@@ -1433,9 +1439,9 @@ class account_move(osv.osv):
             result = super(account_move, self).create(cr, uid, vals, context)
         return result
 
-    def copy(self, cr, uid, id, default={}, context=None):
-        if context is None:
-            context = {}
+    def copy(self, cr, uid, id, default=None, context=None):
+        default = {} if default is None else default.copy()
+        context = {} if context is None else context.copy()
         default.update({
             'state':'draft',
             'name':'/',
@@ -1904,7 +1910,7 @@ class account_tax(osv.osv):
         'ref_tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."),
         'include_base_amount': fields.boolean('Included in base amount', help="Indicates if the amount of tax must be included in the base amount for the computation of the next taxes"),
         'company_id': fields.many2one('res.company', 'Company', required=True),
-        'description': fields.char('Tax Code',size=32),
+        'description': fields.char('Tax Code'),
         'price_include': fields.boolean('Tax Included in Price', help="Check this if the price you use on the product and invoices includes this tax."),
         'type_tax_use': fields.selection([('sale','Sale'),('purchase','Purchase'),('all','All')], 'Tax Application', required=True)
 
@@ -2265,7 +2271,10 @@ 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'),
     }
-    def generate(self, cr, uid, ids, datas={}, context=None):
+
+    def generate(self, cr, uid, ids, data=None, context=None):
+        if data is None:
+            data = {}
         move_ids = []
         entry = {}
         account_move_obj = self.pool.get('account.move')
@@ -2276,8 +2285,8 @@ class account_model(osv.osv):
         if context is None:
             context = {}
 
-        if datas.get('date', False):
-            context.update({'date': datas['date']})
+        if data.get('date', False):
+            context.update({'date': data['date']})
 
         move_date = context.get('date', time.strftime('%Y-%m-%d'))
         move_date = datetime.strptime(move_date,"%Y-%m-%d")
@@ -2339,6 +2348,16 @@ class account_model(osv.osv):
 
         return move_ids
 
+    def onchange_journal_id(self, cr, uid, ids, journal_id, context=None):
+        company_id = False
+
+        if journal_id:
+            journal = self.pool.get('account.journal').browse(cr, uid, journal_id, context=context)
+            if journal.company_id.id:
+                company_id = journal.company_id.id
+
+        return {'value': {'company_id': company_id}}
+
 account_model()
 
 class account_model_line(osv.osv):
@@ -2453,10 +2472,10 @@ class account_subscription_line(osv.osv):
         all_moves = []
         obj_model = self.pool.get('account.model')
         for line in self.browse(cr, uid, ids, context=context):
-            datas = {
+            data = {
                 'date': line.date,
             }
-            move_ids = obj_model.generate(cr, uid, [line.subscription_id.model_id.id], datas, context)
+            move_ids = obj_model.generate(cr, uid, [line.subscription_id.model_id.id], data, context)
             tocheck[line.subscription_id.id] = True
             self.write(cr, uid, [line.id], {'move_id':move_ids[0]})
             all_moves.extend(move_ids)
@@ -2504,7 +2523,7 @@ class account_account_template(osv.osv):
         'reconcile': fields.boolean('Allow Reconciliation', help="Check this option if you want the user to reconcile entries in this account."),
         'shortcut': fields.char('Shortcut', size=12),
         'note': fields.text('Note'),
-        'parent_id': fields.many2one('account.account.template', 'Parent Account Template', ondelete='cascade'),
+        'parent_id': fields.many2one('account.account.template', 'Parent Account Template', ondelete='cascade', domain=[('type','=','view')]),
         'child_parent_ids':fields.one2many('account.account.template', 'parent_id', 'Children'),
         'tax_ids': fields.many2many('account.tax.template', 'account_account_template_tax_rel', 'account_id', 'tax_id', 'Default Taxes'),
         'nocreate': fields.boolean('Optional create', help="If checked, the new chart of accounts will not contain this by default."),
@@ -2522,20 +2541,6 @@ class account_account_template(osv.osv):
         (_check_recursion, 'Error!\nYou cannot create recursive account templates.', ['parent_id']),
     ]
 
-    def create(self, cr, uid, vals, context=None):
-        if vals.get('parent_id'):
-            parent = self.read(cr, uid, [vals['parent_id']], ['type'])
-            if parent and parent[0]['type'] != 'view':
-                raise osv.except_osv(_('Warning!'), _("You may only select a parent account of type 'View'."))
-        return super(account_account_template, self).create(cr, uid, vals, context=context)
-
-    def write(self, cr, uid, ids, vals, context=None):
-        if vals.get('parent_id'):
-            parent = self.read(cr, uid, [vals['parent_id']], ['type'])
-            if parent and parent[0]['type'] != 'view':
-                raise osv.except_osv(_('Warning!'), _("You may only select a parent account of type 'View'."))
-        return super(account_account_template, self).write(cr, uid, ids, vals, context=context)
-
     def name_get(self, cr, uid, ids, context=None):
         if not ids:
             return []
@@ -2814,7 +2819,7 @@ class account_tax_template(osv.osv):
         'ref_base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."),
         'ref_tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."),
         'include_base_amount': fields.boolean('Include in Base Amount', help="Set if the amount of tax must be included in the base amount before computing the next taxes."),
-        'description': fields.char('Internal Name', size=32),
+        'description': fields.char('Internal Name'),
         'type_tax_use': fields.selection([('sale','Sale'),('purchase','Purchase'),('all','All')], 'Tax Use In', required=True,),
         'price_include': fields.boolean('Tax Included in Price', help="Check this if the price you use on the product and invoices includes this tax."),
     }
@@ -3014,9 +3019,9 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         'purchase_tax_rate': fields.float('Purchase Tax(%)'),
         'complete_tax_set': fields.boolean('Complete Set of Taxes', help='This boolean helps you to choose if you want to propose to the user to encode the sales and purchase rates or use the usual m2o fields. This last choice assumes that the set of tax defined for the chosen template is complete'),
     }
-    
+
     def onchange_company_id(self, cr, uid, ids, company_id, context=None):
-        currency_id = False        
+        currency_id = False
         if company_id:
             currency_id = self.pool.get('res.company').browse(cr, uid, company_id, context=context).currency_id.id
         return {'value': {'currency_id': currency_id}}
@@ -3236,7 +3241,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
                     property_obj.create(cr, uid, vals, context=context)
         return True
 
-    def _install_template(self, cr, uid, template_id, company_id, code_digits=None, obj_wizard=None, acc_ref={}, taxes_ref={}, tax_code_ref={}, context=None):
+    def _install_template(self, cr, uid, template_id, company_id, code_digits=None, obj_wizard=None, acc_ref=None, taxes_ref=None, tax_code_ref=None, context=None):
         '''
         This function recursively loads the template objects and create the real objects from them.
 
@@ -3254,6 +3259,12 @@ class wizard_multi_charts_accounts(osv.osv_memory):
             * a last identical containing the mapping of tax code templates and tax codes
         :rtype: tuple(dict, dict, dict)
         '''
+        if acc_ref is None:
+            acc_ref = {}
+        if taxes_ref is None:
+            taxes_ref = {}
+        if tax_code_ref is None:
+            tax_code_ref = {}
         template = self.pool.get('account.chart.template').browse(cr, uid, template_id, context=context)
         if template.parent_id:
             tmp1, tmp2, tmp3 = self._install_template(cr, uid, template.parent_id.id, company_id, code_digits=code_digits, acc_ref=acc_ref, taxes_ref=taxes_ref, tax_code_ref=tax_code_ref, context=context)
@@ -3266,7 +3277,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         tax_code_ref.update(tmp3)
         return acc_ref, taxes_ref, tax_code_ref
 
-    def _load_template(self, cr, uid, template_id, company_id, code_digits=None, obj_wizard=None, account_ref={}, taxes_ref={}, tax_code_ref={}, context=None):
+    def _load_template(self, cr, uid, template_id, company_id, code_digits=None, obj_wizard=None, account_ref=None, taxes_ref=None, tax_code_ref=None, context=None):
         '''
         This function generates all the objects from the templates
 
@@ -3284,6 +3295,12 @@ class wizard_multi_charts_accounts(osv.osv_memory):
             * a last identical containing the mapping of tax code templates and tax codes
         :rtype: tuple(dict, dict, dict)
         '''
+        if account_ref is None:
+            account_ref = {}
+        if taxes_ref is None:
+            taxes_ref = {}
+        if tax_code_ref is None:
+            tax_code_ref = {}
         template = self.pool.get('account.chart.template').browse(cr, uid, template_id, context=context)
         obj_tax_code_template = self.pool.get('account.tax.code.template')
         obj_acc_tax = self.pool.get('account.tax')

addons/account/account_bank.py

@@ -29,12 +29,12 @@ class bank(osv.osv):
         'currency_id': fields.related('journal_id', 'currency', type="many2one", relation='res.currency', readonly=True,
             string="Currency", help="Currency of the related account journal."),
     }
-    def create(self, cr, uid, data, context={}):
+    def create(self, cr, uid, data, context=None):
         result = super(bank, self).create(cr, uid, data, context=context)
         self.post_write(cr, uid, [result], context=context)
         return result
 
-    def write(self, cr, uid, ids, data, context={}):
+    def write(self, cr, uid, ids, data, context=None):
         result = super(bank, self).write(cr, uid, ids, data, context=context)
         self.post_write(cr, uid, ids, context=context)
         return result
@@ -43,13 +43,17 @@ class bank(osv.osv):
         "Return the name to use when creating a bank journal"
         return (bank.bank_name or '') + ' ' + bank.acc_number
 
-    def _prepare_name_get(self, cr, uid, bank_type_obj, bank_obj, context=None):
-        """Add ability to have %(currency_name)s in the format_layout of
-        res.partner.bank.type"""
-        bank_obj._data[bank_obj.id]['currency_name'] = bank_obj.currency_id and bank_obj.currency_id.name or ''
-        return super(bank, self)._prepare_name_get(cr, uid, bank_type_obj, bank_obj, context=context)
+    def _prepare_name_get(self, cr, uid, bank_dicts, context=None):
+        """Add ability to have %(currency_name)s in the format_layout of res.partner.bank.type"""
+        currency_ids = list(set(data['currency_id'][0] for data in bank_dicts if data['currency_id']))
+        currencies = self.pool.get('res.currency').browse(cr, uid, currency_ids, context=context)
+        currency_name = dict((currency.id, currency.name) for currency in currencies)
 
-    def post_write(self, cr, uid, ids, context={}):
+        for data in bank_dicts:
+            data['currency_name'] = data['currency_id'] and currency_name[data['currency_id'][0]] or ''
+        return super(bank, self)._prepare_name_get(cr, uid, bank_dicts, context=context)
+
+    def post_write(self, cr, uid, ids, context=None):
         if isinstance(ids, (int, long)):
           ids = [ids]
 

addons/account/account_bank_statement.py

@@ -304,7 +304,7 @@ class account_bank_statement(osv.osv):
             'date': st_line.date,
             'ref': st_line.ref,
             'move_id': move_id,
-            'partner_id': partner_id,
+            'partner_id': par_id,
             'account_id': acc_id,
             'credit': credit,
             'debit': debit,
@@ -447,14 +447,18 @@ class account_bank_statement(osv.osv):
         return self.write(cr, uid, done, {'state':'draft'}, context=context)
 
     def _compute_balance_end_real(self, cr, uid, journal_id, context=None):
-        cr.execute('SELECT balance_end_real \
-                FROM account_bank_statement \
-                WHERE journal_id = %s AND NOT state = %s \
-                ORDER BY date DESC,id DESC LIMIT 1', (journal_id, 'draft'))
-        res = cr.fetchone()
+        res = False
+        if journal_id:
+            cr.execute('SELECT balance_end_real \
+                    FROM account_bank_statement \
+                    WHERE journal_id = %s AND NOT state = %s \
+                    ORDER BY date DESC,id DESC LIMIT 1', (journal_id, 'draft'))
+            res = cr.fetchone()
         return res and res[0] or 0.0
 
     def onchange_journal_id(self, cr, uid, statement_id, journal_id, context=None):
+        if not journal_id:
+            return {}
         balance_start = self._compute_balance_end_real(cr, uid, journal_id, context=context)
 
         journal_data = self.pool.get('account.journal').read(cr, uid, journal_id, ['default_debit_account_id', 'company_id'], context=context)

addons/account/account_installer.xml

@@ -14,8 +14,12 @@
                     </footer>
                 </footer>
                 <separator string="title" position="replace">
+                    <p class="oe_grey">
+                        Select a configuration package to setup automatically your
+                        taxes and chart of accounts.
+                    </p>
                     <group>
-                        <field name="charts"/>
+                        <field name="charts" class="oe_inline"/>
                     </group>
                     <group string="Configure your Fiscal Year" groups="account.group_account_user">
                         <field name="has_default_company" invisible="1" />
@@ -32,7 +36,7 @@
         </record>
 
         <record id="action_account_configuration_installer" model="ir.actions.act_window">
-            <field name="name">Configure your Chart of Accounts</field>
+            <field name="name">Configure Accounting Data</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.installer</field>
             <field name="view_id" ref="view_account_configuration_installer"/>

addons/account/account_invoice.py

@@ -395,18 +395,23 @@ class account_invoice(osv.osv):
         template_id = template and template[1] or False
         res = mod_obj.get_object_reference(cr, uid, 'mail', 'email_compose_message_wizard_form')
         res_id = res and res[1] or False
-        ctx = dict(context, active_model='account.invoice', active_id=ids[0])
-        ctx.update({'mail.compose.template_id': template_id})
+        ctx = dict(context)
+        ctx.update({
+            'default_model': 'account.invoice',
+            'default_res_id': ids[0],
+            'default_use_template': True,
+            'default_template_id': template_id,
+            })
         return {
-                'view_type': 'form',
-                'view_mode': 'form',
-                'res_model': 'mail.compose.message',
-                'views': [(res_id, 'form')],
-                'view_id': res_id,
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-                'context': ctx,
-                'nodestroy': True,
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'mail.compose.message',
+            'views': [(res_id, 'form')],
+            'view_id': res_id,
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+            'context': ctx,
+            'nodestroy': True,
         }
 
     def confirm_paid(self, cr, uid, ids, context=None):
@@ -503,8 +508,10 @@ class account_invoice(osv.osv):
         if journal_id:
             journal = self.pool.get('account.journal').browse(cr, uid, journal_id, context=context)
             currency_id = journal.currency and journal.currency.id or journal.company_id.currency_id.id
+            company_id = journal.company_id.id
             result = {'value': {
                     'currency_id': currency_id,
+                    'company_id': company_id,
                     }
                 }
         return result
@@ -1098,10 +1105,10 @@ class account_invoice(osv.osv):
         if not ids:
             return []
         types = {
-                'out_invoice': 'CI: ',
-                'in_invoice': 'SI: ',
-                'out_refund': 'OR: ',
-                'in_refund': 'SR: ',
+                'out_invoice': 'Invoice ',
+                'in_invoice': 'Sup. Invoice ',
+                'out_refund': 'Refund ',
+                'in_refund': 'Supplier Refund ',
                 }
         return [(r['id'], (r['number']) or types[r['type']] + (r['name'] or '')) for r in self.read(cr, uid, ids, ['type', 'number', 'name'], context, load='_classic_write')]
 
@@ -1301,17 +1308,19 @@ class account_invoice(osv.osv):
 
     def create_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_post(cr, uid, [obj.id], body=_("%s <b>created</b>.") % (_(self._get_document_type(obj.type))), context=context)
+            self.message_post(cr, uid, [obj.id], body=_("%s <b>created</b>.") % (self._get_document_type(obj.type)),
+                subtype="account.mt_invoice_new", context=context)
 
     def confirm_paid_send_note(self, cr, uid, ids, context=None):
-        for obj in self.browse(cr, uid, ids, context=context):
-            self.message_post(cr, uid, [obj.id], body=_("%s <b>paid</b>.") % (_(self._get_document_type(obj.type))), context=context)
+         for obj in self.browse(cr, uid, ids, context=context):
+            self.message_post(cr, uid, [obj.id], body=_("%s <b>paid</b>.") % (self._get_document_type(obj.type)),
+                subtype="account.mt_invoice_paid", context=context)
 
     def invoice_cancel_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_post(cr, uid, [obj.id], body=_("%s <b>cancelled</b>.") % (_(self._get_document_type(obj.type))), context=context)
+            self.message_post(cr, uid, [obj.id], body=_("%s <b>cancelled</b>.") % (self._get_document_type(obj.type)),
+                context=context)
 
-account_invoice()
 
 class account_invoice_line(osv.osv):
 
@@ -1366,7 +1375,10 @@ class account_invoice_line(osv.osv):
         'partner_id': fields.related('invoice_id','partner_id',type='many2one',relation='res.partner',string='Partner',store=True)
     }
 
-    def _default_account_id(self, cr, uid, ids, context=None):
+    def _default_account_id(self, cr, uid, context=None):
+        # XXX this gets the default account for the user's company,
+        # it should get the default account for the invoice's company
+        # however, the invoice's company does not reach this point
         prop = self.pool.get('ir.property').get(cr, uid, 'property_account_income_categ', 'product.category', context=context)
         return prop and prop.id or False
 
@@ -1396,7 +1408,7 @@ class account_invoice_line(osv.osv):
             context = {}
         company_id = company_id if company_id != None else context.get('company_id',False)
         context = dict(context)
-        context.update({'company_id': company_id})
+        context.update({'company_id': company_id, 'force_company': company_id})
         if not partner_id:
             raise osv.except_osv(_('No Partner Defined !'),_("You must first select a partner !") )
         if not product:
@@ -1551,16 +1563,19 @@ class account_invoice_line(osv.osv):
     def onchange_account_id(self, cr, uid, ids, product_id, partner_id, inv_type, fposition_id, account_id):
         if not account_id:
             return {}
-        taxes = self.pool.get('account.account').browse(cr, uid, account_id).tax_ids
+        unique_tax_ids = []
         fpos = fposition_id and self.pool.get('account.fiscal.position').browse(cr, uid, fposition_id) or False
-        tax_ids = self.pool.get('account.fiscal.position').map_tax(cr, uid, fpos, taxes)
-
-        product_change_result = self.product_id_change(cr, uid, ids, product_id, False, type=inv_type,
-                                                       partner_id=partner_id, fposition_id=fposition_id)
-        unique_tax_ids = set(tax_ids)
-        if product_change_result and 'value' in product_change_result and 'invoice_line_tax_id' in product_change_result['value']:
-            unique_tax_ids |= set(product_change_result['value']['invoice_line_tax_id'])
-        return {'value':{'invoice_line_tax_id': list(unique_tax_ids)}}
+        account = self.pool.get('account.account').browse(cr, uid, account_id)
+        if not product_id:
+            taxes = account.tax_ids
+            unique_tax_ids = self.pool.get('account.fiscal.position').map_tax(cr, uid, fpos, taxes)
+        else:
+            product_change_result = self.product_id_change(cr, uid, ids, product_id, False, type=inv_type,
+                partner_id=partner_id, fposition_id=fposition_id,
+                company_id=account.company_id.id)
+            if product_change_result and 'value' in product_change_result and 'invoice_line_tax_id' in product_change_result['value']:
+                unique_tax_ids = product_change_result['value']['invoice_line_tax_id']
+        return {'value':{'invoice_line_tax_id': unique_tax_ids}}
 
 account_invoice_line()
 
@@ -1645,14 +1660,13 @@ class account_invoice_tax(osv.osv):
 
         for line in inv.invoice_line:
             for tax in tax_obj.compute_all(cr, uid, line.invoice_line_tax_id, (line.price_unit* (1-(line.discount or 0.0)/100.0)), line.quantity, line.product_id, inv.partner_id)['taxes']:
-                tax['price_unit'] = cur_obj.round(cr, uid, cur, tax['price_unit'])
                 val={}
                 val['invoice_id'] = inv.id
                 val['name'] = tax['name']
                 val['amount'] = tax['amount']
                 val['manual'] = False
                 val['sequence'] = tax['sequence']
-                val['base'] = tax['price_unit'] * line['quantity']
+                val['base'] = cur_obj.round(cr, uid, cur, tax['price_unit'] * line['quantity'])
 
                 if inv.type in ('out_invoice','in_invoice'):
                     val['base_code_id'] = tax['base_code_id']

addons/account/account_invoice_view.xml

@@ -299,8 +299,8 @@
                         <button name="invoice_open" states="draft" string="Validate" class="oe_highlight"/>
                         <button name="invoice_open" states="proforma2" string="Validate"/>
                         <button name="invoice_proforma2" states="draft" string="PRO-FORMA" groups="account.group_proforma_invoices"/>
-                        <button name="%(action_account_invoice_refund)d" type='action' string='Refund Invoice' states='paid'/>
-                        <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="base.group_no_one"/>
+                        <button name="%(action_account_invoice_refund)d" type='action' string='Refund Invoice' states='open,proforma2,paid'/>
+                        <button name="invoice_cancel" states="draft,proforma2,open" string="Cancel" groups="base.group_no_one"/>
                         <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object"/>
                         <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
                         <!--button name="%(account_invoices)d" string="Print Invoice" type="action" states="open,paid,proforma,sale,proforma2"/-->

addons/account/account_menuitem.xml

@@ -30,7 +30,7 @@
         <menuitem id="menu_analytic" parent="menu_analytic_accounting" name="Accounts" groups="analytic.group_analytic_accounting"/>
         <menuitem id="menu_journals" sequence="15" name="Journals" parent="menu_finance_configuration" groups="group_account_manager"/>
         <menuitem id="menu_configuration_misc" name="Miscellaneous" parent="menu_finance_configuration" sequence="55"/>
-        <menuitem id="base.menu_action_currency_form" parent="menu_configuration_misc" sequence="20" groups="base.group_no_one"/>
+        <menuitem id="base.menu_action_currency_form" name="Currencies" parent="menu_configuration_misc" sequence="20" groups="base.group_no_one"/>
         <menuitem id="menu_finance_generic_reporting" name="Generic Reporting" parent="menu_finance_reports" sequence="100"/>
         <menuitem id="menu_finance_entries" name="Journal Entries" parent="menu_finance" sequence="5" groups="group_account_user,group_account_manager"/>
         <menuitem id="menu_account_reports" name="Financial Reports" parent="menu_finance_configuration" sequence="30" />

addons/account/account_move_line.py

@@ -215,8 +215,10 @@ class account_move_line(osv.osv):
     def _default_get(self, cr, uid, fields, context=None):
         if context is None:
             context = {}
-        if not context.get('journal_id', False) and context.get('search_default_journal_id', False):
+        if not context.get('journal_id', False):
             context['journal_id'] = context.get('search_default_journal_id')
+        if not context.get('period_id', False):
+            context['period_id'] = context.get('search_default_period_id')
         account_obj = self.pool.get('account.account')
         period_obj = self.pool.get('account.period')
         journal_obj = self.pool.get('account.journal')
@@ -226,6 +228,9 @@ class account_move_line(osv.osv):
         partner_obj = self.pool.get('res.partner')
         currency_obj = self.pool.get('res.currency')
         context = self.convert_to_period(cr, uid, context)
+        #pass the right context when search_defaul_journal_id
+        if context.get('search_default_journal_id',False):
+            context['journal_id'] = context.get('search_default_journal_id')
         # Compute simple values
         data = super(account_move_line, self).default_get(cr, uid, fields, context=context)
         # Starts: Manual entry from account.move form
@@ -480,7 +485,7 @@ class account_move_line(osv.osv):
         'debit': fields.float('Debit', digits_compute=dp.get_precision('Account')),
         'credit': fields.float('Credit', digits_compute=dp.get_precision('Account')),
         'account_id': fields.many2one('account.account', 'Account', required=True, ondelete="cascade", domain=[('type','<>','view'), ('type', '<>', 'closed')], select=2),
-        'move_id': fields.many2one('account.move', 'Move', ondelete="cascade", help="The move of this entry line.", select=2, required=True),
+        'move_id': fields.many2one('account.move', 'Journal Entry', ondelete="cascade", help="The move of this entry line.", select=2, required=True),
         'narration': fields.related('move_id','narration', type='text', relation='account.move', string='Internal Note'),
         'ref': fields.related('move_id', 'ref', string='Reference', type='char', size=64, store=True),
         'statement_id': fields.many2one('account.bank.statement', 'Statement', help="The bank statement used for bank reconciliation", select=1),
@@ -557,6 +562,7 @@ class account_move_line(osv.osv):
         'journal_id': lambda self, cr, uid, c: c.get('journal_id', False),
         'credit': 0.0,
         'debit': 0.0,
+        'amount_currency': 0.0,
         'account_id': lambda self, cr, uid, c: c.get('account_id', False),
         'period_id': lambda self, cr, uid, c: c.get('period_id', False),
         'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.move.line', context=c)
@@ -703,7 +709,9 @@ class account_move_line(osv.osv):
             context = {}
         if context and context.get('next_partner_only', False):
             if not context.get('partner_id', False):
-                partner = self.get_next_partner_only(cr, uid, offset, context)
+                partner = self.list_partners_to_reconcile(cr, uid, context=context)
+                if partner:
+                    partner = partner[0]
             else:
                 partner = context.get('partner_id', False)
             if not partner:
@@ -711,26 +719,26 @@ class account_move_line(osv.osv):
             args.append(('partner_id', '=', partner[0]))
         return super(account_move_line, self).search(cr, uid, args, offset, limit, order, context, count)
 
-    def get_next_partner_only(self, cr, uid, offset=0, context=None):
+    def list_partners_to_reconcile(self, cr, uid, context=None):
         cr.execute(
              """
-             SELECT p.id
-             FROM res_partner p
-             RIGHT JOIN (
-                SELECT l.partner_id AS partner_id, SUM(l.debit) AS debit, SUM(l.credit) AS credit
+             SELECT partner_id
+             FROM (
+                SELECT l.partner_id, p.last_reconciliation_date, SUM(l.debit) AS debit, SUM(l.credit) AS credit
                 FROM account_move_line l
-                LEFT JOIN account_account a ON (a.id = l.account_id)
-                    LEFT JOIN res_partner p ON (l.partner_id = p.id)
+                RIGHT JOIN account_account a ON (a.id = l.account_id)
+                RIGHT JOIN res_partner p ON (l.partner_id = p.id)
                     WHERE a.reconcile IS TRUE
                     AND l.reconcile_id IS NULL
                     AND (p.last_reconciliation_date IS NULL OR l.date > p.last_reconciliation_date)
                     AND l.state <> 'draft'
-                    GROUP BY l.partner_id
-                ) AS s ON (p.id = s.partner_id)
+                    GROUP BY l.partner_id, p.last_reconciliation_date
+                ) AS s
                 WHERE debit > 0 AND credit > 0
-                ORDER BY p.last_reconciliation_date LIMIT 1 OFFSET %s""", (offset, )
-            )
-        return cr.fetchone()
+                ORDER BY last_reconciliation_date""")
+        ids = cr.fetchall()
+        ids = len(ids) and [x[0] for x in ids] or []
+        return self.pool.get('res.partner').name_get(cr, uid, ids, context=context)
 
     def reconcile_partial(self, cr, uid, ids, type='auto', context=None, writeoff_acc_id=False, writeoff_period_id=False, writeoff_journal_id=False):
         move_rec_obj = self.pool.get('account.move.reconcile')
@@ -910,8 +918,8 @@ class account_move_line(osv.osv):
 
         if lines and lines[0]:
             partner_id = lines[0].partner_id and lines[0].partner_id.id or False
-            if partner_id and context and context.get('stop_reconcile', False):
-                partner_obj.write(cr, uid, [partner_id], {'last_reconciliation_date': time.strftime('%Y-%m-%d %H:%M:%S')})
+            if not partner_obj.has_something_to_reconcile(cr, uid, partner_id, context=context):
+                partner_obj.mark_as_reconciled(cr, uid, [partner_id], context=context)
         return r_id
 
     def view_header_get(self, cr, user, view_id, view_type, context=None):
@@ -926,6 +934,8 @@ class account_move_line(osv.osv):
             return res
         if (not context.get('journal_id', False)) or (not context.get('period_id', False)):
             return False
+        if context.get('search_default_journal_id', False):
+            context['journal_id'] = context.get('search_default_journal_id')
         cr.execute('SELECT code FROM account_journal WHERE id = %s', (context['journal_id'], ))
         j = cr.fetchone()[0] or ''
         cr.execute('SELECT code FROM account_period WHERE id = %s', (context['period_id'], ))
@@ -1095,7 +1105,7 @@ class account_move_line(osv.osv):
                                 'has been confirmed.') % res[2])
         return res
 
-    def _remove_move_reconcile(self, cr, uid, move_ids=[], context=None):
+    def _remove_move_reconcile(self, cr, uid, move_ids=None, context=None):
         # Function remove move rencocile ids related with moves
         obj_move_line = self.pool.get('account.move.line')
         obj_move_rec = self.pool.get('account.move.reconcile')
@@ -1184,12 +1194,12 @@ class account_move_line(osv.osv):
         jour_period_obj = self.pool.get('account.journal.period')
         cr.execute('SELECT state FROM account_journal_period WHERE journal_id = %s AND period_id = %s', (journal_id, period_id))
         result = cr.fetchall()
+        journal = journal_obj.browse(cr, uid, journal_id, context=context)
+        period = period_obj.browse(cr, uid, period_id, context=context)
         for (state,) in result:
             if state == 'done':
-                raise osv.except_osv(_('Error!'), _('You cannot add/modify entries in a closed journal.'))
+                raise osv.except_osv(_('Error !'), _('You can not add/modify entries in a closed period %s of journal %s.' % (period.name,journal.name)))                
         if not result:
-            journal = journal_obj.browse(cr, uid, journal_id, context=context)
-            period = period_obj.browse(cr, uid, period_id, context=context)
             jour_period_obj.create(cr, uid, {
                 'name': (journal.code or journal.name)+':'+(period.name or ''),
                 'journal_id': journal.id,

addons/account/account_view.xml

@@ -101,28 +101,29 @@
             <field name="model">account.period</field>
             <field name="arch" type="xml">
                 <form string="Account Period" version="7.0">
-	                <header>
-	                    <button name="action_draft" states="done" string="Set to Draft" type="object" groups="account.group_account_manager"/>
-	                    <field name="state" widget="statusbar" nolabel="1"/>
-	                </header>
-	                <sheet>
-		                <group>
-		                    <group>
-		                        <field name="name"/>
-		                        <field name="fiscalyear_id" widget="selection"/>
-		                        <label for="date_start" string="Duration"/>
-		                        <div>
-		                            <field name="date_start" class="oe_inline" nolabel="1"/> - 
-		                            <field name="date_stop" nolabel="1" class="oe_inline"/>
-		                        </div>
-		                    </group>
-		                    <group>
-		                        <field name="code"/>
-		                        <field name="special"/>
-		                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-		                    </group>
-		                </group>
-	                </sheet>
+                    <header>
+                        <button string="Close Period" name="%(account.action_account_period_close)d" type="action" class="oe_highlight" states="draft"/>
+                        <button name="action_draft" states="done" string="Set to Draft" type="object" groups="account.group_account_manager"/>
+                        <field name="state" widget="statusbar" nolabel="1"/>
+                    </header>
+                    <sheet>
+                        <group>
+                            <group>
+                                <field name="name"/>
+                                <field name="fiscalyear_id" widget="selection"/>
+                                <label for="date_start" string="Duration"/>
+                                <div>
+                                    <field name="date_start" class="oe_inline" nolabel="1"/> -
+                                    <field name="date_stop" nolabel="1" class="oe_inline"/>
+                                </div>
+                            </group>
+                            <group>
+                                <field name="code"/>
+                                <field name="special"/>
+                                <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                            </group>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -181,7 +182,7 @@
                 <form string="Account" version="7.0">
                     <label for="code" class="oe_edit_only" string="Account Code and Name"/>
                     <h1>
-                        <field name="code" class="oe_inline" placeholder="Account code" style="width: 6em"/> - 
+                        <field name="code" class="oe_inline" placeholder="Account code" style="width: 6em"/> -
                         <field name="name" class="oe_inline" placeholder="Account name"/>
                     </h1>
                     <group>
@@ -252,16 +253,6 @@
                 </tree>
             </field>
         </record>
-        <record id="view_treasory_graph" model="ir.ui.view">
-           <field name="name">account.treasury.graph</field>
-           <field name="model">account.account</field>
-           <field name="arch" type="xml">
-               <graph string="Treasury Analysis" type="bar">
-                  <field name="name"/>
-                  <field name="balance" operator="+"/>
-               </graph>
-         </field>
-      </record>
         <record id="action_account_form" model="ir.actions.act_window">
             <field name="name">Accounts</field>
             <field name="res_model">account.account</field>
@@ -1048,7 +1039,26 @@
     Entries lines
     -->
 
-        <record id="view_move_line_tree" model="ir.ui.view">
+        <record id="view_move_line_tree_reconcile" model="ir.ui.view">
+            <field name="name">account.move.line.reconcile.tree</field>
+            <field name="model">account.move.line</field>
+            <field eval="24" name="priority"/>
+            <field name="arch" type="xml">
+                <tree colors="red:state == 'draft';black:state == 'valid'" string="Journal Items to Reconcile" create="false">
+                    <field name="date"/>
+                    <field name="move_id"/>
+                    <field name="ref"/>
+                    <field name="name"/>
+                    <field name="partner_id"/>
+                    <field name="account_id"/>
+                    <field name="reconcile_partial_id"/>
+                    <field name="debit" sum="Total debit"/>
+                    <field name="credit" sum="Total credit"/>
+                </tree>
+            </field>
+        </record>
+
+         <record id="view_move_line_tree" model="ir.ui.view">
             <field name="name">account.move.line.tree</field>
             <field name="model">account.move.line</field>
             <field eval="4" name="priority"/>
@@ -1082,65 +1092,65 @@
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <form string="Journal Item" version="7.0">
-                    <sheet> 
-	                    <group>
-	                        <group>
-		                        <field name="name"/>
-		                        <field name="ref"/>
-		                        <field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
-	                        </group>
-	                        <group>
-		                        <field name="journal_id"/>
-		                        <field name="period_id"/>
-		                        <field name="company_id" required="1" groups="base.group_multi_company"/>
-	                        </group>
-	                    </group>
-	                    <notebook colspan="4">
-	                        <page string="Information">
-	                            <group>
-	                                <group string="Amount">
-	                                    <field name="account_id" domain="[('company_id', '=', company_id), ('type','&lt;&gt;','view'), ('type','&lt;&gt;','consolidation')]"/>
-	                                    <field name="debit"/>
-	                                    <field name="credit"/>
-	                                    <field name="quantity"/>
-	                                </group>
-	                                <group string="Accounting Documents">
-	                                    <field name="invoice" readonly="True"/>
-	                                    <field name="move_id" required="False"/>
-	                                    <field name="statement_id" readonly="True"/>
-	                                </group>
-	                                <group string="Dates">
-	                                    <field name="date"/>
-	                                    <field name="date_maturity"/>
-	                                    <field name="date_created" readonly="True"/>
-	                                </group>
-	                                <group string="Taxes">
-	                                    <field name="tax_code_id"/>
-	                                    <field name="tax_amount"/>
-	                                    <field name="account_tax_id" domain="[('parent_id','=',False)]"/>
-	                                </group>
-	                                <group attrs="{'readonly':[('state','=','valid')]}" string="Currency" groups="base.group_multi_currency">
-	                                    <field name="currency_id"/>
-	                                    <field name="amount_currency"/>
-	                                </group>
-	                                <group string="Reconciliation">
-	                                    <field name="reconcile_id"/>
-	                                    <field name="reconcile_partial_id"/>
-	                                </group>
-	                                <group string="States">
-	                                    <field name="state"/>
-	                                    <field name="blocked"/>
-	                                </group>
-	                                <group groups="analytic.group_analytic_accounting" string="Analytic">
-	                                    <field name="analytic_account_id" domain="[('parent_id','!=',False)]"/>
-	                                </group>
-	                            </group>
-	                            <field name="narration" colspan="4" nolabel="1" placeholder="Add an internal note..."/>
-	                        </page>
-	                        <page string="Analytic Lines" groups="analytic.group_analytic_accounting">
-	                            <field name="analytic_lines" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}"/>
-	                        </page>
-	                    </notebook>
+                    <sheet>
+                        <group>
+                            <group>
+                                <field name="name"/>
+                                <field name="ref"/>
+                                <field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
+                            </group>
+                            <group>
+                                <field name="journal_id"/>
+                                <field name="period_id"/>
+                                <field name="company_id" required="1" groups="base.group_multi_company"/>
+                            </group>
+                        </group>
+                        <notebook colspan="4">
+                            <page string="Information">
+                                <group>
+                                    <group string="Amount">
+                                        <field name="account_id" domain="[('company_id', '=', company_id), ('type','&lt;&gt;','view'), ('type','&lt;&gt;','consolidation')]"/>
+                                        <field name="debit"/>
+                                        <field name="credit"/>
+                                        <field name="quantity"/>
+                                    </group>
+                                    <group string="Accounting Documents">
+                                        <field name="invoice" readonly="True"/>
+                                        <field name="move_id" required="False"/>
+                                        <field name="statement_id" readonly="True"/>
+                                    </group>
+                                    <group string="Dates">
+                                        <field name="date"/>
+                                        <field name="date_maturity"/>
+                                        <field name="date_created" readonly="True"/>
+                                    </group>
+                                    <group string="Taxes">
+                                        <field name="tax_code_id"/>
+                                        <field name="tax_amount"/>
+                                        <field name="account_tax_id" domain="[('parent_id','=',False)]"/>
+                                    </group>
+                                    <group attrs="{'readonly':[('state','=','valid')]}" string="Currency" groups="base.group_multi_currency">
+                                        <field name="currency_id"/>
+                                        <field name="amount_currency"/>
+                                    </group>
+                                    <group string="Reconciliation">
+                                        <field name="reconcile_id"/>
+                                        <field name="reconcile_partial_id"/>
+                                    </group>
+                                    <group string="States">
+                                        <field name="state"/>
+                                        <field name="blocked"/>
+                                    </group>
+                                    <group groups="analytic.group_analytic_accounting" string="Analytic">
+                                        <field name="analytic_account_id" domain="[('parent_id','!=',False)]"/>
+                                    </group>
+                                </group>
+                                <field name="narration" colspan="4" nolabel="1" placeholder="Add an internal note..."/>
+                            </page>
+                            <page string="Analytic Lines" groups="analytic.group_analytic_accounting">
+                                <field name="analytic_lines" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}"/>
+                            </page>
+                        </notebook>
                     </sheet>
                 </form>
             </field>
@@ -1295,16 +1305,6 @@
     Account.Entry Edition
     -->
 
-        <record id="account_move_graph" model="ir.ui.view">
-            <field name="name">account.move.graph</field>
-            <field name="model">account.move</field>
-            <field name="arch" type="xml">
-                <graph string="Account Statistics" type="bar">
-                    <field name="period_id"/>
-                    <field name="amount" operator="+"/>
-                </graph>
-            </field>
-         </record>
         <record id="view_move_tree" model="ir.ui.view">
             <field name="name">account.move.tree</field>
             <field name="model">account.move</field>
@@ -1328,8 +1328,8 @@
             <field name="arch" type="xml">
                 <form string="Account Entry" version="7.0">
                 <header>
-                    <button name="button_validate" states="draft" string="Post" type="object" class="oe_highlight"/>
-                    <button name="button_cancel" states="posted" string="Cancel" type="object"/>
+                    <button name="button_validate" states="draft" string="Post" type="object" class="oe_highlight" groups="account.group_account_invoice"/>
+                    <button name="button_cancel" states="posted" string="Cancel" type="object" groups="account.group_account_invoice"/>
                     <field name="state" widget="statusbar"/>
                 </header>
                 <sheet string="Journal Entries" >
@@ -1349,7 +1349,7 @@
                             <field name="date"/>
                             <field name="to_check"/>
                             <field name="amount" invisible="1"/>
-                        </group>	
+                        </group>
                     </group>
                     <notebook>
                         <page string="Journal Items">
@@ -1478,7 +1478,7 @@
             <field name="name">Journal Entries</field>
             <field name="res_model">account.move</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form,graph</field>
+            <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_move_tree"/>
             <field name="search_view_id" ref="view_account_move_filter"/>
             <field name="help" type="html">
@@ -1522,7 +1522,6 @@
 
         <record id="action_move_line_search" model="ir.actions.act_window">
             <field name="name">Journal Items</field>
-            <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.move.line</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -1541,15 +1540,31 @@
             <field name="act_window_id" ref="action_move_line_search"/>
         </record>
 
-        <act_window
-            context="{'search_default_next_partner':1,'view_mode':True}"
-            id="action_account_manual_reconcile" name="Journal Items"
-            res_model="account.move.line"
-            view_id="view_move_line_tree"/>
-
+        <record id="action_account_manual_reconcile" model="ir.actions.act_window">
+            <field name="context">{'search_default_unreconciled': 1,'view_mode':True}</field>
+            <field name="name">Journal Items to Reconcile</field>
+            <field name="res_model">account.move.line</field>
+            <field name="view_id" ref="view_move_line_tree_reconcile"/>
+            <field name="view_type">form</field>
+            <field name="view_mode">account_reconciliation_list</field>
+            <field name="help" type="html">
+                <p>
+                    Good job!
+                </p><p>
+                    There is nothing to reconcile. All invoices and payments
+                    have been reconciled, your partner balance is clean.
+                </p>
+            </field>
+        </record>
+        <menuitem
+             name="Journal Items to Reconcile"
+             action="action_account_manual_reconcile"
+             id="menu_manual_reconcile_bank"
+             sequence="20"
+             parent="account.menu_finance_bank_and_cash"/>
 
         <menuitem
-             name="Manual Reconciliation" icon="STOCK_EXECUTE"
+             name="Manual Reconciliation"
              action="action_account_manual_reconcile"
              id="menu_manual_reconcile"
              parent="account.periodical_processing_reconciliation"/>
@@ -1651,8 +1666,8 @@
                 <form string="Journal Entry Model" version="7.0">
                     <group col="4">
                         <field name="name"/>
-                        <field name="journal_id"/>
-                        <field name="company_id" widget='selection' groups="base.group_multi_company"/>
+                        <field name="journal_id" on_change="onchange_journal_id(journal_id)"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     </group>
 
                     <field name="lines_id" widget="one2many_list"/>
@@ -1728,8 +1743,10 @@
             <field name="model">account.payment.term.line</field>
             <field name="arch" type="xml">
                 <form string="Payment Term" version="7.0">
-                    <field name="name"/>
-                    <field name="sequence"/>
+                    <group>
+                        <field name="name"/>
+                        <field name="sequence"/>
+                    </group>
                     <group>
                         <group string="Amount Computation">
                             <field name="value"/>
@@ -1777,12 +1794,11 @@
             <field name="model">account.payment.term</field>
             <field name="arch" type="xml">
                 <form string="Payment Term" version="7.0">
-                    <group>
+                    <group col="4">
                         <field name="name"/>
                         <field name="active"/>
                     </group>
-                    <separator string="Description on Invoices"/>
-                    <field name="note"/>
+                    <field name="note" placeholder="Note fo the invoice..."/>
                     <separator string="Computation"/>
                     <field name="line_ids"/>
                 </form>
@@ -2011,7 +2027,7 @@
            src_model="account.journal"/>
 
         <act_window
-            context="{'search_default_reconcile_id':False, 'search_default_partner_id':[active_id], 'default_partner_id': active_id}"
+            context="{'search_default_unreconciled':True, 'search_default_partner_id':[active_id], 'default_partner_id': active_id}"
             domain="[('account_id.reconcile', '=', True),('account_id.type', 'in', ['receivable', 'payable'])]"
             id="act_account_partner_account_move_all"
             name="Receivables &amp; Payables"
@@ -2047,7 +2063,7 @@
             id="account_template_folder"
             name="Templates"
             parent="menu_finance_accounting"
-            groups="base.group_multi_company"/>
+            groups="account.group_account_manager"/>
         <menuitem
             id="account_template_taxes"
             name="Taxes"
@@ -2537,7 +2553,7 @@ action = pool.get('res.config').next(cr, uid, [], context)
                 <header>
                     <button name="button_confirm_cash" states="open" string="Close CashBox" type="object" class="oe_highlight"/>
                     <button name="button_open" states="draft" string="Open CashBox" type="object" class="oe_highlight"/>
-                    <button name="button_cancel" states="confirm,open" string="Cancel" type="object" groups="base.group_extended"/>
+                    <button name="button_cancel" states="confirm,open" string="Cancel" type="object"/>
                     <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
                 </header>
                 <sheet string="Statement">

addons/account/board_account_view.xml

@@ -12,16 +12,6 @@
             <field name="domain">[('year','=',time.strftime('%Y'))]</field>
         </record>
 
-        <record id="action_treasory_graph" model="ir.actions.act_window">
-            <field name="name">Treasury</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="context">{'default_type': 'liquidity'}</field>
-            <field name="view_id" ref="account.view_treasory_graph"/>
-        </record>
-
         <record id="board_account_form" model="ir.ui.view">
             <field name="name">board.account.form</field>
             <field name="model">board.board</field>
@@ -31,9 +21,6 @@
                         <column>
                             <action name="%(action_company_analysis_tree)d" string="Company Analysis"/>
                         </column>
-                        <column>
-                            <action name="%(action_treasory_graph)d" string="Treasury"/>
-                        </column>
                     </board>
                 </form>
             </field>

addons/account/data/account_data.xml

@@ -518,7 +518,6 @@
         <!--
         Account Statement Sequences
         -->
-
         <record id="sequence_reconcile" model="ir.sequence.type">
             <field name="name">Account Reconcile</field>
             <field name="code">account.reconcile</field>
@@ -554,8 +553,6 @@
             <field eval="1" name="number_next"/>
             <field eval="1" name="number_increment"/>
         </record>
-
-
         <!--
         Invoice requests (deprecated)
         -->
@@ -564,7 +561,14 @@
             <field name="object">account.invoice</field>
         </record>
 
-
-
+        <!-- mail: subtypes -->
+        <record id="mt_invoice_new" model="mail.message.subtype">
+            <field name="name">created</field>
+            <field name="res_model">account.invoice</field>
+        </record>
+        <record id="mt_invoice_paid" model="mail.message.subtype">
+            <field name="name">paid</field>
+            <field name="res_model">account.invoice</field>
+        </record>
     </data>
 </openerp>

addons/account/demo/account_minimal.xml

@@ -122,6 +122,14 @@
             <field name="type">other</field>
             <field name="user_type" ref="data_account_type_income"/>
         </record>
+        <record id="usd_bnk" model="account.account">
+            <field name="code">X11007</field>
+            <field name="name">USD Bank Account - (test)</field>
+            <field ref="cas" name="parent_id"/>
+            <field name="type">liquidity</field>
+            <field name="user_type" ref="data_account_type_asset"/>
+            <field name="currency_id" ref="base.USD"/>
+        </record>
 
         <record model="account.account" id="liabilities_view">
             <field name="name">Liabilities - (test)</field>
@@ -360,8 +368,8 @@
             <field name="type">bank</field>
             <field name="view_id" ref="account_journal_bank_view"/>
             <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 model="account.account" name="default_debit_account_id" ref="bnk"/>
+            <field model="account.account" name="default_credit_account_id" ref="bnk"/>
             <field name="analytic_journal_id" ref="sit"/>
             <field name="user_id" ref="base.user_root"/>
         </record>
@@ -384,7 +392,12 @@
             <field name="loss_account_id" model="account.account" ref="rsa" />
             <field name="internal_account_id" model="account.account" ref="rsa" />
             <field name="with_last_closing_balance" eval="True" />
-            <field name="cash_control" eval="True" />
+            <!--
+                 Usually, cash payment methods requires a control at opening and closing.
+                 Bot for demo data, it's better to avoid the control step so that people
+                 that test OpenERP arrive directly in the touchscreen UI.
+            -->
+            <field name="cash_control" eval="False"/>
             <field name="view_id" ref="account_journal_bank_view"/>
             <field name="sequence_id" ref="sequence_cash_journal"/>
             <field model="account.account" name="default_debit_account_id" ref="cash"/>
@@ -412,6 +425,16 @@
             <field eval="True" name="centralisation"/>
             <field name="user_id" ref="base.user_root"/>
         </record>
+
+        <record id="bank_journal_usd" model="account.journal">
+            <field name="name">USD Bank Journal - (test)</field>
+            <field name="code">TUBK</field>
+            <field name="type">bank</field>
+            <field name="view_id" ref="account_journal_bank_view"/>
+            <field model="account.account" name="default_debit_account_id" ref="usd_bnk"/>
+            <field model="account.account" name="default_credit_account_id" ref="usd_bnk"/>
+            <field name="currency" ref="base.USD"/>
+        </record>
         <!--
         Product income and expense accounts, default parameters
         -->

addons/account/installer.py

@@ -45,12 +45,12 @@ class account_installer(osv.osv_memory):
             sorted(((m.name, m.shortdesc)
                     for m in modules.browse(cr, uid, ids, context=context)),
                    key=itemgetter(1)))
-        charts.insert(0, ('configurable', 'Generic Chart Of Accounts'))
+        charts.insert(0, ('configurable', _('Custom')))
         return charts
 
     _columns = {
         # Accounting
-        'charts': fields.selection(_get_charts, 'Chart of Accounts',
+        'charts': fields.selection(_get_charts, 'Accounting Package',
             required=True,
             help="Installs localized accounting charts to match as closely as "
                  "possible the accounting needs of your company based on your "

addons/account/partner.py

@@ -20,8 +20,8 @@
 ##############################################################################
 
 from operator import itemgetter
-
 from osv import fields, osv
+import time
 
 class account_fiscal_position(osv.osv):
     _name = 'account.fiscal.position'
@@ -44,17 +44,17 @@ class account_fiscal_position(osv.osv):
             return []
         if not fposition_id:
             return map(lambda x: x.id, taxes)
-        result = []
+        result = set()
         for t in taxes:
             ok = False
             for tax in fposition_id.tax_ids:
                 if tax.tax_src_id.id == t.id:
                     if tax.tax_dest_id:
-                        result.append(tax.tax_dest_id.id)
+                        result.add(tax.tax_dest_id.id)
                     ok=True
             if not ok:
-                result.append(t.id)
-        return result
+                result.add(t.id)
+        return list(result)
 
     def map_account(self, cr, uid, fposition_id, account_id, context=None):
         if not fposition_id:
@@ -77,6 +77,12 @@ class account_fiscal_position_tax(osv.osv):
         'tax_dest_id': fields.many2one('account.tax', 'Replacement Tax')
     }
 
+    _sql_constraints = [
+        ('tax_src_dest_uniq',
+         'unique (position_id,tax_src_id,tax_dest_id)',
+         'A tax fiscal position could be defined only once time on same taxes.')
+    ]
+
 account_fiscal_position_tax()
 
 class account_fiscal_position_account(osv.osv):
@@ -89,6 +95,12 @@ class account_fiscal_position_account(osv.osv):
         'account_dest_id': fields.many2one('account.account', 'Account Destination', domain=[('type','<>','view')], required=True)
     }
 
+    _sql_constraints = [
+        ('account_src_dest_uniq',
+         'unique (position_id,account_src_id,account_dest_id)',
+         'An account fiscal position could be defined only once time on same accounts.')
+    ]
+
 account_fiscal_position_account()
 
 class res_partner(osv.osv):
@@ -145,6 +157,29 @@ class res_partner(osv.osv):
     def _debit_search(self, cr, uid, obj, name, args, context=None):
         return self._asset_difference_search(cr, uid, obj, name, 'payable', args, context=context)
 
+    def has_something_to_reconcile(self, cr, uid, partner_id, context=None):
+        '''
+        at least a debit, a credit and a line older than the last reconciliation date of the partner
+        '''
+        cr.execute('''
+            SELECT l.partner_id, SUM(l.debit) AS debit, SUM(l.credit) AS credit
+            FROM account_move_line l
+            RIGHT JOIN account_account a ON (a.id = l.account_id)
+            RIGHT JOIN res_partner p ON (l.partner_id = p.id)
+            WHERE a.reconcile IS TRUE
+            AND p.id = %s
+            AND l.reconcile_id IS NULL
+            AND (p.last_reconciliation_date IS NULL OR l.date > p.last_reconciliation_date)
+            AND l.state <> 'draft'
+            GROUP BY l.partner_id''', (partner_id,))
+        res = cr.dictfetchone()
+        if res:
+            return bool(res['debit'] and res['credit'])
+        return False
+
+    def mark_as_reconciled(self, cr, uid, ids, context=None):
+        return self.write(cr, uid, ids, {'last_reconciliation_date': time.strftime('%Y-%m-%d %H:%M:%S')}, context=context)
+
     _columns = {
         'credit': fields.function(_credit_debit_get,
             fnct_search=_credit_search, string='Total Receivable', multi='dc', help="Total amount this customer owes you."),
@@ -185,7 +220,7 @@ class res_partner(osv.osv):
             help="This payment term will be used instead of the default one for the current partner"),
         'ref_companies': fields.one2many('res.company', 'partner_id',
             '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')
+        'last_reconciliation_date': fields.datetime('Latest Reconciliation Date', help='Date on which the partner accounting entries were fully reconciled last time. It differs from the date of the last reconciliation made for this partner, as here we depict the fact that nothing more was to be reconciled at this date. This can be achieved in 2 ways: either the last debit/credit entry was reconciled, either the user pressed the button "Fully Reconciled" in the manual reconciliation process')
     }
 
 res_partner()

addons/account/partner_view.xml

@@ -12,7 +12,7 @@
                         <field name="active"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     </group>
-                    <separator string="Mapping"/>
+                    <separator string="Taxes Mapping"/>
                     <field name="tax_ids" widget="one2many_list">
                         <tree string="Tax Mapping" editable="bottom">
                             <field name="tax_src_id" domain="[('parent_id','=',False)]"/>
@@ -23,6 +23,7 @@
                             <field name="tax_dest_id" domain="[('parent_id','=',False)]"/>
                         </form>
                     </field>
+                    <separator string="Accounts Mapping"/>
                     <field name="account_ids" widget="one2many_list">
                         <tree string="Account Mapping" editable="bottom">
                             <field name="account_src_id"/>
@@ -91,32 +92,7 @@
                             <field name="debit"/>
                         </group>
                     </group>
-                    <field name="bank_ids">
-                        <form string="Bank account" version="7.0">
-                            <field name="state"/>
-                            <field name="acc_number"/>
-                            <group>
-                                <group name="owner" string="Bank Account Owner">
-                                    <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
-                                    <field name="owner_name"/>
-                                    <label for="street" string="Address"/>
-                                    <div>
-                                        <field name="street" placeholder="Street..."/>
-                                        <div>
-                                            <field name="zip" class="oe_inline" placeholder="ZIP"/>
-                                            <field name="city" class="oe_inline" placeholder="City"/>
-                                        </div>
-                                        <field name="state_id" placeholder="State" options='{"no_open": true}'/>
-                                        <field name="country_id" placeholder="Country" options='{"no_open": true}'/>
-                                    </div>
-                                </group>
-                                <group name="bank" string="Information About the Bank">
-                                    <field name="bank" on_change="onchange_bank_id(bank)"/>
-                                    <field name="bank_name"/>
-                                    <field name="bank_bic" placeholder="e.g. GEBABEBB"/>
-                                </group>
-                            </group>
-                        </form>
+                    <field name="bank_ids" context="{'default_partner_id': active_id, 'form_view_ref': 'base.view_partner_bank_form'}">
                         <tree string="Bank Details">
                             <field name="sequence" invisible="1"/>
                             <field name="acc_number"/>
@@ -138,7 +114,7 @@
             context="{'search_default_partner_id':[active_id], 'default_partner_id': active_id}"
             src_model="res.partner"
             view_type="form"
-            view_mode="tree,form,graph,calendar"/>
+            view_mode="tree,form,calendar"/>
 
     </data>
 </openerp>

addons/account/project/project_view.xml

@@ -73,7 +73,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.analytic.account</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,graph,form</field>
+            <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_account_analytic_account_tree"/>
             <field name="search_view_id" ref="account.view_account_analytic_account_search"/>
         </record>
@@ -114,9 +114,6 @@
             </field>
         </record>
 
-        <menuitem groups="analytic.group_analytic_accounting" 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>
@@ -351,15 +348,6 @@
         # Reporting
         #
 
-        <record id="action_account_analytic_journal_tree" model="ir.actions.act_window">
-            <field name="name">Print Analytic Journals</field>
-            <field name="res_model">account.analytic.journal</field>
-            <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"/>
 
         <record id="view_account_journal_1" model="ir.ui.view">
             <field name="name">account.journal.form.1</field>
@@ -372,16 +360,5 @@
             </field>
         </record>
 
-     <record id="analytic_accounts_graph" model="ir.ui.view">
-            <field name="name">analytic.accounts.graph</field>
-            <field name="model">account.analytic.account</field>
-            <field name="arch" type="xml">
-                <graph string="Analytic Account Statistics" type="bar">
-                    <field name="complete_name"/>
-                    <field name="balance" operator="+"/>
-                </graph>
-            </field>
-     </record>
-
     </data>
 </openerp>

addons/account/project/wizard/account_analytic_chart.py

@@ -47,4 +47,4 @@ class account_analytic_chart(osv.osv_memory):
         return result
 
 account_analytic_chart()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/project/wizard/account_analytic_inverted_balance_report.py

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

addons/account/project/wizard/account_analytic_journal_report.py

@@ -29,6 +29,7 @@ class account_analytic_journal_report(osv.osv_memory):
     _columns = {
         'date1': fields.date('Start of period', required=True),
         'date2': fields.date('End of period', required=True),
+        'analytic_account_journal_id': fields.many2many('account.analytic.journal', 'account_analytic_journal_name', 'journal_line_id', 'journal_print_id', 'Analytic Journals', required=True),
     }
 
     _defaults = {
@@ -40,8 +41,15 @@ class account_analytic_journal_report(osv.osv_memory):
         if context is None:
             context = {}
         data = self.read(cr, uid, ids)[0]
+        ids_list = []
+        if context.get('active_id',False):
+            ids_list.append(context.get('active_id',False))
+        else:
+            record = self.browse(cr,uid,ids[0],context=context)
+            for analytic_record in record.analytic_account_journal_id:
+                ids_list.append(analytic_record.id)
         datas = {
-             'ids': context.get('active_ids',[]),
+             'ids': ids_list,
              'model': 'account.analytic.journal',
              'form': data
                  }
@@ -50,6 +58,14 @@ class account_analytic_journal_report(osv.osv_memory):
             'report_name': 'account.analytic.journal',
             'datas': datas,
             }
+        
+    def default_get(self, cr, uid, fields, context=None):
+        if context is None:
+            context = {}
+        res = super(account_analytic_journal_report, self).default_get(cr, uid, fields, context=context)
+        if 'analytic_account_journal_id' in fields:
+            res.update({'analytic_account_journal_id': context.get('active_ids',[])})
+        return res
 
 account_analytic_journal_report()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/project/wizard/account_analytic_journal_report_view.xml

@@ -7,15 +7,16 @@
             <field name="model">account.analytic.journal.report</field>
             <field name="arch" type="xml">
                 <form string="Select Period" version="7.0">
-                    <header>
-                        <button name="check_report" string="Print" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group col="4">
                         <field name="date1"/>
                         <field name="date2"/>
+                        <field name="analytic_account_journal_id" widget="many2many_tags" class="oe_inline" required="1"/>
                     </group>
+                    <footer>
+                        <button name="check_report" string="Print" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
@@ -38,6 +39,13 @@
             <field name="key">action</field>
             <field name="model">account.analytic.journal</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"
+            action="account.action_account_analytic_journal"
+            id="account_analytic_journal_print" parent="account.next_id_40"/>
 
     </data>
 </openerp>

addons/account/project/wizard/project_account_analytic_line.py

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

addons/account/report/account_balance.py

@@ -68,7 +68,7 @@ class account_balance(report_sxw.rml_parse, common_report_header):
             return self.pool.get('account.account').browse(self.cr, self.uid, data['form']['id']).company_id.name
         return super(account_balance ,self)._get_account(data)
 
-    def lines(self, form, ids=[], done=None):#, level=1):
+    def lines(self, form, ids=None, done=None):
         def _process_child(accounts, disp_acc, parent):
                 account_rec = [acct for acct in accounts if acct['id']==parent][0]
                 currency_obj = self.pool.get('res.currency')

addons/account/report/account_central_journal.py

@@ -105,4 +105,4 @@ class journal_print(report_sxw.rml_parse, common_report_header):
 
 report_sxw.report_sxw('report.account.central.journal', 'account.journal.period', 'addons/account/report/account_central_journal.rml', parser=journal_print, header='internal')
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/report/account_general_journal.py

@@ -158,4 +158,4 @@ class journal_print(report_sxw.rml_parse, common_report_header):
 
 report_sxw.report_sxw('report.account.general.journal', 'account.journal.period', 'addons/account/report/general_journal.rml', parser=journal_print, header='internal')
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/report/account_report.py

@@ -284,4 +284,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

@@ -160,7 +160,7 @@ class tax_report(report_sxw.rml_parse, common_report_header):
             i+=1
         return res
 
-    def _get_codes(self, based_on, company_id, parent=False, level=0, period_list=[], context=None):
+    def _get_codes(self, based_on, company_id, parent=False, level=0, period_list=None, context=None):
         obj_tc = self.pool.get('account.tax.code')
         ids = obj_tc.search(self.cr, self.uid, [('parent_id','=',parent),('company_id','=',company_id)], order='sequence', context=context)
 
@@ -171,7 +171,11 @@ class tax_report(report_sxw.rml_parse, common_report_header):
             res += self._get_codes(based_on, company_id, code.id, level+1, context=context)
         return res
 
-    def _add_codes(self, based_on, account_list=[], period_list=[], context=None):
+    def _add_codes(self, based_on, account_list=None, period_list=None, context=None):
+        if account_list is None:
+            account_list = []
+        if period_list is None:
+            period_list = []
         res = []
         obj_tc = self.pool.get('account.tax.code')
         for account in account_list:

addons/account/res_config.py

@@ -51,10 +51,10 @@ class account_config_settings(osv.osv_memory):
         'code_digits': fields.integer('# of Digits', help="No. of digits to use for account code"),
         'tax_calculation_rounding_method': fields.related('company_id',
             'tax_calculation_rounding_method', type='selection', selection=[
-            ('round_per_line', 'Round per Line'),
-            ('round_globally', 'Round Globally'),
+            ('round_per_line', 'Round per line'),
+            ('round_globally', 'Round globally'),
             ], string='Tax calculation rounding method',
-            help="If you select 'Round per Line' : for each tax, the tax amount will first be computed and rounded for each PO/SO/invoice line and then these rounded amounts will be summed, leading to the total amount for that tax. If you select 'Round Globally': for each tax, the tax amount will be computed for each PO/SO/invoice line, then these amounts will be summed and eventually this total tax amount will be rounded. If you sell with tax included, you should choose 'Round per line' because you certainly want the sum of your tax-included line subtotals to be equal to the total amount with taxes."),
+            help="If you select 'Round per line' : for each tax, the tax amount will first be computed and rounded for each PO/SO/invoice line and then these rounded amounts will be summed, leading to the total amount for that tax. If you select 'Round globally': for each tax, the tax amount will be computed for each PO/SO/invoice line, then these amounts will be summed and eventually this total tax amount will be rounded. If you sell with tax included, you should choose 'Round per line' because you certainly want the sum of your tax-included line subtotals to be equal to the total amount with taxes."),
         'sale_tax': fields.many2one("account.tax.template", "Default sale tax"),
         'purchase_tax': fields.many2one("account.tax.template", "Default purchase tax"),
         'sale_tax_rate': fields.float('Sales tax (%)'),
@@ -72,40 +72,40 @@ class account_config_settings(osv.osv_memory):
         'sale_refund_journal_id': fields.many2one('account.journal', 'Sale refund journal'),
         'sale_refund_sequence_prefix': fields.related('sale_refund_journal_id', 'sequence_id', 'prefix', type='char', string='Credit note sequence'),
         'sale_refund_sequence_next': fields.related('sale_refund_journal_id', 'sequence_id', 'number_next', type='integer', string='Next credit note number'),
-        'purchase_journal_id': fields.many2one('account.journal', 'Purchase Journal'),
+        'purchase_journal_id': fields.many2one('account.journal', 'Purchase journal'),
         'purchase_sequence_prefix': fields.related('purchase_journal_id', 'sequence_id', 'prefix', type='char', string='Supplier invoice sequence'),
         'purchase_sequence_next': fields.related('purchase_journal_id', 'sequence_id', 'number_next', type='integer', string='Next supplier invoice number'),
         'purchase_refund_journal_id': fields.many2one('account.journal', 'Purchase refund journal'),
         'purchase_refund_sequence_prefix': fields.related('purchase_refund_journal_id', 'sequence_id', 'prefix', type='char', string='Supplier credit note sequence'),
         'purchase_refund_sequence_next': fields.related('purchase_refund_journal_id', 'sequence_id', 'number_next', type='integer', string='Next supplier credit note number'),
 
-        'module_account_check_writing': fields.boolean('pay your suppliers by check',
+        'module_account_check_writing': fields.boolean('Pay your suppliers by check',
             help="""This allows you to check writing and printing.
                 This installs the module account_check_writing."""),
-        'module_account_accountant': fields.boolean('full accounting features: journals, legal statements, chart of accounts, etc.',
+        'module_account_accountant': fields.boolean('Full accounting features: journals, legal statements, chart of accounts, etc.',
             help="""If you do not check this box, you will be able to do invoicing & payments, but not accounting (Journal Items, Chart of  Accounts, ...)"""),
-        'module_account_asset': fields.boolean('assets management',
+        'module_account_asset': fields.boolean('Assets management',
             help="""This allows you to manage the assets owned by a company or a person.
                 It keeps track of the depreciation occurred on those assets, and creates account move for those depreciation lines.
                 This installs the module account_asset. If you do not check this box, you will be able to do invoicing & payments,
                 but not accounting (Journal Items, Chart of Accounts, ...)"""),
-        'module_account_budget': fields.boolean('budget management',
+        'module_account_budget': fields.boolean('Budget management',
             help="""This allows accountants to manage analytic and crossovered budgets.
                 Once the master budgets and the budgets are defined,
                 the project managers can set the planned amount on each analytic account.
                 This installs the module account_budget."""),
-        'module_account_payment': fields.boolean('manage payment orders',
+        'module_account_payment': fields.boolean('Manage payment orders',
             help="""This allows you to create and manage your payment orders, with purposes to
                     * serve as base for an easy plug-in of various automated payment mechanisms, and
                     * provide a more efficient way to manage invoice payments.
                 This installs the module account_payment."""),
-        'module_account_voucher': fields.boolean('manage customer payments',
+        'module_account_voucher': fields.boolean('Manage customer payments',
             help="""This includes all the basic requirements of voucher entries for bank, cash, sales, purchase, expense, contra, etc.
                 This installs the module account_voucher."""),
-        'module_account_followup': fields.boolean('manage customer payment follow-ups',
+        'module_account_followup': fields.boolean('Manage customer payment follow-ups',
             help="""This allows to automate letters for unpaid invoices, with multi-level recalls.
                 This installs the module account_followup."""),
-        'group_proforma_invoices': fields.boolean('allow pro-forma invoices',
+        'group_proforma_invoices': fields.boolean('Allow pro-forma invoices',
             implied_group='account.group_proforma_invoices',
             help="Allows you to put invoices in pro-forma state."),
         'default_sale_tax': fields.many2one('account.tax', 'Default sale tax',
@@ -114,9 +114,12 @@ class account_config_settings(osv.osv_memory):
             help="This purchase tax will be assigned by default on new products."),
         'decimal_precision': fields.integer('Decimal precision on journal entries',
             help="""As an example, a decimal precision of 2 will allow journal entries  like: 9.99 EUR, whereas a decimal precision of 4 will allow journal  entries like: 0.0231 EUR."""),
-        'group_multi_currency': fields.boolean('allow multi currencies',
+        'group_multi_currency': fields.boolean('Allow multi currencies',
             implied_group='base.group_multi_currency',
             help="Allows you multi currency environment"),
+        'group_analytic_accounting': fields.boolean('Analytic accounting',
+            implied_group='analytic.group_analytic_accounting',
+            help="Allows you to use the analytic accounting."),
     }
 
     def _default_company(self, cr, uid, context=None):
@@ -223,6 +226,16 @@ class account_config_settings(osv.osv_memory):
             return {'value': {'date_stop': end_date.strftime('%Y-%m-%d')}}
         return {}
 
+    def open_company_form(self, cr, uid, ids, context=None):
+        config = self.browse(cr, uid, ids[0], context)
+        return {
+            'type': 'ir.actions.act_window',
+            'name': 'Configure your Company',
+            'res_model': 'res.company',
+            'res_id': config.company_id.id,
+            'view_mode': 'form',
+        }
+
     def set_default_taxes(self, cr, uid, ids, context=None):
         """ set default sale and purchase taxes for products """
         ir_values = self.pool.get('ir.values')

addons/account/res_config_view.xml

@@ -129,6 +129,10 @@
                                 <field name="module_account_accountant" class="oe_inline"/>
                                 <label for="module_account_accountant"/>
                             </div>
+                            <div>
+                                <field name="group_analytic_accounting" class="oe_inline"/>
+                                <label for="group_analytic_accounting"/>
+                            </div>
                             <div>
                                 <field name="module_account_asset" class="oe_inline"/>
                                 <label for="module_account_asset"/>
@@ -224,10 +228,8 @@
                         <div>
                             <div>
                                 <label for="company_footer"/>
-                                <button name="%(action_bank_tree)d"
-                                    string="Configure your bank accounts"
-                                    icon="gtk-go-forward"
-                                    type="action"
+                                <button name="open_company_form" type="object"
+                                    string="Configure your company bank accounts" icon="gtk-go-forward"
                                     class="oe_inline oe_link"/>
                                 <field name="company_footer"/>
                             </div>

addons/account/res_currency.py

@@ -45,4 +45,3 @@ class res_currency_account(osv.osv):
 res_currency_account()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

addons/account/security/account_security.xml

@@ -1,18 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp><data>
+<openerp>
+<data>
 
     <record id="group_account_invoice" model="res.groups">
         <field name="name">Invoicing &amp; Payments</field>
         <field name="category_id" ref="base.module_category_accounting_and_finance"/>
         <field name="users" eval="[(4, ref('base.user_root'))]"/>
+        <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
     </record>
+
     <record id="group_account_user" model="res.groups">
         <field name="name">Accountant</field>
         <field name="category_id" ref="base.module_category_accounting_and_finance"/>
         <field name="implied_ids" eval="[(4, ref('group_account_invoice'))]"/>
     </record>
+
     <record id="group_account_manager" model="res.groups">
-        <field name="name">Manager</field>
+        <field name="name">Financial Manager</field>
         <field name="category_id" ref="base.module_category_accounting_and_finance"/>
         <field name="implied_ids" eval="[(4, ref('group_account_user'))]"/>
     </record>
@@ -24,100 +28,107 @@
 
     <record id="account_move_comp_rule" model="ir.rule">
         <field name="name">Account Entry</field>
-        <field ref="model_account_move" name="model_id"/>
-        <field eval="True" name="global"/>
+        <field name="model_id" ref="model_account_move"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="account_move_line_comp_rule" model="ir.rule">
-         <field name="name">Entry lines</field>
-        <field model="ir.model" name="model_id" ref="model_account_move_line"/>
-        <field eval="True" name="global"/>
+        <field name="name">Entry lines</field>
+        <field name="model_id" ref="model_account_move_line"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="journal_period_comp_rule" model="ir.rule">
         <field name="name">Journal Period</field>
-        <field model="ir.model" name="model_id" ref="model_account_journal_period"/>
-        <field eval="True" name="global"/>
+        <field name="model_id" ref="model_account_journal_period"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
-     
+
 
     <record id="journal_comp_rule" model="ir.rule">
         <field name="name">Journal multi-company</field>
-        <field model="ir.model" name="model_id" ref="model_account_journal"/>
-        <field eval="True" name="global"/>
+        <field name="model_id" ref="model_account_journal"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="analytic_journal_comp_rule" model="ir.rule">
         <field name="name">Analytic journal multi-company</field>
-        <field model="ir.model" name="model_id" ref="model_account_analytic_journal"/>
-        <field eval="True" name="global"/>
+        <field name="model_id" ref="model_account_analytic_journal"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="period_comp_rule" model="ir.rule">
         <field name="name">Period multi-company</field>
-        <field model="ir.model" name="model_id" ref="model_account_period"/>
-        <field eval="True" name="global"/>
+        <field name="model_id" ref="model_account_period"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="fiscal_year_comp_rule" model="ir.rule">
         <field name="name">Fiscal year multi-company</field>
-        <field model="ir.model" name="model_id" ref="model_account_fiscalyear"/>
-        <field eval="True" name="global"/>
+        <field name="model_id" ref="model_account_fiscalyear"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="account_comp_rule" model="ir.rule">
         <field name="name">Account multi-company</field>
-        <field model="ir.model" name="model_id" ref="model_account_account"/>
-        <field eval="True" name="global"/>
+        <field name="model_id" ref="model_account_account"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="tax_comp_rule" model="ir.rule">
-         <field name="name">Tax multi-company</field>
-        <field model="ir.model" name="model_id" ref="model_account_tax"/>
-        <field eval="True" name="global"/>
+        <field name="name">Tax multi-company</field>
+        <field name="model_id" ref="model_account_tax"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="tax_code_comp_rule" model="ir.rule">
         <field name="name">Tax code multi-company</field>
-        <field model="ir.model" name="model_id" ref="model_account_tax_code"/>
-        <field eval="True" name="global"/>
+        <field name="model_id" ref="model_account_tax_code"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="invoice_comp_rule" model="ir.rule">
         <field name="name">Invoice multi-company</field>
-        <field model="ir.model" name="model_id" ref="model_account_invoice"/>
-        <field eval="True" name="global"/>
+        <field name="model_id" ref="model_account_invoice"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="invoice_analysis_comp_rule" model="ir.rule">
         <field name="name">Invoice Analysis multi-company</field>
-        <field model="ir.model" name="model_id" ref="model_account_invoice_report"/>
-        <field eval="True" name="global"/>
+        <field name="model_id" ref="model_account_invoice_report"/>
+        <field name="global" eval="True"/>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+    </record>
+
+    <record id="entry_analysis_comp_rule" model="ir.rule">
+        <field name="name">Entries Analysis multi-company</field>
+        <field name="model_id" ref="model_account_entries_report"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="account_fiscal_position_comp_rule" model="ir.rule">
         <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="model_id" ref="model_account_fiscal_position"/>
+        <field name="global" eval="True"/>
         <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="model_id" ref="model_account_model"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
@@ -142,4 +153,5 @@
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
-</data></openerp>
+</data>
+</openerp>

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

@@ -82,6 +82,7 @@ access_account_entries_report_invoice,account.entries.report,model_account_entri
 access_account_entries_report_employee,account.entries.report employee,model_account_entries_report,base.group_user,1,0,0,0
 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_user,1,1,1,1
+access_account_journal_cashbox_line,account.journal.cashbox.line,model_account_journal_cashbox_line,account.group_account_user,1,1,1,0
 access_account_journal_view_invoice,account.journal.view invoice,model_account_journal_view,account.group_account_invoice,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_accountant,account.invoice.tax accountant,model_account_invoice_tax,account.group_account_user,1,0,0,0

addons/account/static/src/css/account_move_reconciliation.css

@@ -0,0 +1,19 @@
+
+.openerp .oe_account_reconciliation {
+    border-bottom: 1px solid #CACACA;
+    padding: 5px;
+}
+
+.openerp .oe_account_reconciliation button {
+    margin: 3px;
+}
+
+.openerp .oe_account_reconciliation>div {
+    display: table;
+    width: 100%;
+}
+
+.openerp .oe_account_reconciliation>div>div {
+    display: table-cell;
+    width: 50%:
+}

addons/account/static/src/js/account_move_reconciliation.js

@@ -0,0 +1,124 @@
+openerp.account = function (instance) {
+    var _t = instance.web._t,
+        _lt = instance.web._lt;
+    var QWeb = instance.web.qweb;
+    
+    instance.web.account = {};
+    
+    instance.web.views.add('account_reconciliation_list', 'instance.web.account.ReconciliationListView');
+    instance.web.account.ReconciliationListView = instance.web.ListView.extend({
+        init: function() {
+            this._super.apply(this, arguments);
+            var self = this;
+            this.current_partner = null;
+            this.do_select.add(function() {
+                if (self.get_selected_ids().length === 0) {
+                    self.$(".oe_account_recon_reconcile").attr("disabled", "");
+                } else {
+                    self.$(".oe_account_recon_reconcile").removeAttr("disabled");
+                }
+            });
+        },
+        on_loaded: function() {
+            var self = this;
+            var tmp = this._super.apply(this, arguments);
+            if (this.partners) {
+                this.$el.prepend(QWeb.render("AccountReconciliation", {widget: this}));
+                this.$(".oe_account_recon_previous").click(function() {
+                    self.current_partner = (self.current_partner - 1) % self.partners.length;
+                    self.search_by_partner();
+                });
+                this.$(".oe_account_recon_next").click(function() {
+                    self.current_partner = (self.current_partner + 1) % self.partners.length;
+                    self.search_by_partner();
+                });
+                this.$(".oe_account_recon_reconcile").click(function() {
+                    self.reconcile();
+                });
+                this.$(".oe_account_recom_mark_as_reconciled").click(function() {
+                    self.mark_as_reconciled();
+                });
+            }
+            return tmp;
+        },
+        do_search: function(domain, context, group_by) {
+            var self = this;
+            this.last_domain = domain;
+            this.last_context = context;
+            this.last_group_by = group_by;
+            this.old_search = _.bind(this._super, this);
+            var mod = new instance.web.Model("account.move.line", context, domain);
+            return mod.call("list_partners_to_reconcile", []).pipe(function(result) {
+                var current = self.current_partner !== null ? self.partners[self.current_partner][0] : null;
+                self.partners = result;
+                var index = _.find(_.range(self.partners.length), function(el) {
+                    if (current === self.partners[el][0])
+                        return true;
+                });
+                if (index !== undefined)
+                    self.current_partner = index;
+                else
+                    self.current_partner = self.partners.length == 0 ? null : 0;
+                self.search_by_partner();
+            });
+        },
+        search_by_partner: function() {
+            var self = this;
+            var fct = function() {
+                return self.old_search(new instance.web.CompoundDomain(self.last_domain, 
+                    [["partner_id", "in", self.current_partner === null ? [] :
+                    [self.partners[self.current_partner][0]] ]]), self.last_context, self.last_group_by);
+            };
+            if (self.current_partner === null) {
+                self.last_reconciliation_date = _t("Never");
+                return fct();
+            } else {
+                return new instance.web.Model("res.partner").call("read",
+                    [self.partners[self.current_partner][0], ["last_reconciliation_date"]]).pipe(function(res) {
+                    self.last_reconciliation_date = 
+                        instance.web.format_value(res.last_reconciliation_date, {"type": "datetime"}, _t("Never"));
+                    return fct();
+                });
+            }
+        },
+        reconcile: function() {
+            var self = this;
+            var ids = this.get_selected_ids();
+            if (ids.length === 0) {
+                instance.web.dialog($("<div />").text(_t("You must choose at least one record.")), {
+                    title: _t("Warning"),
+                    modal: true
+                });
+                return false;
+            }
+
+            new instance.web.Model("ir.model.data").call("get_object_reference", ["account", "action_view_account_move_line_reconcile"]).pipe(function(result) {
+                var additional_context = _.extend({
+                    active_id: ids[0],
+                    active_ids: ids,
+                    active_model: self.model
+                });
+                return self.rpc("/web/action/load", {
+                    action_id: result[1],
+                    context: additional_context
+                }, function (result) {
+                    result = result.result;
+                    result.context = _.extend(result.context || {}, additional_context);
+                    result.flags = result.flags || {};
+                    result.flags.new_window = true;
+                    return self.do_action(result, function () {
+                        self.do_search(self.last_domain, self.last_context, self.last_group_by);
+                    });
+                });
+            });
+        },
+        mark_as_reconciled: function() {
+            var self = this;
+            var id = self.partners[self.current_partner][0];
+            new instance.web.Model("res.partner").call("mark_as_reconciled", [[id]]).pipe(function() {
+                self.do_search(self.last_domain, self.last_context, self.last_group_by);
+            });
+        },
+    });
+    
+};

addons/account/static/src/xml/account_move_reconciliation.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<templates id="template" xml:space="preserve">
+    
+    <t t-name="AccountReconciliation">
+        <div class="oe_account_reconciliation">
+            <t t-if="widget.current_partner === null">
+                There is no pending reconciliation.
+            </t>
+            <t t-if="widget.current_partner !== null">
+                <div>
+                    <div>
+                        <button class="oe_account_recon_previous oe_button" href="javascript:void(0)">&lt;</button>
+                        <t t-esc="'' + widget.partners[widget.current_partner][1] + ' (' + (widget.current_partner + 1) + '/' + widget.partners.length + ')'"/>
+                        <button class="oe_account_recon_next oe_button" href="javascript:void(0)">&gt;</button>
+                    </div>
+                    <div>
+                        Last Reconciliation: <t t-esc="widget.last_reconciliation_date" />
+                    </div>
+                </div>
+                <div>
+                    <button class="oe_account_recon_reconcile oe_button oe_highlight" href="javascript:void(0)"
+                        disabled="">Reconcile</button>
+                    <button class="oe_account_recom_mark_as_reconciled oe_button" href="javascript:void(0)">Nothing to reconcile</button>
+                </div>
+            </t>
+        </div>
+    </t>
+
+</templates>

addons/account/wizard/account_invoice_refund.py

@@ -32,11 +32,11 @@ class account_invoice_refund(osv.osv_memory):
     _name = "account.invoice.refund"
     _description = "Invoice Refund"
     _columns = {
-       'date': fields.date('Operation Date', help='This date will be used as the invoice date for credit note and period will be chosen accordingly!'),
+       'date': fields.date('Date', help='This date will be used as the invoice date for credit note and period will be chosen accordingly!'),
        'period': fields.many2one('account.period', 'Force period'),
        'journal_id': fields.many2one('account.journal', 'Refund Journal', help='You can select here the journal to use for the credit note that will be created. If you leave that field empty, it will use the same journal as the current invoice.'),
-       'description': fields.char('Description', size=128, required=True),
-       'filter_refund': fields.selection([('refund', 'Create a draft refund'), ('cancel', 'Cancel: create credit note and reconcile'),('modify', 'Modify: create credit note, reconcile and create a new draft invoice')], "Refund Method", required=True, help='Credit note base on this type. You can not Modify and Cancel if the invoice is already reconciled'),
+       'description': fields.char('Reason', size=128, required=True),
+       'filter_refund': fields.selection([('refund', 'Create a draft credit note'), ('cancel', 'Cancel: create credit note and reconcile'),('modify', 'Modify: create credit note, reconcile and create a new draft invoice')], "Refund Method", required=True, help='Credit note base on this type. You can not Modify and Cancel if the invoice is already reconciled'),
     }
 
     def _get_journal(self, cr, uid, context=None):

addons/account/wizard/account_invoice_refund_view.xml

@@ -7,19 +7,40 @@
             <field name="model">account.invoice.refund</field>
             <field name="arch" type="xml">
                 <form string="Credit Note" version="7.0">
-                    <separator string="Credit Note Options"/>
-                    <group col="4">
-                         <field name="description"/>
-                         <field name="journal_id" widget='selection'/>
-                         <field name="date"/>
-                         <field name="period"/>
-                         <field name="filter_refund"/>
+                    <group>
+                         <group colspan="2">
+                             <label for="filter_refund"/>
+                             <div>
+                                 <field name="filter_refund" class="oe_inline"/>
+                                 <p attrs="{'invisible':[('filter_refund','&lt;&gt;','refund')]}" class="oe_grey">
+                                    You will be able to edit and validate this
+                                    credit note directly or keep it draft,
+                                    waiting for the document to be issued by
+                                    your supplier/customer.
+                                 </p>
+                                 <p attrs="{'invisible':[('filter_refund','&lt;&gt;','cancel')]}" class="oe_grey">
+                                    Use this option if you want to cancel an invoice you should not
+                                    have issued. The credit note will be created, validated and reconciled
+                                    with the invoice. You will not be able to modify the credit note.
+                                 </p>
+                                 <p attrs="{'invisible':[('filter_refund','&lt;&gt;','modify')]}" class="oe_grey">
+                                    Use this option if you want to cancel an invoice and create a new
+                                    one. The credit note will be created, validated and reconciled
+                                    with the current invoice. A new, draft, invoice will be created 
+                                    so that you can edit it.
+                                 </p>
+                             </div>
+                         </group>
+                         <group>
+                             <field name="description"/>
+                             <field name="journal_id" widget='selection'/>
+                         </group><group>
+                             <field name="date"/>
+                             <field name="period"/>
+                         </group>
                     </group>
-                    <label string="Modify Invoice: Cancels the current invoice and creates a new copy of it ready for editing."/>
-                    <label string="Credit Note: Creates the credit note, ready for editing."/>
-                    <label string="Cancel Invoice: Creates the credit note, validate and reconcile it to cancel the current invoice."/>
                     <footer>
-                        <button string='Refund' name="invoice_refund" type="object" class="oe_highlight"/>
+                        <button string='Create Credit Note' name="invoice_refund" type="object" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel"/>
                     </footer>
@@ -28,7 +49,7 @@
         </record>
 
         <record id="action_account_invoice_refund" model="ir.actions.act_window">
-            <field name="name">Refund</field>
+            <field name="name">Refund Invoice</field>
             <field name="res_model">account.invoice.refund</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>

addons/account/wizard/account_invoice_state.py

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

addons/account/wizard/account_journal_select.py

@@ -47,4 +47,4 @@ class account_journal_select(osv.osv_memory):
 
 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

@@ -61,4 +61,4 @@ the bank account\nin the journal definition for reconciliation.'))
 
 account_move_bank_reconcile()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/wizard/account_move_journal.py

@@ -38,7 +38,7 @@ class account_move_journal(osv.osv_memory):
     _defaults = {
         'target_move': 'all'
     }
-    def _get_period(self, cr, uid, context={}):
+    def _get_period(self, cr, uid, context=None):
         """
         Return  default account period value
         """
@@ -92,14 +92,14 @@ class account_move_journal(osv.osv_memory):
 
             journal = False
             if journal_id:
-                journal = journal_pool.read(cr, uid, [journal_id], ['name'])[0]['name']
+                journal = journal_pool.read(cr, uid, journal_id, ['name'], context=context).get('name',False)
                 journal_string = _("Journal: %s") % tools.ustr(journal)
             else:
                 journal_string = _("Journal: All")
 
             period = False
             if period_id:
-                period = period_pool.browse(cr, uid, [period_id], ['name'])[0]['name']
+                period = period_pool.browse(cr, uid, period_id, context=context).name
                 period_string = _("Period: %s") % tools.ustr(period)
 
             open_string = _("Open")

addons/account/wizard/account_move_line_reconcile_select.py

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

addons/account/wizard/account_move_line_select.py

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

addons/account/wizard/account_move_line_unreconcile_select.py

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

addons/account/wizard/account_reconcile.py

@@ -23,6 +23,7 @@ import time
 
 from osv import fields, osv
 from tools.translate import _
+import decimal_precision as dp
 
 class account_move_line_reconcile(osv.osv_memory):
     """
@@ -32,9 +33,9 @@ class account_move_line_reconcile(osv.osv_memory):
     _description = 'Account move line reconcile'
     _columns = {
         'trans_nbr': fields.integer('# of Transaction', readonly=True),
-        'credit': fields.float('Credit amount', readonly=True),
-        'debit': fields.float('Debit amount', readonly=True),
-        'writeoff': fields.float('Write-Off amount', readonly=True),
+        'credit': fields.float('Credit amount', readonly=True, digits_compute=dp.get_precision('Account')),
+        'debit': fields.float('Debit amount', readonly=True, digits_compute=dp.get_precision('Account')),
+        'writeoff': fields.float('Write-Off amount', readonly=True, digits_compute=dp.get_precision('Account')),
     }
 
     def default_get(self, cr, uid, fields, context=None):
@@ -86,19 +87,6 @@ class account_move_line_reconcile(osv.osv_memory):
         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
-        if 'active_ids' in context and context['active_ids']:
-            tmp_ml_id = account_move_line_obj.browse(cr, uid, context['active_ids'], context)[0]
-            partner_id = tmp_ml_id.partner_id and tmp_ml_id.partner_id.id or False
-            debit_ml_ids = account_move_line_obj.search(cr, uid, [('partner_id', '=', partner_id), ('account_id.reconcile', '=', True), ('reconcile_id', '=', False), ('debit', '>', 0)], context=context)
-            credit_ml_ids = account_move_line_obj.search(cr, uid, [('partner_id', '=', partner_id), ('account_id.reconcile', '=', True), ('reconcile_id', '=', False), ('credit', '>', 0)], context=context)
-            for ml_id in context['active_ids']:
-                if ml_id in debit_ml_ids:
-                    debit_ml_ids.remove(ml_id)
-                if ml_id in credit_ml_ids:
-                    credit_ml_ids.remove(ml_id)
-            if not debit_ml_ids and credit_ml_ids:
-                context.update({'stop_reconcile': True})
         account_move_line_obj.reconcile(cr, uid, context['active_ids'], 'manual', account_id,
                                         period_id, journal_id, context=context)
         return {'type': 'ir.actions.act_window_close'}
@@ -166,11 +154,10 @@ class account_move_line_reconcile_writeoff(osv.osv_memory):
         if ids:
             period_id = ids[0]
 
-        context.update({'stop_reconcile': True})
         account_move_line_obj.reconcile(cr, uid, context['active_ids'], 'manual', account_id,
                 period_id, journal_id, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
 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

@@ -57,10 +57,10 @@ class account_partner_reconcile_process(osv.osv_memory):
     def _get_partner(self, cr, uid, context=None):
         move_line_obj = self.pool.get('account.move.line')
 
-        partner = move_line_obj.get_next_partner_only(cr, uid, offset=1, context=context)
+        partner = move_line_obj.list_partners_to_reconcile(cr, uid, context=context)
         if not partner:
             return False
-        return partner[0]
+        return partner[0][0]
 
     def data_get(self, cr, uid, to_reconcile, today_reconciled, context=None):
         return {'progress': (100 / (float(to_reconcile + today_reconciled) or 1.0)) * today_reconciled}
@@ -100,4 +100,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_state_open.py

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

addons/account/wizard/account_subscription_generate.py

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

addons/account/wizard/account_unreconcile.py

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

addons/account_accountant/__openerp__.py

@@ -26,15 +26,12 @@
     'sequence': 10,
     'summary': 'Financial and Analytic Accounting',
     'description': """
-Accounting Access Rights.
-=========================
+Accounting Access Rights
+========================
+It gives the Administrator user access to all accounting features such as journal items and the chart of accounts.
 
-This module gives the Admin user the access to all the accounting features
-like the journal items and the chart of accounts.
-
-It assigns manager and user access rights to the Administrator and only
-user rights to Demo user.
-    """,
+It assigns manager and user access rights to the Administrator and only user rights to the Demo user. 
+""",
     'website': 'http://www.openerp.com',
     'depends' : ['account_voucher'],
     'data': [
@@ -46,6 +43,5 @@ user rights to Demo user.
     'installable': True,
     'auto_install': False,
     'application': True,
-    'certificate': '00395091383933390541',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_accountant/account_accountant_data.xml

@@ -5,6 +5,7 @@
         <!-- Top menu item -->
         <menuitem name="Accounting"
             id="account.menu_finance"/>
+
     </data>
 
     <data noupdate="1">
@@ -14,10 +15,9 @@
             <field name="tag">reload</field>
             <field name="params" eval="{'menu_id': ref('account.menu_finance')}"/>
         </record>
-        <record id="todo_open_account_menu" model="ir.actions.todo">
+        <record id="base.open_menu" model="ir.actions.todo">
             <field name="action_id" ref="action_client_account_menu"/>
-            <field name="type">automatic</field>
-            <field name="sequence">100</field>
+            <field name="state">open</field>
         </record>
 
         <!-- Notify all employees of module installation -->
@@ -26,9 +26,11 @@
             <field name="res_id" ref="mail.group_all_employees"/>
             <field name="type">notification</field>
             <field name="subject">Accounting and Finance application installed!</field>
-            <field name="body">With OpenERP's accounting, you get instant access to your financial data, and can setup analytic accounting, forecast taxes, control budgets, easily create and send invoices, record bank statements, etc.
+            <field name="body"><![CDATA[
+                With OpenERP's accounting, you get instant access to your financial  data, and can setup analytic accounting, forecast taxes, control  budgets, easily create and send invoices, record bank statements, etc.
 
-The accounting features are fully integrated with other OpenERP applications to automate all your processes: creation of customer invoices, control of supplier invoices, point-of-sale integration, automated follow-ups, etc.</field>
+<p>The accounting features are fully integrated  with other OpenERP applications to automate all your processes:  creation of customer invoices, control of supplier invoices,  point-of-sale integration, automated follow-ups, etc.</p>
+            ]]></field>
         </record>
     </data>
 </openerp>

addons/account_analytic_analysis/__openerp__.py

@@ -36,6 +36,7 @@ Adds menu to show relevant information to each manager.You can also view the rep
     'depends': ['hr_timesheet_invoice', 'sale'], #although sale is technically not required to install this module, all menuitems are located under 'Sales' application
     'data': [
         'security/ir.model.access.csv',
+        'security/account_analytic_analysis_security.xml',
         'account_analytic_analysis_view.xml',
         'account_analytic_analysis_menu.xml',
         'account_analytic_analysis_cron.xml',
@@ -46,7 +47,6 @@ Adds menu to show relevant information to each manager.You can also view the rep
     'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate': '0042927202589',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_analytic_analysis/account_analytic_analysis.py

@@ -465,7 +465,7 @@ class account_analytic_account(osv.osv):
     def open_sale_order_lines(self,cr,uid,ids,context=None):
         if context is None:
             context = {}
-        sale_ids = self.pool.get('sale.order').search(cr,uid,[('project_id','=',context.get('search_default_project_id',False)),('partner_id','=',context.get('search_default_partner_id',False))])
+        sale_ids = self.pool.get('sale.order').search(cr,uid,[('project_id','=',context.get('search_default_project_id',False)),('partner_id','in',context.get('search_default_partner_id',False))])
         names = [record.name for record in self.browse(cr, uid, ids, context=context)]
         name = _('Sale Order Lines of %s') % ','.join(names)
         return {

addons/account_analytic_analysis/account_analytic_analysis_menu.xml

@@ -48,7 +48,7 @@
             <field name="name">Contracts to Renew</field>
             <field name="res_model">account.analytic.account</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form,graph</field>
+            <field name="view_mode">tree,form</field>
             <field name="context">{'search_default_user_id':uid, 'search_default_draft':1, 'search_default_pending':1, 'search_default_open':1, 'search_default_renew':1}</field>
             <field name="domain">[('type','=','contract')]</field>
             <field name="search_view_id" ref="view_account_analytic_account_overdue_search"/>
@@ -72,10 +72,19 @@
             <field name="name">Contracts</field>
             <field name="res_model">account.analytic.account</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form,graph</field>
-            <field name="context">{'default_type':'contract'}</field>
+            <field name="view_mode">tree,form</field>
+            <field name="context">{'default_type':'contract', 'search_default_open':1, 'search_default_pending':1}</field>
             <field name="domain">[('type','=','contract')]</field>
             <field name="search_view_id" ref="view_account_analytic_account_overdue_search"/>
+            <field name="help" type="html">
+                <p class="oe_view_nocontent_create">
+                    Click to create a new contract.
+                </p><p>
+                    Use contracts to follow tasks, issues, timesheets or invoicing based on
+                    work done, expenses and/or sales orders. OpenERP will automatically manage
+                    the alerts for the renewal of the contracts to the right salesperson.
+                </p>
+            </field>
         </record>
         <menuitem id="base.menu_sales" name="Sales"
             parent="base.menu_base_partner"

addons/account_analytic_analysis/account_analytic_analysis_view.xml

@@ -140,6 +140,16 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[('type','=','template')]</field>
             <field name="context">{'search_default_type':'template','default_type' : 'template'}</field>
+            <field name="help" type="html">
+                <p class="oe_view_nocontent_create">
+                    Click here to create a template of contract.
+                </p><p>
+                    Templates are used to prefigure contract/project that 
+                    can be selected by the salespeople to quickly configure the
+                    terms and conditions of the contract.
+                </p>
+            </field>
+             
         </record>
         <menuitem action="template_of_contract_action" id="menu_template_of_contract_action" parent="base.menu_base_config"/>
     </data>

addons/account_analytic_analysis/security/account_analytic_analysis_security.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    
+    <record model="res.users" id="base.user_root">
+        <field eval="[(4,ref('sale.group_analytic_accounting'))]" name="groups_id"/>
+    </record>
+
+    </data>
+</openerp>

addons/account_analytic_default/__openerp__.py

@@ -47,7 +47,6 @@ Allows to automatically select analytic accounts based on criterions:
     'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate': '0074229833581',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_analytic_plans/__openerp__.py

@@ -79,7 +79,6 @@ The analytic plan validates the minimum and maximum percentage at the time of cr
     'test': ['test/acount_analytic_plans_report.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '0036417675373',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_analytic_plans/account_analytic_plans.py

@@ -262,6 +262,7 @@ account_analytic_plan_instance()
 class account_analytic_plan_instance_line(osv.osv):
     _name = "account.analytic.plan.instance.line"
     _description = "Analytic Instance Line"
+    _rec_name = "analytic_account_id"
     _columns = {
         'plan_id': fields.many2one('account.analytic.plan.instance', 'Plan Id'),
         'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True, domain=[('type','<>','view')]),

addons/account_analytic_plans/report/crossovered_analytic.py

@@ -34,7 +34,7 @@ class crossovered_analytic(report_sxw.rml_parse):
         })
         self.base_amount = 0.00
 
-    def find_children(self,ref_ids):
+    def find_children(self, ref_ids):
         to_return_ids = []
         final_list = []
         parent_list = []
@@ -53,7 +53,7 @@ class crossovered_analytic(report_sxw.rml_parse):
         final_list.extend(set_list)
         return final_list #to_return_ids[0]
 
-    def set_account(self,cats):
+    def set_account(self, cats):
         lst = []
         category = self.pool.get('account.analytic.account').read(self.cr, self.uid, cats)
         for cat in category:
@@ -62,7 +62,7 @@ class crossovered_analytic(report_sxw.rml_parse):
                 lst.extend(self.set_account(cat['child_ids']))
         return lst
 
-    def _ref_lines(self,form):
+    def _ref_lines(self, form):
         result = []
         res = {}
         acc_pool = self.pool.get('account.analytic.account')
@@ -112,7 +112,9 @@ class crossovered_analytic(report_sxw.rml_parse):
         result.append(res)
         return result
 
-    def _lines(self, form, ids={}):
+    def _lines(self, form, ids=None):
+        if ids is None:
+            ids = {}
         if not ids:
             ids = self.ids
 

addons/account_anglo_saxon/__init__.py

@@ -23,4 +23,4 @@ import stock
 import purchase
 import invoice
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_anglo_saxon/__openerp__.py

@@ -46,7 +46,6 @@ account.""",
     'data': ['product_view.xml',],
     'auto_install': False,
     'installable': True,
-    'certificate':'00557423080410733581',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_anglo_saxon/sale.py

@@ -1,43 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-from osv import fields, osv
-
-#class sale_order_line(osv.osv):
-#    _name = 'sale.order.line'
-#    _description = 'Sale Order line'
-#    _inherit = 'sale.order.line'
-#
-#    def invoice_line_create(self, cr, uid, ids, context={}):
-#        line_ids = super('sale_order_line',self).invoice_line_create(cr, uid, ids, context)
-#        invoice_line_obj = self.pool.get('account.invoice.line')
-#        for line in invoice_line_obj.browse(cr, uid, line_ids):
-#            if line.product_id:
-#                    a =  line.product_id.product_tmpl_id.property_stock_account_output and line.product_id.product_tmpl_id.property_stock_account_output.id
-#                    if not a:
-#                        a = line.product_id.categ_id.property_stock_account_output_categ and line.product_id.categ_id.property_stock_account_output_categ.id
-#                    if a:
-#                        a = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, a)
-#                        invoice_line_obj.write(cr, uid, line.id, {'account_id':a})
-#
-#sale_order_line()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_asset/account_asset.py

@@ -75,7 +75,7 @@ class account_asset_asset(osv.osv):
     _name = 'account.asset.asset'
     _description = 'Asset'
 
-    def _get_period(self, cr, uid, context={}):
+    def _get_period(self, cr, uid, context=None):
         periods = self.pool.get('account.period').find(cr, uid)
         if periods:
             return periods[0]
@@ -176,7 +176,9 @@ class account_asset_asset(osv.osv):
                 year = depreciation_date.year
         return True
 
-    def validate(self, cr, uid, ids, context={}):
+    def validate(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         return self.write(cr, uid, ids, {
             'state':'open'
         }, context)
@@ -304,7 +306,7 @@ class account_asset_asset(osv.osv):
         default.update({'depreciation_line_ids': [], 'state': 'draft'})
         return super(account_asset_asset, self).copy(cr, uid, id, default, context=context)
 
-    def _compute_entries(self, cr, uid, ids, period_id, context={}):
+    def _compute_entries(self, cr, uid, ids, period_id, context=None):
         result = []
         period_obj = self.pool.get('account.period')
         depreciation_obj = self.pool.get('account.asset.depreciation.line')
@@ -350,7 +352,7 @@ class account_asset_depreciation_line(osv.osv):
         'amount': fields.float('Depreciation Amount', required=True),
         'remaining_value': fields.float('Amount to Depreciate', required=True),
         'depreciated_value': fields.float('Amount Already Depreciated', required=True),
-        'depreciation_date': fields.char('Depreciation Date', size=64, select=1),
+        'depreciation_date': fields.date('Depreciation Date', select=1),
         'move_id': fields.many2one('account.move', 'Depreciation Entry'),
         'move_check': fields.function(_get_move_check, method=True, type='boolean', string='Posted', store=True)
     }
@@ -368,7 +370,7 @@ class account_asset_depreciation_line(osv.osv):
         for line in self.browse(cr, uid, ids, context=context):
             if currency_obj.is_zero(cr, uid, line.asset_id.currency_id, line.remaining_value):
                 can_close = True
-            depreciation_date = line.asset_id.prorata and line.asset_id.purchase_date or time.strftime('%Y-%m-%d')
+            depreciation_date = time.strftime('%Y-%m-%d')
             period_ids = period_obj.find(cr, uid, depreciation_date, context=context)
             company_currency = line.asset_id.company_id.currency_id.id
             current_currency = line.asset_id.currency_id.id

addons/account_asset/account_asset_invoice.py

@@ -57,6 +57,7 @@ class account_invoice_line(osv.osv):
                     'partner_id': line.invoice_id.partner_id.id,
                     'company_id': line.invoice_id.company_id.id,
                     'currency_id': line.invoice_id.currency_id.id,
+                    'purchase_date' : line.invoice_id.date_invoice,
                 }
                 changed_vals = asset_obj.onchange_category_id(cr, uid, [], vals['category_id'], context=context)
                 vals.update(changed_vals['value'])

addons/account_asset/account_asset_view.xml

@@ -129,7 +129,7 @@
 	                        </group>
                         </page>
                         <page string="Depreciation Board">
-                            <field name="depreciation_line_ids" mode="tree,graph">
+                            <field name="depreciation_line_ids" mode="tree">
                                 <tree string="Depreciation Lines" colors="blue:(move_check == False);black:(move_check == True)">
                                     <field name="depreciation_date"/>
                                     <field name="sequence" invisible="1"/>
@@ -159,11 +159,6 @@
                                         </group>
                                     </group>
                                 </form>
-                                <graph type="bar">
-                                    <field name="name"/>
-                                    <field name="amount"/>
-                                    <field name="depreciated_value"/>
-                                </graph>
                             </field>
                             <button type="object" name="compute_depreciation_board" string="Compute" icon="terp-stock_format-scientific" colspan="2" attrs="{'invisible':[('state','=','close')]}"/>
                         </page>

addons/account_asset/report/account_asset_report.py

@@ -50,7 +50,7 @@ class asset_asset_report(osv.osv):
                 select 
                     min(dl.id) as id,
                     dl.name as name,
-                    to_date(dl.depreciation_date, 'YYYY-MM-DD') as depreciation_date,
+                    dl.depreciation_date as depreciation_date,
                     a.purchase_date as purchase_date,
                     (CASE WHEN (select min(d.id) from account_asset_depreciation_line as d
                                 left join account_asset_asset as ac ON (ac.id=d.asset_id)
@@ -77,7 +77,7 @@ class asset_asset_report(osv.osv):
                 from account_asset_depreciation_line dl
                     left join account_asset_asset a on (dl.asset_id=a.id)
                 group by 
-                    dl.amount,dl.asset_id,to_date(dl.depreciation_date, 'YYYY-MM-DD'),dl.name,
+                    dl.amount,dl.asset_id,dl.depreciation_date,dl.name,
                     a.purchase_date, dl.move_check, a.state, a.category_id, a.partner_id, a.company_id,
                     a.purchase_value, a.id, a.salvage_value
         )""")

addons/account_bank_statement_extensions/account_bank_statement_view.xml

@@ -76,7 +76,7 @@
           <field name="ref" readonly="1"/>
           <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
           <field name="type" on_change="onchange_type(partner_id, type)"/>
-          <field name="account_id" domain="[('journal_id','=',parent.journal_id)]"/>
+          <field name="account_id" domain="[('journal_id','=',journal_id)]"/>
           <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]"/>
           <field name="amount" readonly="1" sum="Total Amount"/>
           <field name="globalisation_id" string="Glob. Id"/>
@@ -100,7 +100,7 @@
               <field name="ref" readonly="0"/>
               <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
               <field name="type" on_change="onchange_type(partner_id, type)"/>
-              <field domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id"/>
+              <field domain="[('journal_id', '=', journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id"/>
               <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]"/>
               <field name="amount"/>
               <field name="globalisation_id"/>

addons/account_budget/__openerp__.py

@@ -69,6 +69,5 @@ Three reports are available:
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '0043819694157',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_budget/account_budget_view.xml

@@ -62,12 +62,7 @@
                             <field name="account_ids"/>
                         </page>
                         <page string="Budget Lines">
-                            <field name="crossovered_budget_line" widget="one2many_list" mode="graph,tree">
-                                <graph type="bar" string="Lines">
-                                    <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
-                                    <field name="planned_amount" operator="+"/>
-                                    <field group="True" name="general_budget_id"/>
-                                </graph>
+                            <field name="crossovered_budget_line" widget="one2many_list" mode="tree">
                                 <tree string="Budget Lines"  editable="top">
                                     <field name="crossovered_budget_id"/>
                                     <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
@@ -299,7 +294,7 @@
             <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field name="arch" type="xml">
                 <notebook position="inside">
-                    <page string="Budget Lines">
+                    <page string="Budget Lines" groups="account.group_account_user">
                             <field name="crossovered_budget_line" widget="one2many_list" colspan="4" nolabel="1" mode="tree,graph">
                                 <tree string="Budget Lines" editable="top">
                                     <field name="crossovered_budget_id"/>

addons/account_budget/report/analytic_account_budget_report.py

@@ -35,7 +35,9 @@ class analytic_account_budget_report(report_sxw.rml_parse):
         })
         self.context = context
 
-    def funct(self, object, form, ids={}, done=None, level=1):
+    def funct(self, object, form, ids=None, done=None, level=1):
+        if ids is None:
+            ids = {}
         if not ids:
             ids = self.ids
         if not done:
@@ -153,7 +155,7 @@ class analytic_account_budget_report(report_sxw.rml_parse):
                 tot['perc'] = float(tot['prac'] / tot['theo']) * 100
         return result
 
-    def funct_total(self,form):
+    def funct_total(self, form):
         result = []
         res = {}
         res = {
@@ -167,4 +169,4 @@ class analytic_account_budget_report(report_sxw.rml_parse):
 
 report_sxw.report_sxw('report.account.analytic.account.budget', 'account.analytic.account', 'addons/account_budget/report/analytic_account_budget_report.rml',parser=analytic_account_budget_report,header='internal')
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_budget/report/budget_report.py

@@ -34,7 +34,9 @@ class budget_report(report_sxw.rml_parse):
         })
         self.context = context
 
-    def funct(self, object, form, ids={}, done=None, level=1):
+    def funct(self, object, form, ids=None, done=None, level=1):
+        if ids is None:
+            ids = {}
         if not ids:
             ids = self.ids
         if not done:

addons/account_budget/report/crossovered_budget_report.py

@@ -37,7 +37,9 @@ class budget_report(report_sxw.rml_parse):
         })
         self.context = context
 
-    def funct(self, object, form, ids={}, done=None, level=1):
+    def funct(self, object, form, ids=None, done=None, level=1):
+        if ids is None:
+            ids = {}
         if not ids:
             ids = self.ids
         if not done:

addons/account_budget/security/account_budget_security.xml

@@ -22,6 +22,10 @@
             <field eval="True" name="global"/>
             <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
         </record>
+        
+        <record model="res.users" id="base.user_root">
+            <field eval="[(4,ref('analytic.group_analytic_accounting'))]" name="groups_id"/>
+        </record>
 
     </data>
 </openerp>

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

@@ -4,4 +4,4 @@ access_account_budget_post,account.budget.post,model_account_budget_post,account
 access_account_budget_post_accountant,account.budget.post accountant,model_account_budget_post,account.group_account_user,1,1,1,1
 access_crossovered_budget_accountant,crossovered.budget accountant,model_crossovered_budget,account.group_account_user,1,1,1,1
 access_crossovered_budget_lines_accountant,crossovered.budget.lines accountant,model_crossovered_budget_lines,account.group_account_user,1,1,1,1
-access_budget,crossovered.budget.lines manager,model_crossovered_budget_lines,base.group_user,1,0,0,0
+access_budget,crossovered.budget.lines manager,model_crossovered_budget_lines,base.group_user,1,1,1,0

addons/account_budget/wizard/account_budget_analytic.py

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

addons/account_budget/wizard/account_budget_crossovered_report.py

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

addons/account_budget/wizard/account_budget_report.py

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

addons/account_cancel/__openerp__.py

@@ -38,9 +38,6 @@ If set to true it allows user to cancel entries & invoices.
     'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate': '001101250473177981989',
-
-
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_chart/__openerp__.py

@@ -36,6 +36,5 @@ Deactivates minimal chart of accounts.
     'data': [],
     'demo': [],
     'installable': True,
-    'certificate': '0073332443901',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_check_writing/i18n/es_EC.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-12 04:36+0000\n"
-"X-Generator: Launchpad (build 15930)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:39+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0

addons/account_followup/__init__.py

@@ -23,4 +23,4 @@ import account_followup
 import wizard
 import report
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_followup/__openerp__.py

@@ -64,7 +64,6 @@ Note that if you want to check the follow-up level for a given partner/account e
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '0072481076453',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_followup/wizard/__init__.py

@@ -21,4 +21,4 @@
 
 import account_followup_print
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_followup/wizard/account_followup_print.py

@@ -209,7 +209,7 @@ class account_followup_print_all(osv.osv_memory):
                 to_update[str(id)]= {'level': fups[followup_line_id][1], 'partner_id': stat_line_id}
         return {'partner_ids': partner_list, 'to_update': to_update}
 
-    def do_mail(self ,cr, uid, ids, context=None):
+    def do_mail(self, cr, uid, ids, context=None):
         mod_obj = self.pool.get('ir.model.data')
         move_obj = self.pool.get('account.move.line')
         user_obj = self.pool.get('res.users')

addons/account_payment/__init__.py

@@ -29,4 +29,4 @@ import account_move_line
 import account_invoice
 import report
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_payment/__openerp__.py

@@ -65,6 +65,5 @@ have a new option to import payment orders as bank statement lines.
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '0061703998541',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_payment/account_invoice.py

@@ -50,4 +50,4 @@ class Invoice(osv.osv):
 
 Invoice()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_payment/account_move_line.py

@@ -26,7 +26,7 @@ from tools.translate import _
 class account_move_line(osv.osv):
     _inherit = "account.move.line"
 
-    def amount_to_pay(self, cr, uid, ids, name, arg={}, context=None):
+    def amount_to_pay(self, cr, uid, ids, name, arg=None, context=None):
         """ Return the amount still to pay regarding all the payemnt orders
         (excepting cancelled orders)"""
         if not ids:
@@ -117,4 +117,4 @@ class account_move_line(osv.osv):
 
 account_move_line()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_payment/account_payment.py

@@ -139,7 +139,9 @@ class payment_order(osv.osv):
         wf_service.trg_validate(uid, 'payment.order', ids[0], 'done', cr)
         return True
 
-    def copy(self, cr, uid, id, default={}, context=None):
+    def copy(self, cr, uid, id, default=None, context=None):
+        if default is None:
+            default = {}
         default.update({
             'state': 'draft',
             'line_ids': [],

addons/account_payment/report/__init__.py

@@ -20,4 +20,4 @@
 ##############################################################################
 
 import payment_order
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_payment/report/payment_order.py

@@ -77,7 +77,7 @@ class payment_order(report_sxw.rml_parse):
         user = pool.get('res.users').browse(self.cr, self.uid, self.uid)
         return user.company_id and user.company_id.currency_id and user.company_id.currency_id.symbol or False
 
-    def _get_account_name(self,bank_id):
+    def _get_account_name(self, bank_id):
         if bank_id:
             pool = pooler.get_pool(self.cr.dbname)
             value_name = pool.get('res.partner.bank').name_get(self.cr, self.uid, [bank_id])
@@ -87,4 +87,4 @@ class payment_order(report_sxw.rml_parse):
 
 report_sxw.report_sxw('report.payment.order', 'payment.order', 'addons/account_payment/report/payment_order.rml', parser=payment_order, header="external")
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_payment/wizard/__init__.py

@@ -23,4 +23,4 @@ import account_payment_order
 import account_payment_populate_statement
 import account_payment_pay
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_payment/wizard/account_payment_order.py

@@ -88,7 +88,7 @@ class payment_order_create(osv.osv_memory):
                     'partner_id': line.partner_id and line.partner_id.id or False,
                     'communication': line.ref or '/',
                     'date': date_to_pay,
-                    'currency': line.invoice and line.invoice.currency_id.id or False,
+                    'currency': (line.invoice and line.invoice.currency_id.id) or line.journal_id.currency.id or line.journal_id.company_id.currency_id.id,
                 }, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
@@ -120,4 +120,4 @@ class payment_order_create(osv.osv_memory):
 
 payment_order_create()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_payment/wizard/account_payment_pay.py

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

addons/account_payment/wizard/account_payment_populate_statement.py

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

addons/account_sequence/__init__.py

@@ -22,4 +22,4 @@
 import account_sequence
 import account_sequence_installer
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_sequence/__openerp__.py

@@ -49,7 +49,6 @@ You can customize the following attributes of the sequence:
     'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate': '00475376442024623469',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_sequence/i18n/el.po

@@ -0,0 +1,214 @@
+# Greek translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-09-15 17:55+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Greek <el@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: 2012-09-16 04:39+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+#: model:ir.actions.act_window,name:account_sequence.action_account_seq_installer
+msgid "Account Sequence Application Configuration"
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move:0
+msgid ""
+"You can not create more than one move per period on centralized journal"
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "Company must be the same for its related account and period."
+msgstr ""
+"Η εταιρία πρέπει να είναι ίδια για τους σχετικούς λογαριασμούς και περίοδο"
+
+#. module: account_sequence
+#: help:account.move,internal_sequence_number:0
+#: help:account.move.line,internal_sequence_number:0
+msgid "Internal Sequence Number"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.sequence.installer,number_next:0
+msgid "Next number of this sequence"
+msgstr "Επόμενος αριθμός αυτής της ακολουθίας"
+
+#. module: account_sequence
+#: field:account.sequence.installer,number_next:0
+msgid "Next Number"
+msgstr "Επόμενος Αριθμός"
+
+#. module: account_sequence
+#: field:account.sequence.installer,number_increment:0
+msgid "Increment Number"
+msgstr "Αριθμός Προσαύξησης"
+
+#. module: account_sequence
+#: help:account.sequence.installer,number_increment:0
+msgid "The next number of the sequence will be incremented by this number"
+msgstr ""
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure Your Account Sequence Application"
+msgstr ""
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.sequence.installer,suffix:0
+msgid "Suffix value of the record for the sequence"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.journal,internal_sequence_id:0
+msgid ""
+"This sequence will be used to maintain the internal number for the journal "
+"entries related to this journal."
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,padding:0
+msgid "Number padding"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_move_line
+msgid "Journal Items"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.move,internal_sequence_number:0
+#: field:account.move.line,internal_sequence_number:0
+msgid "Internal Number"
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "You can not create journal items on an account of type view."
+msgstr ""
+
+#. module: account_sequence
+#: help:account.sequence.installer,padding:0
+msgid ""
+"OpenERP will automatically adds some '0' on the left of the 'Next Number' to "
+"get the required padding size."
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,name:0
+msgid "Name"
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "You can not create journal items on closed account."
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr ""
+
+#. module: account_sequence
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.journal,internal_sequence_id:0
+msgid "Internal Sequence"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.sequence.installer,prefix:0
+msgid "Prefix value of the record for the sequence"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_move
+msgid "Account Entry"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,suffix:0
+msgid "Suffix"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "title"
+msgstr ""
+
+#. module: account_sequence
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid ""
+"The selected account of your Journal Entry forces to provide a secondary "
+"currency. You should remove the secondary currency on the account or select "
+"a multi-currency view on the journal."
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid ""
+"The date of your Journal Entry is not in the defined period! You should "
+"change the date or remove this constraint from the journal."
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,prefix:0
+msgid "Prefix"
+msgstr ""
+
+#. module: account_sequence
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_sequence_installer
+msgid "account.sequence.installer"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_journal
+msgid "Journal"
+msgstr ""
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "You can enhance the Account Sequence Application by installing ."
+msgstr ""