Ujjvala Collins (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-account-asset-analytic-entry-uco into
lp:~openerp-dev/openobject-addons/trunk-account-asset.
Requested reviews:
qdp (OpenERP) (qdp)
Mustufa Rangwala (Open ERP) (mra-tinyerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-account-asset-analytic-entry-uco/+merge/63070
[FIX] account_asset:
--------------------------------
* check anaytic account feature is not working
-> currently it creates two entries one for depr account and other for depr
exp. account.. it should be only one for expense only
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-account-asset-analytic-entry-uco/+merge/63070
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-account-asset.
=== modified file 'account_asset/account_asset.py'
--- account_asset/account_asset.py 2011-05-27 14:50:49 +0000
+++ account_asset/account_asset.py 2011-06-06 12:26:02 +0000
@@ -31,7 +31,6 @@
_columns = {
'name': fields.char('Name', size=64, required=True, select=1),
'note': fields.text('Note'),
- 'journal_analytic_id': fields.many2one('account.analytic.journal', 'Analytic journal'),
'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic account'),
'account_asset_id': fields.many2one('account.account', 'Asset Account', required=True),
'account_depreciation_id': fields.many2one('account.account', 'Depreciation Account', required=True),
@@ -365,7 +364,6 @@
'partner_id': line.asset_id.partner_id.id,
'currency_id': company_currency <> current_currency and current_currency or False,
'amount_currency': company_currency <> current_currency and - sign * line.amount or 0.0,
- 'analytic_account_id': line.asset_id.category_id.account_analytic_id.id,
'date': depreciation_date,
})
move_line_obj.create(cr, uid, {
=== modified file 'account_asset/account_asset_view.xml'
--- account_asset/account_asset_view.xml 2011-05-27 13:49:30 +0000
+++ account_asset/account_asset_view.xml 2011-06-06 12:26:02 +0000
@@ -28,11 +28,10 @@
<field name="prorata"/>
<field name="open_asset"/>
</group>
- <group col="4" colspan="4" groups="analytic.group_analytic_accounting">
+ <group col="2" colspan="2" groups="analytic.group_analytic_accounting">
<separator string="Analytic information" colspan="4" />
<newline/>
<field name="account_analytic_id" />
- <field name="journal_analytic_id" />
</group>
<separator string="Notes" colspan="4"/>
<field name="note" colspan="4" nolabel="1"/>
_______________________________________________
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
