+
Accounts to Renew
ir.actions.act_window
account.analytic.account
@@ -141,7 +141,7 @@
-
@@ -200,22 +200,26 @@
account.analytic.line
search
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -298,16 +302,16 @@
-
+
account.analytic.journal.search
account.analytic.journal
search
-
-
+
+
-
+
@@ -446,14 +450,14 @@
search
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/addons/account/report/report_balance_sheet.rml b/addons/account/report/report_balance_sheet.rml
index c540e16f58e..20f52cdd2f2 100644
--- a/addons/account/report/report_balance_sheet.rml
+++ b/addons/account/report/report_balance_sheet.rml
@@ -186,7 +186,7 @@
[[ '. '*(a['level']-1) ]][[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]][[ a['name'] ]]
- [[ a['balance'] and formatLang(abs(a['balance'])) or 0.0 ]]
+ [[ a['balance'] and formatLang(get_abs(a['balance'])) or 0.0 ]]
|
@@ -196,7 +196,7 @@
Balance:([[ get_currency(data['form']) ]])
- [[ sum_dr() and formatLang(sum_dr()) or 0.0 ]]
+ [[ sum_dr() and formatLang(get_abs(sum_dr())) or 0.0 ]]
|
@@ -221,10 +221,10 @@
[[ repeatIn(get_lines_another('asset'), 'a') ]][[ a['code'] ]][[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]]
- [[ a['code'] ]][[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]][[ a['name'] ]]
+ [[ '. '*(a['level']-1) ]][[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]][[ a['name'] ]]
|
- [[ a['balance'] and formatLang(abs(a['balance'])) or 0.0 ]]
+ [[ a['balance'] and formatLang(get_abs(a['balance'])) or 0.0 ]]
|
@@ -234,7 +234,7 @@
Balance:([[ get_currency(data['form']) ]])
- [[ sum_cr() and formatLang(sum_cr()) or 0.0 ]]
+ [[ sum_cr() and formatLang(get_abs(sum_cr())) or 0.0 ]]
|
diff --git a/addons/account/report/report_balance_sheet_horizontal.rml b/addons/account/report/report_balance_sheet_horizontal.rml
index d9b92da3856..3e60f7bfd2c 100644
--- a/addons/account/report/report_balance_sheet_horizontal.rml
+++ b/addons/account/report/report_balance_sheet_horizontal.rml
@@ -197,7 +197,7 @@
[[ '. '*(a['level']-1) ]][[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]][[ a['name'] ]]
- [[ a['balance'] and formatLang(abs(a['balance'])) or 0.0 ]]
+ [[ a['balance'] and formatLang(get_abs(a['balance'])) or 0.0 ]]
|
[[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]][[ a['code1'] ]]
@@ -206,7 +206,7 @@
[[ '. '*(a['level1']-1) ]][[ a['level1']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]][[ a['name1'] ]]
|
- [[ a['balance1'] and formatLang(abs(a['balance1'])) or 0.0 ]]
+ [[ a['balance1'] and formatLang(get_abs(a['balance1'])) or 0.0 ]]
|
@@ -216,13 +216,13 @@
Balance:([[ get_currency(data['form']) ]])
- [[ sum_dr() and formatLang(abs(sum_dr())) or 0.0 ]]
+ [[ sum_dr() and formatLang(get_abs(sum_dr())) or 0.0 ]]
|
Balance:([[ get_currency(data['form']) ]])
|
- [[ sum_cr() and formatLang(abs(sum_cr())) or 0.0 ]]
+ [[ sum_cr() and formatLang(get_abs(sum_cr())) or 0.0 ]]
|
diff --git a/addons/account/report/report_bs.py b/addons/account/report/report_bs.py
index 5a7294338c5..04fafd7ed30 100644
--- a/addons/account/report/report_bs.py
+++ b/addons/account/report/report_bs.py
@@ -37,6 +37,7 @@ class report_balancesheet_horizontal(rml_parse.rml_parse):
self.result_temp=[]
self.localcontext.update({
'time': time,
+ 'get_abs' : self.get_abs,
'get_lines' : self.get_lines,
'get_lines_another' : self.get_lines_another,
'get_company': self.get_company,
@@ -48,6 +49,9 @@ class report_balancesheet_horizontal(rml_parse.rml_parse):
})
self.context = context
+
+ def get_abs(self,amount):
+ return abs(amount)
def sum_dr(self):
if self.res_pl['type'] == 'Net Profit':
diff --git a/addons/account/report/report_pl.py b/addons/account/report/report_pl.py
index c693b9940c9..e78639cff83 100644
--- a/addons/account/report/report_pl.py
+++ b/addons/account/report/report_pl.py
@@ -35,6 +35,7 @@ class report_pl_account_horizontal(rml_parse.rml_parse):
self.result_temp=[]
self.localcontext.update( {
'time': time,
+ 'get_abs' : self.get_abs,
'get_lines' : self.get_lines,
'get_lines_another' : self.get_lines_another,
'get_company': self.get_company,
@@ -45,7 +46,10 @@ class report_pl_account_horizontal(rml_parse.rml_parse):
'final_result' : self.final_result,
})
self.context = context
-
+
+ def get_abs(self,amount):
+ return abs(amount)
+
def final_result(self):
return self.res_pl
diff --git a/addons/account/report/report_pl_account.rml b/addons/account/report/report_pl_account.rml
index 6e72a198115..80aa4b97701 100644
--- a/addons/account/report/report_pl_account.rml
+++ b/addons/account/report/report_pl_account.rml
@@ -201,7 +201,7 @@
- [[ a.balance and formatLang(abs(a.balance)) or 0.0 ]]
+ [[ a.balance and formatLang(get_abs(a.balance)) or 0.0 ]]
|
@@ -214,7 +214,7 @@
[[ final_result()['type'] == 'Net Profit C.F.B.L.' and final_result()['type'] or removeParentNode('blockTable') ]]
- [[ final_result()['balance'] and final_result()['type'] == 'Net Profit C.F.B.L.' and formatLang(abs(final_result()['balance'])) or 0.0 ]]
+ [[ final_result()['balance'] and final_result()['type'] == 'Net Profit C.F.B.L.' and formatLang(get_abs(final_result()['balance'])) or 0.0 ]]
|
@@ -224,7 +224,7 @@
Total:([[ get_currency(data['form']) ]])
- [[ sum_dr() and formatLang(abs(sum_dr())) or 0.0 ]]
+ [[ sum_dr() and formatLang(get_abs(sum_dr())) or 0.0 ]]
|
@@ -256,7 +256,7 @@
- [[ a.balance and formatLang(abs(a.balance)) or 0.0 ]]
+ [[ a.balance and formatLang(get_abs(a.balance)) or 0.0 ]]
|
@@ -269,7 +269,7 @@
[[ final_result()['type'] == 'Net Loss C.F.B.L.' and final_result()['type'] or removeParentNode('blockTable') ]]
- [[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and formatLang(abs(final_result()['balance'])) or 0.0 ]]
+ [[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and formatLang(get_abs(final_result()['balance'])) or 0.0 ]]
|
@@ -279,7 +279,7 @@
Total:([[ get_currency(data['form']) ]])
- [[ sum_cr() and formatLang(abs(sum_cr())) or 0.0 ]]
+ [[ sum_cr() and formatLang(get_abs(sum_cr())) or 0.0 ]]
|
diff --git a/addons/account/report/report_pl_account_horizontal.rml b/addons/account/report/report_pl_account_horizontal.rml
index b68d375d3be..35e4ff47268 100644
--- a/addons/account/report/report_pl_account_horizontal.rml
+++ b/addons/account/report/report_pl_account_horizontal.rml
@@ -214,7 +214,7 @@
- [[ a['balance'] and formatLang(abs(a['balance'])) or 0.0 ]]
+ [[ a['balance'] and formatLang(get_abs(a['balance'])) or 0.0 ]]
|
@@ -227,7 +227,7 @@
|
- [[ a['balance1'] and formatLang(abs(a['balance1'])) or 0.0 ]]
+ [[ a['balance1'] and formatLang(get_abs(a['balance1'])) or 0.0 ]]
|
@@ -240,7 +240,7 @@
[[ final_result()['type'] == 'Net Profit C.F.B.L.' and final_result()['type'] or '' ]]
- [[ final_result()['balance'] and final_result()['type'] == 'Net Profit C.F.B.L.' and formatLang(abs(final_result()['balance'])) or 0.0 ]]
+ [[ final_result()['balance'] and final_result()['type'] == 'Net Profit C.F.B.L.' and formatLang(get_abs(final_result()['balance'])) or 0.0 ]]
|
@@ -249,7 +249,7 @@
[[ final_result()['type'] == 'Net Loss C.F.B.L.' and final_result()['type'] or '' ]]
|
- [[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and formatLang(abs(final_result()['balance'])) or 0.0 ]]
+ [[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and formatLang(get_abs(final_result()['balance'])) or 0.0 ]]
|
@@ -260,13 +260,13 @@
Total:([[ get_currency(data['form']) ]])
- [[ sum_dr() and formatLang(abs(sum_dr())) or 0.0 ]]
+ [[ sum_dr() and formatLang(get_abs(sum_dr())) or 0.0 ]]
|
Total:([[ get_currency(data['form']) ]])
|
- [[ sum_cr() and formatLang(abs(sum_cr())) or 0.0 ]]
+ [[ sum_cr() and formatLang(get_abs(sum_cr())) or 0.0 ]]
|
diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv
index 63c096d0215..42a4720efd9 100644
--- a/addons/account/security/ir.model.access.csv
+++ b/addons/account/security/ir.model.access.csv
@@ -62,6 +62,7 @@
"access_account_fiscalyear","account.fiscalyear","model_account_fiscalyear","account.group_account_manager",1,1,1,1
"access_account_fiscalyear_user","account.fiscalyear.user","model_account_fiscalyear","account.group_account_user",1,0,0,0
"access_account_fiscalyear_invoice","account.fiscalyear.invoice","model_account_fiscalyear","account.group_account_invoice",1,0,0,0
+"access_account_fiscalyear_partner_manager","account.fiscalyear.partnermanager","model_account_fiscalyear","base.group_partner_manager",1,0,0,0
"access_res_currency_account_manager","res.currency account manager","base.model_res_currency","group_account_manager",1,1,1,1
"access_res_currency_rate_account_manager","res.currency.rate account manager","base.model_res_currency_rate","group_account_manager",1,1,1,1
"access_account_invoice_user","account.invoice user","model_account_invoice","base.group_user",1,0,0,0
diff --git a/addons/account/wizard/__init__.py b/addons/account/wizard/__init__.py
index 1dea8e8d4f3..3f6bd126251 100644
--- a/addons/account/wizard/__init__.py
+++ b/addons/account/wizard/__init__.py
@@ -45,7 +45,9 @@ import account_open_closed_fiscalyear
import account_compare_account_balance_report
import account_invoice_state
import account_chart
-import account_move_line_select
+#TODO: remove this file no moe used
+# also remove related view fiel
+#import account_move_line_select
import account_validate_account_move
import account_use_model
diff --git a/addons/account/wizard/account_bs_report.py b/addons/account/wizard/account_bs_report.py
index 27c50b4b880..dfd035680f2 100644
--- a/addons/account/wizard/account_bs_report.py
+++ b/addons/account/wizard/account_bs_report.py
@@ -114,14 +114,12 @@ class account_bs_report(osv.osv_memory):
'type': 'ir.actions.report.xml',
'report_name': 'account.balancesheet.horizontal',
'datas': data,
- 'nodestroy':True,
}
else:
return {
'type': 'ir.actions.report.xml',
'report_name': 'account.balancesheet',
'datas': data,
- 'nodestroy':True,
}
def _check_date(self, cr, uid, data, context=None):
diff --git a/addons/account/wizard/account_move_line_select_view.xml b/addons/account/wizard/account_move_line_select_view.xml
index bf3831baea0..8c462318271 100644
--- a/addons/account/wizard/account_move_line_select_view.xml
+++ b/addons/account/wizard/account_move_line_select_view.xml
@@ -7,12 +7,12 @@
account.move.line.select
form
-
@@ -27,13 +27,13 @@
new
-