diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index e0ac10abb50..93cdbbf9904 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -16,7 +16,6 @@
-
@@ -34,7 +33,6 @@
-
@@ -46,6 +44,17 @@
+
+
+
+
+
diff --git a/addons/account/wizard/account_balance_report_view.xml b/addons/account/wizard/account_balance_report_view.xml
index 77c615611d3..7011dadef7d 100644
--- a/addons/account/wizard/account_balance_report_view.xml
+++ b/addons/account/wizard/account_balance_report_view.xml
@@ -7,41 +7,41 @@
account.balance.report
form
-
+
-
+
-
+
Account Balance
account.balance.report
ir.actions.act_window
@@ -51,7 +51,7 @@
new
-
+
Account Balance
@@ -59,19 +59,19 @@
action
account.account
-
+
-
+
Account Balance
account.balance.report
form
-
+
@@ -86,11 +86,11 @@
new
-
+
-
+
diff --git a/addons/account/wizard/account_central_journal_view.xml b/addons/account/wizard/account_central_journal_view.xml
index 6a9526c415e..9c9d687785c 100644
--- a/addons/account/wizard/account_central_journal_view.xml
+++ b/addons/account/wizard/account_central_journal_view.xml
@@ -2,27 +2,27 @@
-
+
Account central Journal
account.central.journal
form
-
+
@@ -35,12 +35,12 @@
new
-
+
-
-
\ No newline at end of file
+
+
diff --git a/addons/account/wizard/account_general_journal_view.xml b/addons/account/wizard/account_general_journal_view.xml
index a3a54843396..711e3a85329 100644
--- a/addons/account/wizard/account_general_journal_view.xml
+++ b/addons/account/wizard/account_general_journal_view.xml
@@ -2,27 +2,27 @@
-
+
Account Genral Journal
account.general.journal
form
-
+
@@ -35,12 +35,12 @@
new
-
+
-
-
\ No newline at end of file
+
+
diff --git a/addons/account/wizard/account_general_ledger_report_view.xml b/addons/account/wizard/account_general_ledger_report_view.xml
index b06c24d501d..67526d51788 100644
--- a/addons/account/wizard/account_general_ledger_report_view.xml
+++ b/addons/account/wizard/account_general_ledger_report_view.xml
@@ -96,7 +96,7 @@
diff --git a/addons/account/wizard/account_pl_report_view.xml b/addons/account/wizard/account_pl_report_view.xml
index 47ad83a235e..219d41d312f 100644
--- a/addons/account/wizard/account_pl_report_view.xml
+++ b/addons/account/wizard/account_pl_report_view.xml
@@ -76,11 +76,6 @@
new
-
-
diff --git a/addons/account_coda/wizard/coda_import.py b/addons/account_coda/wizard/coda_import.py
index 9f0b413ee1d..39aa7b645cb 100644
--- a/addons/account_coda/wizard/coda_import.py
+++ b/addons/account_coda/wizard/coda_import.py
@@ -234,22 +234,29 @@ def _coda_parsing(self, cr, uid, data, context):
if rec_id:
reconcile_id = pool.get('account.bank.statement.reconcile').create(cr, uid, {
'line_ids': [(6, 0, rec_id)]
- }, context=context)
+ }, context=context)
+ mv = pool.get('account.move.line').browse(cr, uid, rec_id[0], context=context)
+ if mv.partner_id:
+ line['partner_id'] = mv.partner_id.id
+ if line['amount'] < 0 :
+ line['account_id'] = mv.partner_id.property_account_payable.id
+ else :
+ line['account_id'] = mv.partner_id.property_account_receivable.id
str_not1 = ''
if line.has_key('contry_name') and line.has_key('cntry_number'):
str_not1="Partner name:%s \n Partner Account Number:%s \n Communication:%s \n Value Date:%s \n Entry Date:%s \n"%(line["contry_name"],line["cntry_number"],line["free_comm"]+line['extra_note'],line["val_date"][0],line["entry_date"][0])
id=pool.get('account.bank.statement.line').create(cr,uid,{
- 'name':line['name'],
- 'date': line['date'],
- 'type':line['amount']>0 and 'customer' or 'supplier',
- 'amount': line['amount'],
- 'partner_id':line['partner_id'] or 0,
- 'account_id':line['account_id'],
- 'statement_id': bk_st_id,
- 'reconcile_id': reconcile_id,
- 'note':str_not1,
- 'ref':line['ref'],
- })
+ 'name':line['name'],
+ 'date': line['date'],
+ 'type':line['amount']>0 and 'customer' or 'supplier',
+ 'amount': line['amount'],
+ 'partner_id':line['partner_id'] or 0,
+ 'account_id':line['account_id'],
+ 'statement_id': bk_st_id,
+ 'reconcile_id': reconcile_id,
+ 'note':str_not1,
+ 'ref':line['ref'],
+ })
str_not= "\n \n Account Number: %s \n Account Holder Name: %s " %(statement["acc_number"],statement["acc_holder"])
std_log += "\nStatement : %s , Date : %s, Starting Balance : %.2f , Ending Balance : %.2f \n"\
diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index a8cdba58975..674dc143334 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1147,7 +1147,6 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
'active': fields.boolean('Active', help="If the active field is set to \
true, it will allow you to hide the event alarm information without removing it.")
}
-
_defaults = {
'state': 'tentative',
'class': 'public',