From 9bfce9a99991a0316abee31d1bbce504f82910ec Mon Sep 17 00:00:00 2001 From: Ravi Singh Date: Wed, 25 Mar 2020 09:54:34 +0000 Subject: [PATCH] [IMP] purchase: revamp of purchase order view inside portal. In this commit- we have changed purchase order view(portal side) and included sidebar and chatter just like so view. task-2124829 Closes #48402 --- addons/portal/views/portal_templates.xml | 2 +- addons/purchase/controllers/portal.py | 5 +- addons/purchase/models/purchase.py | 4 + addons/purchase/views/portal_templates.xml | 260 ++++++++++++--------- 4 files changed, 156 insertions(+), 115 deletions(-) diff --git a/addons/portal/views/portal_templates.xml b/addons/portal/views/portal_templates.xml index dfef009723f..2f8484e149e 100644 --- a/addons/portal/views/portal_templates.xml +++ b/addons/portal/views/portal_templates.xml @@ -79,7 +79,7 @@
-
+
diff --git a/addons/purchase/controllers/portal.py b/addons/purchase/controllers/portal.py index ed4672bed5c..402a6700dd3 100644 --- a/addons/purchase/controllers/portal.py +++ b/addons/purchase/controllers/portal.py @@ -34,7 +34,7 @@ class CustomerPortal(CustomerPortal): 'order': order, 'resize_to_48': resize_to_48, } - return self._get_page_view_values(order, access_token, values, 'my_purchases_history', True, **kwargs) + return self._get_page_view_values(order, access_token, values, 'my_purchases_history', False, **kwargs) @http.route(['/my/purchase', '/my/purchase/page/'], type='http', auth="user", website=True) def portal_my_purchase_orders(self, page=1, date_begin=None, date_end=None, sortby=None, filterby=None, **kw): @@ -109,5 +109,8 @@ class CustomerPortal(CustomerPortal): except (AccessError, MissingError): return request.redirect('/my') + report_type = kw.get('report_type') + if report_type in ('html', 'pdf', 'text'): + return self._show_report(model=order_sudo, report_type=report_type, report_ref='purchase.action_report_purchase_order',download=kw.get('download')) values = self._purchase_order_get_page_view_values(order_sudo, access_token, **kw) return request.render("purchase.portal_my_purchase_order", values) diff --git a/addons/purchase/models/purchase.py b/addons/purchase/models/purchase.py index 9f66f9cd3f1..998c8bdc24b 100644 --- a/addons/purchase/models/purchase.py +++ b/addons/purchase/models/purchase.py @@ -216,6 +216,10 @@ class PurchaseOrder(models.Model): return self.env.ref('purchase.mt_rfq_done') return super(PurchaseOrder, self)._track_subtype(init_values) + def _get_report_base_filename(self): + self.ensure_one() + return 'Purchase Order-%s' % (self.name) + @api.onchange('partner_id', 'company_id') def onchange_partner_id(self): # Ensures all properties and fiscal positions diff --git a/addons/purchase/views/portal_templates.xml b/addons/purchase/views/portal_templates.xml index 2917cd5858b..e9553037b0b 100644 --- a/addons/purchase/views/portal_templates.xml +++ b/addons/purchase/views/portal_templates.xml @@ -25,23 +25,28 @@