Amit Rasmiya (OpenERP) has proposed merging
lp:~openerp-commiter/openobject-addons/trunk-add-placeholder-apa-account-ram
into lp:~openerp-dev/openobject-addons/trunk-add-placeholder-apa.
Requested reviews:
Amit Patel (OpenERP) (apa-tiny)
For more details, see:
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-add-placeholder-apa-account-ram/+merge/108105
Hello Sir,
I have added Placeholder for following in Accounting Module:
'source document' and 'Description' of Customer view ,
'source document' and 'free reference' of Supplier view ,
'Memo' and 'Payment Ref' of Payment view ,
'Paypal Account' of Company view
So, Kindly review it.
Thanks,
ram.
--
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-add-placeholder-apa-account-ram/+merge/108105
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-add-placeholder-apa.
=== modified file 'account/account_invoice_view.xml'
--- account/account_invoice_view.xml 2012-05-25 15:17:40 +0000
+++ account/account_invoice_view.xml 2012-05-31 06:34:21 +0000
@@ -159,7 +159,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"/>
@@ -177,7 +177,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">
@@ -225,7 +225,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"/>
@@ -292,8 +292,12 @@
<field name="payment_term" widget="selection"/>
<newline/>
<field domain="[('company_id', '=', company_id),('type','=', 'receivable')]" name="account_id" groups="account.group_account_user"/>
+<<<<<<< TREE
<field name="name"/>
<field name="sent"/>
+=======
+ <field name="name" placeholder="Project XYZ"/>
+>>>>>>> MERGE-SOURCE
</group>
<notebook colspan="4">
<page string="Invoice">
@@ -331,7 +335,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"/>
=== modified file 'account/company_view.xml'
--- account/company_view.xml 2011-09-29 11:08:56 +0000
+++ account/company_view.xml 2012-05-31 06:34:21 +0000
@@ -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="[email protected]"/>
</field>
</field>
</record>
=== modified file 'account_voucher/account_voucher_view.xml'
--- account_voucher/account_voucher_view.xml 2012-05-23 06:53:42 +0000
+++ account_voucher/account_voucher_view.xml 2012-05-31 06:34:21 +0000
@@ -57,9 +57,9 @@
<field name="date" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id)"/>
<field name="journal_id" widget="selection" select="1" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
<field name="type" required="1"/>
- <field name="name" colspan="2"/>
+ <field name="name" colspan="2" placeholder="Invoice SAJ/0042"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
- <field name="reference" select="1"/>
+ <field name="reference" select="1" placeholder="003/10"/>
<field name="account_id" widget="selection" invisible="True"/>
</group>
<notebook colspan="4">
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
