summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabien Pinckaers <fp@tinyerp.com>2012-06-04 14:22:55 +0200
committerFabien Pinckaers <fp@tinyerp.com>2012-06-04 14:22:55 +0200
commitdeb9992ca85a20eb1e2a85a2f8dd35ab9e6c656a (patch)
treeea46098aa553133d0e27e654774efd47f94c1690
parented072048a0eb0d9fdc58e46398efd02ca53afd84 (diff)
parente77bebd8886fd051b22329198a777d6da97a2578 (diff)
[merge] placeholders in view
bzr revid: fp@tinyerp.com-20120604122255-nii4f2aoqbdr0dhj
-rw-r--r--openerp/addons/base/res/res_company_view.xml2
-rw-r--r--openerp/addons/base/res/res_partner_view.xml8
2 files changed, 5 insertions, 5 deletions
diff --git a/openerp/addons/base/res/res_company_view.xml b/openerp/addons/base/res/res_company_view.xml
index 98c69947ff3..1f183265da6 100644
--- a/openerp/addons/base/res/res_company_view.xml
+++ b/openerp/addons/base/res/res_company_view.xml
@@ -46,7 +46,7 @@
<field name="company_registry" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
<separator string="Header/Footer of Reports" colspan="4"/>
<group colspan="4" col="3">
- <field name="rml_header1" colspan="3"/>
+ <field name="rml_header1" colspan="3" placeholder="Global Business Solutions"/>
<newline/>
<field name="rml_footer1" colspan="3" groups="base.group_no_one"/>
<newline/>
diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 31e98bef43f..349f7a97ccc 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -322,7 +322,7 @@
<field name="photo" widget='image' nolabel="1"/>
</group>
<group colspan="4">
- <h2><field name="name" required="1" nolabel="1" colspan="4"/></h2><newline/>
+ <h2><field name="name" required="1" nolabel="1" colspan="4" placeholder="Customer Name"/></h2><newline/>
<field name="function" attrs="{'invisible': [('is_company', '=', True)]}"/>
<field name="title" size="0" domain="[('domain', '=', 'contact')]"/>
<field name="parent_id" string="Company" attrs="{'invisible': [('is_company','=', True)]}"
@@ -354,11 +354,11 @@
</group>
<group colspan="2">
<separator string="Communication" colspan="4"/>
- <field name="phone" colspan="4"/>
+ <field name="phone" colspan="4" placeholder="+32.81.81.37.00"/>
<field name="mobile" colspan="4"/>
<field name="fax" colspan="4"/>
<field name="email" widget="email" colspan="4"/>
- <field name="website" widget="url" colspan="4"/>
+ <field name="website" widget="url" colspan="4" placeholder="www.openerp.com"/>
<field name="ref" colspan="4"/>
</group>
<group colspan="4" attrs="{'invisible': [('is_company','=', False)]}">
@@ -429,7 +429,7 @@
<field name="category_id" colspan="4" nolabel="1" widget="many2many_tags"/>
</page>
<page string="Notes">
- <field name="comment" colspan="4" nolabel="1"/>
+ <field name="comment" colspan="4" nolabel="1" placeholder="Internal notes about this customer..."/>
</page>
</notebook>
</form>