odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

merge 

bzr revid: fp@tinyerp.com-20081027120806-8z83rgl2nwtrqil4
This commit is contained in:
Fabien Pinckaers 2008-10-27 13:08:06 +01:00
parent 8e076faf51 9d6584cb25
commit ff356f5939
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/account/wizard/wizard_account_balance_report.py
View File

@ -134,11 +134,11 @@ class wizard_report(wizard.interface):
},
'account_selection': {
'actions': [],
'result': {'type':'form', 'arch':account_form,'fields':account_fields, 'state':[('end','Cancel'),('checktype','Print')]}
'result': {'type':'form', 'arch':account_form,'fields':account_fields, 'state':[('end','Cancel','gtk-cancel'),('checktype','Print','gtk-print')]}
},
'checktype': {
'actions': [_get_defaults],
'result': {'type':'form', 'arch':period_form, 'fields':period_fields, 'state':[('end','Cancel'),('report','Print')]}
'result': {'type':'form', 'arch':period_form, 'fields':period_fields, 'state':[('end','Cancel','gtk-cancel'),('report','Print','gtk-print')]}
},
'report': {
'actions': [_check_state],

4
addons/account/wizard/wizard_general_ledger_report.py
View File

@ -182,11 +182,11 @@ class wizard_report(wizard.interface):
},
'account_selection': {
'actions': [],
'result': {'type':'form', 'arch':account_form,'fields':account_fields, 'state':[('end','Cancel'),('checktype','Print')]}
'result': {'type':'form', 'arch':account_form,'fields':account_fields, 'state':[('end','Cancel','gtk-cancel'),('checktype','Print','gtk-print')]}
},
'checktype': {
'actions': [_get_defaults],
'result': {'type':'form', 'arch':period_form, 'fields':period_fields, 'state':[('end','Cancel'),('checkreport','Print')]}
'result': {'type':'form', 'arch':period_form, 'fields':period_fields, 'state':[('end','Cancel','gtk-cancel'),('checkreport','Print','gtk-print')]}
},
'checkreport': {
'actions': [],

2
addons/account/wizard/wizard_partner_balance_report.py
View File

@ -119,7 +119,7 @@ class wizard_report(wizard.interface):
states = {
'init': {
'actions': [_get_defaults],
'result': {'type':'form', 'arch':period_form, 'fields':period_fields, 'state':[('end','Cancel'),('report','Print')]}
'result': {'type':'form', 'arch':period_form, 'fields':period_fields, 'state':[('end','Cancel','gtk-cancel'),('report','Print','gtk-print')]}
},
'report': {

2
addons/account/wizard/wizard_third_party_ledger.py
View File

@ -135,7 +135,7 @@ class wizard_report(wizard.interface):
states = {
'init': {
'actions': [_get_defaults],
'result': {'type':'form', 'arch':period_form, 'fields':period_fields, 'state':[('end','Cancel'),('report','Print')]}
'result': {'type':'form', 'arch':period_form, 'fields':period_fields, 'state':[('end','Cancel','gtk-cancel'),('report','Print','gtk-print')]}
},
'report': {
'actions': [_check_state],

4
addons/account_report/report/accounting_report.py
View File

@ -51,8 +51,8 @@ class accounting_report(report_sxw.rml_parse):
'amount':res[0]['amount'],
'note':res[0]['note'],
'level': level,
'color_font':res[0]['color_font'],
'color_back':res[0]['color_back'],
# 'color_font':res[0]['color_font'],
# 'color_back':res[0]['color_back'],
}
self.ret_list.append(ret_dict)

6
addons/account_report/report/accounting_report.rml
View File

@ -119,13 +119,13 @@
<blockTable colWidths="362.0,73.0,93.0" repeatRows="1" style="Table3">
<tr>
<td>
<para style="P11">[[ ' \t '*(obj['level']) + obj['name'] ]] [[ obj['color_font'] and ( setTag('para','para',{'textColor':obj['color_font']})) ]] [[ obj['color_back'] and ( setTag('para','para',{'backColor':obj['color_back']})) ]]</para>
<para style="P11"><font color="white">[[ '....'*(obj['level']) ]]</font>[[ obj['name'] ]]</para>
</td>
<td>
<para style="P11">[[obj['code'] ]] [[ obj['color_font'] and (setTag('para','para',{'textColor':obj['color_font']})) ]] [[ obj['color_back'] and ( setTag('para','para',{'backColor':obj['color_back']})) ]]</para>
<para style="P11">[[obj['code'] ]]</para>
</td>
<td>
<para style="P12">[['%.2f' % obj['amount'] ]] [[ obj['color_font'] and ( setTag('para','para',{'textColor':obj['color_font']})) ]][[ obj['color_back'] and ( setTag('para','para',{'backColor':obj['color_back']})) ]]</para>
<para style="P12">[['%.2f' % obj['amount'] ]] </para>
</td>
</tr>
<tr>