[REF]

bzr revid: jvo@tinyerp.com-20100519124923-09fiqka3gexs6yh2

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 65c0856..c23bd35 100644 (file)
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -569,7 +569,7 @@ class account_bank_statement_line(osv.osv):
             if type == 'supplier':
                 account_id = part.property_account_payable.id
             else:
-                account_id =  part.property_account_receivable.id
+                account_id = part.property_account_receivable.id
             res['value']['account_id'] = account_id
 
         if not line or (line and not line[0].amount):
@@ -638,7 +638,7 @@ class account_bank_statement_line(osv.osv):
         'note': fields.text('Notes'),
         'reconcile_amount': fields.function(_reconcile_amount,
             string='Amount reconciled', method=True, type='float'),
-        'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of bank statement line."),
+        'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of bank statement lines."),
     }
     _defaults = {
         'name': lambda self,cr,uid,context={}: self.pool.get('ir.sequence').get(cr, uid, 'account.bank.statement.line'),

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index ff13a42..8614600 100644 (file)
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -577,7 +577,7 @@ class account_move_line(osv.osv):
         merges_rec = []
         for line in self.browse(cr, uid, ids, context):
             if line.reconcile_id:
-                raise osv.except_osv(_('Already Reconciled'), _('Already Reconciled'))
+                raise osv.except_osv(_('Warning'), _('Already Reconciled!'))
             if line.reconcile_partial_id:
                 for line2 in line.reconcile_partial_id.line_partial_ids:
                     if not line2.reconcile_id:
@@ -927,7 +927,7 @@ class account_move_line(osv.osv):
                         break
             if journal.account_control_ids and not ok:
                 for a in journal.account_control_ids:
-                    if a.id==vals['account_id']:
+                    if a.id == vals['account_id']:
                         ok = True
                         break
             if (account.currency_id) and 'amount_currency' not in vals and account.currency_id.id <> company_currency:
@@ -962,8 +962,8 @@ class account_move_line(osv.osv):
 
         result = super(osv.osv, self).create(cr, uid, vals, context)
         # CREATE Taxes
-        if 'account_tax_id' in vals and vals['account_tax_id']:
-            tax_id=tax_obj.browse(cr,uid,vals['account_tax_id'])
+        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:
                 base_code = 'ref_base_code_id'
@@ -979,7 +979,7 @@ class account_move_line(osv.osv):
                 tax_sign = 'tax_sign'
 
             tmp_cnt = 0
-            for tax in tax_obj.compute(cr,uid,[tax_id],total,1.00):
+            for tax in tax_obj.compute(cr, uid, [tax_id], total, 1.00):
                 #create the base movement
                 if tmp_cnt == 0:
                     if tax[base_code]:

diff --git a/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
index be261bd..13df8f9 100644 (file)
--- a/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
+++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
@@ -36,7 +36,7 @@ class l10n_be_vat_declaration(osv.osv_memory):
         'file_save': fields.binary('Save File'),
         'ask_resitution': fields.boolean('Ask Restitution'),
         'ask_payment': fields.boolean('Ask Payment'),
-        'client_nihil': fields.boolean('Last Declaration of Entreprise',help='Thick this case only if it concerns only the last statement on the civil or cessation of activity'),
+        'client_nihil': fields.boolean('Last Declaration of Enterprise',help='Tick this case only if it concerns only the last statement on the civil or cessation of activity'),
     }
 
     _defaults = {

diff --git a/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
index 62399ae..faaf480 100644 (file)
--- a/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
+++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
@@ -14,10 +14,10 @@
             <field name="arch" type="xml">
                        <form string="Select Period">
                        <group  colspan="4" >
-                                           <field name="period_id" select="1"/>
-              <field name="ask_resitution"/>
-              <field name="ask_payment"/>
-              <field name="client_nihil"/>
+                                       <field name="period_id" select="1"/>
+                                       <field name="ask_resitution"/>
+                                       <field name="ask_payment"/>
+                                       <field name="client_nihil"/>
                        <button colspan="1" name="create_xml" string="Create XML" type="object" default_focus="1"/>
                 </group>
                 <separator string="XML Flie has been Created." colspan="4"/>