Merge lp:~matjaz-6/openerpsl/openerpsl_04_29 into lp:openerpsl/7.0

Proposed by Matjaz Kalic
Status: Merged
Merged at revision: 429
Proposed branch: lp:~matjaz-6/openerpsl/openerpsl_04_29
Merge into: lp:openerpsl/7.0
Diff against target: 26 lines (+2/-3)
2 files modified
account_asset_extensions/__openerp__.py (+1/-1)
account_asset_extensions/account_asset.py (+1/-2)
To merge this branch: bzr merge lp:~matjaz-6/openerpsl/openerpsl_04_29
Reviewer Review Type Date Requested Status
Mentis Pending
Review via email: mp+226254@code.launchpad.net

Description of the change

[FIX] account_asset (new field added)

To post a comment you must log in.
429. By Dušan Laznik (Mentis)

[FIX] account_asset (new field added)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account_asset_extensions/__openerp__.py'
2--- account_asset_extensions/__openerp__.py 2014-07-08 10:38:00 +0000
3+++ account_asset_extensions/__openerp__.py 2014-07-10 08:19:58 +0000
4@@ -27,7 +27,7 @@
5 This Module adds following extensions to Account Asset:
6 - analytic account can be set on asset
7 - location can be set for asset
8- - Deprication date can be explicitly set
9+ - deprication date can be explicitly set
10
11 """,
12 'author': 'Mentis d.o.o.',
13
14=== modified file 'account_asset_extensions/account_asset.py'
15--- account_asset_extensions/account_asset.py 2014-07-08 10:38:00 +0000
16+++ account_asset_extensions/account_asset.py 2014-07-10 08:19:58 +0000
17@@ -28,8 +28,7 @@
18 _columns = {
19 'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic account'),
20 'location_id': fields.many2one('stock.location', 'Location', required=True, domain="[('usage', '=', 'internal')]"),
21- 'purchase_date': fields.date('Depreciation Date', required=True, readonly=True, states={'draft':[('readonly',False)]}, help = _('Depreciation start date')),
22- 'date_acquisition': fields.date('Date Acquisition', help = _('Date acquisition'))
23+ 'acquisition_date': fields.date('Acquisition Date', help = _('Acquisition Date'))
24 }
25
26 def onchange_category_id(self, cr, uid, ids, category_id, context=None):

Subscribers

People subscribed via source and target branches