diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 991a60ef835..03c7ece9c79 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -137,6 +137,17 @@ class purchase_order(osv.osv):
invoiced = True
res[purchase.id] = invoiced
return res
+
+ def _get_journal(self, cr, uid, context=None):
+ if context is None:
+ context = {}
+ user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+ company_id = context.get('company_id', user.company_id.id)
+ journal_obj = self.pool.get('account.journal')
+ res = journal_obj.search(cr, uid, [('type', '=', 'purchase'),
+ ('company_id', '=', company_id)],
+ limit=1)
+ return res and res[0] or False
STATE_SELECTION = [
('draft', 'Draft PO'),
@@ -204,6 +215,7 @@ class purchase_order(osv.osv):
'product_id': fields.related('order_line','product_id', type='many2one', relation='product.product', string='Product'),
'create_uid': fields.many2one('res.users', 'Responsible'),
'company_id': fields.many2one('res.company','Company',required=True,select=1),
+ 'journal_id': fields.many2one('account.journal', 'Journal'),
}
_defaults = {
'date_order': fields.date.context_today,
@@ -214,6 +226,7 @@ class purchase_order(osv.osv):
'invoiced': 0,
'pricelist_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').browse(cr, uid, context['partner_id']).property_product_pricelist_purchase.id,
'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'purchase.order', context=c),
+ 'journal_id': _get_journal,
}
_sql_constraints = [
('name_uniq', 'unique(name, company_id)', 'Order Reference must be unique per Company!'),
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 41be9074ba8..715400fb55e 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -226,6 +226,7 @@
+
diff --git a/addons/purchase_analytic_plans/purchase_analytic_plans_view.xml b/addons/purchase_analytic_plans/purchase_analytic_plans_view.xml
index 6feb6d27bf2..bcc67a2a215 100644
--- a/addons/purchase_analytic_plans/purchase_analytic_plans_view.xml
+++ b/addons/purchase_analytic_plans/purchase_analytic_plans_view.xml
@@ -8,7 +8,7 @@
-
+
@@ -19,7 +19,7 @@
-
+