diff options
| author | jem-odoo <jem@openerp.com> | 2018-08-02 17:26:25 +0200 |
|---|---|---|
| committer | jem-odoo <jem@openerp.com> | 2018-08-13 14:39:50 +0200 |
| commit | 8db463d124a04f4264862a5cfd78c612064c8a34 (patch) | |
| tree | fb28fde98824cb5179737f122ae3ffec60592218 /addons/analytic | |
| parent | 71bf212a2131ee582c36b604e1ad520ab3ce4c2a (diff) | |
[MOV] analytic: move uom field from account to analytic
Diffstat (limited to 'addons/analytic')
| -rw-r--r-- | addons/analytic/__manifest__.py | 2 | ||||
| -rw-r--r-- | addons/analytic/models/analytic_account.py | 1 | ||||
| -rw-r--r-- | addons/analytic/views/analytic_account_views.xml | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/addons/analytic/__manifest__.py b/addons/analytic/__manifest__.py index ffadeae54a8..47815af682e 100644 --- a/addons/analytic/__manifest__.py +++ b/addons/analytic/__manifest__.py @@ -5,7 +5,7 @@ 'name' : 'Analytic Accounting', 'version': '1.1', 'category': 'Hidden/Dependency', - 'depends' : ['base', 'decimal_precision', 'mail'], + 'depends' : ['base', 'decimal_precision', 'mail', 'uom'], 'description': """ Module for defining analytic accounting object. =============================================== diff --git a/addons/analytic/models/analytic_account.py b/addons/analytic/models/analytic_account.py index b84046ab9fe..5f488b786ae 100644 --- a/addons/analytic/models/analytic_account.py +++ b/addons/analytic/models/analytic_account.py @@ -177,6 +177,7 @@ class AccountAnalyticLine(models.Model): date = fields.Date('Date', required=True, index=True, default=fields.Date.context_today) amount = fields.Monetary('Amount', required=True, default=0.0) unit_amount = fields.Float('Quantity', default=0.0) + product_uom_id = fields.Many2one('uom.uom', string='Unit of Measure') account_id = fields.Many2one('account.analytic.account', 'Analytic Account', required=True, ondelete='restrict', index=True) partner_id = fields.Many2one('res.partner', string='Partner') user_id = fields.Many2one('res.users', string='User', default=_default_user) diff --git a/addons/analytic/views/analytic_account_views.xml b/addons/analytic/views/analytic_account_views.xml index 095146e3124..ce4f8b11435 100644 --- a/addons/analytic/views/analytic_account_views.xml +++ b/addons/analytic/views/analytic_account_views.xml @@ -289,6 +289,7 @@ <group name="amount" string="Amount"> <field name="amount"/> <field name="unit_amount"/> + <field name="product_uom_id" class="oe_inline"/> <field name="currency_id" invisible="1"/> </group> </group> |