Skip to content

Commit

Permalink
pep8
Browse files Browse the repository at this point in the history
  • Loading branch information
jbaudoux committed Mar 23, 2017
1 parent 276bafb commit 4ac767f
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 39 deletions.
4 changes: 2 additions & 2 deletions account_companyweb/models/res_config.py
Expand Up @@ -10,5 +10,5 @@ class AccountCompanywebConfigSettings(models.TransientModel):
_name = 'account.companyweb.config.settings'
_inherit = 'res.config.settings'

companyweb_login = fields.Char('Login', 16)
companyweb_pswd = fields.Char('Password', 16)
companyweb_login = fields.Char('Login', size=16)
companyweb_pswd = fields.Char('Password', size=16)
4 changes: 2 additions & 2 deletions account_companyweb/wizard/account_companyweb_report_wizard.py
Expand Up @@ -10,7 +10,7 @@
import xlwt

from openerp import fields, models, _
from openerp.exceptions import Warning
from openerp.exceptions import Warning as UserError

try:
from openerp.addons.account_financial_report_webkit.report.open_invoices \
Expand Down Expand Up @@ -195,7 +195,7 @@ def create_openSalesDocs(self, cr, uid, ids, context=None):
cr, uid, [('date_start', '<=', date_until),
('date_stop', '>=', date_until)])
if (len(fy_model.browse(cr, uid, fy_ids)) == 0):
raise Warning(_('No fiscal year %s found') % this.year)
raise UserError(_('No fiscal year %s found') % this.year)
else:
fy = fy_model.browse(cr, uid, fy_ids)[0]

Expand Down
69 changes: 34 additions & 35 deletions account_companyweb/wizard/account_companyweb_report_wizard_view.xml
@@ -1,48 +1,47 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record model="ir.ui.view" id="report_view_wizard">
<field name="name">account.companyweb.report.form</field>
<field name="model">account.companyweb.report.wizard</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Custom Report" version="7.0">
<group colspan="2">
<field name="chart_account_id" widget='selection' />
</group>
<group colspan="2">
<field name="month" />
<field name="year" />
</group>
<group colspan="2">
<field name="export_filename" invisible="1"/>
<field name="data" nolabel="1" readonly="1" filename="export_filename" />
</group>
<data>
<record model="ir.ui.view" id="report_view_wizard">
<field name="name">account.companyweb.report.form</field>
<field name="model">account.companyweb.report.wizard</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Custom Report" version="7.0">
<group colspan="2">
<field name="chart_account_id" widget='selection' />
</group>
<group colspan="2">
<field name="month" />
<field name="year" />
</group>
<group colspan="2">
<field name="export_filename" invisible="1"/>
<field name="data" nolabel="1" readonly="1" filename="export_filename" />
</group>
<footer>
<button special="cancel" icon="gtk-cancel" string="Close" />
<button name="create_createdSalesDocs" string="Generate CreatedSalesDocs Report"
type="object" icon="gtk-execute" class="oe_highlight" />
<button name="create_openSalesDocs" string="Generate OpenSalesDocs Report"
type="object" icon="gtk-execute" class="oe_highlight" />
</footer>
</form>
</field>
</record>
</form>
</field>
</record>

<record model="ir.actions.act_window" id="action_report">
<field name="name">Companyweb Report</field>
<field name="res_model">account.companyweb.report.wizard</field>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="target">new</field>
</record>
<record model="ir.actions.act_window" id="action_report">
<field name="name">Companyweb Report</field>
<field name="res_model">account.companyweb.report.wizard</field>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="target">new</field>
</record>

<record id="companyweb_report_menu" model="ir.ui.menu">
<field name="name">Companyweb Report</field>
<field name="action" ref="action_report" />
<field name="parent_id" ref="account.next_id_22" />
</record>
<record id="companyweb_report_menu" model="ir.ui.menu">
<field name="name">Companyweb Report</field>
<field name="action" ref="action_report" />
<field name="parent_id" ref="account.next_id_22" />
</record>

</data>
</data>
</openerp>

0 comments on commit 4ac767f

Please sign in to comment.