Amit Bhavsar (Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-usability2-asset_demodata-amb into
lp:~openerp-dev/openobject-addons/trunk-usability2.
Requested reviews:
Amit (Open ERP) (apa-tiny)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-usability2-asset_demodata-amb/+merge/79387
Hello Sir,
As per your suggestion ,
I removed asset type field.
And add the demo data for account.asset.category model.
Thanks,
Amit Bhavsar(amb)
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-usability2-asset_demodata-amb/+merge/79387
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-usability2.
=== modified file 'account_asset/account_asset_demo.xml'
--- account_asset/account_asset_demo.xml 2011-07-11 22:47:50 +0000
+++ account_asset/account_asset_demo.xml 2011-10-14 10:40:13 +0000
@@ -13,6 +13,30 @@
<field name="name">Fixed Assets</field>
</record>
+ <record id="account_asset_category_sale" model="account.asset.category">
+ <field name="account_expense_depreciation_id" ref="account.a_expense"/>
+ <field name="account_asset_id" ref="account.xfa"/>
+ <field name="account_depreciation_id" ref="account.xfa"/>
+ <field name="journal_id" ref="account.expenses_journal"/>
+ <field name="name">Sale</field>
+ </record>
+
+ <record id="account_asset_category_purchase" model="account.asset.category">
+ <field name="account_expense_depreciation_id" ref="account.a_expense"/>
+ <field name="account_asset_id" ref="account.xfa"/>
+ <field name="account_depreciation_id" ref="account.xfa"/>
+ <field name="journal_id" ref="account.expenses_journal"/>
+ <field name="name">Purchase</field>
+ </record>
+
+ <record id="account_asset_category_both" model="account.asset.category">
+ <field name="account_expense_depreciation_id" ref="account.a_expense"/>
+ <field name="account_asset_id" ref="account.xfa"/>
+ <field name="account_depreciation_id" ref="account.xfa"/>
+ <field name="journal_id" ref="account.expenses_journal"/>
+ <field name="name">Both</field>
+ </record>
+
<!--
Assets Demo
-->
=== modified file 'account_asset/account_asset_invoice.py'
--- account_asset/account_asset_invoice.py 2011-10-02 17:31:16 +0000
+++ account_asset/account_asset_invoice.py 2011-10-14 10:40:13 +0000
@@ -24,6 +24,9 @@
class account_invoice(osv.osv):
_inherit = 'account.invoice'
+ _columns = {
+ 'category_id': fields.many2one('account.asset.category', 'Asset category', required=True, change_default=True, readonly=True, states={'draft':[('readonly',False)]}),
+ }
def line_get_convert(self, cr, uid, x, part, date, context=None):
res = super(account_invoice, self).line_get_convert(cr, uid, x, part, date, context=context)
res['asset_id'] = x.get('asset_id', False)
=== modified file 'account_asset/account_asset_view.xml'
--- account_asset/account_asset_view.xml 2011-10-02 17:31:16 +0000
+++ account_asset/account_asset_view.xml 2011-10-14 10:40:13 +0000
@@ -212,6 +212,21 @@
</field>
</record>
+ # ------------------------------------------------------
+ # Account invoice
+ # ------------------------------------------------------
+ <record id="view_account_invoice_search_inherit" model="ir.ui.view">
+ <field name="name">account.invoice.search.inherit</field>
+ <field name="model">account.invoice</field>
+ <field name="type">search</field>
+ <field name="inherit_id" ref="account.view_account_invoice_filter"/>
+ <field name="arch" type="xml">
+ <xpath expr="group/field[@name='period_id']" position="after">
+ <field name="category_id"/>
+ </xpath>
+ </field>
+ </record>
+
<!--
Asset History
-->
_______________________________________________
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
