Merge lp:~openerp-dev/openobject-addons/trunk-bug-740134-skh into lp:openobject-addons/6.0

[Moisés López - http://www.vauxoo.com]

=== modified file 'account/__openerp__.py'
--- account/__openerp__.py	2011-01-14 00:11:01 +0000
+++ account/__openerp__.py	2011-11-22 19:28:30 +0000
@@ -22,26 +22,35 @@
     "name" : "Accounting and Financial Management",
     "version" : "1.1",
     "author" : "OpenERP SA",
-    "category": 'Generic Modules/Accounting',
-    "description": """Financial and accounting module that covers:
-    General accountings
-    Cost / Analytic accounting
-    Third party accounting
-    Taxes management
-    Budgets
-    Customer and Supplier Invoices
-    Bank statements
-    Reconciliation process by partner
-    Creates a dashboard for accountants that includes:
-    * List of uninvoiced quotations
-    * Graph of aged receivables
-    * Graph of aged incomes
+    "category": 'Finance',
+    "description": """
+Accounting and Financial Management.
+====================================
+
+Financial and accounting module that covers:
+--------------------------------------------
+General accountings
+Cost / Analytic accounting
+Third party accounting
+Taxes management
+Budgets
+Customer and Supplier Invoices
+Bank statements
+Reconciliation process by partner
+
+Creates a dashboard for accountants that includes:
+--------------------------------------------------
+* List of Customer Invoice to Approve
+* Company Analysis
+* Graph of Aged Receivables
+* Graph of Treasury
 
 The processes like maintaining of general ledger is done through the defined financial Journals (entry move line or
 grouping is maintained through journal) for a particular financial year and for preparation of vouchers there is a
 module named account_voucher.
     """,
     'website': 'http://www.openerp.com',
+    'images' : ['images/accounts.jpeg','images/bank_statement.jpeg','images/cash_register.jpeg','images/chart_of_accounts.jpeg','images/customer_invoice.jpeg','images/journal_entries.jpeg'],
     'init_xml': [],
     "depends" : ["product", "analytic", "process","board"],
     'update_xml': [
@@ -133,7 +142,7 @@
         'test/account_bank_statement.yml',
         'test/account_cash_statement.yml',
         'test/account_report.yml',
-        
+
 
             ],
     'installable': True,

=== modified file 'account/account.py'
--- account/account.py	2011-10-24 12:22:19 +0000
+++ account/account.py	2011-11-22 19:28:30 +0000
@@ -333,7 +333,7 @@
         return result
 
     def _get_level(self, cr, uid, ids, field_name, arg, context=None):
-        res={}
+        res = {}
         accounts = self.browse(cr, uid, ids, context=context)
         for account in accounts:
             level = 0
@@ -395,7 +395,7 @@
         'reconcile': False,
         'active': True,
         'currency_mode': 'current',
-        'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'account.account', context=c),
+        'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'account.account', context=c),
     }
 
     def _check_recursion(self, cr, uid, ids, context=None):
@@ -474,7 +474,7 @@
         for record in reads:
             name = record['name']
             if record['code']:
-                name = record['code'] + ' '+name
+                name = record['code'] + ' ' + name
             res.append((record['id'], name))
         return res
 
@@ -606,7 +606,6 @@
                                  " Select 'Cash' to be used at the time of making payment."\
                                  " Select 'General' for miscellaneous operations."\
                                  " Select 'Opening/Closing Situation' to be used at the time of new fiscal year creation or end of year entries generation."),
-        'refund_journal': fields.boolean('Refund Journal', help='Fill this if the journal is to be used for refunds of invoices.'),
         'type_control_ids': fields.many2many('account.account.type', 'account_journal_type_rel', 'journal_id','type_id', 'Type Controls', domain=[('code','<>','view'), ('code', '<>', 'closed')]),
         'account_control_ids': fields.many2many('account.account', 'account_account_type_rel', 'journal_id','account_id', 'Account', domain=[('type','<>','view'), ('type', '<>', 'closed')]),
         'view_id': fields.many2one('account.journal.view', 'Display Mode', required=True, help="Gives the view used when writing or browsing entries in this journal. The view tells OpenERP which fields should be visible, required or readonly and in which order. You can create your own view for a faster encoding in each journal."),
@@ -642,6 +641,7 @@
         default = default.copy()
         default['code'] = (journal['code'] or '') + '(copy)'
         default['name'] = (journal['name'] or '') + '(copy)'
+        default['sequence_id'] = False
         return super(account_journal, self).copy(cr, uid, id, default, context=context)
 
     def write(self, cr, uid, ids, vals, context=None):
@@ -739,9 +739,7 @@
         }
 
         res = {}
-
         view_id = type_map.get(type, 'account_journal_view')
-
         user = user_pool.browse(cr, uid, uid)
         if type in ('cash', 'bank') and currency and user.company_id.currency_id.id != currency:
             view_id = 'account_journal_bank_view_multi'
@@ -752,7 +750,6 @@
             'centralisation':type == 'situation',
             'view_id':data.res_id,
         })
-
         return {
             'value':res
         }
@@ -802,19 +799,28 @@
         (_check_fiscal_year, 'Error! You cannot define overlapping fiscal years',['date_start', 'date_stop'])
     ]
 
-    def create_period3(self,cr, uid, ids, context=None):
+    def create_period3(self, cr, uid, ids, context=None):
         return self.create_period(cr, uid, ids, context, 3)
 
-    def create_period(self,cr, uid, ids, context=None, interval=1):
+    def create_period(self, cr, uid, ids, context=None, interval=1):
+        period_obj = self.pool.get('account.period')
         for fy in self.browse(cr, uid, ids, context=context):
             ds = datetime.strptime(fy.date_start, '%Y-%m-%d')
-            while ds.strftime('%Y-%m-%d')<fy.date_stop:
+            period_obj.create(cr, uid, {
+                    'name': _('Opening Period'),
+                    'code': ds.strftime('00/%Y'),
+                    'date_start': ds,
+                    'date_stop': ds,
+                    'special': True,
+                    'fiscalyear_id': fy.id,
+                })
+            while ds.strftime('%Y-%m-%d') < fy.date_stop:
                 de = ds + relativedelta(months=interval, days=-1)
 
-                if de.strftime('%Y-%m-%d')>fy.date_stop:
+                if de.strftime('%Y-%m-%d') > fy.date_stop:
                     de = datetime.strptime(fy.date_stop, '%Y-%m-%d')
 
-                self.pool.get('account.period').create(cr, uid, {
+                period_obj.create(cr, uid, {
                     'name': ds.strftime('%m/%Y'),
                     'code': ds.strftime('%m/%Y'),
                     'date_start': ds.strftime('%Y-%m-%d'),
@@ -999,7 +1005,7 @@
         return super(account_journal_period, self).write(cr, uid, ids, vals, context=context)
 
     def create(self, cr, uid, vals, context=None):
-        period_id=vals.get('period_id',False)
+        period_id = vals.get('period_id',False)
         if period_id:
             period = self.pool.get('account.period').browse(cr, uid, period_id, context=context)
             vals['state']=period.state
@@ -1119,9 +1125,8 @@
             res_ids = set(id[0] for id in cr.fetchall())
             ids = ids and (ids & res_ids) or res_ids
         if ids:
-            return [('id','in',tuple(ids))]
-        else:
-            return [('id', '=', '0')]
+            return [('id', 'in', tuple(ids))]
+        return [('id', '=', '0')]
 
     _columns = {
         'name': fields.char('Number', size=64, required=True),
@@ -1205,7 +1210,6 @@
                    'SET state=%s '\
                    'WHERE id IN %s',
                    ('posted', tuple(valid_moves),))
-
         return True
 
     def button_validate(self, cursor, user, ids, context=None):
@@ -1555,7 +1559,6 @@
                 result.append((r.id,r.name))
         return result
 
-
 account_move_reconcile()
 
 #----------------------------------------------------------
@@ -1868,7 +1871,6 @@
         obj_partener_address = self.pool.get('res.partner.address')
         for tax in taxes:
             # we compute the amount for the current tax object and append it to the result
-
             data = {'id':tax.id,
                     'name':tax.description and tax.description + " - " + tax.name or tax.name,
                     'account_collected_id':tax.account_collected_id.id,
@@ -1950,7 +1952,7 @@
             totalex -= r.get('amount', 0.0)
         totlex_qty = 0.0
         try:
-            totlex_qty=totalex/quantity
+            totlex_qty = totalex/quantity
         except:
             pass
         tex = self._compute(cr, uid, tex, totlex_qty, quantity, address_id=address_id, product=product, partner=partner)
@@ -2084,6 +2086,7 @@
                 r['amount'] = round(r['amount'] * quantity, prec)
                 total += r['amount']
         return res
+
 account_tax()
 
 # ---------------------------------------------------------
@@ -2212,13 +2215,11 @@
         'name': fields.char('Name', size=64, required=True),
         'ref': fields.char('Reference', size=16),
         'model_id': fields.many2one('account.model', 'Model', required=True),
-
         'date_start': fields.date('Start Date', required=True),
         'period_total': fields.integer('Number of Periods', required=True),
         'period_nbr': fields.integer('Period', required=True),
         'period_type': fields.selection([('day','days'),('month','month'),('year','year')], 'Period Type', required=True),
         'state': fields.selection([('draft','Draft'),('running','Running'),('done','Done')], 'State', required=True, readonly=True),
-
         'lines_id': fields.one2many('account.subscription.line', 'subscription_id', 'Subscription Lines')
     }
     _defaults = {
@@ -2273,6 +2274,7 @@
                     ds = (datetime.strptime(ds, '%Y-%m-%d') + relativedelta(years=sub.period_nbr)).strftime('%Y-%m-%d')
         self.write(cr, uid, ids, {'state':'running'})
         return True
+
 account_subscription()
 
 class account_subscription_line(osv.osv):
@@ -2301,6 +2303,7 @@
         return all_moves
 
     _rec_name = 'date'
+
 account_subscription_line()
 
 #  ---------------------------------------------------------------
@@ -2387,9 +2390,9 @@
     _name = 'account.addtmpl.wizard'
 
     def _get_def_cparent(self, cr, uid, context=None):
-        acc_obj=self.pool.get('account.account')
-        tmpl_obj=self.pool.get('account.account.template')
-        tids=tmpl_obj.read(cr, uid, [context['tmpl_ids']], ['parent_id'])
+        acc_obj = self.pool.get('account.account')
+        tmpl_obj = self.pool.get('account.account.template')
+        tids = tmpl_obj.read(cr, uid, [context['tmpl_ids']], ['parent_id'])
         if not tids or not tids[0]['parent_id']:
             return False
         ptids = tmpl_obj.read(cr, uid, [tids[0]['parent_id'][0]], ['code'])
@@ -2397,7 +2400,6 @@
         if not ptids or not ptids[0]['code']:
             raise osv.except_osv(_('Error !'), _('Cannot locate parent code for template account!'))
             res = acc_obj.search(cr, uid, [('code','=',ptids[0]['code'])])
-
         return res and res[0] or False
 
     _columns = {
@@ -2490,6 +2492,8 @@
         'property_account_expense': fields.many2one('account.account.template','Expense Account on Product Template'),
         'property_account_income': fields.many2one('account.account.template','Income Account on Product Template'),
         'property_reserve_and_surplus_account': fields.many2one('account.account.template', 'Reserve and Profit/Loss Account', domain=[('type', '=', 'payable')], help='This Account is used for transferring Profit/Loss(If It is Profit: Amount will be added, Loss: Amount will be deducted.), Which is calculated from Profilt & Loss Report'),
+        'property_account_income_opening': fields.many2one('account.account.template','Opening Entries Income Account'),
+        'property_account_expense_opening': fields.many2one('account.account.template','Opening Entries Expense Account'),
     }
 
 account_chart_template()
@@ -2567,7 +2571,6 @@
     }
     _order = 'sequence'
 
-
 account_tax_template()
 
 # Fiscal Position Templates
@@ -2643,10 +2646,12 @@
         res['value']["sale_tax"] = False
         res['value']["purchase_tax"] = False
         if chart_template_id:
+            # default tax is given by the lowesst sequence. For same sequence we will take the latest created as it will be the case for tax created while isntalling the generic chart of account
             sale_tax_ids = self.pool.get('account.tax.template').search(cr, uid, [("chart_template_id"
-                                          , "=", chart_template_id), ('type_tax_use', 'in', ('sale','all'))], order="sequence")
+                                          , "=", chart_template_id), ('type_tax_use', 'in', ('sale','all'))], order="sequence, id desc")
             purchase_tax_ids = self.pool.get('account.tax.template').search(cr, uid, [("chart_template_id"
-                                          , "=", chart_template_id), ('type_tax_use', 'in', ('purchase','all'))], order="sequence")
+                                          , "=", chart_template_id), ('type_tax_use', 'in', ('purchase','all'))], order="sequence, id desc")
+
             res['value']["sale_tax"] = sale_tax_ids and sale_tax_ids[0] or False
             res['value']["purchase_tax"] = purchase_tax_ids and purchase_tax_ids[0] or False
         return res
@@ -2676,10 +2681,9 @@
         return False
 
     def _get_default_accounts(self, cr, uid, context=None):
-        accounts = [{'acc_name':'Current','account_type':'bank'},
-                    {'acc_name':'Deposit','account_type':'bank'},
-                    {'acc_name':'Cash','account_type':'cash'}]
-        return accounts
+        return [{'acc_name': _('Current'),'account_type':'bank'},
+                    {'acc_name': _('Deposit'),'account_type':'bank'},
+                    {'acc_name': _('Cash'),'account_type':'cash'}]
 
     _defaults = {
         'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, [uid], c)[0].company_id.id,
@@ -2722,6 +2726,10 @@
         obj_data = self.pool.get('ir.model.data')
         analytic_journal_obj = self.pool.get('account.analytic.journal')
         obj_tax_code = self.pool.get('account.tax.code')
+        obj_tax_code_template = self.pool.get('account.tax.code.template')
+        obj_acc_journal_view = self.pool.get('account.journal.view')
+        ir_values = self.pool.get('ir.values')
+        obj_product = self.pool.get('product.product')
         # Creating Account
         obj_acc_root = obj_multi.chart_template_id.account_root_id
         tax_code_root_id = obj_multi.chart_template_id.tax_code_root_id.id
@@ -2734,10 +2742,10 @@
         todo_dict = {}
 
         #create all the tax code
-        children_tax_code_template = self.pool.get('account.tax.code.template').search(cr, uid, [('parent_id','child_of',[tax_code_root_id])], order='id')
+        children_tax_code_template = obj_tax_code_template.search(cr, uid, [('parent_id','child_of',[tax_code_root_id])], order='id')
         children_tax_code_template.sort()
-        for tax_code_template in self.pool.get('account.tax.code.template').browse(cr, uid, children_tax_code_template, context=context):
-            vals={
+        for tax_code_template in obj_tax_code_template.browse(cr, uid, children_tax_code_template, context=context):
+            vals = {
                 'name': (tax_code_root_id == tax_code_template.id) and obj_multi.company_id.name or tax_code_template.name,
                 'code': tax_code_template.code,
                 'info': tax_code_template.info,
@@ -2787,14 +2795,13 @@
                 'account_paid_id': tax.account_paid_id and tax.account_paid_id.id or False,
             }
             tax_template_ref[tax.id] = new_tax
-
         #deactivate the parent_store functionnality on account_account for rapidity purpose
         ctx = context and context.copy() or {}
         ctx['defer_parent_store_computation'] = True
 
         children_acc_template = obj_acc_template.search(cr, uid, [('parent_id','child_of',[obj_acc_root.id]),('nocreate','!=',True)])
         children_acc_template.sort()
-        for account_template in obj_acc_template.browse(cr, uid, children_acc_template,context=context):
+        for account_template in obj_acc_template.browse(cr, uid, children_acc_template, context=context):
             tax_ids = []
             for tax in account_template.tax_ids:
                 tax_ids.append(tax_template_ref[tax.id])
@@ -2820,8 +2827,10 @@
             }
             new_account = obj_acc.create(cr, uid, vals, context=ctx)
             acc_template_ref[account_template.id] = new_account
+
+
         #reactivate the parent_store functionnality on account_account
-        self.pool.get('account.account')._parent_store_compute(cr)
+        obj_acc._parent_store_compute(cr)
 
         for key,value in todo_dict.items():
             if value['account_collected_id'] or value['account_paid_id']:
@@ -2830,41 +2839,23 @@
                     'account_paid_id': acc_template_ref.get(value['account_paid_id'], False),
                 })
 
-        # Creating Journals Sales and Purchase
-        vals_journal={}
+        # Creating Journals
         data_id = obj_data.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_sp_journal_view')])
         data = obj_data.browse(cr, uid, data_id[0], context=context)
         view_id = data.res_id
 
-        seq_id = obj_sequence.search(cr, uid, [('name','=','Account Journal')])[0]
-
-        if obj_multi.seq_journal:
-            seq_id_sale = obj_sequence.search(cr, uid, [('name','=','Sale Journal')])[0]
-            seq_id_purchase = obj_sequence.search(cr, uid, [('name','=','Purchase Journal')])[0]
-            seq_id_sale_refund = obj_sequence.search(cr, uid, [('name','=','Sales Refund Journal')])
-            if seq_id_sale_refund:
-                seq_id_sale_refund = seq_id_sale_refund[0]
-            seq_id_purchase_refund = obj_sequence.search(cr, uid, [('name','=','Purchase Refund Journal')])
-            if seq_id_purchase_refund:
-                seq_id_purchase_refund = seq_id_purchase_refund[0]
-        else:
-            seq_id_sale = seq_id
-            seq_id_purchase = seq_id
-            seq_id_sale_refund = seq_id
-            seq_id_purchase_refund = seq_id
-
-        vals_journal['view_id'] = view_id
-
         #Sales Journal
-        analitical_sale_ids = analytic_journal_obj.search(cr,uid,[('type','=','sale')])
-        analitical_journal_sale = analitical_sale_ids and analitical_sale_ids[0] or False
+        analytical_sale_ids = analytic_journal_obj.search(cr,uid,[('type','=','sale')])
+        analytical_journal_sale = analytical_sale_ids and analytical_sale_ids[0] or False
 
-        vals_journal['name'] = _('Sales Journal')
-        vals_journal['type'] = 'sale'
-        vals_journal['code'] = _('SAJ')
-        vals_journal['sequence_id'] = seq_id_sale
-        vals_journal['company_id'] =  company_id
-        vals_journal['analytic_journal_id'] = analitical_journal_sale
+        vals_journal = {
+            'name': _('Sales Journal'),
+            'type': 'sale',
+            'code': _('SAJ'),
+            'view_id': view_id,
+            'company_id': company_id,
+            'analytic_journal_id': analytical_journal_sale,
+        }
 
         if obj_multi.chart_template_id.property_account_receivable:
             vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_income_categ.id]
@@ -2873,38 +2864,35 @@
         obj_journal.create(cr,uid,vals_journal)
 
         # Purchase Journal
-        analitical_purchase_ids = analytic_journal_obj.search(cr,uid,[('type','=','purchase')])
-        analitical_journal_purchase = analitical_purchase_ids and analitical_purchase_ids[0] or False
+        analytical_purchase_ids = analytic_journal_obj.search(cr,uid,[('type','=','purchase')])
+        analytical_journal_purchase = analytical_purchase_ids and analytical_purchase_ids[0] or False
 
-        vals_journal['name'] = _('Purchase Journal')
-        vals_journal['type'] = 'purchase'
-        vals_journal['code'] = _('EXJ')
-        vals_journal['sequence_id'] = seq_id_purchase
-        vals_journal['view_id'] = view_id
-        vals_journal['company_id'] =  company_id
-        vals_journal['analytic_journal_id'] = analitical_journal_purchase
+        vals_journal = {
+            'name': _('Purchase Journal'),
+            'type': 'purchase',
+            'code': _('EXJ'),
+            'view_id': view_id,
+            'company_id':  company_id,
+            'analytic_journal_id': analytical_journal_purchase,
+        }
 
         if obj_multi.chart_template_id.property_account_payable:
             vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_expense_categ.id]
             vals_journal['default_debit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_expense_categ.id]
-
         obj_journal.create(cr,uid,vals_journal)
 
         # Creating Journals Sales Refund and Purchase Refund
-        vals_journal = {}
         data_id = obj_data.search(cr, uid, [('model', '=', 'account.journal.view'), ('name', '=', 'account_sp_refund_journal_view')], context=context)
         data = obj_data.browse(cr, uid, data_id[0], context=context)
         view_id = data.res_id
 
         #Sales Refund Journal
         vals_journal = {
-            'view_id': view_id,
             'name': _('Sales Refund Journal'),
             'type': 'sale_refund',
-            'refund_journal': True,
             'code': _('SCNJ'),
-            'sequence_id': seq_id_sale_refund,
-            'analytic_journal_id': analitical_journal_sale,
+            'view_id': view_id,
+            'analytic_journal_id': analytical_journal_sale,
             'company_id': company_id
         }
 
@@ -2912,23 +2900,15 @@
             vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_income_categ.id]
             vals_journal['default_debit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_income_categ.id]
 
-
-#        if obj_multi.property_account_receivable:
-#            vals_journal.update({
-#                'default_credit_account_id': acc_template_ref[obj_multi.chart_template_id.property_account_income_categ.id],
-#                'default_debit_account_id': acc_template_ref[obj_multi.chart_template_id.property_account_income_categ.id]
-#            })
         obj_journal.create(cr, uid, vals_journal, context=context)
 
         # Purchase Refund Journal
         vals_journal = {
-            'view_id': view_id,
             'name': _('Purchase Refund Journal'),
             'type': 'purchase_refund',
-            'refund_journal': True,
             'code': _('ECNJ'),
-            'sequence_id': seq_id_purchase_refund,
-            'analytic_journal_id': analitical_journal_purchase,
+            'view_id': view_id,
+            'analytic_journal_id': analytical_journal_purchase,
             'company_id': company_id
         }
 
@@ -2936,13 +2916,40 @@
             vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_expense_categ.id]
             vals_journal['default_debit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_expense_categ.id]
 
-
-#        if obj_multi.property_account_payable:
-#            vals_journal.update({
-#                'default_credit_account_id': acc_template_ref[obj_multi.property_account_expense_categ.id],
-#                'default_debit_account_id': acc_template_ref[obj_multi.property_account_expense_categ.id]
-#            })
-        obj_journal.create(cr, uid, vals_journal, context=context)
+        obj_journal.create(cr, uid, vals_journal, context=context)
+
+        # Miscellaneous Journal
+        data_id = obj_data.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_view')])
+        data = obj_data.browse(cr, uid, data_id[0], context=context)
+        view_id = data.res_id
+
+        analytical_miscellaneous_ids = analytic_journal_obj.search(cr, uid, [('type', '=', 'situation')], context=context)
+        analytical_journal_miscellaneous = analytical_miscellaneous_ids and analytical_miscellaneous_ids[0] or False
+
+        vals_journal = {
+            'name': _('Miscellaneous Journal'),
+            'type': 'general',
+            'code': _('MISC'),
+            'view_id': view_id,
+            'analytic_journal_id': analytical_journal_miscellaneous,
+            'company_id': company_id
+        }
+
+        obj_journal.create(cr, uid, vals_journal, context=context)
+
+        # Opening Entries Journal
+        if obj_multi.chart_template_id.property_account_income_opening and obj_multi.chart_template_id.property_account_expense_opening:
+            vals_journal = {
+                'name': _('Opening Entries Journal'),
+                'type': 'situation',
+                'code': _('OPEJ'),
+                'view_id': view_id,
+                'company_id': company_id,
+                'centralisation': True,
+                'default_credit_account_id': acc_template_ref[obj_multi.chart_template_id.property_account_income_opening.id],
+                'default_debit_account_id': acc_template_ref[obj_multi.chart_template_id.property_account_expense_opening.id]
+                }
+            obj_journal.create(cr, uid, vals_journal, context=context)
 
         # Bank Journals
         data_id = obj_data.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_bank_view')])
@@ -2976,14 +2983,8 @@
             }
             acc_cash_id  = obj_acc.create(cr,uid,vals)
 
-            if obj_multi.seq_journal:
-                vals_seq={
-                    'name': _('Bank Journal ') + vals['name'],
-                    'code': 'account.journal',
-                }
-                seq_id = obj_sequence.create(cr,uid,vals_seq)
-
             #create the bank journal
+<<<<<<< TREE
             analitical_bank_ids = analytic_journal_obj.search(cr,uid,[('type','=','situation')])
             analitical_journal_bank = analitical_bank_ids and analitical_bank_ids[0] or False
 
@@ -2995,6 +2996,18 @@
             vals_journal['company_id'] =  company_id
             vals_journal['analytic_journal_id'] = analitical_journal_bank
 
+=======
+            analytical_bank_ids = analytic_journal_obj.search(cr,uid,[('type','=','situation')])
+            analytical_journal_bank = analytical_bank_ids and analytical_bank_ids[0] or False
+            vals_journal = {
+                'name': vals['name'],
+                'code': _('BNK') + str(current_num),
+                'type': line.account_type == 'cash' and 'cash' or 'bank',
+                'company_id': company_id,
+                'analytic_journal_id': False,
+                'currency_id': False,
+            }
+>>>>>>> MERGE-SOURCE
             if line.currency_id:
                 vals_journal['view_id'] = view_id_cur
                 vals_journal['currency'] = line.currency_id.id
@@ -3027,7 +3040,7 @@
                 'name': record[0],
                 'company_id': company_id,
                 'fields_id': field[0],
-                'value': account and 'account.account,'+str(acc_template_ref[account.id]) or False,
+                'value': account and 'account.account,' + str(acc_template_ref[account.id]) or False,
             }
 
             if r:
@@ -3040,7 +3053,6 @@
         fp_ids = obj_fiscal_position_template.search(cr, uid, [('chart_template_id', '=', obj_multi.chart_template_id.id)])
 
         if fp_ids:
-
             obj_tax_fp = self.pool.get('account.fiscal.position.tax')
             obj_ac_fp = self.pool.get('account.fiscal.position.account')
 
@@ -3068,7 +3080,6 @@
                     }
                     obj_ac_fp.create(cr, uid, vals_acc)
 
-        ir_values = self.pool.get('ir.values')
         if obj_multi.sale_tax:
             ir_values.set(cr, uid, key='default', key2=False, name="taxes_id", company=obj_multi.company_id.id,
                             models =[('product.product',False)], value=[tax_template_to_tax[obj_multi.sale_tax.id]])
@@ -3079,16 +3090,13 @@
 wizard_multi_charts_accounts()
 
 class account_bank_accounts_wizard(osv.osv_memory):
-    _name = 'account.bank.accounts.wizard'
+    _name='account.bank.accounts.wizard'
 
     _columns = {
         'acc_name': fields.char('Account Name.', size=64, required=True),
         'bank_account_id': fields.many2one('wizard.multi.charts.accounts', 'Bank Account', required=True),
-        'currency_id': fields.many2one('res.currency', 'Currency'),
-        'account_type': fields.selection([('cash','Cash'),('check','Check'),('bank','Bank')], 'Type', size=32),
-    }
-    _defaults = {
-        'currency_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.currency_id.id,
+        'currency_id': fields.many2one('res.currency', 'Secondary Currency', help="Forces all moves for this account to have this secondary currency."),
+        'account_type': fields.selection([('cash','Cash'), ('check','Check'), ('bank','Bank')], 'Account Type', size=32),
     }
 
 account_bank_accounts_wizard()

=== modified file 'account/account_analytic_line.py'
--- account/account_analytic_line.py	2011-06-27 11:10:00 +0000
+++ account/account_analytic_line.py	2011-11-22 19:28:30 +0000
@@ -80,7 +80,10 @@
         j_id = analytic_journal_obj.browse(cr, uid, journal_id, context=context)
         prod = product_obj.browse(cr, uid, prod_id, context=context)
         result = 0.0
-
+        if prod_id:
+            unit = prod.uom_id.id
+            if j_id.type == 'purchase':
+                unit = prod.uom_po_id.id
         if j_id.type <> 'sale':
             a = prod.product_tmpl_id.property_account_expense.id
             if not a:
@@ -127,6 +130,7 @@
         return {'value': {
             'amount': result,
             'general_account_id': a,
+            'product_uom_id': unit
             }
         }
 
@@ -155,4 +159,4 @@
 
 res_partner()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'account/account_bank_statement.py'
--- account/account_bank_statement.py	2011-09-27 12:34:47 +0000
+++ account/account_bank_statement.py	2011-11-22 19:28:30 +0000
@@ -303,8 +303,7 @@
         st = self.browse(cr, uid, st_id, context=context)
         if not (abs((st.balance_end or 0.0) - st.balance_end_real) < 0.0001):
             raise osv.except_osv(_('Error !'),
-                    _('The statement balance is incorrect !\n') +
-                    _('The expected balance (%.2f) is different than the computed one. (%.2f)') % (st.balance_end_real, st.balance_end))
+                    _('The statement balance is incorrect !\nThe expected balance (%.2f) is different than the computed one. (%.2f)') % (st.balance_end_real, st.balance_end))
         return True
 
     def statement_close(self, cr, uid, ids, journal_type='bank', context=None):
@@ -314,7 +313,6 @@
         return state=='draft'
 
     def button_confirm_bank(self, cr, uid, ids, context=None):
-        done = []
         obj_seq = self.pool.get('ir.sequence')
         if context is None:
             context = {}
@@ -355,7 +353,6 @@
 
             self.write(cr, uid, [st.id], {'name': st_number}, context=context)
             self.log(cr, uid, st.id, _('Statement %s is confirmed, journal items are created.') % (st_number,))
-            done.append(st.id)
         return self.write(cr, uid, ids, {'state':'confirm'}, context=context)
 
     def button_cancel(self, cr, uid, ids, context=None):
@@ -463,7 +460,7 @@
             select=True, required=True, ondelete='cascade'),
         'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account'),
         'move_ids': fields.many2many('account.move',
-            'account_bank_statement_line_move_rel', 'move_id','statement_id',
+            'account_bank_statement_line_move_rel', 'statement_id','move_id',
             'Moves'),
         'ref': fields.char('Reference', size=32),
         'note': fields.text('Notes'),

=== modified file 'account/account_installer.xml'
--- account/account_installer.xml	2011-01-14 00:11:01 +0000
+++ account/account_installer.xml	2011-11-22 19:28:30 +0000
@@ -37,21 +37,6 @@
                                 <field name="sale_tax" on_change="on_change_tax(sale_tax)" attrs="{'required':[('charts','=','configurable')]}"/>
                                 <field name="purchase_tax" groups="base.group_extended"/>
                             </group>
-                            <group colspan="4" attrs="{'invisible':[('charts','!=','configurable')]}">
-                                <separator col="4" colspan="4" string="Bank and Cash Accounts"/>
-                                <field colspan="4" mode="tree" height="200" name="bank_accounts_id" nolabel="1" widget="one2many_list">
-                                    <form string="">
-                                        <field name="acc_name"/>
-                                        <field name="account_type"/>
-                                        <field name="currency_id" widget="selection" groups="base.group_extended"/>
-                                    </form>
-                                    <tree editable="bottom" string="Your bank and cash accounts">
-                                        <field name="acc_name"/>
-                                        <field name="account_type"/>
-                                        <field name="currency_id" widget="selection" groups="base.group_extended"/>
-                                    </tree>
-                                </field>
-                            </group>
                         </group>
                     </group>
                 </data>

=== modified file 'account/account_invoice_view.xml'
--- account/account_invoice_view.xml	2011-01-20 14:02:14 +0000
+++ account/account_invoice_view.xml	2011-11-22 19:28:30 +0000
@@ -172,7 +172,7 @@
                             <field name="reference" nolabel="1"/>
                             <field name="date_due"/>
                             <field name="check_total" required="2"/>
-                            <field colspan="4" default_get="{'check_total': check_total, 'invoice_line': invoice_line, 'address_invoice_id': address_invoice_id, 'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False}" name="invoice_line" nolabel="1">
+                            <field colspan="4" default_get="{'check_total': check_total, 'invoice_line': invoice_line, 'address_invoice_id': address_invoice_id, 'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False}" name="invoice_line" context="{'type': type}" nolabel="1">
                                 <tree string="Invoice lines">
                                     <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.address_invoice_id, parent.currency_id, {'company_id': parent.company_id})"/>
                                     <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(parent.fiscal_position,account_id)"/>
@@ -280,7 +280,7 @@
                             <field domain="[('company_id', '=', company_id),('type','=', 'receivable')]" name="account_id" groups="account.group_account_user"/>
                             <field name="name"/>
                             <field name="payment_term" widget="selection"/>
-                            <field colspan="4" name="invoice_line" nolabel="1" widget="one2many_list"/>
+                            <field colspan="4" name="invoice_line" nolabel="1" widget="one2many_list" context="{'type': type}"/>
                             <group col="1" colspan="2">
                                 <field name="tax_line" nolabel="1">
                                     <tree editable="bottom" string="Taxes">
@@ -506,12 +506,12 @@
         </record>
         <menuitem action="action_invoice_tree4" id="menu_action_invoice_tree4" parent="menu_finance_payables"/>
 
-        <act_window context="{'search_default_partner_id':[active_id]}" id="act_res_partner_2_account_invoice_opened" name="Invoices" res_model="account.invoice" src_model="res.partner"/>
+        <act_window context="{'search_default_partner_id':[active_id], 'default_partner_id': active_id}" id="act_res_partner_2_account_invoice_opened" name="Invoices" res_model="account.invoice" src_model="res.partner"/>
 
         <act_window
            id="act_account_journal_2_account_invoice_opened"
            name="Unpaid Invoices"
-           context="{'search_default_journal_id':active_id, 'search_default_unpaid':1,}"
+           context="{'search_default_journal_id': [active_id], 'search_default_unpaid':1, 'default_journal_id': active_id}"
            res_model="account.invoice"
            src_model="account.journal"/>
 

=== modified file 'account/account_move_line.py'
--- account/account_move_line.py	2011-10-24 07:25:44 +0000
+++ account/account_move_line.py	2011-11-22 19:28:30 +0000
@@ -1090,13 +1090,21 @@
         move_obj = self.pool.get('account.move')
         self._update_check(cr, uid, ids, context)
         result = False
+        move_ids = set()
         for line in self.browse(cr, uid, ids, context=context):
+            move_ids.add(line.move_id.id)
             context['journal_id'] = line.journal_id.id
             context['period_id'] = line.period_id.id
             result = super(account_move_line, self).unlink(cr, uid, [line.id], context=context)
+<<<<<<< TREE
             if check:
                 context.update({'lines_cancel': 'cancel'})
                 move_obj.validate(cr, uid, [line.move_id.id], context=context)
+=======
+        move_ids = list(move_ids)
+        if check and move_ids:
+            move_obj.validate(cr, uid, move_ids, context=context)
+>>>>>>> MERGE-SOURCE
         return result
 
     def _check_date(self, cr, uid, vals, context=None, check=True):
@@ -1134,6 +1142,8 @@
         move_obj = self.pool.get('account.move')
         account_obj = self.pool.get('account.account')
         journal_obj = self.pool.get('account.journal')
+        if isinstance(ids, (int, long)):
+            ids = [ids]
         if vals.get('account_tax_id', False):
             raise osv.except_osv(_('Unable to change tax !'), _('You can not change the tax, you should remove and recreate lines !'))
         self._check_date(cr, uid, vals, context, check)
@@ -1299,7 +1309,7 @@
         if vals.get('account_tax_id', False):
             tax_id = tax_obj.browse(cr, uid, vals['account_tax_id'])
             total = vals['debit'] - vals['credit']
-            if journal.refund_journal:
+            if journal.type in ('purchase_refund', 'sale_refund'):
                 base_code = 'ref_base_code_id'
                 tax_code = 'ref_tax_code_id'
                 account_id = 'account_paid_id'

=== modified file 'account/account_view.xml'
--- account/account_view.xml	2011-08-25 05:31:39 +0000
+++ account/account_view.xml	2011-11-22 19:28:30 +0000
@@ -47,6 +47,7 @@
                 <tree colors="blue:state in ('draft');gray:state in ('done') " string="Fiscalyear">
                     <field name="code"/>
                     <field name="name"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                     <field name="state"/>
                 </tree>
             </field>
@@ -116,6 +117,7 @@
                     <field name="date_start"/>
                     <field name="date_stop"/>
                     <field name="special"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                     <field name="state"/>
                     <button name="action_draft" states="done" string="Set to Draft" type="object" icon="terp-document-new" groups="account.group_account_manager"/>
                     <button name="%(action_account_period_close)d" states="draft" string="Close Period" type="action" icon="terp-camera_test"/>
@@ -421,8 +423,13 @@
                             <group col="2" colspan="2">
                                 <group colspan="2" col="2">
                                     <separator string="Accounts" colspan="4"/>
+<<<<<<< TREE
                                     <field name="default_debit_account_id" attrs="{'required':[('type','in',('cash', 'bank'))]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                                     <field name="default_credit_account_id" attrs="{'required':[('type','in',('cash', 'bank'))]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+=======
+                                    <field name="default_debit_account_id" attrs="{'required':[('type','in', ('cash', 'bank'))]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                                    <field name="default_credit_account_id" attrs="{'required':[('type','in',('cash', 'bank'))]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+>>>>>>> MERGE-SOURCE
                                 </group>
                                 <group colspan="2" col="2">
                                     <separator string="Journal View" colspan="4"/>
@@ -570,7 +577,7 @@
                                     <field name="ref"/>
                                     <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)]" name="account_id"/>
+                                    <field domain="[('journal_id','=',parent.journal_id), ('company_id', '=', parent.company_id)]" 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"/>
                                 </tree>
@@ -580,7 +587,7 @@
                                     <field name="ref"/>
                                     <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', '=', parent.journal_id), ('type', '&lt;&gt;', 'view'), ('company_id', '=', parent.company_id)]" 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="sequence" readonly="0"/>
@@ -1027,7 +1034,7 @@
                     <field name="invoice"/>
                     <field name="name"/>
                     <field name="partner_id" on_change="onchange_partner_id(move_id, partner_id, account_id, debit, credit, date, journal_id)"/>
-                    <field name="account_id" domain="[('journal_id','=',journal_id)]"/>
+                    <field name="account_id" domain="[('journal_id','=',journal_id), ('company_id', '=', company_id)]"/>
                     <field name="journal_id"/>
                     <field name="debit" sum="Total debit"/>
                     <field name="credit" sum="Total credit"/>
@@ -1062,7 +1069,7 @@
                         <page string="Information">
                             <group col="2" colspan="2">
                                 <separator colspan="2" string="Amount"/>
-                                <field name="account_id" select="1" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                                <field name="account_id" select="1" domain="[('company_id', '=', company_id), ('type','&lt;&gt;','view'), ('type','&lt;&gt;','consolidation')]"/>
                                 <field name="debit"/>
                                 <field name="credit"/>
                                 <field name="quantity"/>
@@ -1136,7 +1143,7 @@
                             <field name="date"/>
                             <field name="journal_id" readonly="False" select="1"/>
                             <field name="period_id" readonly="False"/>
-                            <field name="account_id" select="1" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                            <field name="account_id" select="1" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation'),('company_id', '=', company_id)]"/>
                             <field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
                             <newline/>
                             <field name="debit"/>
@@ -1357,7 +1364,7 @@
                                         <page string="Information">
                                             <group col="2" colspan="2">
                                                 <separator colspan="2" string="Amount"/>
-                                                <field name="account_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                                                <field name="account_id" domain="[('company_id', '=', parent.company_id), ('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                                                 <field name="debit"/>
                                                 <field name="credit"/>
                                                 <field name="quantity"/>
@@ -1419,7 +1426,7 @@
                                     <field name="invoice"/>
                                     <field name="name"/>
                                     <field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,parent.date,parent.journal_id)"/>
-                                    <field name="account_id" domain="[('journal_id','=',parent.journal_id)]"/>
+                                    <field name="account_id" domain="[('journal_id','=',parent.journal_id),('company_id', '=', parent.company_id)]"/>
                                     <field name="date_maturity"/>
                                     <field name="debit" sum="Total Debit"/>
                                     <field name="credit" sum="Total Credit"/>
@@ -1512,7 +1519,7 @@
         <act_window
             id="act_account_move_to_account_move_line_open"
             name="Journal Items"
-            context="{'search_default_move_id':[active_id]}"
+            context="{'search_default_move_id':[active_id], 'default_move_id': active_id}"
             res_model="account.move.line"
             src_model="account.move"/>
 
@@ -1554,7 +1561,7 @@
         <act_window
             id="act_account_acount_move_line_open"
             name="Entries"
-            context="{'search_default_account_id':[active_id], 'search_default_unreconciled':0}"
+            context="{'search_default_account_id':[active_id], 'search_default_unreconciled':0, 'default_account_id': active_id}"
             res_model="account.move.line"
             src_model="account.account"/>
 
@@ -1562,7 +1569,7 @@
             id="act_account_acount_move_line_open_unreconciled"
             name="Unreconciled Entries"
             res_model="account.move.line"
-            context="{'search_default_account_id':[active_id], 'search_default_unreconciled':1,}"
+            context="{'search_default_account_id':[active_id], 'search_default_unreconciled':1, 'default_account_id': active_id}"
             src_model="account.account"/>
 
         <act_window domain="[('reconcile_id', '=', active_id)]" id="act_account_acount_move_line_reconcile_open" name="Reconciled entries" res_model="account.move.line" src_model="account.move.reconcile"/>
@@ -2007,20 +2014,20 @@
         <act_window
            id="act_account_journal_2_account_bank_statement"
            name="Bank statements"
-           context="{'search_default_journal_id':active_id,}"
+           context="{'search_default_journal_id': active_id, 'default_journal_id': active_id}"
            res_model="account.bank.statement"
            src_model="account.journal"/>
 
         <act_window
            id="act_account_journal_2_account_move_line"
            name="Journal Items"
-           context="{'search_default_journal_id':active_id,}"
+           context="{'search_default_journal_id':active_id, 'default_journal_id': active_id}"
            res_model="account.move.line"
            src_model="account.journal"/>
 
-        <act_window context="{'search_default_reconcile_id':False, 'search_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" res_model="account.move.line" src_model="res.partner" groups="base.group_extended"/>
+        <act_window context="{'search_default_reconcile_id':False, '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" res_model="account.move.line" src_model="res.partner" groups="base.group_extended"/>
 
-        <act_window context="{'search_default_partner_id':[active_id]}" id="act_account_partner_account_move" name="Journal Items" res_model="account.move.line" src_model="res.partner" groups="account.group_account_user"/>
+        <act_window context="{'search_default_partner_id':[active_id], 'default_partner_id': active_id}" id="act_account_partner_account_move" name="Journal Items" res_model="account.move.line" src_model="res.partner" groups="account.group_account_user"/>
 
         <record id="view_account_addtmpl_wizard_form" model="ir.ui.view">
             <field name="name">Create Account</field>
@@ -2166,6 +2173,8 @@
                     <field name="property_account_income_categ" domain="[('id', 'child_of', [account_root_id])]" />
                     <field name="property_account_expense" domain="[('id', 'child_of', [account_root_id])]"/>
                     <field name="property_account_income" domain="[('id', 'child_of', [account_root_id])]"/>
+                    <field name="property_account_income_opening" domain="[('id', 'child_of', [account_root_id])]"/>
+                    <field name="property_account_expense_opening" domain="[('id', 'child_of', [account_root_id])]"/>
                     <field name="property_reserve_and_surplus_account" />
                     </group>
                 </form>
@@ -2588,7 +2597,7 @@
                                     <field name="ref"/>
                                     <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)]" name="account_id"/>
+                                    <field domain="[('journal_id','=',parent.journal_id), ('company_id', '=', parent.company_id)]" name="account_id"/>
                                     <field name="analytic_account_id" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]" groups="analytic.group_analytic_accounting" />
                                     <field name="amount"/>
                                 </tree>
@@ -2598,7 +2607,7 @@
                                     <field name="ref"/>
                                     <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', '=', parent.journal_id), ('type', '&lt;&gt;', 'view'), ('company_id', '=', parent.company_id)]" name="account_id"/>
                                     <field name="analytic_account_id" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]" groups="analytic.group_analytic_accounting" />
                                     <field name="amount"/>
                                     <field name="sequence"/>

=== modified file 'account/configurable_account_chart.xml'
--- account/configurable_account_chart.xml	2011-09-28 10:27:28 +0000
+++ account/configurable_account_chart.xml	2011-11-22 19:28:30 +0000
@@ -191,6 +191,14 @@
 			            <field name="user_type" ref="conf_account_type_asset"/>
 			        </record>
 
+			        <record id="conf_o_income" model="account.account.template">
+			            <field name="code">1106</field>
+			            <field name="name">Opening Income Account</field>
+			            <field ref="conf_cas" name="parent_id"/>
+			            <field name="type">other</field>
+			            <field name="user_type" ref="conf_account_type_income"/>
+			        </record>
+
 		        <record id="conf_cli" model="account.account.template">
 		            <field name="code">111</field>
 		            <field name="name">Current Liabilities</field>
@@ -225,6 +233,13 @@
 			            <field name="user_type" ref="conf_account_type_liability"/>
 			        </record>
 
+			        <record id="conf_o_expense" model="account.account.template">
+			            <field name="code">1114</field>
+			            <field name="name">Opening Expense Account</field>
+			            <field ref="conf_cli" name="parent_id"/>
+			            <field name="type">other</field>
+			            <field name="user_type" ref="conf_account_type_expense"/>
+			        </record>
 
         <!-- Profit and Loss -->
 
@@ -431,6 +446,8 @@
             <field name="property_account_payable" ref="conf_a_pay"/>
             <field name="property_account_expense_categ" ref="conf_a_expense"/>
             <field name="property_account_income_categ" ref="conf_a_sale"/>
+            <field name="property_account_income_opening" ref="conf_o_income"/>
+            <field name="property_account_expense_opening" ref="conf_o_expense"/>            
             <field name="property_reserve_and_surplus_account" ref="conf_a_reserve_and_surplus"/>
         </record>
 
@@ -596,6 +613,13 @@
 			<field name="tax_ids" eval="[(6,0,[ref('otaxs')])]"/>
 		</record>
 
+		<record id="action_wizard_multi_chart_todo" model="ir.actions.todo">
+			<field name="name">Generate Chart of Accounts from a Chart Template</field>
+			<field name="action_id" ref="account.action_wizard_multi_chart"/>
+			<field name="state">open</field>
+			<field name="restart">onskip</field>
+		</record>
+
 
     </data>
 </openerp>

=== modified file 'account/data/account_data2.xml'
--- account/data/account_data2.xml	2011-01-19 00:09:38 +0000
+++ account/data/account_data2.xml	2011-11-22 19:28:30 +0000
@@ -483,6 +483,19 @@
             <field eval="3" name="padding"/>
             <field name="prefix">CSH/%(year)s/</field>
         </record>
+        <record id="sequence_opening_journal" model="ir.sequence">
+            <field name="name">Opening Entries Journal</field>
+            <field name="code">account.journal</field>
+            <field eval="3" name="padding"/>
+            <field name="prefix">OPEJ/%(year)s/</field>
+        </record>
+        <record id="sequence_miscellaneous_journal" model="ir.sequence">
+            <field name="name">Miscellaneous Journal</field>
+            <field name="code">account.journal</field>
+            <field eval="3" name="padding"/>
+            <field name="prefix">MISJ/%(year)s/</field>
+        </record>
+
         <!--
         Account Statement Sequences
         -->

=== modified file 'account/demo/account_minimal.xml'
--- account/demo/account_minimal.xml	2011-09-28 10:27:28 +0000
+++ account/demo/account_minimal.xml	2011-11-22 19:28:30 +0000
@@ -163,6 +163,14 @@
             <field name="user_type" ref="account_type_asset"/>
         </record>
 
+        <record id="o_income" model="account.account">
+            <field name="code">X11006</field>
+            <field name="name">Opening Income - (test)</field>
+            <field ref="cas" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="account_type_income"/>
+        </record>
+
         <record model="account.account" id="liabilities_view">
             <field name="name">Liabilities - (test)</field>
             <field name="code">X11</field>
@@ -205,6 +213,14 @@
             <field name="user_type" ref="account_type_liability"/>
         </record>
 
+        <record id="o_expense" model="account.account">
+            <field name="code">X1114</field>
+            <field name="name">Opening Expense - (test)</field>
+            <field ref="cli" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="account_type_expense"/>
+        </record>
+
         <!-- Profit and Loss -->
 
         <record id="gpf" model="account.account">
@@ -355,7 +371,6 @@
             <field name="name">Sales Credit Note Journal - (test)</field>
             <field name="code">TSCNJ</field>
             <field name="type">sale_refund</field>
-            <field eval="True" name="refund_journal"/>
             <field name="view_id" ref="account_sp_refund_journal_view"/>
             <field name="sequence_id" ref="sequence_refund_sales_journal"/>
             <field model="account.account" name="default_credit_account_id" ref="a_sale"/>
@@ -379,7 +394,6 @@
             <field name="name">Expenses Credit Notes Journal - (test)</field>
             <field name="code">TECNJ</field>
             <field name="type">purchase_refund</field>
-            <field eval="True" name="refund_journal"/>
             <field name="view_id" ref="account_sp_refund_journal_view"/>
             <field name="sequence_id" ref="sequence_refund_purchase_journal"/>
             <field model="account.account" name="default_debit_account_id" ref="a_expense"/>
@@ -421,7 +435,26 @@
             <field name="analytic_journal_id" ref="sit"/>
             <field name="user_id" ref="base.user_root"/>
         </record>
-
+        <record id="miscellaneous_journal" model="account.journal">
+            <field name="name">Miscellaneous Journal - (test)</field>
+            <field name="code">TMIS</field>
+            <field name="type">general</field>
+            <field name="view_id" ref="account_journal_view"/>
+            <field name="sequence_id" ref="sequence_miscellaneous_journal"/>
+            <field name="analytic_journal_id" ref="sit"/>
+            <field name="user_id" ref="base.user_root"/>
+        </record>
+        <record id="opening_journal" model="account.journal">
+            <field name="name">Opening Entries Journal - (test)</field>
+            <field name="code">TOEJ</field>
+            <field name="type">situation</field>
+            <field name="view_id" ref="account_journal_view"/>
+            <field name="sequence_id" ref="sequence_opening_journal"/>
+            <field model="account.account" name="default_debit_account_id" ref="o_income"/>
+            <field model="account.account" name="default_credit_account_id" ref="o_expense"/>
+            <field eval="True" name="centralisation"/>
+            <field name="user_id" ref="base.user_root"/>
+        </record>
         <!--
         Product income and expense accounts, default parameters
         -->

=== modified file 'account/i18n/account.pot'
--- account/i18n/account.pot	2011-07-22 06:35:48 +0000
+++ account/i18n/account.pot	2011-11-22 19:28:30 +0000
@@ -669,13 +669,6 @@
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:306
-#, python-format
-msgid "The statement balance is incorrect !\n"
-""
-msgstr ""
-
-#. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
@@ -2444,9 +2437,10 @@
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:307
+#: code:addons/account/account_bank_statement.py:306
 #, python-format
-msgid "The expected balance (%.2f) is different than the computed one. (%.2f)"
+msgid "The statement balance is incorrect !\n"
+"The expected balance (%.2f) is different than the computed one. (%.2f)"
 msgstr ""
 
 #. module: account
@@ -2662,7 +2656,17 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account.py:2950
+=======
+#: code:addons/account/account.py:2951
+#, python-format
+msgid "BNK%s"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2906
+>>>>>>> MERGE-SOURCE
 #: code:addons/account/installer.py:296
 #, python-format
 msgid "BNK"
@@ -3979,12 +3983,15 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/invoice.py:997
 #, python-format
 msgid "Invoice "
 msgstr ""
 
 #. module: account
+=======
+>>>>>>> MERGE-SOURCE
 #: field:account.automatic.reconcile,date1:0
 msgid "Starting Date"
 msgstr ""
@@ -5203,7 +5210,7 @@
 #. module: account
 #: code:addons/account/invoice.py:997
 #, python-format
-msgid "is validated."
+msgid "Invoice  '%s' is validated."
 msgstr ""
 
 #. module: account

=== modified file 'account/i18n/ar.po'
--- account/i18n/ar.po	2011-11-22 05:21:48 +0000
+++ account/i18n/ar.po	2011-11-22 19:28:30 +0000
@@ -6,25 +6,50 @@
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2011-05-09 10:18+0000\n"
 "PO-Revision-Date: 2011-11-21 15:14+0000\n"
 "Last-Translator: kifcaliph <[e-mail]>\n"
+=======
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-01-19 11:12+0000\n"
+"Last-Translator: bamuhrez <[e-mail]>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-11-22 05:21+0000\n"
 "X-Generator: Launchpad (build 14299)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-18 04:47+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
 msgid "System payment"
+<<<<<<< TREE
 msgstr "نظام الدفع"
+=======
+msgstr "الدفع عن طريق النظام"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: view:account.journal:0
 msgid "Other Configuration"
+<<<<<<< TREE
 msgstr "تعديلات أخرى"
+=======
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
+#, python-format
+msgid "No End of year journal defined for the fiscal year"
+msgstr "لايوجد نهاية لسجل السنة للعام المحاسبي"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: code:addons/account/account.py:506
@@ -319,7 +344,11 @@
 #. module: account
 #: field:account.journal.column,field:0
 msgid "Field Name"
+<<<<<<< TREE
 msgstr "اسم الحقل"
+=======
+msgstr "إسم الحقل"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: help:account.installer,charts:0
@@ -362,7 +391,11 @@
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "June"
+<<<<<<< TREE
 msgstr "يونيو/حزيران"
+=======
+msgstr "يونيو"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_bank
@@ -391,7 +424,11 @@
 #. module: account
 #: selection:account.journal,type:0
 msgid "Purchase Refund"
+<<<<<<< TREE
 msgstr "إعادة المشتريات"
+=======
+msgstr "رد المشتروات"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: selection:account.journal,type:0
@@ -406,7 +443,11 @@
 #. module: account
 #: field:account.open.closed.fiscalyear,fyear_id:0
 msgid "Fiscal Year to Open"
+<<<<<<< TREE
 msgstr "فتح سنة مالية"
+=======
+msgstr "السنة المالية للفتح"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: help:account.journal,sequence_id:0
@@ -712,12 +753,15 @@
 msgstr "شركاء تم تسويتهم اليوم"
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account_bank_statement.py:306
 #, python-format
 msgid "The statement balance is incorrect !\n"
 msgstr "رصيد الكشف خاطئ !\n"
 
 #. module: account
+=======
+>>>>>>> MERGE-SOURCE
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
@@ -2587,9 +2631,10 @@
 msgstr "أغسطس"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:307
+#: code:addons/account/account_bank_statement.py:306
 #, python-format
 msgid ""
+"The statement balance is incorrect !\n"
 "The expected balance (%.2f) is different than the computed one. (%.2f)"
 msgstr ""
 
@@ -2826,6 +2871,12 @@
 msgstr "عرض"
 
 #. module: account
+#: code:addons/account/account.py:2951
+#, python-format
+msgid "BNK%s"
+msgstr ""
+
+#. module: account
 #: code:addons/account/account.py:2906
 #: code:addons/account/installer.py:296
 #, python-format
@@ -4220,12 +4271,15 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/invoice.py:997
 #, python-format
 msgid "Invoice "
 msgstr "فاتورة "
 
 #. module: account
+=======
+>>>>>>> MERGE-SOURCE
 #: field:account.automatic.reconcile,date1:0
 msgid "Starting Date"
 msgstr "تاريخ الإبتداء"
@@ -5515,7 +5569,7 @@
 #. module: account
 #: code:addons/account/invoice.py:997
 #, python-format
-msgid "is validated."
+msgid "Invoice  '%s' is validated."
 msgstr ""
 
 #. module: account

=== modified file 'account/i18n/bg.po'
--- account/i18n/bg.po	2011-10-05 05:53:44 +0000
+++ account/i18n/bg.po	2011-11-22 19:28:30 +0000
@@ -7,15 +7,26 @@
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2011-05-09 10:18+0000\n"
 "PO-Revision-Date: 2011-04-01 09:39+0000\n"
 "Last-Translator: Dimitar Markov <[e-mail]>\n"
+=======
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-03-02 06:18+0000\n"
+"Last-Translator: Dimitar Markov <[e-mail]>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-10-05 04:55+0000\n"
 "X-Generator: Launchpad (build 14085)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-18 04:48+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -25,7 +36,17 @@
 #. module: account
 #: view:account.journal:0
 msgid "Other Configuration"
-msgstr "Други настройки"
+<<<<<<< TREE
+msgstr "Други настройки"
+=======
+msgstr "Други настройки"
+
+#. module: account
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
+#, python-format
+msgid "No End of year journal defined for the fiscal year"
+msgstr "Не е дефиниран край на финансовата година в Журнала"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: code:addons/account/account.py:506
@@ -723,6 +744,7 @@
 #. module: account
 #: field:account.partner.reconcile.process,today_reconciled:0
 msgid "Partners Reconciled Today"
+<<<<<<< TREE
 msgstr "Партньори равнени днес"
 
 #. module: account
@@ -730,6 +752,9 @@
 #, python-format
 msgid "The statement balance is incorrect !\n"
 msgstr "Баланса на отчета не е правилен !\n"
+=======
+msgstr "Партньори равнени днес"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: selection:account.payment.term.line,value:0
@@ -1635,6 +1660,14 @@
 msgstr "Годишна сума"
 
 #. module: account
+<<<<<<< TREE
+=======
+#: model:ir.actions.report.xml,name:account.report_account_voucher_new
+msgid "Print Voucher"
+msgstr "Отпечатване на ваучер"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: view:account.change.currency:0
 msgid "This wizard will change the currency of the invoice"
 msgstr "Този помощник ще промени валутата на фактурата"
@@ -1702,7 +1735,16 @@
 #. module: account
 #: selection:account.partner.balance,display_partner:0
 msgid "All Partners"
-msgstr "Всички партньори"
+<<<<<<< TREE
+msgstr "Всички партньори"
+=======
+msgstr "Всички партньори"
+
+#. module: account
+#: report:account.move.voucher:0
+msgid "Ref. :"
+msgstr "Реф. :"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: view:account.analytic.chart:0
@@ -1916,7 +1958,16 @@
 #: field:account.installer.modules,config_logo:0
 #: field:wizard.multi.charts.accounts,config_logo:0
 msgid "Image"
-msgstr "Изображение"
+<<<<<<< TREE
+msgstr "Изображение"
+=======
+msgstr "Изображение"
+
+#. module: account
+#: report:account.move.voucher:0
+msgid "Canceled"
+msgstr "Отменени"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: view:account.invoice:0
@@ -2623,11 +2674,12 @@
 msgstr "Август"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:307
+#: code:addons/account/account_bank_statement.py:306
 #, python-format
 msgid ""
+"The statement balance is incorrect !\n"
 "The expected balance (%.2f) is different than the computed one. (%.2f)"
-msgstr "Очаквания баланс (%.2f) е различен от изчисления. (%.2f)"
+msgstr ""
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentreconcile0
@@ -2635,6 +2687,14 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
+=======
+#: report:account.move.voucher:0
+msgid "Number:"
+msgstr "Номер:"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: selection:account.print.journal,sort_selection:0
 msgid "Reference Number"
 msgstr "Референтен номер"
@@ -2872,6 +2932,12 @@
 msgstr "Изглед"
 
 #. module: account
+#: code:addons/account/account.py:2951
+#, python-format
+msgid "BNK%s"
+msgstr ""
+
+#. module: account
 #: code:addons/account/account.py:2906
 #: code:addons/account/installer.py:296
 #, python-format
@@ -3087,6 +3153,14 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
+=======
+#: report:account.move.voucher:0
+msgid "Journal:"
+msgstr "Дневник:"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: view:account.bank.statement:0
 #: selection:account.bank.statement,state:0
 #: view:account.invoice:0
@@ -4057,7 +4131,11 @@
 #. module: account
 #: view:account.tax.template:0
 msgid "Credit Notes"
+<<<<<<< TREE
 msgstr "кредитни известия"
+=======
+msgstr "Бележки по кредит"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: code:addons/account/account.py:2067
@@ -4109,6 +4187,7 @@
 #: field:account.tax,price_include:0
 #: field:account.tax.template,price_include:0
 msgid "Tax Included in Price"
+<<<<<<< TREE
 msgstr "Данъци включени в цената"
 
 #. module: account
@@ -4119,6 +4198,9 @@
 "You cannot define children to an account with internal type different of "
 "\"View\"! "
 msgstr ""
+=======
+msgstr "Данъци включени в цената"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
@@ -4272,6 +4354,7 @@
 #. module: account
 #: report:account.account.balance.landscape:0
 msgid "Account Balance -"
+<<<<<<< TREE
 msgstr "Баланс по сметка -"
 
 #. module: account
@@ -4279,6 +4362,9 @@
 #, python-format
 msgid "Invoice "
 msgstr "Фактура "
+=======
+msgstr "Баланс по сметка -"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: field:account.automatic.reconcile,date1:0
@@ -5582,8 +5668,13 @@
 #. module: account
 #: code:addons/account/invoice.py:997
 #, python-format
+<<<<<<< TREE
 msgid "is validated."
 msgstr "е валидирано."
+=======
+msgid "Invoice  '%s' is validated."
+msgstr ""
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: view:account.chart.template:0
@@ -6918,9 +7009,17 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: view:account.payment.term.line:0
 msgid "  value amount: n.a"
 msgstr ""
+=======
+#: selection:account.entries.report,move_line_state:0
+#: view:account.move.line:0
+#: selection:account.move.line,state:0
+msgid "Unbalanced"
+msgstr "Небалансиран"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: selection:account.move.line,centralisation:0
@@ -7260,6 +7359,14 @@
 msgstr "Пресмятане на абонамент"
 
 #. module: account
+<<<<<<< TREE
+=======
+#: report:account.move.voucher:0
+msgid "Amount (in words) :"
+msgstr "Сума (словом):"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: field:account.bank.statement.line,partner_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
@@ -8390,7 +8497,16 @@
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
-msgstr "Сметки вземания"
+<<<<<<< TREE
+msgstr "Сметки вземания"
+=======
+msgstr "Сметки вземания"
+
+#. module: account
+#: report:account.move.voucher:0
+msgid "Particulars"
+msgstr ""
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: selection:account.account.type,report_type:0
@@ -8899,6 +9015,14 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
+=======
+#: report:account.move.voucher:0
+msgid "Through :"
+msgstr "Чрез :"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: view:account.general.journal:0
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
@@ -9089,7 +9213,16 @@
 #: field:account.account.template,type:0
 #: field:account.entries.report,type:0
 msgid "Internal Type"
-msgstr "Вътрешен тип"
+<<<<<<< TREE
+msgstr "Вътрешен тип"
+=======
+msgstr "Вътрешен тип"
+
+#. module: account
+#: report:account.move.voucher:0
+msgid "State:"
+msgstr "Състояние:"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_running
@@ -9426,7 +9559,19 @@
 #. module: account
 #: constraint:account.account.template:0
 msgid "Error ! You can not create recursive account templates."
-msgstr "Грешка! Не може да създавате рекурсивни шаблони за сметки."
+<<<<<<< TREE
+msgstr "Грешка! Не може да създавате рекурсивни шаблони за сметки."
+=======
+msgstr "Грешка! Не може да създавате рекурсивни шаблони за сметки."
+
+#. module: account
+#: constraint:account.account.template:0
+msgid ""
+"You cannot create an account template! \n"
+"Make sure if the account template has parent then it should be type "
+"\"View\"! "
+msgstr ""
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: view:account.subscription:0
@@ -9851,6 +9996,7 @@
 "in its currency (maybe different of the company currency)."
 msgstr ""
 
+<<<<<<< TREE
 #. module: account
 #: report:account.balancesheet:0
 #: report:account.balancesheet.horizontal:0
@@ -9920,3 +10066,751 @@
 
 #~ msgid "State:"
 #~ msgstr "Състояние:"
+=======
+#~ msgid "Keep empty to use the period of the validation date."
+#~ msgstr "Оставете празно за да бъде изпозван периода на проверка на дадата."
+
+#~ msgid "Error! You can not create recursive account."
+#~ msgstr "Грешка! Не може да създавате рекурсивна сметка."
+
+#, python-format
+#~ msgid "Account move line \"%s\" is not valid"
+#~ msgstr "Ред \"%s\" от движение по сметка не е валиден"
+
+#~ msgid "Entries Encoding"
+#~ msgstr "Кодиране на записи"
+
+#~ msgid "Select Message"
+#~ msgstr "Изберете съобщение"
+
+#~ msgid "Confirm draft invoices"
+#~ msgstr "Потвърди проектите на фактури"
+
+#~ msgid "Move line select"
+#~ msgstr "Премесетване на избрания ред"
+
+#~ msgid "Entry label"
+#~ msgstr "Етикет на запис"
+
+#~ msgid "Account Entry Line"
+#~ msgstr "Ред от запис на сметка"
+
+#~ msgid "Aged Trial Balance"
+#~ msgstr "Стар пробен баланс"
+
+#~ msgid "Total entries"
+#~ msgstr "Общо записи"
+
+#~ msgid "Disc. (%)"
+#~ msgstr "Отстъка (%)"
+
+#~ msgid ""
+#~ "Would your payment have been carried out after this mail was sent, please "
+#~ "consider the present one as void. Do not hesitate to contact our accounting "
+#~ "departement at [phone]."
+#~ msgstr ""
+#~ "Ако искате ли плащането да бъде извършено след като изпратите този email, "
+#~ "моля считайте този като нулев. Не се притеснявайте да се обадите на "
+#~ "търговския ни отдел на ..............."
+
+#~ msgid "Unpaid Supplier Refunds"
+#~ msgstr "Неплатени обезщетения на доставчици"
+
+#~ msgid "Supplier invoice"
+#~ msgstr "Фактура за доставчик"
+
+#~ msgid "Contact"
+#~ msgstr "Контакт"
+
+#~ msgid "Account Entry Reconcile"
+#~ msgstr "Обединяване на записи от сметка"
+
+#~ msgid "account.move.line"
+#~ msgstr "account.move.line"
+
+#~ msgid "Sign for parent"
+#~ msgstr "Знак за родител"
+
+#~ msgid "Partial Payment"
+#~ msgstr "Частично плащаме"
+
+#~ msgid "Move Lines Created."
+#~ msgstr "Създадени редове за преместване"
+
+#~ msgid "Status"
+#~ msgstr "Състояние"
+
+#~ msgid "Partner account"
+#~ msgstr "Сметка на партньор"
+
+#~ msgid "Generate entries before:"
+#~ msgstr "Създай записи преди:"
+
+#~ msgid "Account cost and revenue by journal"
+#~ msgstr "Приходи и разходи на сметка по дневник"
+
+#~ msgid "Bank Reconciliation"
+#~ msgstr "Обединяване на банка"
+
+#~ msgid "Print Journal"
+#~ msgstr "Печат на дневник"
+
+#~ msgid "End date"
+#~ msgstr "Крайна дата"
+
+#~ msgid "Entries by Statements"
+#~ msgstr "Записи според отчета"
+
+#~ msgid "Grand total"
+#~ msgstr "Обща сума"
+
+#~ msgid "New Supplier Invoice"
+#~ msgstr "Нова фактура за доставчик"
+
+#~ msgid "Amount paid"
+#~ msgstr "Платена сума"
+
+#~ msgid "Voucher Nb"
+#~ msgstr "Номер на ваучер"
+
+#~ msgid "Total write-off"
+#~ msgstr "Общо отписване"
+
+#~ msgid "New Analytic Account"
+#~ msgstr "Нова аналитична сметка"
+
+#~ msgid "Standard entry"
+#~ msgstr "Стандартен запис"
+
+#~ msgid "Tax Report"
+#~ msgstr "Справка относно данък"
+
+#~ msgid "Ending Balance"
+#~ msgstr "Краен баланс"
+
+#~ msgid "Value"
+#~ msgstr "Стойност"
+
+#~ msgid "Compute Entry Dates"
+#~ msgstr "Изчисляване на въведените дати"
+
+#~ msgid "Statement reconcile line"
+#~ msgstr "Ред от отчет за приравняване"
+
+#~ msgid "Income"
+#~ msgstr "Приход"
+
+#~ msgid "Print General Journal"
+#~ msgstr "Отпечатване на основен дневник"
+
+#~ msgid "Invoice Movement"
+#~ msgstr "Преместване на фактура"
+
+#~ msgid "Open for reconciliation"
+#~ msgstr "Отваряне за обединяване"
+
+#~ msgid "VAT"
+#~ msgstr "ДДС"
+
+#~ msgid "Account to reconcile"
+#~ msgstr "Сметка за приравняване"
+
+#~ msgid "Partner Ref."
+#~ msgstr "Препратки към партньора"
+
+#~ msgid "Total quantity"
+#~ msgstr "Общо количество"
+
+#~ msgid "Third party"
+#~ msgstr "Външен"
+
+#~ msgid "Costs & Revenues"
+#~ msgstr "Разходи & приходи"
+
+#~ msgid "Account Number"
+#~ msgstr "Номер на сметка"
+
+#~ msgid "Gives the sequence order when displaying a list of account types."
+#~ msgstr "Задава последователността при показване на списък с видове сметки"
+
+#~ msgid "Include in base amount"
+#~ msgstr "Включване в основната сума"
+
+#~ msgid "New Statement"
+#~ msgstr "Нов отчет"
+
+#~ msgid "Print Central Journal"
+#~ msgstr "Отпечатване централен дневник"
+
+#~ msgid "Account Manager"
+#~ msgstr "Отговорник за сметка"
+
+#~ msgid "Start date"
+#~ msgstr "Начална дата"
+
+#~ msgid "Untaxed amount"
+#~ msgstr "Сума без данъци"
+
+#~ msgid "Pay invoice"
+#~ msgstr "Плащане на фактура"
+
+#~ msgid "Draft Customer Invoices"
+#~ msgstr "Проект на фактура за клиент"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Невалиден XML за преглед на архитектурата"
+
+#~ msgid "Analytic Journal Report"
+#~ msgstr "Справка за аналитичен дневник"
+
+#~ msgid "Expense"
+#~ msgstr "Разход"
+
+#~ msgid "Options"
+#~ msgstr "Настройки"
+
+#~ msgid "Validate Account Moves"
+#~ msgstr "Проверка на движения на сметка"
+
+#~ msgid "Unpaid invoices"
+#~ msgstr "Неплатени фактури"
+
+#~ msgid "Statements reconciliation"
+#~ msgstr "Обединяване на бюлетини"
+
+#~ msgid "Draft Supplier Invoices"
+#~ msgstr "Проект фактура за доставчик"
+
+#~ msgid ""
+#~ "Exception made of a mistake of our side, it seems that the following bills "
+#~ "stay unpaid. Please, take appropriate measures in order to carry out this "
+#~ "payment in the next 8 days."
+#~ msgstr ""
+#~ "Грешка следствие на наша грешка, изглежда че следните сметки остават "
+#~ "неплатени. Моля направете необходимите мерки за да направите плащането в "
+#~ "следващите 8 дена."
+
+#~ msgid "Create subscription entries"
+#~ msgstr "Създаване на абонаментни записи"
+
+#~ msgid "Date Invoiced"
+#~ msgstr "Дата на фактуриране"
+
+#~ msgid "Automatic reconciliation"
+#~ msgstr "Автоматично обединяване"
+
+#~ msgid "Date End"
+#~ msgstr "Крайна дата"
+
+#~ msgid "Entries Encoding by Line"
+#~ msgstr "Записи кодирани по ред"
+
+#~ msgid "The amount in the currency of the journal"
+#~ msgstr "Сумата е във валутата на дневника"
+
+#~ msgid "Equity"
+#~ msgstr "Акции"
+
+#~ msgid "Analytic Chart of Accounts"
+#~ msgstr "Аналитична диаграма на сметки"
+
+#~ msgid "Select Period and Journal for Validation"
+#~ msgstr "Иберете период и дневник за проверка"
+
+#~ msgid "Partner ID"
+#~ msgstr "Идентификатор на партньор"
+
+#~ msgid "New Customer Invoice"
+#~ msgstr "Нова клиентска фактура"
+
+#~ msgid "Analytic account costs and revenues"
+#~ msgstr "Разходи и печалби на аналитична сметла"
+
+#~ msgid "Are you sure you want to refund this invoice ?"
+#~ msgstr "Сигурни ли сте че искате да обезщетите тази фактура?"
+
+#~ msgid "Open State"
+#~ msgstr "Отваряне на статус"
+
+#~ msgid "Draft Supplier Refunds"
+#~ msgstr "Проект на обезщетение на достачик"
+
+#~ msgid "Draft Customer Refunds"
+#~ msgstr "Проект на обещетения на клиент"
+
+#~ msgid ""
+#~ "The maturity date of the generated entries for this model. You can chosse "
+#~ "between the date of the creation action or the the date of the creation of "
+#~ "the entries plus the partner payment terms."
+#~ msgstr ""
+#~ "Дата на падеж на генерираните записи за този модел. Може да изберете между "
+#~ "датата на създаване на модела и датата на създаване на записите плюс "
+#~ "условията за плащане на партньора."
+
+#~ msgid "Document"
+#~ msgstr "Документ"
+
+#~ msgid "Move name"
+#~ msgstr "Име на движение"
+
+#~ msgid "Cancel selected invoices"
+#~ msgstr "Отказа на избраните фактури"
+
+#~ msgid "account.move.line.select"
+#~ msgstr "account.move.line.select"
+
+#~ msgid "Financial Management"
+#~ msgstr "Управление на финанси"
+
+#~ msgid "Additionnal Information"
+#~ msgstr "Допълнителна информация"
+
+#~ msgid "Partner Accounts"
+#~ msgstr "Сметка на партньор"
+
+#~ msgid ""
+#~ "If a default tax if given in the partner it only override taxes from account "
+#~ "(or product) of the same group."
+#~ msgstr ""
+#~ "Ако е зададен данък по подразбиране за партньора, той само застъпва данъци "
+#~ "от сметка (или продукт) от същата група."
+
+#~ msgid "Real Entries"
+#~ msgstr "Реални записи"
+
+#~ msgid "Invoice line"
+#~ msgstr "Ред от фактура"
+
+#~ msgid "Force all moves for this account to have this secondary currency."
+#~ msgstr "Задължи всички движения за тази сметка да имат втора валута."
+
+#~ msgid ""
+#~ "All draft account entries in this journal and period will be validated. It "
+#~ "means you won't be able to modify their accouting fields."
+#~ msgstr ""
+#~ "Всички записи на сметки в проект в този дневник и период ще бъдат проверени. "
+#~ "Това означава че няма да може да променяте полета на сметки им."
+
+#~ msgid "Pay and reconcile"
+#~ msgstr "Плащане и приравняване"
+
+#~ msgid "Balance brought forward"
+#~ msgstr "Баланс пренесен напред"
+
+#~ msgid "New Supplier Refund"
+#~ msgstr "Ново обещетение за доставчик"
+
+#~ msgid "Entry Model"
+#~ msgstr "Модел на запис"
+
+#~ msgid "Journal code"
+#~ msgstr "Код на дневник"
+
+#~ msgid "Entry Name"
+#~ msgstr "Име на запис"
+
+#~ msgid "Entry encoding"
+#~ msgstr "Кодиране на ред"
+
+#~ msgid "Write-Off Period"
+#~ msgstr "Период за отписване"
+
+#~ msgid "Other"
+#~ msgstr "Друго"
+
+#~ msgid "Financial Journals"
+#~ msgstr "Финансови дневници"
+
+#~ msgid "Select entries"
+#~ msgstr "Изберете записи"
+
+#~ msgid ""
+#~ "Indicate if the tax computation is based on the value computed for the "
+#~ "computation of child taxes or based on the total amount."
+#~ msgstr ""
+#~ "Посочва че данъка е базиран на стойност изчислена за бъдещи изчисления на "
+#~ "подчинени данъци или е базиран на общата сума."
+
+#~ msgid "Taxed Amount"
+#~ msgstr "Данъчна сума"
+
+#~ msgid "Subtotal w/o tax"
+#~ msgstr "Междинна сума без данък"
+
+#~ msgid "Invoice Ref"
+#~ msgstr "Отпратка към фактура"
+
+#~ msgid ""
+#~ "You can check this box to mark the entry line as a litigation with the "
+#~ "associated partner"
+#~ msgstr "Отметнете за да отбележете записа като според с асоциирания партньор"
+
+#~ msgid "The currency of the journal"
+#~ msgstr "Валута на дневника"
+
+#~ msgid "Search Entries"
+#~ msgstr "Записи за търсене"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Името на обекта трябва да започва с \"x_\" и да не съдържа никакви специални "
+#~ "символи!"
+
+#~ msgid ""
+#~ "This field is used for payable and receivable entries. You can put the limit "
+#~ "date for the payment of this entry line."
+#~ msgstr ""
+#~ "Това поле се използва за записи за приходи и разходи. Може да поставите "
+#~ "крайна дата за плащането на този запис."
+
+#~ msgid "Third party (Country)"
+#~ msgstr "Външен (Държава)"
+
+#~ msgid "The sequence gives the display order for a list of journals"
+#~ msgstr "Последователността дава реда на показване при списък от дневници"
+
+#~ msgid "Payment date"
+#~ msgstr "Дата на плащане"
+
+#~ msgid "Unpaid Customer Invoices"
+#~ msgstr "Неплатени фактури на клиенти"
+
+#~ msgid "Canceled Invoice"
+#~ msgstr "Прекратена фактура"
+
+#~ msgid "End of Year Treatments"
+#~ msgstr "Обработка на края на годината"
+
+#~ msgid "Entry Model Line"
+#~ msgstr "Ред на запис на модел"
+
+#~ msgid "Quantities"
+#~ msgstr "Количества"
+
+#~ msgid "Date Start"
+#~ msgstr "Начална дата"
+
+#~ msgid "The date of the generated entries"
+#~ msgstr "Дата на генерираните записи"
+
+#~ msgid "Analytic Entries by Journal"
+#~ msgstr "Аналитични записи по дневник"
+
+#~ msgid ""
+#~ "Indicate if the amount of tax must be included in the base amount for the "
+#~ "computation of the next taxes"
+#~ msgstr ""
+#~ "Показва дали сумата на данъка трябва да бъде включен в основната сума при "
+#~ "изчисляване на следващите данъци."
+
+#~ msgid "Journal name"
+#~ msgstr "Име на дневник"
+
+#~ msgid "Reconcile entries"
+#~ msgstr "Приравняване на записи"
+
+#~ msgid "Journal - Period"
+#~ msgstr "Дневник - период"
+
+#~ msgid "Account cost and revenue by journal (This Month)"
+#~ msgstr "Сметка за приходи и разходи по дневник (текущ месец)"
+
+#~ msgid "Open for unreconciliation"
+#~ msgstr "Отваряне за връщане на приравняване"
+
+#~ msgid "OK"
+#~ msgstr "Добре"
+
+#~ msgid "Account Balance"
+#~ msgstr "Баланс на сметка"
+
+#~ msgid "Analytic Check"
+#~ msgstr "Аналитична проверка"
+
+#~ msgid "account.analytic.journal"
+#~ msgstr "account.analytic.journal"
+
+#~ msgid "Payment amount"
+#~ msgstr "Сума за плащане"
+
+#~ msgid "All Months"
+#~ msgstr "Всички месеци"
+
+#~ msgid "Total amount"
+#~ msgstr "Обща сума"
+
+#~ msgid "Tax Group"
+#~ msgstr "Група данъци"
+
+#~ msgid "New Customer Refund"
+#~ msgstr "Ново обезщетение на клиент"
+
+#~ msgid "Subscription Periods"
+#~ msgstr "Периоди на абонамент"
+
+#~ msgid "Write-Off journal"
+#~ msgstr "Дневник за отписвания"
+
+#~ msgid "Full Payment"
+#~ msgstr "Пълно плащане"
+
+#~ msgid "All account entries"
+#~ msgstr "Всични записи на сметката"
+
+#~ msgid "Unpaid Customer Refunds"
+#~ msgstr "Неплатени обезщетения на клиент"
+
+#~ msgid "Amount reconciled"
+#~ msgstr "Сумата приравнена"
+
+#~ msgid "Subscription Entries"
+#~ msgstr "Записи на абонамент"
+
+#~ msgid "PRO-FORMA Customer Invoices"
+#~ msgstr "Клиентска ПРОФОРМА фактура"
+
+#~ msgid "Analytic Journal Definition"
+#~ msgstr "Определение на аналитичен дневник"
+
+#~ msgid "Skip 'Draft' State for Created Entries"
+#~ msgstr "Пропускане на състоянието 'проект' за създадените записи"
+
+#~ msgid "List of Accounts"
+#~ msgstr "Списък със сметки"
+
+#~ msgid "Validate Account Entries"
+#~ msgstr "Проверка на записите на сметка"
+
+#~ msgid "Current Date"
+#~ msgstr "Текуща дата"
+
+#~ msgid "Financial Accounts"
+#~ msgstr "Финансови сметки"
+
+#~ msgid "Models Definition"
+#~ msgstr "Определения на модели"
+
+#~ msgid "Statement reconcile"
+#~ msgstr "Приравняване на отчет"
+
+#~ msgid "Charts of Account"
+#~ msgstr "Графики на сметка"
+
+#~ msgid "Printing Date"
+#~ msgstr "Дата на отпечатване"
+
+#, python-format
+#~ msgid "No Data Available"
+#~ msgstr "Няма налични данни"
+
+#~ msgid ""
+#~ "This account will be used to value incoming stock for the current product "
+#~ "category"
+#~ msgstr ""
+#~ "Тази сметка ще се използва за оценка на постъпващата стока за текущата "
+#~ "продуктова категория"
+
+#, python-format
+#~ msgid "No journal for ending writing has been defined for the fiscal year"
+#~ msgstr "Не е зададен дневник за краен запис за финансовата година"
+
+#, python-format
+#~ msgid "No analytic journal !"
+#~ msgstr "Не е аналитичен дневник !"
+
+#~ msgid "Account Num."
+#~ msgstr "Номер на сметка"
+
+#~ msgid "Journal Voucher"
+#~ msgstr "Разписка за дневник"
+
+#, python-format
+#~ msgid "You can not validate a non-balanced entry !"
+#~ msgstr "Не може да проверявате небалансиран запис !"
+
+#, python-format
+#~ msgid ""
+#~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
+#~ msgstr "Очаквания баланс (%.2f) е различен от изчисления. (%.2f)"
+
+#~ msgid "Crédit"
+#~ msgstr "Кредит"
+
+#~ msgid "Débit"
+#~ msgstr "Дебит"
+
+#, python-format
+#~ msgid "The statement balance is incorrect !\n"
+#~ msgstr "Баланса на отчета не е правилен !\n"
+
+#, python-format
+#~ msgid "Configration Error !"
+#~ msgstr "Грешка при конфигурация !"
+
+#, python-format
+#~ msgid "Your journal must have a default credit and debit account."
+#~ msgstr ""
+#~ "Вашия дневник трябва да има по подразбиране сметки за дебит и кредит."
+
+#, python-format
+#~ msgid "No sequence defined in the journal !"
+#~ msgstr "Не са зададени последоватености за този дневник !"
+
+#, python-format
+#~ msgid "The opening journal must not have any entry in the new fiscal year !"
+#~ msgstr ""
+#~ "Отваряния дневник не трябва да има запис за новата финансова година !"
+
+#, python-format
+#~ msgid ""
+#~ "No period defined for this date !\n"
+#~ "Please create a fiscal year."
+#~ msgstr ""
+#~ "Няма период за тази дата !\n"
+#~ "Моля създайте финансова година."
+
+#, python-format
+#~ msgid "Already Reconciled"
+#~ msgstr "Вече приравнен"
+
+#, python-format
+#~ msgid "Unable to reconcile entry \"%s\": %.2f"
+#~ msgstr "Не може да приравни запис %s\": %.2f"
+
+#, python-format
+#~ msgid "Please set an analytic journal on this financial journal !"
+#~ msgstr "Моля изберете аналитичен дневник за този финансов дневник !"
+
+#, python-format
+#~ msgid "Date to must be set between %s and %s"
+#~ msgstr "Датата трябва да бъде между %s и %s"
+
+#, python-format
+#~ msgid "No records found for your selection!"
+#~ msgstr "Няма намерен данък за вашия избор"
+
+#, python-format
+#~ msgid "The account is not defined to be reconcile !"
+#~ msgstr "Тази сметка не е предвидена за приравняване !"
+
+#, python-format
+#~ msgid "The journal must have centralised counterpart"
+#~ msgstr "Дневника трябва да има централно копие"
+
+#, python-format
+#~ msgid "The old fiscal year does not have any entry to reconcile!"
+#~ msgstr "Старата финансова година няма записи за приравняване!"
+
+#~ msgid "Partner name"
+#~ msgstr "Име на партньор"
+
+#, python-format
+#~ msgid "Can not pay draft/proforma/cancel invoice."
+#~ msgstr "Не може да бъде платена  проект/проформа/отказана фактура."
+
+#, python-format
+#~ msgid "You can not deactivate an account that contains account moves."
+#~ msgstr "Не може да деактивирате сметка която съдържа движения по сметка."
+
+#, python-format
+#~ msgid "Date not in a defined fiscal year"
+#~ msgstr "Датата не е в зададената финансова година"
+
+#, python-format
+#~ msgid ""
+#~ "Selected Move lines does not have any account move enties in draft state"
+#~ msgstr ""
+#~ "Избраните редове от движения нямат движения по сметка в състояние проект"
+
+#, python-format
+#~ msgid "Closing of fiscal year cancelled, please check the box !"
+#~ msgstr "Затварянето на финансовата година прекратено, моля отменете полето !"
+
+#~ msgid "Journal Sale"
+#~ msgstr "Дневник на продажбите"
+
+#~ msgid "The sequence used for invoice numbers in this journal."
+#~ msgstr "Последователността използвана за номера на фактури в този дневник."
+
+#~ msgid "Accounting and financial management"
+#~ msgstr "Счетоводство и финансови операции"
+
+#~ msgid "Reconcile Entries."
+#~ msgstr "Съгласувай записи"
+
+#~ msgid "Proposed invoice to be checked, validated and printed"
+#~ msgstr "Предложената фактура да бъде проверена, валидирана и отпечатана"
+
+#~ msgid "Print Aged Trial Balance"
+#~ msgstr "Отпечатай стара оборотна ведомост"
+
+#~ msgid ""
+#~ "Gives the type of the analytic journal. When a document (eg: an invoice) "
+#~ "needs to create analytic entries, Open ERP will look for a matching journal "
+#~ "of the same type."
+#~ msgstr ""
+#~ "Дава типа на аналитичния дневник. Когато документ (напр. фактура) трябва да "
+#~ "направи аналитичен запис, Open ERP ще търси съвпадащ дневник от същия тип."
+
+#~ msgid "Error ! The duration of the Fiscal Year is invalid. "
+#~ msgstr "Грешка ! Продължителността на фискалната година е невалидна. "
+
+#~ msgid ""
+#~ "If you use payment terms, the due date will be computed automatically at the "
+#~ "generation of accounting entries. If you keep the payment term and the due "
+#~ "date empty, it means direct payment."
+#~ msgstr ""
+#~ "Ако използвате \"усовия за плащане\",  датата на падежа ще бъде изчислена "
+#~ "автоматично при създаването на счетоводни записи. Ако оставите условията за "
+#~ "плащане и падежната дата празни, това означава директно плащане."
+
+#~ msgid "Asset"
+#~ msgstr "Актив"
+
+#~ msgid "Unpaid Supplier Invoices"
+#~ msgstr "Неплатени фактури на доставчици"
+
+#~ msgid "Print Taxes Report"
+#~ msgstr "Отпечатване на справка за данъци"
+
+#~ msgid "Unreconcile entries"
+#~ msgstr "Несъгласувани записи"
+
+#~ msgid "Confirm statement from draft"
+#~ msgstr "Потвърждаване на отчет от проект(чернова)"
+
+#~ msgid ""
+#~ "Gives the view used when writing or browsing entries in this journal. The "
+#~ "view tell Open ERP which fields should be visible, required or readonly and "
+#~ "in which order. You can create your own view for a faster encoding in each "
+#~ "journal."
+#~ msgstr ""
+#~ "Дава изглед използван за запис или разглеждане на записи от този дневник. "
+#~ "Изгледа задава на Open ERP кои полета ще бъдат видими, задължителни или само "
+#~ "за четене и в какъв ред. Може да създадете собствен изглед за по-бързо "
+#~ "набиране във всеки дневник."
+
+#~ msgid "Recurrent Entries"
+#~ msgstr "Повтарящи се записи"
+
+#~ msgid "Error! You can not create recursive analytic accounts."
+#~ msgstr "Грешка! Не можете да създадете рекурсивни аналитични сметки."
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Невалидно име на модел при задаването на действие."
+
+#~ msgid "Specify The Message for the Overdue Payment Report."
+#~ msgstr "Определи съобщението за доклада с просрочени плащания."
+
+#~ msgid "Unreconciled entries"
+#~ msgstr "Неизравнени стойности"
+
+#, python-format
+#~ msgid "Invoice "
+#~ msgstr "Фактура "
+
+#, python-format
+#~ msgid "is validated."
+#~ msgstr "е валидирано."
+>>>>>>> MERGE-SOURCE

=== modified file 'account/i18n/br.po'
--- account/i18n/br.po	2011-10-05 05:53:44 +0000
+++ account/i18n/br.po	2011-11-22 19:28:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-10-05 04:55+0000\n"
 "X-Generator: Launchpad (build 14085)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-18 04:47+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -702,12 +707,6 @@
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:306
-#, python-format
-msgid "The statement balance is incorrect !\n"
-msgstr ""
-
-#. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
@@ -2566,9 +2565,10 @@
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:307
+#: code:addons/account/account_bank_statement.py:306
 #, python-format
 msgid ""
+"The statement balance is incorrect !\n"
 "The expected balance (%.2f) is different than the computed one. (%.2f)"
 msgstr ""
 
@@ -2803,6 +2803,12 @@
 msgstr ""
 
 #. module: account
+#: code:addons/account/account.py:2951
+#, python-format
+msgid "BNK%s"
+msgstr ""
+
+#. module: account
 #: code:addons/account/account.py:2906
 #: code:addons/account/installer.py:296
 #, python-format
@@ -4193,12 +4199,15 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/invoice.py:997
 #, python-format
 msgid "Invoice "
 msgstr ""
 
 #. module: account
+=======
+>>>>>>> MERGE-SOURCE
 #: field:account.automatic.reconcile,date1:0
 msgid "Starting Date"
 msgstr ""
@@ -5488,7 +5497,7 @@
 #. module: account
 #: code:addons/account/invoice.py:997
 #, python-format
-msgid "is validated."
+msgid "Invoice  '%s' is validated."
 msgstr ""
 
 #. module: account

=== modified file 'account/i18n/bs.po'
--- account/i18n/bs.po	2011-10-05 05:53:44 +0000
+++ account/i18n/bs.po	2011-11-22 19:28:30 +0000
@@ -13,8 +13,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-10-05 04:55+0000\n"
 "X-Generator: Launchpad (build 14085)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-18 04:47+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -707,12 +712,6 @@
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:306
-#, python-format
-msgid "The statement balance is incorrect !\n"
-msgstr ""
-
-#. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
@@ -2580,9 +2579,10 @@
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:307
+#: code:addons/account/account_bank_statement.py:306
 #, python-format
 msgid ""
+"The statement balance is incorrect !\n"
 "The expected balance (%.2f) is different than the computed one. (%.2f)"
 msgstr ""
 
@@ -2824,6 +2824,12 @@
 msgstr "Prikaz"
 
 #. module: account
+#: code:addons/account/account.py:2951
+#, python-format
+msgid "BNK%s"
+msgstr ""
+
+#. module: account
 #: code:addons/account/account.py:2906
 #: code:addons/account/installer.py:296
 #, python-format
@@ -4220,12 +4226,15 @@
 msgstr "Saldo računa -"
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/invoice.py:997
 #, python-format
 msgid "Invoice "
 msgstr ""
 
 #. module: account
+=======
+>>>>>>> MERGE-SOURCE
 #: field:account.automatic.reconcile,date1:0
 msgid "Starting Date"
 msgstr ""
@@ -5519,7 +5528,7 @@
 #. module: account
 #: code:addons/account/invoice.py:997
 #, python-format
-msgid "is validated."
+msgid "Invoice  '%s' is validated."
 msgstr ""
 
 #. module: account

=== modified file 'account/i18n/ca.po'
--- account/i18n/ca.po	2011-10-05 05:53:44 +0000
+++ account/i18n/ca.po	2011-11-22 19:28:30 +0000
@@ -6,15 +6,27 @@
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2011-05-09 10:18+0000\n"
 "PO-Revision-Date: 2011-08-17 00:34+0000\n"
 "Last-Translator: mgaja (GrupoIsep.com) <Unknown>\n"
+=======
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-03-26 18:10+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<[e-mail]>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-10-05 04:55+0000\n"
 "X-Generator: Launchpad (build 14085)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-27 04:53+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -742,12 +754,6 @@
 msgstr "Empreses conciliades avui"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:306
-#, python-format
-msgid "The statement balance is incorrect !\n"
-msgstr "El balanç de l'extracte bancari és incorrecte!\n"
-
-#. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
@@ -2703,11 +2709,12 @@
 msgstr "Agost"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:307
+#: code:addons/account/account_bank_statement.py:306
 #, python-format
 msgid ""
+"The statement balance is incorrect !\n"
 "The expected balance (%.2f) is different than the computed one. (%.2f)"
-msgstr "El balanç previst (%.2f) és diferent del calculat. (%.2f)"
+msgstr ""
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentreconcile0
@@ -2960,6 +2967,12 @@
 msgstr "Vista"
 
 #. module: account
+#: code:addons/account/account.py:2951
+#, python-format
+msgid "BNK%s"
+msgstr ""
+
+#. module: account
 #: code:addons/account/account.py:2906
 #: code:addons/account/installer.py:296
 #, python-format
@@ -4423,12 +4436,15 @@
 msgstr "Balanç compte -"
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/invoice.py:997
 #, python-format
 msgid "Invoice "
 msgstr "Factura "
 
 #. module: account
+=======
+>>>>>>> MERGE-SOURCE
 #: field:account.automatic.reconcile,date1:0
 msgid "Starting Date"
 msgstr "Data d'inici"
@@ -5785,8 +5801,13 @@
 #. module: account
 #: code:addons/account/invoice.py:997
 #, python-format
+<<<<<<< TREE
 msgid "is validated."
 msgstr "està validada."
+=======
+msgid "Invoice  '%s' is validated."
+msgstr ""
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: view:account.chart.template:0
@@ -10316,6 +10337,7 @@
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in its currency (maybe different of the company currency)."
 msgstr ""
+<<<<<<< TREE
 "L'import residual d'una anotació a cobrar o a pagar expressat en la seva "
 "moneda (pot ser diferent de la moneda de la companyia)."
 
@@ -10418,7 +10440,1629 @@
 #~ "You can not create move line on receivable/payable account without partner"
 #~ msgstr ""
 #~ "No podeu crear una línia de moviment en un compte a cobrar/a pagar sense una "
+=======
+
+#~ msgid "Keep empty to use the period of the validation date."
+#~ msgstr "Deixar-ho buit per utilitzar el període de la data de validació."
+
+#~ msgid "Error! You can not create recursive account."
+#~ msgstr "Error! No es pot crear un compte recursiu."
+
+#~ msgid ""
+#~ "If you use payment terms, the due date will be computed automatically at the "
+#~ "generation of accounting entries. If you keep the payment term and the due "
+#~ "date empty, it means direct payment."
+#~ msgstr ""
+#~ "Si utilitza terminis de pagament, la data de venciment es calcularà "
+#~ "automàticament en la generació d'assentaments comptables. Si deixeu buits el "
+#~ "termini de pagament i la data de venciment, significa pagament directe."
+
+#~ msgid "Unpaid Supplier Invoices"
+#~ msgstr "Factures de proveïdor sense pagar"
+
+#~ msgid "Entries Encoding"
+#~ msgstr "Codificació assentaments"
+
+#~ msgid "Confirm statement from draft"
+#~ msgstr "Confirma extracte des de esborrany"
+
+#~ msgid "Asset"
+#~ msgstr "Actiu"
+
+#~ msgid "Unreconciled entries"
+#~ msgstr "Assentaments no conciliats"
+
+#~ msgid "Print Taxes Report"
+#~ msgstr "Imprimeix informe d'impostos"
+
+#, python-format
+#~ msgid "Account move line \"%s\" is not valid"
+#~ msgstr "Línia d'assentament comptable \"%s\" no és vàlid"
+
+#~ msgid "Unreconcile entries"
+#~ msgstr "Trenca conciliació dels assentaments"
+
+#~ msgid "Confirm draft invoices"
+#~ msgstr "Confirma factures esborrany"
+
+#~ msgid "Charts of Account"
+#~ msgstr "Plans comptables"
+
+#~ msgid "Entry label"
+#~ msgstr "Ref. assentament"
+
+#~ msgid "Aged Trial Balance"
+#~ msgstr "Balanç de comprovació anterior"
+
+#~ msgid "Recurrent Entries"
+#~ msgstr "Assentaments recurrents"
+
+#~ msgid ""
+#~ "Gives the view used when writing or browsing entries in this journal. The "
+#~ "view tell Open ERP which fields should be visible, required or readonly and "
+#~ "in which order. You can create your own view for a faster encoding in each "
+#~ "journal."
+#~ msgstr ""
+#~ "Indica la vista utilitzada per introduir o mostrar assentaments en aquest "
+#~ "diari. La vista indica a OpenERP els camps que han de ser visibles, "
+#~ "requerits o només lectura i en quin ordre. Podeu crear la vostra pròpia "
+#~ "vista per codificar més ràpid en cada diari."
+
+#~ msgid "Account Num."
+#~ msgstr "Núm. compte"
+
+#~ msgid "Delta Debit"
+#~ msgstr "Diferència deure"
+
+#, python-format
+#~ msgid "No analytic journal !"
+#~ msgstr "No diari analític!"
+
+#~ msgid "Debit Trans."
+#~ msgstr "Trans. deure"
+
+#~ msgid "Total entries"
+#~ msgstr "Entrades totals"
+
+#~ msgid "Payment Reconcilation"
+#~ msgstr "Conciliació del pagament"
+
+#~ msgid "Disc. (%)"
+#~ msgstr "Desc. %"
+
+#~ msgid ""
+#~ "Would your payment have been carried out after this mail was sent, please "
+#~ "consider the present one as void. Do not hesitate to contact our accounting "
+#~ "departement at [phone]."
+#~ msgstr ""
+#~ "Si el pagament s'hagués realitzat després d'enviar aquest correu, no el "
+#~ "tingueu en compte. No dubteu en contactar amb el nostre departament de "
+#~ "comptabilitat."
+
+#~ msgid "Contra"
+#~ msgstr "Contra"
+
+#~ msgid "Confirm statement with/without reconciliation from draft statement"
+#~ msgstr ""
+#~ "Confirma extracte bancari amb/sense conciliació a partir de l'extracte "
+#~ "esborrany"
+
+#~ msgid "Supplier invoice"
+#~ msgstr "Factura de proveïdor"
+
+#~ msgid "Reconcile Paid"
+#~ msgstr "Pagament conciliat"
+
+#~ msgid "Printing Date"
+#~ msgstr "Data d'impressió"
+
+#~ msgid "Mvt"
+#~ msgstr "Mov."
+
+#~ msgid "Fiscal Position Accounts Mapping"
+#~ msgstr "Mapa de relacions comptes posició fiscal"
+
+#~ msgid "Contact"
+#~ msgstr "Contacte"
+
+#~ msgid "Account Entry Reconcile"
+#~ msgstr "Conciliació assentament comptable"
+
+#~ msgid "Keep empty if the fiscal year belongs to several companies."
+#~ msgstr "Deixeu-lo buit si l'exercici fiscal pertany a varie companyies"
+
+#~ msgid "Journal Voucher"
+#~ msgstr "Diari de bons"
+
+#~ msgid "account.move.line"
+#~ msgstr "account.move.line"
+
+#~ msgid "Analytic Invoice"
+#~ msgstr "Factura analítica"
+
+#~ msgid "Sign for parent"
+#~ msgstr "Signe pel pare"
+
+#~ msgid "Can be draft or validated"
+#~ msgstr "Pot ser esborrany o vàlid"
+
+#~ msgid "Partial Payment"
+#~ msgstr "Pagament parcial"
+
+#~ msgid "Move Lines Created."
+#~ msgstr "Moviments creats."
+
+#~ msgid "Status"
+#~ msgstr "Estat"
+
+#~ msgid "Partner account"
+#~ msgstr "Compte de l'empresa"
+
+#~ msgid "Generate entries before:"
+#~ msgstr "Genera assentaments abans:"
+
+#~ msgid "(Keep empty for all open fiscal years)"
+#~ msgstr "(deixar-lo buit per a tots els exercicis fiscals oberts)"
+
+#~ msgid "Move Lines"
+#~ msgstr "Línies moviment"
+
+#, python-format
+#~ msgid "The opening journal must not have any entry in the new fiscal year !"
+#~ msgstr ""
+#~ "El diari d'obertura no ha de tenir cap assentament en el nou exercici fiscal!"
+
+#~ msgid "account.config.wizard"
+#~ msgstr "account.config.assistent"
+
+#~ msgid "Account cost and revenue by journal"
+#~ msgstr "Cost i retorn del compte per diari"
+
+#~ msgid "Bank Reconciliation"
+#~ msgstr "Conciliació bancària"
+
+#~ msgid "Print Journal"
+#~ msgstr "Imprimeix diari"
+
+#~ msgid "Cancel Invoice"
+#~ msgstr "Cancel·la factura"
+
+#~ msgid "Printing Date :"
+#~ msgstr "Data d'impressió :"
+
+#~ msgid "End date"
+#~ msgstr "Data final"
+
+#~ msgid "Entries by Statements"
+#~ msgstr "Assentaments per extracte bancari"
+
+#~ msgid "analytic Invoice"
+#~ msgstr "Factura analítica"
+
+#~ msgid "Grand total"
+#~ msgstr "Suma total"
+
+#~ msgid "Fiscal Position Taxes Mapping"
+#~ msgstr "Mapa de relacions d'impostos posició fiscal"
+
+#~ msgid "New Supplier Invoice"
+#~ msgstr "Nova factura de proveïdor"
+
+#~ msgid "Amount paid"
+#~ msgstr "Import pagat"
+
+#~ msgid "Voucher Nb"
+#~ msgstr "Núm. de justificat"
+
+#~ msgid "Total write-off"
+#~ msgstr "Desajust total"
+
+#~ msgid "New Analytic Account"
+#~ msgstr "Nou compte analític"
+
+#~ msgid "Standard entry"
+#~ msgstr "Assentament estàndar"
+
+#~ msgid "Tax Report"
+#~ msgstr "Informe impostos"
+
+#~ msgid "Are you sure you want to close the fiscal year ?"
+#~ msgstr "Esteu segurs que voleu tancar l'exercici fiscal?"
+
+#~ msgid "Bank Receipt"
+#~ msgstr "Rebut bancari"
+
+#~ msgid "Invoice import"
+#~ msgstr "Import factura"
+
+#, python-format
+#~ msgid ""
+#~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
+#~ msgstr "El balanç previst (%.2f) és diferent del calculat. (%.2f)"
+
+#~ msgid "Ending Balance"
+#~ msgstr "Saldo final"
+
+#~ msgid "Analytic Credit"
+#~ msgstr "Haver analític"
+
+#~ msgid "Continue"
+#~ msgstr "Continua"
+
+#~ msgid "Value"
+#~ msgstr "Valor"
+
+#~ msgid "Compute Entry Dates"
+#~ msgstr "Calcula les dates de l'assentament"
+
+#~ msgid "Display History"
+#~ msgstr "Mostra historial"
+
+#~ msgid "        Start date"
+#~ msgstr "        Data inicial"
+
+#~ msgid "Display accounts "
+#~ msgstr "Mostra comptes "
+
+#~ msgid "Statement reconcile line"
+#~ msgstr "Línia de conciliació extracte"
+
+#~ msgid "Close states"
+#~ msgstr "Tanca estats"
+
+#~ msgid "Crédit"
+#~ msgstr "Haver"
+
+#~ msgid "Income"
+#~ msgstr "Ingrés"
+
+#~ msgid "Print General Journal"
+#~ msgstr "Imprimeix diari general"
+
+#~ msgid "Invoice Movement"
+#~ msgstr "Assent. factura"
+
+#~ msgid "Legal Statements"
+#~ msgstr "Declaracions oficials"
+
+#~ msgid "Open for reconciliation"
+#~ msgstr "Obre per la conciliació"
+
+#~ msgid "VAT"
+#~ msgstr "IVA"
+
+#~ msgid "Account to reconcile"
+#~ msgstr "Compte per conciliar"
+
+#~ msgid "Partner Ref."
+#~ msgstr "Ref. empresa"
+
+#~ msgid "Total quantity"
+#~ msgstr "Quantitat total"
+
+#~ msgid "Third party"
+#~ msgstr "Tercers"
+
+#~ msgid "Costs & Revenues"
+#~ msgstr "Costos i ingressos"
+
+#~ msgid "Account Number"
+#~ msgstr "Número de compte"
+
+#~ msgid "Skip"
+#~ msgstr "Omet"
+
+#~ msgid "Gives the sequence order when displaying a list of account types."
+#~ msgstr ""
+#~ "Indica l'ordre de seqüència al mostrar una llista de tipus de compte."
+
+#~ msgid "Include in base amount"
+#~ msgstr "Incloure en import base"
+
+#~ msgid "Delta Credit"
+#~ msgstr "Diferència haver"
+
+#~ msgid "Pre-generated invoice from control"
+#~ msgstr "Factura pre-generada de control"
+
+#~ msgid "Valid Entries"
+#~ msgstr "Assentaments vàlids"
+
+#~ msgid "Cost Legder for period"
+#~ msgstr "Cost comptable per període"
+
+#~ msgid "New Statement"
+#~ msgstr "Nou extracte bancari"
+
+#~ msgid "Reconciliation of entries from invoice(s) and payment(s)"
+#~ msgstr "Conciliació d'assentaments de factura(es) i pagament(s)"
+
+#~ msgid "Print Central Journal"
+#~ msgstr "Imprimeix diari central"
+
+#~ msgid "Next"
+#~ msgstr "Següent"
+
+#~ msgid ""
+#~ "The fiscal position will determine taxes and the accounts used for the the "
+#~ "partner."
+#~ msgstr ""
+#~ "La posició fiscal determinarà els impostos i els comptes utilitzats per la "
+>>>>>>> MERGE-SOURCE
 #~ "empresa."
 
+<<<<<<< TREE
 #~ msgid "Receiver's Signature"
 #~ msgstr "Signatura del receptor"
+=======
+#~ msgid "Account Manager"
+#~ msgstr "Compte director"
+
+#~ msgid "Start date"
+#~ msgstr "Data inicial"
+
+#~ msgid "Untaxed amount"
+#~ msgstr "Base imposable"
+
+#~ msgid "Pay invoice"
+#~ msgstr "Paga factura"
+
+#~ msgid "Draft Customer Invoices"
+#~ msgstr "Factures de client esborrany"
+
+#~ msgid "Sort by:"
+#~ msgstr "Ordena per:"
+
+#~ msgid "To Be Verified"
+#~ msgstr "Per a ser verificat"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML invàlid per a la definició de la vista!"
+
+#~ msgid "          Start date"
+#~ msgstr "          Data inicial"
+
+#~ msgid "Analytic Journal Report"
+#~ msgstr "Informe analític de diari"
+
+#, python-format
+#~ msgid "No sequence defined in the journal !"
+#~ msgstr "No s'ha definit una seqüència en el diari!"
+
+#~ msgid "Expense"
+#~ msgstr "Despesa"
+
+#~ msgid "Options"
+#~ msgstr "Opcions"
+
+#~ msgid "Customer Invoice Process"
+#~ msgstr "Procés de factura de client"
+
+#~ msgid "Validate Account Moves"
+#~ msgstr "Valida moviments comptables"
+
+#~ msgid "Unpaid invoices"
+#~ msgstr "Factures sense pagar"
+
+#~ msgid "Payment Reconcile"
+#~ msgstr "Conciliació pagament"
+
+#~ msgid "Statements reconciliation"
+#~ msgstr "Conciliació d'extractes bancaris"
+
+#~ msgid "Validated accounting entries."
+#~ msgstr "Assentaments comptables validats."
+
+#~ msgid "Draft Supplier Invoices"
+#~ msgstr "Factures de proveïdor esborrany"
+
+#, python-format
+#~ msgid "Configration Error !"
+#~ msgstr "Error de configuració!"
+
+#~ msgid ""
+#~ "Exception made of a mistake of our side, it seems that the following bills "
+#~ "stay unpaid. Please, take appropriate measures in order to carry out this "
+#~ "payment in the next 8 days."
+#~ msgstr ""
+#~ "Tret que hi hagués un error, les següents factures ens consten com "
+#~ "impagades. Si us plau, preneu les mesures necessàries per realitzar el "
+#~ "pagament en els propers 8 dies."
+
+#~ msgid "Débit"
+#~ msgstr "Deure"
+
+#~ msgid "x Checks Journal"
+#~ msgstr "x Diari de xecs"
+
+#, python-format
+#~ msgid "Your journal must have a default credit and debit account."
+#~ msgstr "El diari ha de tenir un compte haver i deure per defecte."
+
+#~ msgid "Create subscription entries"
+#~ msgstr "Crea assentaments periòdics"
+
+#~ msgid "Date Invoiced"
+#~ msgstr "Data factura"
+
+#~ msgid "All periods if empty"
+#~ msgstr "Tots els períodes si està buit"
+
+#~ msgid "Liability"
+#~ msgstr "Passiu"
+
+#~ msgid "Statement Entries"
+#~ msgstr "Assentaments d'extractes"
+
+#~ msgid "Automatic reconciliation"
+#~ msgstr "Conciliació automàtica"
+
+#~ msgid "Import Invoice"
+#~ msgstr "Importa factura"
+
+#~ msgid "Account No."
+#~ msgstr "Núm. compte"
+
+#~ msgid "Date End"
+#~ msgstr "Data final"
+
+#~ msgid "Entries Encoding by Line"
+#~ msgstr "Codificació d'assentaments per línia"
+
+#~ msgid "Entries Reconcile"
+#~ msgstr "Assentaments conciliats"
+
+#~ msgid "From analytic accounts, Create invoice."
+#~ msgstr "Des de comptes analítics, crea factura."
+
+#~ msgid "Taxes Reports"
+#~ msgstr "Informes d'impostos"
+
+#, python-format
+#~ msgid "Already Reconciled"
+#~ msgstr "Ja conciliat"
+
+#~ msgid "Equity"
+#~ msgstr "Patrimoni"
+
+#~ msgid "Generic Reports"
+#~ msgstr "Informes genèrics"
+
+#~ msgid "Account Analytic Lines Analysis"
+#~ msgstr "Anàlisi línies analítiques comptables"
+
+#~ msgid "Analytic Chart of Accounts"
+#~ msgstr "Pla de comptes analítics"
+
+#~ msgid "Select Period and Journal for Validation"
+#~ msgstr "Selecioneu període i diari per a la validació"
+
+#~ msgid "O_k"
+#~ msgstr "_Accepta"
+
+#~ msgid "_Go"
+#~ msgstr "_Vés"
+
+#~ msgid "Partner ID"
+#~ msgstr "ID empresa"
+
+#~ msgid "New Customer Invoice"
+#~ msgstr "Nova factura de client"
+
+#~ msgid "Analytic account costs and revenues"
+#~ msgstr "Compte analític costos i retorns"
+
+#~ msgid "Are you sure you want to refund this invoice ?"
+#~ msgstr "Esteu segur que voleu retornar aquesta factura?"
+
+#~ msgid "Open State"
+#~ msgstr "Estat abert"
+
+#~ msgid "From statement, create entries"
+#~ msgstr "A partir de extractes, crea assentaments"
+
+#~ msgid "1cm 27.7cm 20cm 27.7cm"
+#~ msgstr "1cm 27.7cm 20cm 27.7cm"
+
+#~ msgid "Accounting Statement"
+#~ msgstr "Extracte comptable"
+
+#, python-format
+#~ msgid "Unable to reconcile entry \"%s\": %.2f"
+#~ msgstr "No és possible conciliar l'assentament \"%s\": %.2f"
+
+#, python-format
+#~ msgid "Please set an analytic journal on this financial journal !"
+#~ msgstr "Indiqueu un diari analític en aquest diari financer!"
+
+#~ msgid "Reconcilation of entries from payment order."
+#~ msgstr "Conciliació d'assentaments d'ordres de pagament."
+
+#~ msgid "Analytic Journal -"
+#~ msgstr "Diari analític -"
+
+#~ msgid "Analytic Debit"
+#~ msgstr "Deure analític"
+
+#~ msgid ""
+#~ "The maturity date of the generated entries for this model. You can chosse "
+#~ "between the date of the creation action or the the date of the creation of "
+#~ "the entries plus the partner payment terms."
+#~ msgstr ""
+#~ "La data de venciment dels assentaments generats per aquest model. Podeu "
+#~ "escollir entre la data de l'acció de creació o la data de la creació dels "
+#~ "assentaments més els terminis de pagament de l'empresa."
+
+#~ msgid "Document"
+#~ msgstr "Document"
+
+#~ msgid "Move name"
+#~ msgstr "Nom moviment"
+
+#~ msgid "Cancel selected invoices"
+#~ msgstr "Cancel·la factures seleccionades"
+
+#~ msgid "Reconcilate the entries from payment"
+#~ msgstr "Concilia els assentaments des de pagament"
+
+#~ msgid "Proposed invoice to be checked, validated and printed"
+#~ msgstr "Factura proposada per ser comprovada, validada e impresa"
+
+#~ msgid "account.move.line.select"
+#~ msgstr "account.move.line.select"
+
+#~ msgid "By Date and Period"
+#~ msgstr "Per data i període"
+
+#~ msgid ""
+#~ "The account moves of the invoice have been reconciled with account moves of "
+#~ "the payment(s)."
+#~ msgstr ""
+#~ "Els assentaments de la factura han sigut conciliats amb els assentaments del "
+#~ "pagament(s)."
+
+#~ msgid "Close Fiscal Year with new entries"
+#~ msgstr "Tanca exercici fiscal amb nous assentaments"
+
+#~ msgid "Statement encoding produces payment entries"
+#~ msgstr "Codificació d'extractes crea assentaments de pagament"
+
+#, python-format
+#~ msgid "The account is not defined to be reconcile !"
+#~ msgstr "El compte no està definit per ser conciliat!"
+
+#~ msgid "Additionnal Information"
+#~ msgstr "Informació addicional"
+
+#~ msgid " Close states of Fiscal year and periods"
+#~ msgstr " Tanca estats d'exercici fiscal i períodes"
+
+#~ msgid "Third Party Ledger"
+#~ msgstr "Llibre major de tercers"
+
+#~ msgid "Partner Accounts"
+#~ msgstr "Comptes d'empresa"
+
+#~ msgid ""
+#~ "If a default tax if given in the partner it only override taxes from account "
+#~ "(or product) of the same group."
+#~ msgstr ""
+#~ "Si a la empresa se li ha assignat un impost per defecte, aquest només "
+#~ "anul·larà impostos del compte (o producte) del mateix grup."
+
+#~ msgid "Real Entries"
+#~ msgstr "Assentaments reals"
+
+#~ msgid "Import invoice"
+#~ msgstr "Importa factura"
+
+#~ msgid "Invoice line"
+#~ msgstr "Línia de factura"
+
+#~ msgid ""
+#~ "All draft account entries in this journal and period will be validated. It "
+#~ "means you won't be able to modify their accouting fields."
+#~ msgstr ""
+#~ "Tots els assentaments comptables esborrany d'aquest diari i període seran "
+#~ "validats. Això significa que no podreu modificar els camps comptables."
+
+#~ msgid "Filter on Periods"
+#~ msgstr "Filtra per períodes"
+
+#~ msgid "Pay and reconcile"
+#~ msgstr "Paga i concilia"
+
+#~ msgid "Balance brought forward"
+#~ msgstr "Saldo a compte nou"
+
+#~ msgid "Entry Model"
+#~ msgstr "Model d'assentament"
+
+#~ msgid "Journal code"
+#~ msgstr "Codi de diari"
+
+#~ msgid "Entry Name"
+#~ msgstr "Núm. assentament"
+
+#~ msgid "Entry encoding"
+#~ msgstr "Codificació extracte"
+
+#~ msgid "Write-Off Period"
+#~ msgstr "Període de desajust"
+
+#~ msgid ""
+#~ "Check this box if you want to print all entries when printing the General "
+#~ "Ledger, otherwise it will only print its balance."
+#~ msgstr ""
+#~ "Marqueu aquesta opció si voleu imprimir tots els assentaments al imprimir el "
+#~ "llibre major general, altrament imprimirà només el seu balanç."
+
+#~ msgid "By date"
+#~ msgstr "Per data"
+
+#~ msgid "Account Configure Wizard "
+#~ msgstr "Assistent de configuració comptabilitat "
+
+#, python-format
+#~ msgid "The journal must have centralised counterpart"
+#~ msgstr "El diari ha de tenir un homòleg centralitzat"
+
+#~ msgid "Payment Entries"
+#~ msgstr "Assentaments de pagament"
+
+#~ msgid ""
+#~ "If no account is specified, the reconciliation will be made using every "
+#~ "accounts that can be reconcilied"
+#~ msgstr ""
+#~ "Si no s'especifica cap compte, la conciliació es farà utilitzant cada compte "
+#~ "que pugui ser conciliat"
+
+#~ msgid "Other"
+#~ msgstr "Altre"
+
+#~ msgid "Movement"
+#~ msgstr "Moviment"
+
+#~ msgid "Encode manually the statement"
+#~ msgstr "Codifica manualment l'extracte"
+
+#~ msgid "Financial Journals"
+#~ msgstr "Diaris financers"
+
+#~ msgid "By Period"
+#~ msgstr "Per període"
+
+#~ msgid ""
+#~ "Gives the type of the analytic journal. When a document (eg: an invoice) "
+#~ "needs to create analytic entries, Open ERP will look for a matching journal "
+#~ "of the same type."
+#~ msgstr ""
+#~ "Indica el tipus del diari analític. Quan un document (per ex.: una factura) "
+#~ "necessita crear assentaments analítics, OpenERP buscarà un diari que "
+#~ "correspongui del mateix tipus."
+
+#~ msgid "Import from your bank statements"
+#~ msgstr "Importa des dels extractes bancaris"
+
+#~ msgid "Base on"
+#~ msgstr "Basat en"
+
+#~ msgid "Cash Payment"
+#~ msgstr "Pagament de caixa"
+
+#~ msgid ""
+#~ "Indicate if the tax computation is based on the value computed for the "
+#~ "computation of child taxes or based on the total amount."
+#~ msgstr ""
+#~ "Indica si el càlcul de l'impost està basat en el valor calculat per el "
+#~ "còmput d'impostos fills o basat en l'import total."
+
+#~ msgid "Account Move"
+#~ msgstr "Assentament"
+
+#~ msgid "Taxed Amount"
+#~ msgstr "Import impostos"
+
+#~ msgid "Subtotal w/o tax"
+#~ msgstr "Subtotal sense imp."
+
+#~ msgid "Invoice Ref"
+#~ msgstr "Ref. factura"
+
+#~ msgid "       Include Reconciled Entries"
+#~ msgstr "       Incloure assentaments conciliats"
+
+#~ msgid "Date/Period Filter"
+#~ msgstr "Filtra data/període"
+
+#~ msgid "Credit Trans."
+#~ msgstr "Trans. haver"
+
+#~ msgid "Search Entries"
+#~ msgstr "Cerca assentaments"
+
+#~ msgid "Analytic costs to reinvoice purchases, timesheets, ..."
+#~ msgstr "Costos analítics per a refacturar compres, fulls de serveis, ..."
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
+#~ "especial!"
+
+#~ msgid "Name of the fiscal year as displayed in reports."
+#~ msgstr "Nom de l'exercici fiscal que es mostra en informes."
+
+#~ msgid ""
+#~ "This field is used for payable and receivable entries. You can put the limit "
+#~ "date for the payment of this entry line."
+#~ msgstr ""
+#~ "Aquest camp s'utilitza en assentaments a pagar i a cobrar. Podeu definir la "
+#~ "data límit de pagament per aquesta línia de assentament."
+
+#~ msgid "Third party (Country)"
+#~ msgstr "Tercers (país)"
+
+#~ msgid "The sequence gives the display order for a list of journals"
+#~ msgstr "La seqüència indica l'ordre a mostrar en una llista de diari"
+
+#~ msgid "Payment date"
+#~ msgstr "Data de pagament"
+
+#~ msgid "Unpaid Customer Invoices"
+#~ msgstr "Factures de client sense pagar"
+
+#~ msgid "Partner name"
+#~ msgstr "Nom empresa"
+
+#~ msgid "Journal/Payment Mode"
+#~ msgstr "Diari/Mode de pagament"
+
+#~ msgid "Canceled Invoice"
+#~ msgstr "Factura cancel·lada"
+
+#~ msgid "Import file from your bank statement"
+#~ msgstr "Importa fitxer des de extracte bancari"
+
+#~ msgid "Bank Payment"
+#~ msgstr "Pagament bancari"
+
+#~ msgid "Manually statement"
+#~ msgstr "Extracte manual"
+
+#~ msgid "End of Year Treatments"
+#~ msgstr "Tractaments de fi d'any"
+
+#~ msgid "File statement"
+#~ msgstr "Fitxer d'extractes"
+
+#~ msgid "Entry Model Line"
+#~ msgstr "Línia del model d'assentament"
+
+#~ msgid "Set starting and ending balance for control"
+#~ msgstr "Indica balanç inicial i final per a control"
+
+#~ msgid "General Ledger -"
+#~ msgstr "Llibro major -"
+
+#~ msgid "Quantities"
+#~ msgstr "Quantitats"
+
+#~ msgid "Date Start"
+#~ msgstr "Data inicial"
+
+#~ msgid "Number of entries are generated"
+#~ msgstr "Número de assentaments que s'han generat"
+
+#~ msgid "By Date"
+#~ msgstr "Per data"
+
+#~ msgid "The date of the generated entries"
+#~ msgstr "La data de la generació dels assentaments"
+
+#~ msgid "Modify Invoice"
+#~ msgstr "Modifica factura"
+
+#~ msgid "Entries Encoding by Move"
+#~ msgstr "Assentaments codificats per apunt"
+
+#, python-format
+#~ msgid "You can not deactivate an account that contains account moves."
+#~ msgstr "No podeu desactivar un compte que conté assentaments comptables."
+
+#~ msgid "Filter on Partners"
+#~ msgstr "Filtra per empreses"
+
+#~ msgid "Analytic Entries by Journal"
+#~ msgstr "Assentaments analítics per diari"
+
+#~ msgid "Valid entries from invoice"
+#~ msgstr "Assentaments vàlids des de factura"
+
+#~ msgid "Crebit"
+#~ msgstr "Haver"
+
+#~ msgid ""
+#~ "Indicate if the amount of tax must be included in the base amount for the "
+#~ "computation of the next taxes"
+#~ msgstr ""
+#~ "Indiqueu si l'import de l'impost ha de ser inclòs en l'import base pel "
+#~ "càlcul d'altres impostos"
+
+#~ msgid "Journal name"
+#~ msgstr "Nom de diari"
+
+#~ msgid "Import invoice from statement"
+#~ msgstr "Importa fitxer des de extracte"
+
+#~ msgid "Import from invoices or payments"
+#~ msgstr "Importa des de factures o pagaments"
+
+#~ msgid "Reconcile entries"
+#~ msgstr "Concilia els assentaments"
+
+#~ msgid "Journal - Period"
+#~ msgstr "Diari - Període"
+
+#~ msgid "Print Aged Trial Balance"
+#~ msgstr "Imprimeix balanç de comprovació anterior"
+
+#~ msgid "General Credit"
+#~ msgstr "Haver general"
+
+#~ msgid "Date payment"
+#~ msgstr "Data de pagament"
+
+#~ msgid "A/c No."
+#~ msgstr "Nº compte"
+
+#~ msgid "Account cost and revenue by journal (This Month)"
+#~ msgstr "Cost i retorn del compte per diari (aquest mes)"
+
+#~ msgid "Open for unreconciliation"
+#~ msgstr "Obre per trencar conciliació"
+
+#~ msgid "OK"
+#~ msgstr "D'acord"
+
+#~ msgid "Control Invoice"
+#~ msgstr "Controla factura"
+
+#~ msgid "Account Balance"
+#~ msgstr "Saldo del compte"
+
+#~ msgid "Analytic Check"
+#~ msgstr "Comprovació analítica"
+
+#~ msgid "account.analytic.journal"
+#~ msgstr "comptabilitat.analític.diari"
+
+#~ msgid "Payment amount"
+#~ msgstr "Import a pagar"
+
+#~ msgid "All Months"
+#~ msgstr "Tots els mesos"
+
+#~ msgid "Link to the automatically generated account moves."
+#~ msgstr "Enllaç a l'assentament comptable generat automàticament."
+
+#~ msgid "Have a number and entries are generated"
+#~ msgstr "Obté un número i els assentaments són generats"
+
+#~ msgid "Analytic Check -"
+#~ msgstr "Comprovació analítica -"
+
+#~ msgid "Group invoice lines"
+#~ msgstr "Agrupa línies de factura"
+
+#~ msgid "Total amount"
+#~ msgstr "Import total"
+
+#~ msgid "_Cancel"
+#~ msgstr "_Cancel·la"
+
+#~ msgid "Tax Group"
+#~ msgstr "Grup de l'impost"
+
+#~ msgid "Import invoices"
+#~ msgstr "Importa factures"
+
+#~ msgid "Maintains Invoice sequences with Fiscal Year"
+#~ msgstr "Manté seqüències de factura amb exercici fiscal"
+
+#~ msgid "Subscription Periods"
+#~ msgstr "Repetició dels assentaments periòdics"
+
+#~ msgid "Write-Off journal"
+#~ msgstr "Diari de desajust"
+
+#~ msgid "Full Payment"
+#~ msgstr "Pagament complet"
+
+#~ msgid "Journal Purchase"
+#~ msgstr "Diari de compres"
+
+#~ msgid "Cash Receipt"
+#~ msgstr "Rebut de caixa"
+
+#~ msgid "Encode manually statement comes into the draft statement"
+#~ msgstr "Codifica l'extracte manualment el converteix en extracte esborrany"
+
+#~ msgid "Accounting entries at statement's confirmation"
+#~ msgstr "Assentaments comptables en la confirmació de l'extracte"
+
+#, python-format
+#~ msgid ""
+#~ "Selected Move lines does not have any account move enties in draft state"
+#~ msgstr ""
+#~ "Heu seleccionat apunts que no tenen cap assentament comptable en estat "
+#~ "esborrany"
+
+#~ msgid "All account entries"
+#~ msgstr "Tots els assentaments del compte"
+
+#~ msgid "Date Filter"
+#~ msgstr "Filtrat per data"
+
+#~ msgid "Supplier Invoice Process"
+#~ msgstr "Procés factura de proveïdor"
+
+#~ msgid "Page"
+#~ msgstr "Pàgina"
+
+#~ msgid "Receivable and Payable"
+#~ msgstr "A cobrar i pagar"
+
+#~ msgid "Amount reconciled"
+#~ msgstr "Quantitat conciliada"
+
+#~ msgid "Subscription Entries"
+#~ msgstr "Assentaments periòdics"
+
+#, python-format
+#~ msgid "Closing of fiscal year cancelled, please check the box !"
+#~ msgstr ""
+#~ "Tancament de l'exercici fiscal cancel·lat, si us plau heu de marcar la "
+#~ "casella!"
+
+#~ msgid "PRO-FORMA Customer Invoices"
+#~ msgstr "Factures de client PRO-FORMA"
+
+#~ msgid "Analytic Journal Definition"
+#~ msgstr "Definició de diari analític"
+
+#~ msgid "Skip 'Draft' State for Created Entries"
+#~ msgstr "Saltar-se l'estat 'Esborrany ' en els assentaments"
+
+#~ msgid ""
+#~ "This field allow you to choose the accounting journals you want for "
+#~ "filtering the invoices. If you left this field empty, it will search on all "
+#~ "sale, purchase and cash journals."
+#~ msgstr ""
+#~ "Aquest camp us permet seleccionar els diaris comptables que voleu per "
+#~ "filtrar les factures. Si deixeu aquest camp buit, cercarà en tots els diaris "
+#~ "de venda, compra i de caixa."
+
+#~ msgid "List of Accounts"
+#~ msgstr "Llistat de comptes"
+
+#, python-format
+#~ msgid "Closing of states cancelled, please check the box !"
+#~ msgstr "Tancament d'estats cancel·lat, si us plau heu de marcar la casella!"
+
+#~ msgid "Validate Account Entries"
+#~ msgstr "Valida assentaments comptables"
+
+#~ msgid "Entries of Open Analytic Journals"
+#~ msgstr "Assentaments de diaris analítics oberts"
+
+#~ msgid "Current Date"
+#~ msgstr "Data canvi"
+
+#~ msgid "Journal Sale"
+#~ msgstr "Diari de vendes"
+
+#~ msgid "Print VAT Decl."
+#~ msgstr "Imprimeix declaració IVA"
+
+#~ msgid "Financial Accounts"
+#~ msgstr "Comptes generals"
+
+#~ msgid "Account Configure"
+#~ msgstr "Configura compte"
+
+#~ msgid "Print Journal -"
+#~ msgstr "Impressió diari -"
+
+#~ msgid "Models Definition"
+#~ msgstr "Definició de models d'assentaments"
+
+#~ msgid "Reconcile Entries."
+#~ msgstr "Assentaments conciliats."
+
+#~ msgid "Paid invoice when reconciled."
+#~ msgstr "Paga factura quan es conciliï."
+
+#~ msgid "General Debit"
+#~ msgstr "Deure general"
+
+#~ msgid "Name of the fiscal year as displayed on screens."
+#~ msgstr "Nom de l'exercici fiscal que es mostra en pantalla."
+
+#~ msgid "Statement Process"
+#~ msgstr "Procés d'extracte"
+
+#~ msgid "Statement reconcile"
+#~ msgstr "Conciliació extracte"
+
+#~ msgid ""
+#~ "The optional quantity expressed by this line, eg: number of product sold. "
+#~ "The quantity is not a legal requirement but is very usefull for some reports."
+#~ msgstr ""
+#~ "La quantitat opcional expressada per aquesta línia, per ex.: quantitat de "
+#~ "producte venut. La quantitat no és un requisit legal però es molt útil per "
+#~ "alguns informes."
+
+#~ msgid ""
+#~ "This account will be used to value incoming stock for the current product "
+#~ "category"
+#~ msgstr ""
+#~ "Aquest compte s'utilitzarà per valorar l'estoc entrant per l'actual "
+#~ "categoria de producte"
+
+#, python-format
+#~ msgid "No journal for ending writing has been defined for the fiscal year"
+#~ msgstr ""
+#~ "No s'ha definit un diari per l'assentament de tancament per l'exercici fiscal"
+
+#~ msgid "Journal de frais"
+#~ msgstr "Diari de despeses"
+
+#~ msgid ""
+#~ "If a default tax is given in the partner it only overrides taxes from "
+#~ "accounts (or products) in the same group."
+#~ msgstr ""
+#~ "Si s'indica a l'empresa un impost per defecte només anul·la els impostos "
+#~ "dels comptes (o productes) en el mateix grup."
+
+#, python-format
+#~ msgid "No Data Available"
+#~ msgstr "No hi ha dades disponibles"
+
+#~ msgid "J.C. or Move name"
+#~ msgstr "Cod. diari o assentament"
+
+#~ msgid "Parent Analytic Account"
+#~ msgstr "Compte analítica pare"
+
+#~ msgid "Invoice Sequence"
+#~ msgstr "Seqüència de factura"
+
+#~ msgid "Date or Code"
+#~ msgstr "Data o codi"
+
+#~ msgid "Journal de vente"
+#~ msgstr "Diari de vendes"
+
+#, python-format
+#~ msgid "You can not validate a non-balanced entry !"
+#~ msgstr "No es pot validar un assentament no quadrat!"
+
+#~ msgid "Fiscal Position Template Account Mapping"
+#~ msgstr "Mapa comptes plantilla posició fiscal"
+
+#~ msgid "Error: Invalid Bvr Number (wrong checksum)."
+#~ msgstr "Error: Número BVR no vàlid (checksum erroni)."
+
+#~ msgid ""
+#~ "The partner bank account to pay\n"
+#~ "Keep empty to use the default"
+#~ msgstr ""
+#~ "El compte bancari de l'empresa per pagar\n"
+#~ "Deixa buit per utilitzar el valor per defecte"
+
+#~ msgid "Journal d'extourne"
+#~ msgstr "Diari d'inversió"
+
+#~ msgid "Import Invoices in Statement"
+#~ msgstr "Importa factures en extracte"
+
+#~ msgid "Full Account Name"
+#~ msgstr "Nom del compte complet"
+
+#, python-format
+#~ msgid "Date to must be set between %s and %s"
+#~ msgstr "La data ha d'estar entre%s i %s"
+
+#~ msgid "Journal de Banque CHF"
+#~ msgstr "Diari de banc"
+
+#, python-format
+#~ msgid "No records found for your selection!"
+#~ msgstr "No s'han trobat registres en la seva selecció!"
+
+#~ msgid ""
+#~ "This account will be used instead of the default one to value outgoing stock "
+#~ "for the current product"
+#~ msgstr ""
+#~ "Aquest compte s'utilitzarà en comptes del compte per defecte per valorar "
+#~ "l'estoc sortint pel producte actual."
+
+#, python-format
+#~ msgid "The old fiscal year does not have any entry to reconcile!"
+#~ msgstr ""
+#~ "L'exercici fiscal anterior no ha de tenir cap assentament a conciliar!"
+
+#~ msgid "Maximum Quantity"
+#~ msgstr "Quantitat màxima"
+
+#, python-format
+#~ msgid "Date not in a defined fiscal year"
+#~ msgstr "La data no està en un exercici fiscal definit"
+
+#, python-format
+#~ msgid "Can not pay draft/proforma/cancel invoice."
+#~ msgstr "No es pot pagar una factura esborrany/proforma/cancel.lada."
+
+#~ msgid ""
+#~ "This account will be used instead of the default one to value incoming stock "
+#~ "for the current product"
+#~ msgstr ""
+#~ "Aquest compte s'utilitzarà en comptes del compte per defecte per valorar "
+#~ "l'estoc entrant pel producte actual."
+
+#~ msgid "The sequence used for invoice numbers in this journal."
+#~ msgstr "La seqüència utilitzada pels números de factura en aquest diari."
+
+#~ msgid "Error ! The duration of the Fiscal Year is invalid. "
+#~ msgstr "Error! La durada de l'exercici fiscal no és correcta. "
+
+#~ msgid ""
+#~ "This account will be used to value outgoing stock for the current product "
+#~ "category"
+#~ msgstr ""
+#~ "Aquest compte s'utilitzarà per valorar l'estoc sortint per a la categoria de "
+#~ "producte actual."
+
+#~ msgid "Accounting and financial management"
+#~ msgstr "Gestió comptable i financera"
+
+#~ msgid "Account Code"
+#~ msgstr "Codi compte"
+
+#~ msgid ""
+#~ "Financial and accounting module that covers:\n"
+#~ "    General accounting\n"
+#~ "    Cost / Analytic accounting\n"
+#~ "    Third party accounting\n"
+#~ "    Taxes management\n"
+#~ "    Budgets\n"
+#~ "    Customer and Supplier Invoices\n"
+#~ "    Bank statements\n"
+#~ "    "
+#~ msgstr ""
+#~ "Mòdul de comptabilitat financera i analítica que cobreix:\n"
+#~ "    Comptabilitat general\n"
+#~ "    Costos / comptabilitat analítica\n"
+#~ "    Comptabilitat de tercers\n"
+#~ "    Gestió d'impostos\n"
+#~ "    Pressupostos\n"
+#~ "    Factures de clients i proveïdors\n"
+#~ "    Extractes de comptes bancaris\n"
+#~ "    "
+
+#~ msgid "Fiscal Position Template Tax Mapping"
+#~ msgstr "Mapa impostos plantilla posició fiscal"
+
+#, python-format
+#~ msgid "The statement balance is incorrect !\n"
+#~ msgstr "El balanç de l'extracte bancari és incorrecte!\n"
+
+#, python-format
+#~ msgid ""
+#~ "No period defined for this date !\n"
+#~ "Please create a fiscal year."
+#~ msgstr ""
+#~ "No s'ha definit un període per a aquesta data!\n"
+#~ "Creeu un exercici fiscal."
+
+#~ msgid ""
+#~ "You can check this box to mark the entry line as a litigation with the "
+#~ "associated partner"
+#~ msgstr ""
+#~ "Marqueu aquesta casella per senyalar la línia de l'assentament com un "
+#~ "desacord amb l'empresa associada"
+
+#, python-format
+#~ msgid ""
+#~ "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"
+#~ "\n"
+#~ "e.g. My model on %(date)s"
+#~ msgstr ""
+#~ "Podeu indicar any, mes i data en el nom del model utilitzant les etiquetes "
+#~ "següents:\n"
+#~ "\n"
+#~ "%(year)s: Indica any\n"
+#~ "%(month)s: Indica mes\n"
+#~ "%(date)s: Data actual\n"
+#~ "\n"
+#~ "per ex. El meu model de %(date)s"
+
+#~ msgid "Force all moves for this account to have this secondary currency."
+#~ msgstr ""
+#~ "Força a tots els moviments d'aquest compte que tinguin aquesta divisa "
+#~ "secundària."
+
+#~ msgid "The amount in the currency of the journal"
+#~ msgstr "La quantitat en la divisa del diari"
+
+#~ msgid "The currency of the journal"
+#~ msgstr "La divisa del diari"
+
+#~ msgid ""
+#~ "Check this box if you don't want new account moves to pass through the "
+#~ "'draft' state and instead goes directly to the 'posted state' without any "
+#~ "manual validation."
+#~ msgstr ""
+#~ "Marqueu aquesta casella si no voleu que els nous assentaments passin per "
+#~ "l'estat 'Esborrany' i vagin directament a l'estat 'Fixat' sense validar-los "
+#~ "manualment."
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nom de model no vàlid en la definició de l'acció."
+
+#~ msgid "Error! You can not create recursive analytic accounts."
+#~ msgstr "Error! No es pot crear comptes analítics recursius."
+
+#~ msgid ""
+#~ "If the Tax account is tax code account, this field will contain the taxed "
+#~ "amount.If the tax account is base tax code,                    this field "
+#~ "will contain the basic amount(without tax)."
+#~ msgstr ""
+#~ "Si el compte d'impostos és un compte codi d'impostos, aquest camp contindrà "
+#~ "l'import amb impostos. Si el compte d'impostos és el codi d'impostos base, "
+#~ "aquest camp contindrà l'import base (sense impostos)."
+
+#~ msgid "The Account can either be a base tax code or tax code account."
+#~ msgstr ""
+#~ "El compte pot ser un codi d'impostos base o un compte codi d'impostos."
+
+#~ msgid ""
+#~ "This type is used to differenciate types with special effects in Open ERP: "
+#~ "view can not have entries, consolidation are accounts that can have children "
+#~ "accounts for multi-company consolidations, payable/receivable are for "
+#~ "partners accounts (for debit/credit computations), closed for deprecated "
+#~ "accounts."
+#~ msgstr ""
+#~ "Aquest tipus serveix per diferenciar els tipus de compte amb "
+#~ "característiques especials en OpenERP: Vista no pot tenir assentaments, "
+#~ "consolidació són comptes que poden tenir comptes filles per consolidacions "
+#~ "multi-companyia, a cobrar / a pagar són comptes per a les empreses (per a "
+#~ "càlculs de dèbit / crèdit), tancat per comptes obsoletes."
+
+#~ msgid ""
+#~ "These types are defined according to your country. The type contain more "
+#~ "information about the account and it's specificities."
+#~ msgstr ""
+#~ "Aquests tipus es defineixen d'acord al seu país. El tipus conté més "
+#~ "informació sobre el compte i les seves especificitats."
+
+#~ msgid "Draft Supplier Refunds"
+#~ msgstr "Factures rectificatives (abonament) de proveïdor esborrany"
+
+#~ msgid "Unpaid Supplier Refunds"
+#~ msgstr "Factures rectificatives (abonament) de proveïdor sense pagar"
+
+#~ msgid "Credit Note"
+#~ msgstr "Factura rectificativa (abonament)"
+
+#~ msgid "Draft Customer Refunds"
+#~ msgstr "Factures rectificatives (abonament) de client esborrany"
+
+#~ msgid "New Supplier Refund"
+#~ msgstr "Nova factura rectificativa (abonament) de proveïdor"
+
+#~ msgid "x Expenses Credit Notes Journal"
+#~ msgstr "x Diari factures rectificatives (abonament) de despeses"
+
+#~ msgid "Unpaid Customer Refunds"
+#~ msgstr "Factures rectificatives (abonament) de client sense pagar"
+
+#~ msgid "New Customer Refund"
+#~ msgstr "Nova factura rectificativa (abonament) de client"
+
+#~ msgid "Journal d'ouverture"
+#~ msgstr "Diari d'obertura"
+
+#~ msgid "Error: BVR reference is required."
+#~ msgstr "Error: La referència BVR és necessària."
+
+#~ msgid "Financial Management"
+#~ msgstr "Comptabilitat i finances"
+
+#~ msgid "to :"
+#~ msgstr "a:"
+
+#~ msgid "wizard.company.setup"
+#~ msgstr "wizard.company.setup"
+
+#~ msgid "Period from :"
+#~ msgstr "Període des de:"
+
+#~ msgid "Specify The Message for the Overdue Payment Report."
+#~ msgstr "Especifiquel el missage per als pagaments fora de termini."
+
+#~ msgid "Overdue Payment Report Message"
+#~ msgstr "Missatge de l'informe dels pagaments fora de termini"
+
+#~ msgid "asgfas"
+#~ msgstr "asgfas"
+
+#~ msgid "Overdue Payment Message"
+#~ msgstr "Missage dels pagaments fora de termini"
+
+#~ msgid "Message"
+#~ msgstr "Missatge"
+
+#~ msgid "Define Fiscal Years and Select Charts of Account"
+#~ msgstr "Definiu els exercicis fiscals i seleccioneu el pla comptable"
+
+#~ msgid "Create a Fiscal Year"
+#~ msgstr "Creeu un exercici fiscal"
+
+#~ msgid "Select Chart of Accounts"
+#~ msgstr "Seleccioneu un pla comptable"
+
+#~ msgid "Select invoices you want to pay and manages advances"
+#~ msgstr "Seleccioneu les factures que voleu pagar i gestionar avançaments"
+
+#~ msgid "Select Message"
+#~ msgstr "Seleccioneu missatge"
+
+#~ msgid "Move line select"
+#~ msgstr "Seleccioneu línia moviment"
+
+#~ msgid "Select Chart"
+#~ msgstr "Seleccioneu un pla comptable"
+
+#~ msgid "Choose Journal and Payment Date"
+#~ msgstr "Seleccioneu diari i data de pagament"
+
+#~ msgid "Select parent account"
+#~ msgstr "Seleccioneu el compte pare"
+
+#~ msgid "Select Date-Period"
+#~ msgstr "Seleccioneu data-període"
+
+#~ msgid "Select entries"
+#~ msgstr "Seleccioneu les entrades"
+
+#~ msgid "3 Months"
+#~ msgstr "Trimestral"
+
+#~ msgid "Account Entry Line"
+#~ msgstr "Apunt comptable"
+
+#~ msgid "<drawRightString x=\"19.8cm\" y=\"28cm\">"
+#~ msgstr "<drawRightString x=\"19.8cm\" y=\"28cm\">"
+
+#~ msgid "Header"
+#~ msgstr "Capçalera"
+
+#~ msgid "COL 2"
+#~ msgstr "COL 2"
+
+#~ msgid "</drawRightString>"
+#~ msgstr "</drawRightString>"
+
+#~ msgid "TITLE COMPANY"
+#~ msgstr "TÍTOL COMPANYIA"
+
+#~ msgid "logo"
+#~ msgstr "logo"
+
+#~ msgid "COL 1"
+#~ msgstr "COL 1"
+
+#~ msgid "<stroke color=\"darkblue\"/>"
+#~ msgstr "<stroke color=\"darkblue\"/>"
+
+#~ msgid "<drawString x=\"4.6cm\" y=\"28.7cm\">"
+#~ msgstr "<drawString x=\"4.6cm\" y=\"28.7cm\">"
+
+#, python-format
+#~ msgid "UnknownError"
+#~ msgstr "Error desconegut"
+
+#~ msgid "</drawString>"
+#~ msgstr "</drawString>"
+
+#~ msgid "<fill color=\"darkblue\"/>"
+#~ msgstr "<fill color=\"darkblue\"/>"
+
+#~ msgid ""
+#~ "Example: 14 days 2%, 30 days net\n"
+#~ "1. Line 1: percent 0.02 14 days\n"
+#~ "2. Line 2: balance 30 days"
+#~ msgstr ""
+#~ "Exemple: 14 dies 2%, 30 dies la resta\n"
+#~ "1. Línia 1: Percentatge 0.02 14 dies\n"
+#~ "2. Línia 2: Saldo 30 dies"
+
+#~ msgid "Balance Brought Forward"
+#~ msgstr "Saldo inicial"
+
+#~ msgid "Partner Other Ledger"
+#~ msgstr "Llibre major empresa"
+
+#~ msgid "Account Entry Lines"
+#~ msgstr "Línies assentament comptable"
+
+#~ msgid "Analytic accounts to close"
+#~ msgstr "Comptes analítics a tancar"
+
+#~ msgid "Draft invoices"
+#~ msgstr "Factures esborrany"
+
+#~ msgid "Accounts to invoice"
+#~ msgstr "Comptes a facturar"
+
+#~ msgid "Costs to invoice"
+#~ msgstr "Costos a facturar"
+
+#~ msgid "Aged receivables"
+#~ msgstr "A cobrar anteriors"
+
+#~ msgid "Board for accountant"
+#~ msgstr "Taulell per comptables"
+
+#~ msgid "My indicators"
+#~ msgstr "Els meus indicadors"
+
+#~ msgid "Aged income"
+#~ msgstr "Ingressos anteriors"
+
+#~ msgid "Show Debit/Credit Information"
+#~ msgstr "Mostra informació dèbit/crèdit"
+
+#~ msgid "All accounts"
+#~ msgstr "Tots els comptes"
+
+#~ msgid "Entries Selection Based on"
+#~ msgstr "Selecció d'entrades basada en"
+
+#~ msgid "Notification"
+#~ msgstr "Notificació"
+
+#~ msgid "Financial Period"
+#~ msgstr "Període financer"
+
+#~ msgid "Select Period(s)"
+#~ msgstr "Selecciona període(s)"
+
+#~ msgid "Compare Selected Years In Terms Of"
+#~ msgstr "Compara exercicis seleccionats en termes de"
+
+#~ msgid "Select Fiscal Year(s)(Maximum Three Years)"
+#~ msgstr "Selecciona exercici(s) fiscal(s) (màxim 3 anys)"
+
+#~ msgid "Select Reference Account(for  % comparision)"
+#~ msgstr "Selecciona compte de referència (per comparació %)"
+
+#~ msgid "Account balance-Compare Years"
+#~ msgstr "Saldo comptable-Compara exercicis"
+
+#~ msgid ""
+#~ "Account Balance Module is an added functionality to the Financial Management "
+#~ "module.\n"
+#~ "\n"
+#~ "    This module gives you the various options for printing balance sheet.\n"
+#~ "\n"
+#~ "    1. You can compare the balance sheet for different years.\n"
+#~ "\n"
+#~ "    2. You can set the cash or percentage comparison between two years.\n"
+#~ "\n"
+#~ "    3. You can set the referential account for the percentage comparison for "
+#~ "particular years.\n"
+#~ "\n"
+#~ "    4. You can select periods as an actual date or periods as creation "
+#~ "date.\n"
+#~ "\n"
+#~ "    5. You have an option to print the desired report in Landscape format.\n"
+#~ "    "
+#~ msgstr ""
+#~ "El mòdul de balanç de comptes és una funcionalitat afegida al mòdul de "
+#~ "gestió financera.\n"
+#~ "\n"
+#~ "    Aquest mòdul ofereix diverses opcions d'impressió de balanços.\n"
+#~ "\n"
+#~ "    1. Es pot comparar el balanç de diferents anys.\n"
+#~ "\n"
+#~ "    2. Podeu establir la comparació en import o percentual entre dos anys.\n"
+#~ "\n"
+#~ "    3. Podeu configurar el compte de referència per a la comparació "
+#~ "percentual per a anys en particular.\n"
+#~ "\n"
+#~ "    4. Podeu seleccionar períodes com una data real o períodes com a data de "
+#~ "creació.\n"
+#~ "\n"
+#~ "    5. Podeu imprimir l'informe escollit en format apaïsat.\n"
+#~ "    "
+
+#~ msgid "You have to select 'Landscape' option. Please Check it."
+#~ msgstr "Heu de seleccionar l'opció 'Horitzontal'. Marqueu-la."
+
+#~ msgid "Show Report in Landscape Form"
+#~ msgstr "Mostra informe en format horitzontal"
+
+#~ msgid "Show Comparision in %"
+#~ msgstr "Mostra comparació en %"
+
+#~ msgid "Don't Compare"
+#~ msgstr "No compara"
+
+#~ msgid "Show Accounts"
+#~ msgstr "Mostra comptes"
+
+#~ msgid "1. You have selected more than 3 years in any case."
+#~ msgstr "1. Ha de seleccionar més de 3 exercicis en qualsevol cas."
+
+#~ msgid "Accounting and financial management-Compare Accounts"
+#~ msgstr "Gestió comptable financera - Comparació de comptes"
+
+#~ msgid "You can select maximum 3 years. Please check again."
+#~ msgstr ""
+#~ "Pot seleccionar un màxim de 3 exercicis. Seleccioneu un altre vegada."
+
+#~ msgid ""
+#~ "3. You have selected 'Percentage' option with more than 2 years, but you "
+#~ "have not selected landscape format."
+#~ msgstr ""
+#~ "3. Heu seleccionat la opció 'Percentatge' amb més de 2 exercicis, però no "
+#~ "ha seleccionat format horitzontal."
+
+#~ msgid ""
+#~ "You might have done following mistakes. Please correct them and try again."
+#~ msgstr ""
+#~ "Podríeu haver comès els següents errors. Corregiu-los e intenteu de nou."
+
+#~ msgid "Keep empty for comparision to its parent"
+#~ msgstr "Deixeu-lo buit per a comparar amb els seus pares"
+
+#~ msgid "Creation Date"
+#~ msgstr "Data creació"
+
+#~ msgid ""
+#~ "2. You have not selected 'Percentage' option, but you have selected more "
+#~ "than 2 years."
+#~ msgstr ""
+#~ "2. No heu seleccionat l'opció 'Percentatge', però heu seleccionat més de 2 "
+#~ "exercicis."
+
+#~ msgid ""
+#~ "You may have selected the compare options with more than 1 year with "
+#~ "credit/debit columns and % option.This can lead contents to be printed out "
+#~ "of the paper.Please try again."
+#~ msgstr ""
+#~ "Pot haver seleccionat les opcions comparar amb més de 1 exercici amb "
+#~ "columnes crèdit/dèbit i opció %. Això pot ocasionar que hi hagin continguts "
+#~ "que s'imprimeixin fora del paper. Intenteu de nou."
+
+#~ msgid "You have to select at least 1 Fiscal Year. Try again."
+#~ msgstr "Heu de seleccionar al menys un exercici fiscal. Intenteu de nou."
+
+#~ msgid "Customize Report"
+#~ msgstr "Informe personalitzat"
+
+#~ msgid "A module that adds new reports based on the account module."
+#~ msgstr ""
+#~ "Mòdul que afegeix nous informes basat en el mòdul comptable-financer."
+
+#~ msgid "Account Reporting - Reporting"
+#~ msgstr "Informe comptable - Informe"
+>>>>>>> MERGE-SOURCE

=== modified file 'account/i18n/cs.po'
--- account/i18n/cs.po	2011-10-05 05:53:44 +0000
+++ account/i18n/cs.po	2011-11-22 19:28:30 +0000
@@ -6,16 +6,27 @@
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2011-05-09 10:18+0000\n"
 "PO-Revision-Date: 2011-08-13 17:22+0000\n"
 "Last-Translator: Jan B. Krejčí <Unknown>\n"
+=======
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-01-26 09:56+0000\n"
+"Last-Translator: Pavel Stejskal <Unknown>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-10-05 04:56+0000\n"
 "X-Generator: Launchpad (build 14085)\n"
 "X-Poedit-Language: Czech\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-18 04:48+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -25,7 +36,17 @@
 #. module: account
 #: view:account.journal:0
 msgid "Other Configuration"
-msgstr "Ostatní nastavení"
+<<<<<<< TREE
+msgstr "Ostatní nastavení"
+=======
+msgstr "Ostatní nastavení"
+
+#. module: account
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
+#, python-format
+msgid "No End of year journal defined for the fiscal year"
+msgstr ""
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: code:addons/account/account.py:506
@@ -34,7 +55,12 @@
 "You cannot remove/deactivate an account which is set as a property to any "
 "Partner."
 msgstr ""
+<<<<<<< TREE
 "Nemůžete odstranit/deaktivovat účet, který je přiřazen některému partnerovi"
+=======
+"Nemůžete odstranit/deaktivovat účet, který je nastaven jako vlastnost "
+"některého partnera"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: view:account.move.reconcile:0
@@ -64,17 +90,29 @@
 #: code:addons/account/invoice.py:785
 #, python-format
 msgid "Please define sequence on invoice journal"
+<<<<<<< TREE
 msgstr "Prosím nadefinujte číselnou řadu knihy faktur"
+=======
+msgstr "Prosím nadefinujte sekvenci knihy faktur"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: constraint:account.period:0
 msgid "Error ! The duration of the Period(s) is/are invalid. "
+<<<<<<< TREE
 msgstr "Chyba! Neplatná délka období. "
+=======
+msgstr "Chyba! Délku období (s) je / jsou neplatné. "
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: field:account.analytic.line,currency_id:0
 msgid "Account currency"
+<<<<<<< TREE
 msgstr "Měna účtu"
+=======
+msgstr "Účetní měna"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: view:account.tax:0
@@ -84,7 +122,11 @@
 #. module: account
 #: model:ir.model,name:account.model_report_aged_receivable
 msgid "Aged Receivable Till Today"
+<<<<<<< TREE
 msgstr "Pohledávky splatné ke dnešku"
+=======
+msgstr "splatné pohledávky do dnešního dne"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: field:account.partner.ledger,reconcil:0
@@ -97,13 +139,22 @@
 "The Profit and Loss report gives you an overview of your company profit and "
 "loss in a single document"
 msgstr ""
+<<<<<<< TREE
 "Výkaz zisku a ztráty Vám dá přehled o zisku či ztrátě společnosti v jediném "
 "dokumentu"
+=======
+"Výkaz zisku a ztrát Vám dá přehled o zisku/ztrátě společnosti v jediném "
+"dokumentu"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.transition,name:account.process_transition_invoiceimport0
 msgid "Import from invoice or payment"
+<<<<<<< TREE
 msgstr "Importovat z faktury nebo platby"
+=======
+msgstr "Importovat z faktur nebo plateb"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:ir.model,name:account.model_wizard_multi_charts_accounts
@@ -737,12 +788,15 @@
 msgstr "Dnes likvidovaní partneři"
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account_bank_statement.py:306
 #, python-format
 msgid "The statement balance is incorrect !\n"
 msgstr "Nesprávný zůstatek výpisu!\n"
 
 #. module: account
+=======
+>>>>>>> MERGE-SOURCE
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
@@ -2636,9 +2690,10 @@
 msgstr "Srpen"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:307
+#: code:addons/account/account_bank_statement.py:306
 #, python-format
 msgid ""
+"The statement balance is incorrect !\n"
 "The expected balance (%.2f) is different than the computed one. (%.2f)"
 msgstr ""
 
@@ -2875,6 +2930,12 @@
 msgstr "Pohled"
 
 #. module: account
+#: code:addons/account/account.py:2951
+#, python-format
+msgid "BNK%s"
+msgstr ""
+
+#. module: account
 #: code:addons/account/account.py:2906
 #: code:addons/account/installer.py:296
 #, python-format
@@ -4284,12 +4345,15 @@
 msgstr "Zůstatek účtu -"
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/invoice.py:997
 #, python-format
 msgid "Invoice "
 msgstr "Faktura "
 
 #. module: account
+=======
+>>>>>>> MERGE-SOURCE
 #: field:account.automatic.reconcile,date1:0
 msgid "Starting Date"
 msgstr "Počáteční den"
@@ -5595,8 +5659,13 @@
 #. module: account
 #: code:addons/account/invoice.py:997
 #, python-format
+<<<<<<< TREE
 msgid "is validated."
 msgstr "není platné."
+=======
+msgid "Invoice  '%s' is validated."
+msgstr ""
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: view:account.chart.template:0

=== modified file 'account/i18n/da.po'
--- account/i18n/da.po	2011-10-12 04:55:57 +0000
+++ account/i18n/da.po	2011-11-22 19:28:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-10-12 04:55+0000\n"
 "X-Generator: Launchpad (build 14124)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-18 04:48+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -705,12 +710,6 @@
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:306
-#, python-format
-msgid "The statement balance is incorrect !\n"
-msgstr ""
-
-#. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
@@ -2576,12 +2575,12 @@
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:307
+#: code:addons/account/account_bank_statement.py:306
 #, python-format
 msgid ""
+"The statement balance is incorrect !\n"
 "The expected balance (%.2f) is different than the computed one. (%.2f)"
 msgstr ""
-"Den forventede balance (%.2f) er forskellig fra den beregnede. (%.2f)"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentreconcile0
@@ -2820,6 +2819,12 @@
 msgstr "Vis"
 
 #. module: account
+#: code:addons/account/account.py:2951
+#, python-format
+msgid "BNK%s"
+msgstr ""
+
+#. module: account
 #: code:addons/account/account.py:2906
 #: code:addons/account/installer.py:296
 #, python-format
@@ -4210,12 +4215,15 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/invoice.py:997
 #, python-format
 msgid "Invoice "
 msgstr ""
 
 #. module: account
+=======
+>>>>>>> MERGE-SOURCE
 #: field:account.automatic.reconcile,date1:0
 msgid "Starting Date"
 msgstr ""
@@ -5507,7 +5515,7 @@
 #. module: account
 #: code:addons/account/invoice.py:997
 #, python-format
-msgid "is validated."
+msgid "Invoice  '%s' is validated."
 msgstr ""
 
 #. module: account
@@ -9717,6 +9725,7 @@
 "in its currency (maybe different of the company currency)."
 msgstr ""
 
+<<<<<<< TREE
 #. module: account
 #: report:account.balancesheet:0
 #: report:account.balancesheet.horizontal:0
@@ -9762,3 +9771,147 @@
 #: report:account.aged_trial_balance:0
 msgid "Not due"
 msgstr ""
+=======
+#~ msgid "Unpaid Supplier Invoices"
+#~ msgstr "Ubetalte leverandør fakturaer."
+
+#~ msgid "Print Taxes Report"
+#~ msgstr "Udskriv skatte rapporter"
+
+#~ msgid "Confirm draft invoices"
+#~ msgstr "Bekræft udkast til fakturaer"
+
+#~ msgid "Account Num."
+#~ msgstr "Konto nummer."
+
+#~ msgid "Total entries"
+#~ msgstr "Totale posteringe"
+
+#~ msgid "Supplier invoice"
+#~ msgstr "Leverandør faktura"
+
+#~ msgid "Printing Date"
+#~ msgstr "Udskrivnings dato"
+
+#~ msgid "J.C. or Move name"
+#~ msgstr "J.C eller flyt navn"
+
+#~ msgid "Error! You can not create recursive account."
+#~ msgstr "Fejl! Du kan ikke oprette rekursive konto."
+
+#~ msgid "Contact"
+#~ msgstr "Kontaktperson"
+
+#~ msgid "Can be draft or validated"
+#~ msgstr "Kan være udkast eller valideret"
+
+#~ msgid "Partner account"
+#~ msgstr "Partner konto"
+
+#~ msgid "Status"
+#~ msgstr "Status"
+
+#~ msgid "Partial Payment"
+#~ msgstr "Delbetaling"
+
+#~ msgid "Bank Reconciliation"
+#~ msgstr "Bank afstemning"
+
+#~ msgid "Cancel Invoice"
+#~ msgstr "Annuller Faktura"
+
+#, python-format
+#~ msgid "No Data Available"
+#~ msgstr "Ingen data tilgængelig"
+
+#~ msgid "End date"
+#~ msgstr "Slut dato"
+
+#~ msgid "Printing Date :"
+#~ msgstr "Udskrifts dato:"
+
+#~ msgid "analytic Invoice"
+#~ msgstr "analyse Faktura"
+
+#~ msgid "Grand total"
+#~ msgstr "Grand total"
+
+#~ msgid "New Supplier Invoice"
+#~ msgstr "Ny leverandør faktura"
+
+#~ msgid "Voucher Nb"
+#~ msgstr "Kupon No"
+
+#~ msgid "Amount paid"
+#~ msgstr "Beløb betalt"
+
+#~ msgid "Are you sure you want to close the fiscal year ?"
+#~ msgstr "Er du sikker på du vil afslutte regnskabsåret ?"
+
+#~ msgid "Bank Receipt"
+#~ msgstr "Bank kvittering"
+
+#~ msgid "Invoice import"
+#~ msgstr "Faktura import"
+
+#, python-format
+#~ msgid ""
+#~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
+#~ msgstr ""
+#~ "Den forventede balance (%.2f) er forskellig fra den beregnede. (%.2f)"
+
+#~ msgid "Continue"
+#~ msgstr "Fortsæt"
+
+#~ msgid "Value"
+#~ msgstr "Værdi"
+
+#~ msgid "Select invoices you want to pay and manages advances"
+#~ msgstr "Vælg fakturaer, du ønsker at betale og administrere"
+
+#~ msgid "Display History"
+#~ msgstr "Vis historik"
+
+#~ msgid "        Start date"
+#~ msgstr "        Start dato"
+
+#~ msgid "Display accounts "
+#~ msgstr "Vis kontoer "
+
+#~ msgid "Crédit"
+#~ msgstr "Kredit"
+
+#~ msgid ""
+#~ "The partner bank account to pay\n"
+#~ "Keep empty to use the default"
+#~ msgstr ""
+#~ "Partners bank konto for betaling\n"
+#~ "Holdes tom for default værdier"
+
+#~ msgid "Invoice Movement"
+#~ msgstr "Faktura bevægelser"
+
+#~ msgid "Income"
+#~ msgstr "Indtægt"
+
+#~ msgid "Partner Ref."
+#~ msgstr "Partner Ref."
+
+#~ msgid "VAT"
+#~ msgstr "Moms"
+
+#~ msgid "Total quantity"
+#~ msgstr "Total antal"
+
+#~ msgid "Third party"
+#~ msgstr "Tredie part"
+
+#~ msgid "Select Message"
+#~ msgstr "Vælg besked"
+
+#~ msgid "Charts of Account"
+#~ msgstr "Diagrammer af kontoen"
+
+#~ msgid "supplier"
+#~ msgstr "leverandør"
+>>>>>>> MERGE-SOURCE

=== modified file 'account/i18n/de.po'
--- account/i18n/de.po	2011-10-05 05:53:44 +0000
+++ account/i18n/de.po	2011-11-22 19:28:30 +0000
@@ -6,15 +6,26 @@
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2011-05-09 10:18+0000\n"
 "PO-Revision-Date: 2011-09-21 10:54+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
+=======
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-02-13 22:46+0000\n"
+"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-10-05 04:56+0000\n"
 "X-Generator: Launchpad (build 14085)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-18 04:49+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -749,12 +760,6 @@
 msgstr "Heute ausgeglichene Partner"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:306
-#, python-format
-msgid "The statement balance is incorrect !\n"
-msgstr "Der Saldo für diesen gebuchten Auszug stimmt nicht überein !\n"
-
-#. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
@@ -2720,11 +2725,12 @@
 msgstr "August"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:307
+#: code:addons/account/account_bank_statement.py:306
 #, python-format
 msgid ""
+"The statement balance is incorrect !\n"
 "The expected balance (%.2f) is different than the computed one. (%.2f)"
-msgstr "Der erwartete Wert (%.2f) weicht ab von dem berechneten Wert (%.2f)"
+msgstr ""
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentreconcile0
@@ -2978,6 +2984,12 @@
 msgstr "Ansicht"
 
 #. module: account
+#: code:addons/account/account.py:2951
+#, python-format
+msgid "BNK%s"
+msgstr ""
+
+#. module: account
 #: code:addons/account/account.py:2906
 #: code:addons/account/installer.py:296
 #, python-format
@@ -4449,12 +4461,15 @@
 msgstr "Saldo"
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/invoice.py:997
 #, python-format
 msgid "Invoice "
 msgstr "Rechnung "
 
 #. module: account
+=======
+>>>>>>> MERGE-SOURCE
 #: field:account.automatic.reconcile,date1:0
 msgid "Starting Date"
 msgstr "Start Datum"
@@ -5826,8 +5841,8 @@
 #. module: account
 #: code:addons/account/invoice.py:997
 #, python-format
-msgid "is validated."
-msgstr "wurde geprüft und gebucht."
+msgid "Invoice  '%s' is validated."
+msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
@@ -10388,6 +10403,7 @@
 "Der verbleibende Saldo auf einem Debitor oder Kreditor nach vorgenommenen "
 "Buchung in der Landeswährung."
 
+<<<<<<< TREE
 #. module: account
 #: report:account.balancesheet:0
 #: report:account.balancesheet.horizontal:0
@@ -10492,3 +10508,1971 @@
 #~ "Sie können keinen Kontenplan erzeugen!\n"
 #~ "Stellen Sie sicher, dass die Finanzkontovorlage eines übergeordneten Kontos "
 #~ "den Typ \"Ansicht\" haben sollte. "
+=======
+#~ msgid "Keep empty to use the period of the validation date."
+#~ msgstr "Frei lassen für Periode des Validierungsdatums."
+
+#~ msgid "Error! You can not create recursive account."
+#~ msgstr "Fehler! Sie können keine rekursiven Konten definieren."
+
+#~ msgid ""
+#~ "If you use payment terms, the due date will be computed automatically at the "
+#~ "generation of accounting entries. If you keep the payment term and the due "
+#~ "date empty, it means direct payment."
+#~ msgstr ""
+#~ "Falls Sie Zahlungsbedingungen einsetzen wird das Fälligkeitsdatum für die "
+#~ "Rechnungen automatisch berechnet."
+
+#~ msgid "Unpaid Supplier Invoices"
+#~ msgstr "Offene Eingangsrechnungen"
+
+#~ msgid "Entries Encoding"
+#~ msgstr "Erfasse Buchungen"
+
+#~ msgid "Confirm statement from draft"
+#~ msgstr "Bestätige Buchung Bankkontoauszug"
+
+#~ msgid "Asset"
+#~ msgstr "Aktiva"
+
+#~ msgid "Select Message"
+#~ msgstr "Wähle Nachricht"
+
+#~ msgid "Unreconciled entries"
+#~ msgstr "Offene Posten"
+
+#~ msgid "Print Taxes Report"
+#~ msgstr "Druck Report Steuer"
+
+#, python-format
+#~ msgid "Account move line \"%s\" is not valid"
+#~ msgstr "Buchungsposition \"%s\" ist ungültig"
+
+#~ msgid "Unreconcile entries"
+#~ msgstr "Storno Ausgleich"
+
+#~ msgid "Confirm draft invoices"
+#~ msgstr "Bestätige Entwurf Rechnung"
+
+#~ msgid "Charts of Account"
+#~ msgstr "Kontenplan Finanzkonten"
+
+#~ msgid "Move line select"
+#~ msgstr "Auswahl Buchungszeile"
+
+#~ msgid "Entry label"
+#~ msgstr "Buchungstext"
+
+#~ msgid "Account Entry Line"
+#~ msgstr "Buchungszeile"