diff --git a/addons/purchase/edi/purchase_order_action_data.xml b/addons/purchase/edi/purchase_order_action_data.xml index ca206851170..c920437f2b4 100644 --- a/addons/purchase/edi/purchase_order_action_data.xml +++ b/addons/purchase/edi/purchase_order_action_data.xml @@ -18,7 +18,7 @@ - RFQ - Send by mail + RFQ - Send by Email ${object.validator.email or ''} ${object.company_id.name} Order (Ref ${object.name or 'n/a' }) ${object.partner_id.id} @@ -36,10 +36,10 @@

  REFERENCES
-   Order number: ${object.name}
-   Order date: ${object.date_order}
+   RFQ number: ${object.name}
+   RFQ date: ${object.date_order}
% if object.origin: -   Order reference: ${object.origin}
+   RFQ reference: ${object.origin}
% endif % if object.partner_ref:   Your reference: ${object.partner_ref}
@@ -92,7 +92,7 @@ - Purchase Order - Send by mail + Purchase Order - Send by Email ${object.validator.email or ''} ${object.company_id.name} Order (Ref ${object.name or 'n/a' }) ${object.partner_id.id} diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index 129b2b8cabb..0f4aebcb5fe 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -344,7 +344,7 @@ ir.actions.act_window purchase.order {} - [('state','in',('draft','sent','bid'))] + [('state','in',('draft','sent','bid','cancel'))] tree,form,graph,calendar diff --git a/addons/purchase_requisition/report/purchase_requisition.rml b/addons/purchase_requisition/report/purchase_requisition.rml index 6e1eee134bf..a3185a53ee3 100644 --- a/addons/purchase_requisition/report/purchase_requisition.rml +++ b/addons/purchase_requisition/report/purchase_requisition.rml @@ -1,6 +1,6 @@ - -