pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[merge] placeholders

Browse Source 
bzr revid: fp@tinyerp.com-20120604122053-n2q2q545tbezcyip
This commit is contained in:
Fabien Pinckaers
2012-06-04 14:20:53 +02:00
parent ec5fb5c606 2e5ee20109
commit ed072048a0
10 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/account_invoice_view.xml
+5 -5
View File
@@ -154,7 +154,7 @@
<sheet string="Supplier Invoice" layout="auto">
<group col="8" colspan="4" class="oe_form_header">
<field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"/>
<field name="number" readonly="1"/>
<field name="number" readonly="1" placeholder="PO0025"/>
<field name="type" invisible="1"/>
<field name="currency_id" width="50"/>
<button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" groups="account.group_account_user"/>
@@ -172,7 +172,7 @@
<page string="Invoice">
<field domain="[('company_id', '=', company_id), ('type', '=', 'payable')]" name="account_id" groups="account.group_account_user"/>
<field name="reference_type" nolabel="1" size="0"/>
<field name="reference" nolabel="1"/>
<field name="reference" nolabel="1" placeholder="Payment Reference"/>
<field name="date_due"/>
<field colspan="4" context="{'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False, 'type': type}" name="invoice_line" nolabel="1">
<tree string="Invoice lines">
@@ -220,7 +220,7 @@
<field name="payment_term" widget="selection"/>
<field name="name"/>
<newline/>
<field name="origin"/>
<field name="origin" placeholder="PO0025"/>
<field name="user_id"/>
<field name="move_id" groups="account.group_account_user"/>
<separator colspan="4" string="Additional Information"/>
@@ -284,7 +284,7 @@
<field name="payment_term" widget="selection"/>
<newline/>
<field domain="[('company_id', '=', company_id),('type','=', 'receivable')]" name="account_id" groups="account.group_account_user"/>
<field name="name"/>
<field name="name" placeholder="Project XYZ"/>
<field name="sent"/>
</group>
<notebook colspan="4">
@@ -323,7 +323,7 @@
<field name="user_id"/>
<newline/>
<field domain="[('partner_id.ref_companies', 'in', [company_id])]" name="partner_bank_id"/>
<field name="origin"/>
<field name="origin" placeholder="SO0032"/>
<field name="move_id" groups="account.group_account_user"/>
<separator colspan="4" string="Additional Information"/>
<field colspan="4" name="comment" nolabel="1"/>
addons/account/company_view.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<field name="arch" type="xml">
<field name="currency_id" position="after">
<field name="property_reserve_and_surplus_account" colspan="2"/>
<field name="paypal_account" />
<field name="paypal_account" placeholder="sales@openerp.com"/>
</field>
</field>
</record>
addons/account_voucher/voucher_payment_receipt_view.xml
+4 -4
View File
@@ -162,8 +162,8 @@
on_change="onchange_journal(journal_id, line_dr_ids, False, partner_id, date, amount, type, company_id, context)"
string="Payment Method"/>
<field name="date" select="1" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
<field name="reference" select="1" invisible="context.get('line_type', False)" string="Payment Ref"/>
<field name="name" colspan="2" invisible="context.get('line_type', False)"/>
<field name="reference" select="1" invisible="context.get('line_type', False)" string="Payment Ref" placeholder="003/10"/>
<field name="name" colspan="2" invisible="context.get('line_type', False)" placeholder="Invoice SAJ/0042"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
<field name="account_id"
widget="selection"
@@ -317,8 +317,8 @@
on_change="onchange_journal(journal_id, line_cr_ids, False, partner_id, date, amount, type, company_id, context)"
string="Payment Method"/>
<field name="date" select="1" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
<field name="reference" select="1" invisible="context.get('line_type', False)" string="Payment Ref"/>
<field name="name" colspan="2" invisible="context.get('line_type', False)"/>
<field name="reference" select="1" invisible="context.get('line_type', False)" string="Payment Ref" placeholder="003/10"/>
<field name="name" colspan="2" invisible="context.get('line_type', False)" placeholder="Invoice SAJ/0042"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
<field name="account_id"
widget="selection"
addons/base_vat/base_vat_view.xml
+1 -1
View File
@@ -9,7 +9,7 @@
<field name="arch" type="xml">
<field name="property_account_payable" position="after">
<group colspan="2" col="6">
<field name="vat" on_change="vat_change(vat)"/>
<field name="vat" on_change="vat_change(vat)" placeholder="BE0477472702"/>
<button colspan="2" name="button_check_vat" string="Check VAT" type="object" icon="gtk-execute"/>
<field name="vat_subjected" colspan="1"/>
</group>
addons/crm/crm_lead_view.xml
-1
View File
@@ -390,7 +390,6 @@
name="action_makeMeeting"
type="object"/>
</div>
<div class="oe_form_title">
<label for="name" class="oe_form_readonly_hidden"/>
<h1><field name="name"/></h1>
addons/product/product.py
+1 -1
View File
@@ -518,7 +518,7 @@ class product_product(osv.osv):
'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the product without removing it."),
'variants': fields.char('Variants', size=64),
'product_tmpl_id': fields.many2one('product.template', 'Product Template', required=True, ondelete="cascade"),
'ean13': fields.char('EAN13', size=13),
'ean13': fields.char('EAN13', size=13, help="The numbers encoded in EAN-13 bar codes are product identification numbers."),
'packaging' : fields.one2many('product.packaging', 'product_id', 'Logistical Units', help="Gives the different ways to package the same product. This has no impact on the picking order and is mainly used if you use the EDI module."),
'price_extra': fields.float('Variant Price Extra', digits_compute=dp.get_precision('Sale Price')),
'price_margin': fields.float('Variant Price Margin', digits_compute=dp.get_precision('Sale Price')),
addons/product/product_view.xml
+3 -3
View File
@@ -78,7 +78,7 @@
<group colspan="1" col="2">
<separator string="Codes" colspan="2"/>
<field name="default_code"/>
<field name="ean13"/>
<field name="ean13" placeholder="5901234123457" />
</group>
<group colspan="1" col="2">
<separator string="Characteristics" colspan="2"/>
@@ -163,9 +163,9 @@
<separator string="Description"/>
<field colspan="4" name="description" nolabel="1"/>
<separator string="Sale Description"/>
<field colspan="4" name="description_sale" nolabel="1"/>
<field colspan="4" name="description_sale" nolabel="1" placeholder="This note will be displayed on quotations..."/>
<separator string="Purchase Description"/>
<field colspan="4" name="description_purchase" nolabel="1"/>
<field colspan="4" name="description_purchase" nolabel="1" placeholder="This note will be displayed on requests for quotation..."/>
</page>
<page groups="product.group_stock_packaging" string="Packaging">
<field colspan="4" name="packaging" nolabel="1">
addons/sale/sale_view.xml
+3 -3
View File
@@ -150,8 +150,8 @@
context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
name="product_id"
on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, True, parent.date_order, product_packaging, parent.fiscal_position, False, context)"/>
<field name="name"/>
<field name="name" placeholder="Porduct/Service characteristics"/>
<field
context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
name="product_uom_qty"
@@ -227,7 +227,7 @@
<div class="oe_clear"/>
<separator colspan="4" string="Notes"/>
<field colspan="4" name="note" nolabel="1"/>
<field colspan="4" name="note" nolabel="1" placeholder="Our quotation is valid for 30 days..."/>
</page>
<page string="Other Information">
<group colspan="2" col="2" name="logistics">
addons/stock/stock_view.xml
+3 -3
View File
@@ -118,7 +118,7 @@
</header>
<sheet string="Physical Inventory" layout="auto">
<group class="oe_form_header">
<field name="name"/>
<field name="name" placeholder="Annual invetory 2013"/>
<field name="date"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
<notebook colspan="4">
@@ -720,7 +720,7 @@
<group colspan="4" col="6">
<group colspan="4" col="4">
<field name="name" readonly="1"/>
<field name="origin"/>
<field name="origin" placeholder="PO0032"/>
<field name="partner_id" on_change="onchange_partner_in(partner_id)" colspan="4"/>
<field name="invoice_state" string="Invoice Control"/>
<field name="backorder_id" readonly="1"/>
@@ -829,7 +829,7 @@
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</page>
<page string="Notes">
<field colspan="4" name="note" nolabel="1"/>
<field colspan="4" name="note" nolabel="1" placeholder="Quality test ok..."/>
</page>
</notebook>
</sheet>
addons/stock_location/stock_location_view.xml
+2 -2
View File
@@ -51,7 +51,7 @@
</tree>
<form string="Pulled Paths">
<separator string="Conditions" colspan="4"/>
<field name="name" colspan="4"/>
<field name="name" colspan="4" placeholder="Fulfill needs on location X from location Y "/>
<field name="location_id"/>
<separator string="Action Type" colspan="4"/>
<field name="type_proc"/>
@@ -81,7 +81,7 @@
</tree>
<form string="Pushed flows">
<group colspan="4" col="6">
<field name="name"/>
<field name="name" placeholder="When receiving at location X, move to location Y"/>
<field name="location_from_id"/>
<field name="location_dest_id"/>
<field name="auto"/>