[IMP] settings: usability, review of form views
bzr revid: qdp-launchpad@openerp.com-20120713153520-unk4nr4rhjdwykjr
This commit is contained in:
Quentin (OpenERP)
@@ -108,12 +108,12 @@ class res_company(osv.osv):
|
||||
'parent_id': fields.many2one('res.company', 'Parent Company', select=True),
|
||||
'child_ids': fields.one2many('res.company', 'parent_id', 'Child Companies'),
|
||||
'partner_id': fields.many2one('res.partner', 'Partner', required=True),
|
||||
'rml_header1': fields.char('Report Header / Company Slogan', size=200, help="Appears by default on the top right corner of your printed documents."),
|
||||
'rml_header1': fields.char('Company Slogan', size=200, help="Appears by default on the top right corner of your printed documents (report header)."),
|
||||
'rml_footer1': fields.char('General Information Footer', size=200),
|
||||
'rml_footer2': fields.char('Bank Accounts Footer', size=250, help="Write here your bank accounts for customer payments."),
|
||||
'rml_header': fields.text('RML Header', required=True),
|
||||
'rml_header2': fields.text('RML Internal Header', required=True),
|
||||
'rml_header3': fields.text('RML Internal Header', required=True),
|
||||
'rml_header3': fields.text('RML Internal Header for Landscape Reports', required=True),
|
||||
'logo': fields.related('partner_id', 'photo', string="Logo", type="binary"),
|
||||
'currency_id': fields.many2one('res.currency', 'Currency', required=True),
|
||||
'currency_ids': fields.one2many('res.currency', 'company_id', 'Currency'),
|
||||
|
||||
@@ -24,16 +24,23 @@
|
||||
<div class="oe_right oe_avatar">
|
||||
<field name="logo" nolabel="1" widget="image"/>
|
||||
</div>
|
||||
<div class="oe_right oe_button_box" name="button_box">
|
||||
<button name="%(preview_report)d" string="Preview Header/Footer" type="action" icon="gtk-print" class="oe_inline oe_right"/>
|
||||
</div>
|
||||
<div class="oe_title">
|
||||
<label for="name" class="oe_edit_only"/>
|
||||
<h1>
|
||||
<field name="name" class="oe_inline"/>
|
||||
</h1>
|
||||
<group col="4">
|
||||
<field name="partner_id" readonly="1" required="0" groups="base.group_no_one"/>
|
||||
<field name="parent_id" groups="base.group_multi_company"/>
|
||||
</group>
|
||||
<label for="rml_header1" class="oe_edit_only"/>
|
||||
<div>
|
||||
<field name="rml_header1" placeholder="Global Business Solutions"/>
|
||||
</div>
|
||||
</div>
|
||||
<group col="4">
|
||||
<field name="partner_id" readonly="1" required="0" groups="base.group_no_one"/>
|
||||
<field name="parent_id" groups="base.group_multi_company"/>
|
||||
</group>
|
||||
<notebook colspan="4">
|
||||
<page string="General Information">
|
||||
<group>
|
||||
@@ -43,44 +50,38 @@
|
||||
<field name="street" placeholder="Street..."/>
|
||||
<field name="street2"/>
|
||||
<div>
|
||||
<field name="zip" class="oe_inline" placeholder="ZIP"/>
|
||||
<field name="city" class="oe_inline" placeholder="City"/>
|
||||
<field name="city" placeholder="City" style="width: 40%%"/>
|
||||
<field name="state_id" class="oe_no_button" placeholder="State" style="width: 24%%"/>
|
||||
<field name="zip" placeholder="ZIP" style="width: 34%%"/>
|
||||
</div>
|
||||
<field name="state_id" placeholder="State"/>
|
||||
<field name="country_id" placeholder="Country"/>
|
||||
<field name="country_id" placeholder="Country" class="oe_no_button"/>
|
||||
</div>
|
||||
<field name="website" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
|
||||
<field name="website" widget="url" placeholder="e.g. www.openerp.com"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="phone" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
|
||||
<field name="email" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
|
||||
<field name="fax" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
|
||||
<field name="email" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
|
||||
<field name="vat" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
|
||||
<field name="company_registry" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
|
||||
</group>
|
||||
</group>
|
||||
<separator string="Header/Footer of Reports"/>
|
||||
<group>
|
||||
<label for="rml_header1"/>
|
||||
<div>
|
||||
<field name="rml_header1" placeholder="Global Business Solutions" class="oe_inline"/>
|
||||
<button name="%(preview_report)d" string="Preview Header/Footer" type="action" icon="gtk-print" class="oe_inline"/>
|
||||
</div>
|
||||
<field name="rml_footer1" groups="base.group_no_one"/>
|
||||
<group string="Bank Accounts">
|
||||
<field name="bank_ids" colspan="4" nolabel="1"/>
|
||||
<label for="rml_footer2"/>
|
||||
<div name="bank_acc">
|
||||
<field name="rml_footer2" class="oe_inline"/>
|
||||
<button name="%(bank_account_update)d" string="Set Bank Accounts" type="action" icon="gtk-go-forward" class="oe_inline"/>
|
||||
<field name="rml_footer2"/>
|
||||
<!--<button name="%(bank_account_update)d" string="Set Bank Accounts" type="action" icon="gtk-go-forward" class="oe_inline"/>-->
|
||||
</div>
|
||||
</group>
|
||||
</page>
|
||||
<page string="Header/Footer" groups="base.group_no_one">
|
||||
<group>
|
||||
<field name="paper_format" on_change="onchange_paper_format(paper_format)"/>
|
||||
<field name="rml_header"/>
|
||||
<field name="rml_footer1"/>
|
||||
</group>
|
||||
</page>
|
||||
<page string="Internal Header/Footer" groups="base.group_no_one">
|
||||
<label for="rml_header"/>
|
||||
<field name="rml_header"/>
|
||||
<label for="rml_header2"/>
|
||||
<field name="rml_header2"/>
|
||||
<label for="rml_header3"/>
|
||||
@@ -96,9 +97,6 @@
|
||||
<group name="time_grp"/>
|
||||
</group>
|
||||
</page>
|
||||
<page string="Bank Accounts">
|
||||
<field name="bank_ids"/>
|
||||
</page>
|
||||
</notebook>
|
||||
</sheet>
|
||||
</form>
|
||||
|
||||
@@ -87,8 +87,6 @@
|
||||
<div class="oe_title">
|
||||
<label for="name" class="oe_edit_only"/>
|
||||
<h1><field name="name"/></h1>
|
||||
<label for="company_id" class="oe_edit_only" string="Default Company"/>
|
||||
<h2><field name="company_id" context="{'user_preference': 0}"/></h2>
|
||||
</div>
|
||||
<group>
|
||||
<group>
|
||||
@@ -96,6 +94,7 @@
|
||||
<field name="new_password" password="True" attrs="{'required': [('id','=',False)]}"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="company_id" context="{'user_preference': 0}"/>
|
||||
<field name="active"/>
|
||||
</group>
|
||||
</group>
|
||||
@@ -119,13 +118,11 @@
|
||||
</group>
|
||||
</page>
|
||||
<page string="Access Rights">
|
||||
<group col="4">
|
||||
<field name="groups_id"/>
|
||||
<group string="Allowed Companies" groups="base.group_multi_company">
|
||||
<field name="company_ids" nolabel="1" widget="many2many_tags"/>
|
||||
</group>
|
||||
</page>
|
||||
<page string="Allowed Companies" groups="base.group_multi_company">
|
||||
<group>
|
||||
<field name="company_ids" widget="many2many_tags" string="Allowed Company"/>
|
||||
<group col="4">
|
||||
<field name="groups_id"/>
|
||||
</group>
|
||||
</page>
|
||||
</notebook>
|
||||
@@ -205,7 +202,7 @@
|
||||
<field name="name" readonly="1" class="oe_edit_only oe_inline"/>
|
||||
(<field name="login" readonly="1" class="oe_edit_only oe_inline"/>)
|
||||
</h1>
|
||||
<label for="company_id" class="oe_edit_only" string="Default Company" groups="base.group_multi_company"/>
|
||||
<label for="company_id" class="oe_edit_only" groups="base.group_multi_company"/>
|
||||
<h2>
|
||||
<field name="company_id" widget="selection" readonly="0"
|
||||
groups="base.group_multi_company" on_change="on_change_company_id(company_id)"/>
|
||||
|
||||
Reference in New Issue
Block a user