diff --git a/ngo_purchase/LICENSE/LICENSE b/ngo_purchase/LICENSE/LICENSE
new file mode 100644
index 00000000..db611cbe
--- /dev/null
+++ b/ngo_purchase/LICENSE/LICENSE
@@ -0,0 +1,19 @@
+ -*- coding: utf-8 -*-
+
+
+    Author: Yannick Vaucher
+    Copyright 2014 Camptocamp SA
+    Copyright 2017 Serpent Consulting Services Pvt. Ltd.
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation, either version 3 of the
+    License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/ngo_purchase/README.rst b/ngo_purchase/README.rst
index b28a7f43..b807de49 100644
--- a/ngo_purchase/README.rst
+++ b/ngo_purchase/README.rst
@@ -12,4 +12,5 @@ Contributors
 ------------
 
 * Yannick Vaucher <yannick.vaucher@camptocamp.com>
+* Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
 
diff --git a/ngo_purchase/__init__.py b/ngo_purchase/__init__.py
index f3fc39f7..956aa1b7 100644
--- a/ngo_purchase/__init__.py
+++ b/ngo_purchase/__init__.py
@@ -1,2 +1,4 @@
 # -*- coding: utf-8 -*-
-from . import model
+# See LICENSE file for full copyright and licensing details.
+
+from . import models
diff --git a/ngo_purchase/__manifest__.py b/ngo_purchase/__manifest__.py
index 07b2d327..5fce3484 100644
--- a/ngo_purchase/__manifest__.py
+++ b/ngo_purchase/__manifest__.py
@@ -1,45 +1,29 @@
 # -*- coding: utf-8 -*-
-#
-#
-#    Author: Yannick Vaucher
-#    Copyright 2014 Camptocamp SA
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-{"name": "NGO - Purchase Order",
- "summary": "Base Purchase Order view for NGO",
- "version": "8.0.1.2.0",
- "author": "Camptocamp,Odoo Community Association (OCA)",
- "license": "AGPL-3",
- "category": "Purchase Management",
- 'complexity': "normal",
- "images": [],
- "website": "http://www.camptocamp.com",
- "depends": ["framework_agreement",
-             "framework_agreement_requisition",
-             "purchase_origin_address",
-             "purchase_delivery_address",
-             "purchase_requisition",
-             "purchase_requisition_bid_selection",
-             "purchase_rfq_bid_workflow",
-             "purchase_transport_document",
-             ],
- "demo": [],
- "data": ["view/purchase_order.xml",
-          ],
- "test": [],
- 'installable': False,
- 'auto_install': False,
- }
+# See LICENSE file for full copyright and licensing details.
+
+{
+    'name': 'NGO - Purchase Order',
+    'summary': 'Base Purchase Order view for NGO',
+    'version': '10.0.1.0.0',
+    'author': 'Camptocamp,Odoo Community Association (OCA), \
+         Serpent Consulting Services Pvt. Ltd.',
+    'category': 'Purchase Management',
+    'complexity': 'normal',
+    'website': 'http://www.camptocamp.com',
+    'license': 'LGPL-3',
+    'depends': [
+        'framework_agreement',
+        'framework_agreement_requisition',
+        'purchase_origin_address',
+        'purchase_delivery_address',
+        'purchase_requisition',
+        'purchase_requisition_bid_selection',
+        'purchase_rfq_bid_workflow',
+        'purchase_transport_document',
+    ],
+    'data': [
+        'views/purchase_order.xml',
+    ],
+    'installable': True,
+    'auto_install': False,
+}
diff --git a/ngo_purchase/model/__init__.py b/ngo_purchase/model/__init__.py
deleted file mode 100644
index 449e22b0..00000000
--- a/ngo_purchase/model/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-# -*- coding: utf-8 -*-
-from . import purchase_order
diff --git a/ngo_purchase/model/purchase_order.py b/ngo_purchase/model/purchase_order.py
deleted file mode 100644
index 2897ed16..00000000
--- a/ngo_purchase/model/purchase_order.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-#
-#    Author: Yannick Vaucher
-#    Copyright 2014 Camptocamp SA
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-from openerp import models, fields
-
-
-class PurchaseOrder(models.Model):
-    _inherit = 'purchase.order'
-
-    req_bid_tendering_mode = fields.Selection(
-        related='requisition_id.bid_tendering_mode',
-        selection=[('open', 'Open'),
-                   ('restricted', 'Restricted')],
-        string='Call for Bids Mode',
-        readonly=True,
-        help="Call for Bids mode of the requisition from which this RFQ was "
-             "generated\n- Restricted: Only the Tender's creator can select "
-             "bidders and generate a RFQ for each of those.\n"
-             "- Open : anybody can bid.")
-    req_date_end = fields.Datetime(
-        related='requisition_id.date_end',
-        string="Bid Submission Deadline",
-        readonly=True)
diff --git a/ngo_purchase/models/__init__.py b/ngo_purchase/models/__init__.py
new file mode 100644
index 00000000..e70a4e7a
--- /dev/null
+++ b/ngo_purchase/models/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# See LICENSE file for full copyright and licensing details.
+
+from . import purchase_order
diff --git a/ngo_purchase/models/purchase_order.py b/ngo_purchase/models/purchase_order.py
new file mode 100644
index 00000000..e2149df0
--- /dev/null
+++ b/ngo_purchase/models/purchase_order.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# See LICENSE file for full copyright and licensing details.
+
+from odoo import fields, models
+
+
+class PurchaseOrder(models.Model):
+    _inherit = 'purchase.order'
+
+    req_bid_tendering_mode = fields.Selection(
+        related='requisition_id.bid_tendering_mode',
+        selection=[('open', 'Open'),
+                   ('restricted', 'Restricted')],
+        string='Call for Bids Mode',
+        readonly=True,
+        help="Call for Bids mode of the requisition from which this RFQ was "
+             "generated\n- Restricted: Only the Tender's creator can select "
+             "bidders and generate a RFQ for each of those.\n"
+             "- Open : anybody can bid.")
+    req_date_end = fields.Datetime(
+        related='requisition_id.date_end',
+        string="Bid Submission Deadline",
+        readonly=True)
diff --git a/ngo_purchase/purchase_order.py b/ngo_purchase/purchase_order.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/ngo_purchase/static/description/index.html b/ngo_purchase/static/description/index.html
new file mode 100644
index 00000000..5638c4e5
--- /dev/null
+++ b/ngo_purchase/static/description/index.html
@@ -0,0 +1,51 @@
+
+<section class="oe_container oe_dark">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">Vertical NGO</h2>
+        <h2 class="oe_slogan">Requests for Quotations</h2>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+                This is the main page where request for quotation, it includes purchase
+                agreement, portfolio, pricelist, terms and conditions, currency,
+                and products,purchase order and quotation request are similar to each other.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture oe_screenshot" src="ngo2.png">
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Purchase Order</h2>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture oe_screenshot" src="ngo3.png">
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+                 Create purchase orders to which you can add brief records or generic charges and fees
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Purchase Agreement</h2>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+                This is the page where you can used to transfer the ownership of a business from a seller to a buyer.This page shows the agreement status too.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture oe_screenshot" src="ngo1.png">
+            </div>
+        </div>
+    </div>
+</section>
diff --git a/ngo_purchase/static/description/ngo1.png b/ngo_purchase/static/description/ngo1.png
new file mode 100644
index 00000000..c23434a5
Binary files /dev/null and b/ngo_purchase/static/description/ngo1.png differ
diff --git a/ngo_purchase/static/description/ngo2.png b/ngo_purchase/static/description/ngo2.png
new file mode 100644
index 00000000..7702c614
Binary files /dev/null and b/ngo_purchase/static/description/ngo2.png differ
diff --git a/ngo_purchase/static/description/ngo3.png b/ngo_purchase/static/description/ngo3.png
new file mode 100644
index 00000000..ebad5dd8
Binary files /dev/null and b/ngo_purchase/static/description/ngo3.png differ
diff --git a/ngo_purchase/view/purchase_order.xml b/ngo_purchase/view/purchase_order.xml
deleted file mode 100644
index 7c4e8aa0..00000000
--- a/ngo_purchase/view/purchase_order.xml
+++ /dev/null
@@ -1,418 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-  <data>
-
-    <record id="purchase_order_form" model="ir.ui.view">
-      <field name="name">ngo.purchase.order.form</field>
-      <field name="model">purchase.order</field>
-      <field name="priority" eval="10"/>
-      <field name="arch" type="xml">
-        <form string="Purchase Order">
-          <header>
-            <button name="bid_received" states="sent" string="Bid Received" class="oe_highlight"/>
-            <button name="wkf_send_rfq" states="draft" string="Send RFQ by Email" type="object" context="{'send_rfq':True}" class="oe_highlight"/>
-            <button name="wkf_send_rfq" states="sent" string="Re-Send RFQ by Email" type="object" context="{'send_rfq':True}"/>
-            <button name="print_quotation" string="Print RFQ" type="object" states="draft" class="oe_highlight" groups="base.group_user"/>
-            <button name="print_quotation" string="Re-Print RFQ" type="object" states="sent" groups="base.group_user"/>
-            <button name="purchase_confirm" states="draft" string="Confirm Order" id="draft_confirm"/>
-            <button name="purchase_confirm" states="bid" string="Confirm Order" class="oe_highlight" id="bid_confirm"/>
-            <button name="picking_ok" states="except_picking" string="Manually Corrected"/>
-            <button name="invoice_ok" states="except_invoice" string="Manually Corrected"/>
-            <button name="purchase_approve" states="confirmed" string="Approve Order" class="oe_highlight" groups="purchase.group_purchase_manager"/>
-            <button name="wkf_send_rfq" states="approved" string="Send PO by Email" type="object" context="{'send_rfq':False}"/>
-            <button name="view_picking" string="Receive Products" type="object" attrs="{'invisible': ['|', ('shipped','=',True), ('state','!=', 'approved')]}" class="oe_highlight"/>
-            <button name="view_invoice" string="Receive Invoice" type="object" attrs="{'invisible': ['|', ('invoice_method','in', ['picking', 'manual']), '|', ('state','!=', 'approved'), ('invoiced','=',True) ]}" class="oe_highlight"/>
-            <button name="action_cancel_draft" states="cancel,sent,confirmed" string="Set to Draft" type="object" />
-            <button name="action_cancel" states="draft,confirmed,sent,bid,approved,except_picking,except_invoice" string="Cancel" type="object" />
-            <field name="state" widget="statusbar" statusbar_visible="draft,sent,bid,approved,done" statusbar_colors='{"except_picking":"red","except_invoice":"red","confirmed":"blue"}' readonly="1"/>
-          </header>
-          <sheet>
-            <!-- buttons from purchase/stock_view.xml -->
-            <div class="oe_right oe_button_box" name="buttons">
-              <button type="object"
-                name="view_picking"
-                class="oe_stat_button"
-                icon="fa-truck"
-                attrs="{'invisible': [('shipment_count', '=', 0)]}">
-                <field name="shipment_count" widget="statinfo" string="In Shipments" help="Incoming Shipments"/>
-              </button>
-              <button type="object"  name="invoice_open"
-                class="oe_stat_button"
-                icon="fa-pencil-square-o"
-                attrs="{'invisible': [('invoice_count', '=', 0)]}">
-                <field name="invoice_count" widget="statinfo" string="Invoices"/>
-              </button> 
-            </div>
-            <!-- end -->
-            <div class="oe_title">
-              <h1>
-                <!-- purchase-workflow/purchase_rfq_bid_workflow -->
-                <field name="type" nolabel="1" class="oe_inline"/>
-                <label string=" "/>
-                <!-- end -->
-                <field name="name" class="oe_inline" readonly="1"/>
-              </h1>
-            </div>
-            <group>
-              <group>
-                <field name="partner_id" on_change="onchange_partner_id(partner_id, context)" context="{'search_default_supplier':1, 'default_supplier':1, 'default_customer':0}" domain="[('supplier','=',True)]" attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
-                <field name="for_agreement" attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" /><!-- vertical-ngo/framework_agreement_requisition -->
-                <field name="agreement_expected_date"
-                  attrs="{'invisible': [('for_agreement', '=', False)], 'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
-                <field name="agreement_promised_date"
-                  attrs="{'invisible': [('for_agreement', '=', False)], 'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
-              </group>
-              <group>
-                <field name="date_order" attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
-                <field name="partner_ref" attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
-                <field name="origin" attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
-              </group>
-
-            </group>
-            <notebook>
-              <page string="Products">
-                <field name="order_line" attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" >
-                  <tree string="Purchase Order Lines" editable="bottom">
-                    <field name="product_id" on_change="onchange_product_id(parent.pricelist_id,product_id,0,False,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,False,parent.state,context)"/>
-                    <field name="name" invisible="1"/>
-                    <field name="date_planned"/>
-                    <field name="company_id" invisible="1"/>
-                    <field name="account_analytic_id" groups="purchase.group_analytic_accounting" domain="[('type','not in',('view','template'))]"/>
-                    <field name="product_qty" on_change="onchange_product_id(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id,parent.date_order,parent.fiscal_position,date_planned,name,price_unit,parent.state,context)"/>
-                    <field name="product_uom" groups="product.group_uom" on_change="onchange_product_uom(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,parent.state,context)"/>
-                    <field name="price_unit"/>
-                    <field name="price_subtotal"/>
-                    <field name="state" invisible="1"/>
-                  </tree>
-                </field>
-                <group class="oe_subtotal_footer oe_right">
-                  <div class="oe_subtotal_footer_separator oe_inline">
-                    <label for="amount_total"/>
-                    <button name="button_dummy"
-                      states="draft" string="(update)" type="object" class="oe_edit_only oe_link"/>
-                  </div>
-                  <field name="amount_total" nolabel="1" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency_id'}"/>
-                </group>
-              </page>
-              <page string="Transportation and Delivery">
-                <group>
-                  <group>
-                    <field name="picking_type_id" on_change="1" domain="[('code','=','incoming')]" widget="selection" context="{'special_shortened_wh_name': True}" groups="stock.group_locations" attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
-                    <field name="location_id" groups="stock.group_locations" attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
-                    <field name="related_location_id" invisible="1"/>
-                    <!-- attrs and required domain removed by purchase_delivery_address -->
-                    <!-- workaround odoo/odoo#2950 -->
-                    <field
-                      name="dest_address_id"
-                      on_change="1"
-                      string="Delivery Address"
-                      attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}"
-                      groups="stock.group_locations"/>
-                    <field name="origin_address_id" attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
-                    <field name="volume_estimated" attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
-                    <field name="weight_estimated" attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
-                  </group>
-                  <group>
-                    <field name="minimum_planned_date" attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
-                    <field name="shipped" groups="base.group_no_one" attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
-                    <field name="incoterm_id" attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
-                    <!-- purchase-workflow/purchase_rfq_bid_workflow -->
-                    <field name="incoterm_address" attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
-                  </group>
-                </group>
-                <!-- purchase-workflow/purchase_transport_document -->
-                <separator string="Transport Documents"/>
-                <field name="transport_document_ids" attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
-                <!-- purchase-workflow/purchase_requisition_bid_selection -->
-                <separator string="Delivery Remarks"/>
-                <field name="delivery_remark" attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
-              </page>
-
-              <page string="Accounting and Currency">
-                <group>
-                  <group>
-                    <field domain="[('type','=','purchase')]" name="pricelist_id" groups="product.group_purchase_pricelist" on_change="onchange_pricelist(pricelist_id, context)"/>
-                    <field name="currency_id" groups="base.group_multi_currency" attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
-                    <field name="company_id" groups="base.group_multi_company" widget="selection" attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
-                    <field name="journal_id" invisible='1' attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
-                  </group>
-                  <group>
-                    <field name="payment_term_id" options="{'no_open': True, 'no_create': True}" attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
-                    <field name="terms_of_payment" attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" /><!-- purchase-workflow/purchase_requisition_bid_selection -->
-                    <field name="fiscal_position" attrs="{'readonly': [('invoiced','=', True)], 'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
-                    <field name="invoice_method" attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
-                    <field name="invoiced" attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
-                  </group>
-                </group>
-              </page>
-
-              <page string="Terms and Conditions">
-                <field name="notes" class="oe_inline" placeholder="Terms and conditions..." attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
-              </page>
-
-              <page string="Bid Information">
-                <group>
-                  <group>
-                    <field name="requisition_id" attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
-                    <field name="req_bid_tendering_mode" attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" /><!-- added related field -->
-                    <field name="tender_bid_receipt_mode" attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" /><!-- purchase-workflow/purchase_requisition_bid_selection -->
-                    <field name="bid_partial"/>
-                  </group>
-                  <group>
-                    <field name="req_date_end"/><!-- added related field -->
-                    <field name="bid_date" attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
-                    <field name="bid_validity" attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
-                    <field name="country_of_origin" attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" /><!-- purchase-workflow/purchase_requisition_bid_selection -->
-                    <field name="meets_specifications" attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" /><!-- purchase-workflow/purchase_requisition_bid_selection -->
-                    <field name="bid_eligible" attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" /><!-- purchase-workflow/purchase_requisition_bid_selection -->
-                  </group>
-                </group>
-              </page>
-
-            </notebook>
-            <div class="oe_clear"/>
-            <group string="Validation">
-              <div colspan="4">
-                <label for="validator"/>
-                <field name="validator"
-                  class="oe_inline" attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
-                <label string=" validated on "
-                  attrs="{'invisible': [('validator', '=', False)], 'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
-                <field name="date_approve"
-                  attrs="{'invisible': [('validator', '=', False)], 'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}"
-                  class="oe_inline"/>
-              </div>
-            </group>
-          </sheet>
-          <div class="oe_chatter">
-            <field name="message_follower_ids" widget="mail_followers"/>
-            <field name="message_ids" widget="mail_thread"/>
-          </div>
-        </form>
-      </field>
-    </record>
-
-    <record id="view_purchase_order_filter" model="ir.ui.view">
-      <field name="name">purchase.order.list.select</field>
-      <field name="model">purchase.order</field>
-      <field name="inherit_id" ref="purchase.view_purchase_order_filter" />
-      <field name="arch" type="xml">
-        <field name="name" position="after">
-          <field name="origin" string="Origin"/>
-        </field>
-      </field>
-    </record>
-
-    <!-- Purchase inheritances -->
-    <!-- purchase-workflow/framework_agreement -->
-    <record id="add_onchange_on_purchase_order_form" model="ir.ui.view">
-      <field name="name">add onchange on purchase form</field>
-      <field name="model">purchase.order</field>
-      <field name="inherit_id" ref="ngo_purchase.purchase_order_form" />
-      <field name="arch" type="xml">
-
-        <field name="partner_id" position="after">
-          <field name="portfolio_id" options="{'always_show_search_more': true}" attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
-        </field>
-
-        <field name="pricelist_id" position="attributes">
-          <attribute name="on_change">1</attribute>
-        </field>
-
-        <field name="partner_id" position="attributes">
-          <attribute name="context_agreement">{'portfolio_id': portfolio_id}</attribute>
-        </field>
-
-        <field name="product_id" position="attributes">
-          <attribute name="context_agreement">{'agreement_id': framework_agreement_id, 'incoterm_id': parent.incoterm_id, 'currency_id': parent.currency_id, 'portfolio_id': parent.portfolio_id}</attribute>
-        </field>
-
-        <field name="product_qty" position="after">
-          <field name="portfolio_id" invisible="1"/> <!-- used by attrs below -->
-          <field name="framework_agreement_id" attrs="{'required': [('portfolio_id', '!=', False)], 'readonly': [('portfolio_id', '=', False)]}" />
-        </field>
-
-        <field name="product_qty" position="attributes">
-          <attribute name="context_agreement">{'agreement_id': framework_agreement_id, 'incoterm_id': parent.incoterm_id, 'currency_id': parent.currency_id, 'portfolio_id': parent.portfolio_id}</attribute>
-        </field>
-
-        <xpath expr="//page[@string='Bid Information']" position="inside">
-          <separator string="Internal remarks"/>
-          <field name="bid_internal_remark" attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
-        </xpath>
-
-      </field>
-
-    </record>
-
-    <record id="purchase_order_line_form" model="ir.ui.view">
-      <field name="name">ngo.purchase.order.line.form</field>
-      <field name="model">purchase.order.line</field>
-      <field name="priority" eval="10"/>
-      <field name="arch" type="xml">
-        <form string="Purchase Order Line">
-          <sheet>
-            <group>
-              <group>
-                <field name="product_id" on_change="onchange_product_id(parent.pricelist_id,product_id,0,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,'draft',context)"/>
-              </group>
-              <group>
-                <label for="product_qty"/>
-                <div>
-                  <field name="product_qty" on_change="onchange_product_id(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id,parent.date_order,parent.fiscal_position,date_planned,name,price_unit,'draft',context)" class="oe_inline"/>
-                  <field name="product_uom" groups="product.group_uom" on_change="onchange_product_uom(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,'draft',context)" class="oe_inline"/>
-                </div>
-              </group>
-            </group>
-            <label for="name"/>
-            <field name="name"/>
-            <group>
-              <group>
-                <field name="price_unit"/>
-                <field name="price_subtotal"/>
-              </group>
-              <group>
-                <field name="date_planned" widget="date"/>
-                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-              </group>
-              <group string="Accounting">
-                <field name="account_analytic_id" colspan="2" groups="purchase.group_analytic_accounting"/>
-              </group>
-            </group>
-            <notebook>
-              <page string="Invoices and Incoming Shipments">
-                <field name="invoice_lines"/>
-                <field name="move_ids"/>
-              </page>
-              <!-- add field from purchase_requisition_bid_selection -->
-              <page string="Remarks / Conditions">
-                <field name="remark"/>
-              </page>
-            </notebook>
-          </sheet>
-        </form>
-      </field>
-    </record>
-
-    <!-- purchase-workflow/purchase_rfq_bid_workflow -->
-    <record model="ir.ui.view" id="purchase_rfq_bid_workflow_view_purchase_order_form">
-      <field name="name">purchase.order.form.inherit</field>
-      <field name="model">purchase.order</field>
-      <field name="inherit_id" ref="ngo_purchase.purchase_order_form"/>
-      <field name="arch" type="xml">
-
-        <xpath expr="//sheet/div[@class='oe_title']/h1" position="after">
-          <h2 attrs="{'invisible': [('state', '!=', 'cancel')]}">
-            <label for="cancel_reason_id" string="Reason for Cancellation:"/>
-            <field name="cancel_reason_id" class="oe_inline" />
-          </h2>
-        </xpath>
-
-        <xpath expr="//field[@name='state']" position="attributes">
-          <attribute name="statusbar_visible">draft,sent,bid,draftpo,approved,done</attribute>
-        </xpath>
-
-        <xpath expr="//button[@name='action_cancel_draft']" position="attributes">
-          <attribute name="states">cancel,draftpo</attribute>
-          <attribute name="string">Reset to Draft RFQ</attribute>
-        </xpath>
-
-        <xpath expr="//button[@string='Send PO by Email']" position="after">
-          <button name="wkf_send_rfq" states="draftpo" string="Send Draft PO by Email" type="object" context="{'send_rfq':True}"/>
-        </xpath>
-
-        <xpath expr="//button[@name='bid_received']" position="attributes">
-          <attribute name="string">Bid Encoded</attribute>
-          <attribute name="type">object</attribute>
-          <attribute name="states">sent,draftbid</attribute>
-        </xpath>
-
-        <xpath expr="//button[@id='bid_confirm']" position="attributes">
-          <attribute name="states">draftpo</attribute>
-        </xpath>
-
-        <xpath expr="//button[@id='draft_confirm']" position="attributes">
-          <attribute name="states">draftpo</attribute>
-          <attribute name="invisible">1</attribute>
-        </xpath>
-
-        <field name="picking_type_id" position="attributes">
-          <attribute name="on_change">1</attribute>
-        </field>
-
-        <button name="action_cancel" position="attributes">
-          <!-- draftbid,draftpo added -->
-          <attribute name="states">draft,confirmed,sent,bid,draftbid,draftpo,approved,except_picking,except_invoice</attribute>
-        </button>
-
-        <xpath expr="//button[@name='purchase_confirm']" position="after">
-          <!-- FIXME confusing button name -->
-          <button name="draft_po" states="draft" string="Convert to PO"/>
-          <button name="draft_po" states="bid" string="Convert to PO" class="oe_highlight"/>
-        </xpath>
-
-        <field name="product_id" position="attributes">
-          <!-- TODO investigate context_extended -->
-          <attribute name="context_extended">{'order_type': parent.type}</attribute>
-        </field>
-
-        <field name="product_qty" position="attributes">
-          <attribute name="context_extended">{'order_type': parent.type}</attribute>
-        </field>
-
-      </field>
-    </record>
-
-    <!-- purchase-workflow/purchase_requisition_bid_selection -->
-    <record model="ir.ui.view" id="view_purchase_order_form">
-      <field name="name">purchase.order.inherit</field>
-      <field name="model">purchase.order</field>
-      <field name="inherit_id" ref="ngo_purchase.purchase_rfq_bid_workflow_view_purchase_order_form"/>
-      <field name="arch" type="xml">
-
-        <xpath expr="//button[@name='draft_po'][1]" position="attributes">
-          <attribute name="attrs">{'invisible': ['|', ('requisition_id','!=',False)]}</attribute>
-        </xpath>
-
-        <xpath expr="//button[@name='draft_po'][2]" position="attributes">
-          <attribute name="attrs">{'invisible': ['|', ('requisition_id','!=',False)]}</attribute>
-        </xpath>
-
-      </field>
-    </record>
-
-    <!-- purchase-workflow/framework_agreement -->
-    <record model="ir.ui.view" id="purchase_order_line_agreement_view_form">
-      <field name="name">purchase_order_line_agreement_view_form</field>
-      <field name="model">purchase.order.line</field>
-      <field name="inherit_id" ref="ngo_purchase.purchase_order_line_form"/>
-      <field name="arch" type="xml">
-
-        <field name="product_id" position="attributes">
-          <attribute name="context_agreement">{'agreement_id': framework_agreement_id, 'incoterm_id': parent.incoterm_id, 'currency_id': parent.currency_id, 'portfolio_id': parent.portfolio_id}</attribute>
-        </field>
-
-        <field name="product_id" position="after">
-          <field name="portfolio_id" invisible="1"/> <!-- used by attrs below -->
-          <field name="framework_agreement_id" attrs="{'required': [('portfolio_id', '!=', False)], 'readonly': [('portfolio_id', '=', False)]}" />
-        </field>
-
-        <field name="product_qty" position="attributes">
-          <attribute name="context_agreement">{'agreement_id': framework_agreement_id, 'incoterm_id': parent.incoterm_id, 'currency_id': parent.currency_id, 'portfolio_id': parent.portfolio_id}</attribute>
-        </field>
-
-      </field>
-    </record>
-
-    <record id="purchase_order_tree" model="ir.ui.view">
-      <field name="name">purchase.order.tree</field>
-      <field name="model">purchase.order</field>
-      <field name="inherit_id" ref="purchase.purchase_order_tree"/>
-      <field name="arch" type="xml">
-        <field name="amount_untaxed" position="attributes">
-          <attribute name="invisible">1</attribute>
-        </field>
-      </field>
-    </record>
-  </data>
-</openerp>
diff --git a/ngo_purchase/views/purchase_order.xml b/ngo_purchase/views/purchase_order.xml
new file mode 100644
index 00000000..cdd57dab
--- /dev/null
+++ b/ngo_purchase/views/purchase_order.xml
@@ -0,0 +1,468 @@
+<odoo>
+    <record id="purchase_order_form" model="ir.ui.view">
+        <field name="name">purchase.order.form</field>
+        <field name="model">purchase.order</field>
+        <field name="arch" type="xml">
+            <form string="Purchase Order">
+                <header>
+                    <button name="action_rfq_send" states="draft" string="Send RFQ by Email"
+                        type="object" context="{'send_rfq':True}" class="oe_highlight" />
+                    <button name="action_rfq_send" states="sent" string="Re-Send RFQ by Email"
+                        type="object" context="{'send_rfq':True}" />
+                    <button name="print_quotation" string="Print RFQ" type="object"
+                        states="draft" class="oe_highlight" groups="base.group_user" />
+                    <button name="print_quotation" string="Print RFQ" type="object"
+                        states="sent" groups="base.group_user" />
+                    <button name="button_confirm" type="object" states="draft"
+                        string="Confirm Order" id="draft_confirm" />
+                    <button name="button_confirm" type="object" states="sent"
+                        string="Confirm Order" class="oe_highlight" id="bid_confirm" />
+                    <button name="button_approve" type="object" states='to approve'
+                        string="Approve Order" class="oe_highlight" groups="purchase.group_purchase_manager" />
+                    <button name="action_rfq_send" states="purchase" string="Send PO by Email"
+                        type="object" context="{'send_rfq':False}" />
+                    <button name="action_view_picking" string="Receive Products"
+                        class="oe_highlight" type="object"
+                        attrs="{'invisible': ['|', '|' , ('is_shipped', '=', True), ('state','not in', ('done')), ('picking_count', '=', 0)]}" />
+                    <button name="button_draft" states="cancel" string="Set to Draft"
+                        type="object" />
+                    <button name="button_cancel" states="draft,to approve,sent"
+                        string="Cancel" type="object" />
+                    <button name="button_done" type="object" string="Lock"
+                        states="purchase" />
+                    <button name="button_unlock" type="object" string="Unlock"
+                        states="done" groups="purchase.group_purchase_manager" />
+                    <field name="state" widget="statusbar" statusbar_visible="draft,sent,purchase"
+                        readonly="1" />
+                </header>
+                <sheet>
+                    <div class="oe_button_box" name="button_box">
+                        <button type="object" name="action_view_picking" class="oe_stat_button"
+                            icon="fa-truck"
+                            attrs="{'invisible':[('state', 'in', ('draft','sent','to approve')),('picking_ids','=',[])]}">
+                            <field name="picking_count" widget="statinfo" string="Shipment"
+                                help="Incoming Shipments" />
+                            <field name="picking_ids" invisible="1" />
+                        </button>
+                        <button type="object" name="action_view_invoice" class="oe_stat_button"
+                            icon="fa-pencil-square-o"
+                            attrs="{'invisible':[('state', 'in', ('draft','sent','to approve')),('invoice_ids','=',[])]}">
+                            <field name="invoice_count" widget="statinfo" string="Invoices" />
+                            <field name='invoice_ids' invisible="1" />
+                        </button>
+                    </div>
+                    <div class="oe_title">
+                        <h1>
+                            <!-- purchase-work flow/purchase_rfq_bid_workflow -->
+                            <field name="type" nolabel="1" class="oe_inline" />
+                            <label string=" " />
+                            <!-- end -->
+                            <field name="name" class="oe_inline" readonly="1" />
+                        </h1>
+                    </div>
+                    <group>
+                        <group>
+                            <field name="partner_id"
+                                context="{'search_default_supplier':1, 'default_supplier':1, 'default_customer':0}"
+                                domain="[('supplier','=',True)]"
+                                attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
+                            <field name="for_agreement"
+                                attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
+                            <field name="agreement_expected_date"
+                                attrs="{'invisible': [('for_agreement', '=', False)], 'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
+                            <field name="agreement_promised_date"
+                                attrs="{'invisible': [('for_agreement', '=', False)], 'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
+                        </group>
+                        <group>
+                            <field name="date_order"
+                                attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
+                            <field name="partner_ref"
+                                attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
+                            <field name="origin"
+                                attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
+                        </group>
+
+                    </group>
+                    <notebook>
+                        <page string="Products">
+                            <field name="order_line"
+                                attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}">
+                                <tree string="Purchase Order Lines" editable="bottom">
+                                    <field name="state" invisible="1" />
+                                    <field name="product_id"
+                                        context="{'partner_id':parent.partner_id, 'quantity':product_qty,'uom':product_uom, 'company_id': parent.company_id}"
+                                        attrs="{'readonly': [('state', 'in', [('purchase', 'to approve','done', 'cancel')])]}" />
+                                    <field name="name" invisible="1" />
+                                    <field name="date_planned" />
+                                    <field name="company_id" invisible="1" />
+                                    <field name="account_analytic_id" context="{'default_partner_id':parent.partner_id}"
+                                        groups="purchase.group_analytic_accounting" />
+                                    <field name="product_qty" />
+                                    <field name="qty_received" invisible="not context.get('show_purchase', False)" />
+                                    <field name="qty_invoiced" invisible="not context.get('show_purchase', False)" />
+                                    <field name="product_uom" groups="product.group_uom"
+                                        attrs="{'readonly': [('state', 'in', [('purchase', 'done', 'cancel')])]}" />
+                                    <field name="price_unit" />
+                                    <field name="price_subtotal" widget="monetary" />
+                                </tree>
+                            </field>
+                            <group class="oe_subtotal_footer oe_right">
+                                <div class="oe_subtotal_footer_separator oe_inline">
+                                    <label for="amount_total" />
+                                </div>
+                                <field name="amount_total" nolabel="1"
+                                    class="oe_subtotal_footer_separator" widget="monetary" />
+                            </group>
+                        </page>
+                        <page string="Transportation and Delivery">
+                            <group>
+                                <group>
+                                    <field name="picking_type_id" domain="[('code','=','incoming')]"
+                                        widget="selection" context="{'special_shortened_wh_name': True}"
+                                        groups="stock.group_locations"
+                                        attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
+                                    <field name="default_location_dest_id_usage" invisible="1" />
+                                    <field name="dest_address_id" string="Delivery Address"
+                                        attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}"
+                                        groups="stock.group_locations" />
+                                    <!-- attrs and required domain removed by purchase_delivery_address -->
+                                    <!-- workaround odoo/odoo#2950 -->
+                                    <field name="origin_address_id"
+                                        attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
+                                    <field name="volume_estimated"
+                                        attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
+                                    <field name="weight_estimated"
+                                        attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
+                                </group>
+                                <group>
+                                    <field name="date_planned"
+                                        attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
+                                    <field name="date_approve" groups="base.group_no_one"
+                                        attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
+                                    <field name="incoterm_id"
+                                        attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
+                                    <!-- purchase-workflow/purchase_rfq_bid_workflow -->
+                                    <field name="incoterm_address"
+                                        attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
+                                </group>
+                            </group>
+                            <!-- purchase-workflow/purchase_transport_document -->
+                            <separator string="Transport Documents" />
+                            <field name="transport_document_ids"
+                                attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
+                            <!-- purchase-workflow/purchase_requisition_bid_selection -->
+                            <separator string="Delivery Remarks" />
+                            <field name="delivery_remark"
+                                attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
+                        </page>
+                        <page string="Accounting and Currency">
+                            <group>
+                                <group>
+                                    <field domain="[('type','=','purchase')]" name="pricelist_id"
+                                        groups="product.group_purchase_pricelist" />
+                                    <field name="currency_id" groups="base.group_multi_currency"
+                                        attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
+                                    <field name="company_id" groups="base.group_multi_company"
+                                        widget="selection"
+                                        attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
+                                    <field name="is_shipped" invisible='1'
+                                        attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
+                                </group>
+                                <group>
+                                    <field name="payment_term_id" options="{'no_open': True, 'no_create': True}"
+                                        attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
+                                    <field name="terms_of_payment"
+                                        attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
+                                    <field name="fiscal_position_id"
+                                        attrs="{'readonly': [('invoice_status','=', True)], 'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
+                                    <!--purchase-workflow/purchase_requisition_bid_selection -->
+                                    <field name="invoice_status"
+                                        attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
+                                </group>
+                            </group>
+                        </page>
+                        <page string="Terms and Conditions">
+                            <field name="notes" class="oe_inline" placeholder="Terms and conditions..."
+                                attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
+                        </page>
+                        <page string="Bid Information">
+                            <group>
+                                <group>
+                                    <field name="requisition_id"
+                                        attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
+                                    <field name="req_bid_tendering_mode"
+                                        attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
+                                    <!-- added related field -->
+                                    <field name="tender_bid_receipt_mode"
+                                        attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
+                                    <!--purchase-workflow/purchase_requisition_bid_selection -->
+                                    <field name="bid_partial" />
+                                </group>
+                                <group>
+                                    <field name="req_date_end" /><!-- added related field -->
+                                    <field name="date_approve"
+                                        attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
+                                    <field name="bid_validity"
+                                        attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
+                                    <field name="country_of_origin"
+                                        attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
+                                    <!--purchase-workflow/purchase_requisition_bid_selection -->
+                                    <field name="meets_specifications"
+                                        attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
+                                    <!-- purchase-workflow/purchase_requisition_bid_selection -->
+                                    <field name="bid_eligible"
+                                        attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
+                                    <!--purchase-workflow/purchase_requisition_bid_selection -->
+                                </group>
+                            </group>
+                        </page>
+                    </notebook>
+                    <div class="oe_clear" />
+                    <group string="Validation">
+                        <div colspan="4">
+                            <label for="create_uid" />
+                            <field name="create_uid" class="oe_inline"
+                                attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
+                            <label string=" validated on "
+                                attrs="{'invisible': [('validator', '=', False)], 'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
+                            <field name="date_approve"
+                                attrs="{'invisible': [('validator', '=', False)], 'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}"
+                                class="oe_inline" />
+                        </div>
+                    </group>
+                </sheet>
+                <div class="oe_chatter">
+                    <field name="message_follower_ids" widget="mail_followers" />
+                    <field name="message_ids" widget="mail_thread" />
+                </div>
+            </form>
+        </field>
+    </record>
+    <record id="view_purchase_order_filter_ngo_purchase_order"
+        model="ir.ui.view">
+        <field name="name">purchase.order.list.select</field>
+        <field name="model">purchase.order</field>
+        <field name="inherit_id" ref="purchase.view_purchase_order_filter" />
+        <field name="arch" type="xml">
+            <field name="name" position="after">
+                <field name="origin" string="Origin" />
+            </field>
+        </field>
+    </record>
+
+    <!-- Purchase inheritances -->
+    <!-- purchase-workflow/framework_agreement -->
+    <record id="add_onchange_on_purchase_order_form" model="ir.ui.view">
+        <field name="name">add onchange on purchase form</field>
+        <field name="model">purchase.order</field>
+        <field name="inherit_id" ref="ngo_purchase.purchase_order_form" />
+        <field name="arch" type="xml">
+
+            <field name="partner_id" position="attributes">
+                <attribute name="context_agreement">{'portfolio_id': portfolio_id}</attribute>
+            </field>
+
+            <field name="product_id" position="attributes">
+                <attribute name="context_agreement">{'agreement_id':
+                    framework_agreement_id,'incoterm_id': parent.incoterm_id,
+                    'currency_id': parent.currency_id, 'portfolio_id':
+                    parent.portfolio_id}
+                </attribute>
+            </field>
+
+            <field name="product_qty" position="after">
+                <field name="portfolio_id" invisible="1" /> <!-- used by attrs below -->
+                <field name="framework_agreement_id"
+                    attrs="{'required': [('portfolio_id', '!=', False)], 'readonly': [('portfolio_id', '=', False)]}" />
+            </field>
+
+            <field name="product_qty" position="attributes">
+                <attribute name="context_agreement">{'agreement_id': framework_agreement_id,
+                    'incoterm_id': parent.incoterm_id, 'currency_id':
+                    parent.currency_id, 'portfolio_id': parent.portfolio_id}
+                </attribute>
+            </field>
+
+            <xpath expr="//page[1]" position="inside">
+                <separator string="Internal remarks" />
+                <field name="bid_internal_remark"
+                    attrs="{'readonly': [('state', 'not in', ['draft', 'draftbid', 'draftpo'])]}" />
+            </xpath>
+        </field>
+    </record>
+
+    <record id="purchase_order_line_form2" model="ir.ui.view">
+        <field name="name">ngo.purchase.order.line.form</field>
+        <field name="model">purchase.order.line</field>
+        <field name="priority" eval="10" />
+        <field name="arch" type="xml">
+            <form string="Purchase Order Line">
+                <sheet>
+                    <group>
+                        <group>
+                            <label for="product_qty" />
+                            <div>
+                                <field name="product_uom" groups="product.group_uom"
+                                    class="oe_inline" />
+                            </div>
+                        </group>
+                    </group>
+                    <label for="name" />
+                    <field name="name" />
+                    <group>
+                        <group>
+                            <field name="price_unit" />
+                            <field name="price_subtotal" />
+                        </group>
+                        <group>
+                            <field name="date_planned" widget="date" />
+                            <field name="company_id" groups="base.group_multi_company"
+                                widget="selection" />
+                        </group>
+                        <group string="Accounting">
+                            <field name="account_analytic_id" colspan="2"
+                                groups="purchase.group_analytic_accounting" />
+                        </group>
+                    </group>
+                    <field name="name" />
+                    <separator string="Manual Invoices" />
+                    <field name="invoice_lines" />
+                    <separator string="Stock Moves" />
+                    <field name="move_ids" />
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <!-- purchase-workflow/purchase_rfq_bid_workflow -->
+    <record model="ir.ui.view"
+        id="purchase_rfq_bid_workflow_view_purchase_order_form">
+        <field name="name">purchase.order.form.inherit</field>
+        <field name="model">purchase.order</field>
+        <field name="inherit_id" ref="purchase.purchase_order_form" />
+        <field name="arch" type="xml">
+
+            <xpath expr="//sheet/div[@class='oe_title']/h1" position="after">
+                <h2 attrs="{'invisible': [('state', '!=', 'cancel')]}">
+                    <label for="cancel_reason_id" string="Reason for Cancellation:" />
+                    <field name="cancel_reason_id" class="oe_inline" />
+                </h2>
+            </xpath>
+
+            <xpath expr="//field[@name='state']" position="attributes">
+                <attribute name="statusbar_visible">draft,sent,bid,draftpo,approved,done
+                </attribute>
+            </xpath>
+
+            <xpath expr="//button[@name='button_cancel']" position="attributes">
+                <attribute name="states">cancel,draftpo</attribute>
+                <attribute name="string">Reset to Draft RFQ</attribute>
+            </xpath>
+
+            <xpath expr="//button[@name='action_rfq_send']" position="after">
+                <button name="wkf_send_rfq" states="draftpo" string="Send Draft PO by Email"
+                    type="object" context="{'send_rfq':True}" />
+            </xpath>
+
+            <xpath expr="//button[@name='button_confirm']" position="attributes">
+                <attribute name="string">Bid Encoded</attribute>
+                <attribute name="type">object</attribute>
+                <attribute name="states">sent,draftbid</attribute>
+            </xpath>
+
+            <xpath expr="//button[@name='button_confirm']" position="attributes">
+                <attribute name="states">draftpo</attribute>
+            </xpath>
+
+            <xpath expr="//button[@name='button_confirm']" position="attributes">
+                <attribute name="states">draftpo</attribute>
+                <attribute name="invisible">1</attribute>
+            </xpath>
+
+            <button name="button_cancel" position="attributes">
+                <!-- draftbid,draftpo added -->
+                <attribute name="states">draft,confirmed,sent,bid,draftbid,draftpo,approved,except_picking,except_invoice
+                </attribute>
+            </button>
+
+            <xpath expr="//button[@name='button_confirm']" position="after">
+                <!-- FIXME confusing button name -->
+                <button name="draft_po" states="draft" string="Convert to PO" />
+                <button name="draft_po" states="bid" string="Convert to PO"
+                    class="oe_highlight" />
+            </xpath>
+
+            <field name="product_id" position="attributes">
+                <!-- TODO investigate context_extended -->
+                <attribute name="context_extended">{'order_type': parent.type}</attribute>
+            </field>
+
+            <field name="product_qty" position="attributes">
+                <attribute name="context_extended">{'order_type': parent.type}</attribute>
+            </field>
+        </field>
+    </record>
+
+
+    <!-- purchase-workflow/purchase_requisition_bid_selection -->
+    <record model="ir.ui.view" id="view_purchase_order_form">
+        <field name="name">purchase.order.inherit</field>
+        <field name="model">purchase.order</field>
+        <field name="inherit_id"
+            ref="ngo_purchase.purchase_rfq_bid_workflow_view_purchase_order_form" />
+        <field name="arch" type="xml">
+            <xpath expr="//button[@name='draft_po'][1]" position="attributes">
+                <attribute name="attrs">{'invisible':['|',('requisition_id','!=',False)]}
+                </attribute>
+            </xpath>
+
+            <xpath expr="//button[@name='draft_po'][2]" position="attributes">
+                <attribute name="attrs">{'invisible':['|',('requisition_id','!=',False)]}
+                </attribute>
+            </xpath>
+
+        </field>
+    </record>
+
+    <!-- purchase-workflow/framework_agreement -->
+    <record model="ir.ui.view" id="purchase_order_line_agreement_view_form">
+        <field name="name">purchase_order_line_agreement_view_form</field>
+        <field name="model">purchase.order.line</field>
+        <field name="inherit_id" ref="purchase.purchase_order_line_form2" />
+        <field name="arch" type="xml">
+
+            <xpath expr="//form/sheet/group/group/field[@name='product_id']"
+                position="attributes">
+                <attribute name="context_agreement">{'agreement_id':
+                    framework_agreement_id,'incoterm_id': parent.incoterm_id,
+                    'currency_id': parent.currency_id, 'portfolio_id':
+                    parent.portfolio_id}
+                </attribute>
+            </xpath>
+            <field name="product_id" position="after">
+                <field name="portfolio_id" invisible="1" /> <!-- used by attrs below -->
+                <field name="framework_agreement_id"
+                    attrs="{'required': [('portfolio_id', '!=', False)], 'readonly': [('portfolio_id', '=', False)]}" />
+            </field>
+
+            <field name="product_qty" position="attributes">
+                <attribute name="context_agreement">{'agreement_id':
+                    framework_agreement_id,'incoterm_id': parent.incoterm_id,
+                    'currency_id':parent.currency_id, 'portfolio_id':
+                    parent.portfolio_id}
+                </attribute>
+            </field>
+        </field>
+    </record>
+
+    <record id="purchase_order_tree" model="ir.ui.view">
+        <field name="name">purchase.order.tree</field>
+        <field name="model">purchase.order</field>
+        <field name="inherit_id" ref="purchase.purchase_order_tree" />
+        <field name="arch" type="xml">
+            <field name="amount_untaxed" position="attributes">
+                <attribute name="invisible">1</attribute>
+            </field>
+        </field>
+    </record>
+</odoo>
diff --git a/ngo_purchase_requisition/LICENSE/LICENSE b/ngo_purchase_requisition/LICENSE/LICENSE
new file mode 100644
index 00000000..db611cbe
--- /dev/null
+++ b/ngo_purchase_requisition/LICENSE/LICENSE
@@ -0,0 +1,19 @@
+ -*- coding: utf-8 -*-
+
+
+    Author: Yannick Vaucher
+    Copyright 2014 Camptocamp SA
+    Copyright 2017 Serpent Consulting Services Pvt. Ltd.
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation, either version 3 of the
+    License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/ngo_purchase_requisition/README.rst b/ngo_purchase_requisition/README.rst
index 03d6ef81..3d735a4b 100644
--- a/ngo_purchase_requisition/README.rst
+++ b/ngo_purchase_requisition/README.rst
@@ -10,3 +10,4 @@ Contributors
 ------------
 
 * Yannick Vaucher <yannick.vaucher@camptocamp.com>
+* Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
diff --git a/ngo_purchase_requisition/__init__.py b/ngo_purchase_requisition/__init__.py
index 40a96afc..7af590a0 100644
--- a/ngo_purchase_requisition/__init__.py
+++ b/ngo_purchase_requisition/__init__.py
@@ -1 +1,2 @@
 # -*- coding: utf-8 -*-
+# See LICENSE file for full copyright and licensing details.
diff --git a/ngo_purchase_requisition/__manifest__.py b/ngo_purchase_requisition/__manifest__.py
index d2ac97dd..cecbdf7c 100644
--- a/ngo_purchase_requisition/__manifest__.py
+++ b/ngo_purchase_requisition/__manifest__.py
@@ -1,40 +1,27 @@
 # -*- coding: utf-8 -*-
-#    Author: Yannick Vaucher, Leonardo Pistone
-#    Copyright 2014-2015 Camptocamp SA
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# See LICENSE file for full copyright and licensing details.
 
-{"name": "NGO - Purchase Requisition",
- "summary": "Base Purchase Requisition view for NGO",
- "version": "8.0.2.0.0",
- "author": "Camptocamp,Odoo Community Association (OCA)",
- "license": "AGPL-3",
- "category": "Purchase Management",
- 'complexity': "normal",
- "images": [],
- "website": "http://www.camptocamp.com",
- "depends": ["purchase_requisition",
-             "purchase_requisition_bid_selection",
-             "purchase_requisition_delivery_address",
-             "purchase_requisition_auto_rfq",
-             "purchase_requisition_transport_document",
-             ],
- "demo": [],
- "data": ["view/purchase_order.xml",
-          "view/purchase_requisition.xml",
-          ],
- "test": [],
- 'installable': False,
- 'auto_install': False,
- }
+{
+    'name': 'NGO - Purchase Requisition',
+    'summary': 'Base Purchase Requisition view for NGO',
+    'version': '10.0.1.0.0',
+    'category': 'Purchase Management',
+    'author': 'Camptocamp,Odoo Community Association (OCA),\
+            Serpent Consulting Services Pvt. Ltd.',
+    'complexity': 'normal',
+    'website': 'http://www.camptocamp.com',
+    'license': 'LGPL-3',
+    'depends': [
+        'purchase_requisition',
+        'purchase_requisition_bid_selection',
+        'purchase_requisition_delivery_address',
+        'purchase_requisition_auto_rfq',
+        'purchase_requisition_transport_document',
+    ],
+    'data': [
+        'views/purchase_order.xml',
+        'views/purchase_requisition.xml',
+    ],
+    'installable': True,
+    'auto_install': False,
+}
diff --git a/ngo_purchase_requisition/static/description/index.html b/ngo_purchase_requisition/static/description/index.html
new file mode 100644
index 00000000..5e7ac31e
--- /dev/null
+++ b/ngo_purchase_requisition/static/description/index.html
@@ -0,0 +1,51 @@
+
+<section class="oe_container oe_dark">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">Vertical NGO</h2>
+        <h2 class="oe_slogan">Purchase Requisition</h2>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+                This is the main page generates request for quotation after this purchase order will get generate.
+		This object will allow you to easily keep track and order all your purchase orders
+            </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture oe_screenshot" src="requisition1.png">
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Purchase Order</h2>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture oe_screenshot" src="requisition2.png">
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+                 Create purchase orders to which you can add brief records or generic charges and fees
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Purchase Agreement</h2>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+                 This is the page where you can used to transfer the ownership of a business from a seller to a buyer.
+		You can choose best supplier at best price.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture oe_screenshot" src="requisition3.png">
+            </div>
+        </div>
+    </div>
+</section>
diff --git a/ngo_purchase_requisition/static/description/requisition1.png b/ngo_purchase_requisition/static/description/requisition1.png
new file mode 100644
index 00000000..ae5a1468
Binary files /dev/null and b/ngo_purchase_requisition/static/description/requisition1.png differ
diff --git a/ngo_purchase_requisition/static/description/requisition2.png b/ngo_purchase_requisition/static/description/requisition2.png
new file mode 100644
index 00000000..6fd0b75e
Binary files /dev/null and b/ngo_purchase_requisition/static/description/requisition2.png differ
diff --git a/ngo_purchase_requisition/static/description/requisition3.png b/ngo_purchase_requisition/static/description/requisition3.png
new file mode 100644
index 00000000..c23434a5
Binary files /dev/null and b/ngo_purchase_requisition/static/description/requisition3.png differ
diff --git a/ngo_purchase_requisition/view/purchase_order.xml b/ngo_purchase_requisition/view/purchase_order.xml
deleted file mode 100644
index 698f45a8..00000000
--- a/ngo_purchase_requisition/view/purchase_order.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-  <data>
-
-    <record model="ir.ui.view" id="view_purchase_order_line_tree">
-      <field name="name">purchase_order_line_tree</field>
-      <field name="model">purchase.order.line</field>
-      <field name="inherit_id" ref="purchase_requisition_bid_selection.view_purchase_order_line_tree"/>
-      <field name="arch" type="xml">
-
-        <field name="name" position="after">
-          <field name="country_of_origin" invisible="not context.get('selection_view')"/>
-        </field>
-
-        <field name="partner_id" position="after">
-          <field name="meets_specifications" invisible="not context.get('selection_view')"/>
-          <field name="bid_eligible" invisible="not context.get('selection_view')"/>
-          <field name="incoterm_id" invisible="not context.get('selection_view')"/>
-          <field name="incoterm_address" invisible="not context.get('selection_view')"/>
-          <field name="date_planned" invisible="not context.get('selection_view')"/>
-        </field>
-
-        <field name="product_qty" position="before">
-          <field name="terms_of_payment" invisible="not context.get('selection_view')"/>
-          <field name="payment_term_id" invisible="not context.get('selection_view')"/>
-        </field>
-
-      </field>
-    </record>
-
-    <record model="ir.ui.view" id="view_purchase_order_line_search">
-      <field name="name">purchase_order_line_search</field>
-      <field name="model">purchase.order.line</field>
-      <field name="inherit_id" ref="purchase_requisition_bid_selection.view_purchase_order_line_search"/>
-      <field name="arch" type="xml">
-        <xpath expr="//group[@string='Group By']" position="after">
-          <group string="Columns">
-            <filter name="selection_view" string="Selection view" context="{'selection_view': True}" />
-          </group>
-        </xpath>
-
-      </field>
-    </record>
-
-  </data>
-</openerp>
diff --git a/ngo_purchase_requisition/view/purchase_requisition.xml b/ngo_purchase_requisition/view/purchase_requisition.xml
deleted file mode 100644
index 09793b57..00000000
--- a/ngo_purchase_requisition/view/purchase_requisition.xml
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-  <data>
-    <record model="ir.ui.view" id="view_purchase_requisition_form">
-      <field name="name">ngo.purchase.requisition.form</field>
-      <field name="model">purchase.requisition</field>
-      <field name="priority" eval="10"/>
-      <field name="arch" type="xml">
-        <form string="Call for Bids">
-          <header>
-            <button name="sent_suppliers" states="draft" string="Confirm Call" class="oe_highlight"/>
-            <button type="object" name="ask_confirmation_to_close_selection" states="selected" string="Accept selection" class="oe_highlight"/>
-            <button name="open_bid" states="in_progress" string="Close Call for Bids" class="oe_highlight"/>
-            <!-- added by purchase_requisition_bid_selection -->
-            <button name="reopen_bid" states="selected" string="Re-Open Bids Selection"/>
-            <button name="tender_reset" states="cancel" string="Reset to Draft" type="object" />
-            <button name="open_product_line" states="open" string="Choose product lines" type="object" class="oe_highlight" groups="purchase.group_advance_bidding" />
-            <!-- extended by purchase_requisition_bid_selection -->
-            <button name="generate_po" states="closed" string="Generate PO" type="object" class="oe_highlight"/>
-            <button name="cancel_requisition" states="draft,in_progress" string="Cancel Call"/>
-            <!-- extended by purchase_requisition_bid_selection -->
-            <field name="state" widget="statusbar" statusbar_visible="draft,in_progress,open,closed,done" statusbar_colors='{"in_progress":"blue"}'/>
-          </header>
-          <sheet>
-            <div class="oe_right oe_button_box" style="margin-top: 10px">
-              <!-- extended by purchase_requisition_bid_selection adds states 'selected' and 'closed' -->
-              <button name="open_product_line" type="object" string="View Products Lines"
-                attrs="{'invisible': ['|', ('state', 'not in', ('open','selected','closed','done')), ('exclusive', '=', 'exclusive')]}" groups="purchase.group_advance_bidding"/>
-              <!-- added by purchase_requisition_bid_selection -->
-              <button name="open_po" type="object" string="View Generated PO" states="open,closed,done"/>
-            </div>
-            <div class="pull-left">
-              <label for="name" class="oe_edit_only oe_inline"/>
-              <h1>
-                <field name="name" class="oe_inline" attrs="{'readonly': [('state','!=','draft')]}"/>
-              </h1>
-            </div>
-            <div class="pull-left">
-              <label for="origin" class="oe_edit_only oe_inline"/>
-              <h1>
-                <label string="," attrs="{'invisible':[('origin','=',False)]}"/>
-                <field name="origin" class="oe_inline" placeholder="e.g. PO0025" attrs="{'readonly': [('state', '!=', 'draft')]}" />
-              </h1>
-            </div>
-            <!-- hidden by purchase_requisition_bid_selection -->
-            <field name="exclusive" invisible="1"/>
-            <group>
-              <group>
-                <field name="user_id" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'purchase_requisition.group_purchase_requisition_user', 'purchase.group_purchase_user', 'account.group_account_invoice']}" attrs="{'readonly': [('state','!=','draft')]}"/>
-                <field name="bid_tendering_mode" attrs="{'readonly': [('state','!=','draft')]}" /> <!-- purchase_requisition_bid_selection -->
-                <field name="bid_receipt_mode" attrs="{'readonly': [('state','!=','draft')]}"/>
-              </group>
-              <group>
-                <field name="ordering_date" attrs="{'readonly': [('state','!=','draft')]}"/>
-                <field name="schedule_date" attrs="{'readonly': [('state','!=','draft')]}"/>
-                <field name="req_validity" attrs="{'readonly': [('state','!=','draft')]}"/>
-                <field name="date_end" attrs="{'readonly': [('state','!=','draft')]}"/>
-              </group>
-              <group>
-                <field name="multiple_rfq_per_supplier" attrs="{'readonly': [('state','!=','draft')]}"/>
-              </group>
-            </group>
-            <notebook>
-              <page string="Products">
-                <field name="line_ids" attrs="{'readonly': [('state','!=','draft')]}">
-                  <tree string="Products">
-                    <field name="product_id" on_change="onchange_product_id(product_id,product_uom_id,parent.account_analytic_id,account_analytic_id,parent.schedule_date,schedule_date)"/>
-                    <field name="product_qty"/>
-                    <field name="product_uom_id" groups="product.group_uom"/>
-                    <field name="schedule_date"/>
-                    <field name="account_analytic_id" groups="purchase.group_analytic_accounting"/>
-
-                  </tree>
-                  <form string="Products">
-                    <group>
-                      <group>
-                        <field name="product_id" on_change="onchange_product_id(product_id,product_uom_id,parent.account_analytic_id,account_analytic_id,parent.schedule_date,schedule_date)"/>
-                        <field name="account_analytic_id" groups="purchase.group_analytic_accounting"/>
-                      </group>
-                      <group>
-                        <label for="product_qty"/>
-                        <div>
-                          <field name="product_qty" class="oe_inline"/>
-                          <field name="product_uom_id" class="oe_inline"/>
-                        </div>
-                        <field name="schedule_date"/>
-                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                      </group>
-                      <!-- added by purchase_requisition_bid_selection -->
-                      <group string="Remarks / Conditions">
-                        <field name="remark"
-                               nolabel="1"
-                               class="oe_inline"/>
-                      </group>
-                    </group>
-                  </form>
-                </field>
-                <div class="oe_right oe_button_box" style="margin-top: 10px">
-                  <!-- extended by purchase_requisition_bid_selection change invisible attrs -->
-                  <button name="%(purchase_requisition.action_purchase_requisition_partner)d" type="action"
-                    string="Request a Quotation" icon="gtk-execute"
-                    attrs="{'invisible': ['|','|',('bid_tendering_mode','=','open'),('line_ids','=',[]),('state','!=','in_progress')]}"/>
-                  <!-- added by purchase_requisition_bid_selection -->
-                  <button name="%(purchase_requisition_bid_selection.action_purchase_requisition_partner_draftbid)d" type="action"
-                    string="Encode a Bid" icon="gtk-execute"
-                    attrs="{'invisible': ['|','|',('bid_tendering_mode','=','restricted'),('line_ids','=',[]),('state','!=','in_progress')]}"/>
-                  <!-- extended by purchase_requisition_bid_selection change invisible attrs -->
-                  <button name="open_rfq" type="object" string="View RFQs/Bids" attrs="{'invisible': ['|',('purchase_ids','=',[]), ('state', 'in', ('draft'))]}"/>
-                </div>
-
-                <!-- renamed by purchase_requisition_bid_selection -->
-                <separator string="Requests for Quotation / Bids"/>
-                <field name="purchase_ids">
-                  <tree string="Purchase Order">
-                    <field name="name" string="Reference"/>
-                    <field name="date_order" string="Order Date"/>
-                    <field name="partner_id"/>
-                    <field name="minimum_planned_date" invisible="1"/>
-                    <field name="state"/>
-                    <!-- purchase_requisition_bid_selection removed button purchase_cancel -->
-                    <!-- purchase_requisition_bid_selection removed button purchase_confirm -->
-                    <!-- purchase_requisition_bid_selection removed button purchase_approve -->
-                    <!-- purchase_requisition_bid_selection change button icon -->
-                    <field name="bid_internal_remark"/>
-                    <button name="%(purchase_requisition_bid_selection.action_update_bid_internal_remark)d" type="action" string="Update internal remark" icon="gtk-ok"/>
-                    <button name="wkf_send_rfq" states="draft" string="Send RFQ by Email" type="object" context="{'send_rfq':True}" icon="gtk-apply"/>
-                  </tree>
-                </field>
-
-                <group string="Selection reasons" attrs="{'invisible': [('state','not in',('open', 'selected', 'closed', 'done', 'cancel'))]}">
-                  <field name="selection_reasons" attrs="{'readonly': [('state','in',('closed', 'done'))]}" nolabel="1"/>
-                </group>
-
-              </page>
-              <page string="Transportation and delivery">
-                <group>
-                  <group>
-                    <field name="dest_address_id" attrs="{'readonly': [('state','!=','draft')]}"/>
-                    <field
-                      name="picking_type_id"
-                      string="Deliver To"
-                      domain="[('code','=','incoming')]"
-                      context="{'special_shortened_wh_name': True}"
-                      widget="selection"
-                      groups="stock.group_locations"
-                      attrs="{'readonly': [('state','!=','draft')]}"/>
-                  </group>
-                  <group>
-                    <field name="req_incoterm_id" attrs="{'readonly': [('state','!=','draft')]}"/>
-                    <field name="req_incoterm_address" attrs="{'readonly': [('state','!=','draft')]}"/>
-                  </group>
-                </group>
-                <group string="Transport Documents">
-                  <field name="transport_document_ids" nolabel="1" colspan="4" attrs="{'readonly': [('state', '!=', 'draft')]}" />
-                </group>
-                <group string="Delivery Remarks">
-                  <field name="delivery_remark"
-                    colspan="4"
-                    nolabel="1"
-                    attrs="{'readonly': [('state', '!=', 'draft')]}"
-                    class="oe_inline"/>
-                </group>
-              </page>
-              <page string="Accounting and Currency">
-                <group>
-                  <group>
-                    <!-- added by purchase_requisition_bid_selecton -->
-                    <field name="budget" attrs="{'readonly': [('state','!=','draft')]}"/>
-                    <field name="pricelist_id" attrs="{'readonly': [('state','!=','draft')]}"/>
-                    <field name="company_id" groups="base.group_multi_company" widget="selection" attrs="{'readonly': [('state','!=','draft')]}"/>
-                  </group>
-                  <group>
-                    <field name="req_payment_term_id" attrs="{'readonly': [('state', '!=', 'draft')]}" />
-                    <field name="req_terms_of_payment" attrs="{'readonly': [('state', '!=', 'draft')]}" />
-                    <field name="account_analytic_id" invisible="1"/>
-                  </group>
-                </group>
-              </page>
-              <page string="Terms and Conditions">
-                <field name="description" attrs="{'readonly': [('state','!=','draft')]}" placeholder="Terms and Conditions..."/>
-              </page>
-            </notebook>
-          </sheet>
-          <div class="oe_chatter">
-            <field name="message_follower_ids" widget="mail_followers"/>
-            <field name="message_ids" widget="mail_thread"/>
-          </div>
-        </form>
-      </field>
-    </record>
-
-  </data>
-</openerp>
diff --git a/ngo_purchase_requisition/views/purchase_order.xml b/ngo_purchase_requisition/views/purchase_order.xml
new file mode 100644
index 00000000..b19bb5fa
--- /dev/null
+++ b/ngo_purchase_requisition/views/purchase_order.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<odoo>
+
+    <record model="ir.ui.view" id="view_purchase_order_line_tree">
+        <field name="name">purchase_order_line_tree</field>
+        <field name="model">purchase.order.line</field>
+        <field name="inherit_id" ref="purchase.purchase_order_line_tree" />
+        <field name="arch" type="xml">
+
+            <field name="order_id" position="after">
+                <field name="country_of_origin" />
+            </field>
+
+            <field name="partner_id" position="after">
+                <field name="meets_specifications" invisible="not context.get('selection_view')" />
+                <field name="bid_eligible" invisible="not context.get('selection_view')" />
+                <field name="incoterm_id" invisible="not context.get('selection_view')" />
+                <field name="incoterm_address" invisible="not context.get('selection_view')" />
+                <field name="date_planned" invisible="not context.get('selection_view')" />
+            </field>
+
+            <field name="product_id" position="before">
+                <field name="terms_of_payment" invisible="not context.get('selection_view')" />
+                <field name="payment_term_id" invisible="not context.get('selection_view')" />
+            </field>
+
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_purchase_order_line_search">
+        <field name="name">purchase_order_line_search</field>
+        <field name="model">purchase.order.line</field>
+        <field name="inherit_id" ref="purchase.purchase_order_line_search" />
+        <field name="arch" type="xml">
+            <xpath expr="//search/filter[@name='hide_cancelled']" position="after">
+                <group string="Columns">
+                    <filter name="selection_view" string="Selection view"
+                        context="{'selection_view': True}" />
+                </group>
+            </xpath>
+
+        </field>
+    </record>
+
+</odoo>
diff --git a/ngo_purchase_requisition/views/purchase_requisition.xml b/ngo_purchase_requisition/views/purchase_requisition.xml
new file mode 100644
index 00000000..67424f8a
--- /dev/null
+++ b/ngo_purchase_requisition/views/purchase_requisition.xml
@@ -0,0 +1,185 @@
+<?xml version="1.0"?>
+<odoo>
+
+    <record model="ir.ui.view" id="view_purchase_requisition_form">
+        <field name="name">ngo.purchase.requisition.form</field>
+        <field name="model">purchase.requisition</field>
+        <field name="priority" eval="10" />
+        <field name="arch" type="xml">
+            <form string="Purchase Agreements">
+                <header>
+                    <button name="%(purchase_requisition.action_purchase_requisition_to_so)d" type="action" string="New Quotation" attrs="{'invisible': [('state', '!=', 'open')]}" />
+                    <button name="%(purchase_requisition.action_purchase_requisition_to_so)d" type="action" string="New Quotation" class="btn-primary" attrs="{'invisible': [('state', '!=', 'in_progress')]}" />
+                    <button name="action_in_progress" states="draft" string="Confirm" type="object" class="btn-primary" />
+                    <button type="object" name="ask_confirmation_to_close_selection" states="selected" string="Accept selection" class="oe_highlight" />
+                    <button name="open_bid" states="in_progress" string="Close Call for Bids" class="oe_highlight" />
+                    <button name="reopen_bid" states="selected" string="Re-Open Bids Selection" />
+                    <button name="action_open" states="in_progress" string="Validate" type="object" class="btn-primary" />
+                    <button name="action_done" states="open" string="Done" type="object" class="btn-primary" />
+                    <button name="action_draft" states="cancel" string="Reset to Draft" type="object" />
+                    <button name="action_cancel" states="draft,in_progress" string="Cancel Call" type="object" />
+                    <field name="state" widget="statusbar" statusbar_visible="draft,in_progress,open,done" />
+                </header>
+                <sheet>
+                    <div class="oe_right oe_button_box" style="margin-top: 10px">
+                        <!-- extended by purchase_requisition_bid_selection adds states 'selected' and 'closed' -->
+                        <button name="open_product_line" type="object" string="View Products Lines" attrs="{'invisible': ['|', ('state', 'not in', ('open','selected','closed','done')), ('exclusive', '=', 'exclusive')]}" groups="purchase.group_advance_bidding" />
+                        <!-- added by purchase_requisition_bid_selection -->
+                        <button name="open_po" type="object" string="View Generated PO" states="open,closed,done" />
+                        <field name="order_count" widget="statinfo" string="RFQs/Orders" />
+                    </div>
+                    <div class="pull-left">
+                        <label for="name" class="oe_edit_only oe_inline" />
+                        <h1>
+                            <field name="name" class="oe_inline" attrs="{'readonly': [('state','!=','draft')]}" />
+                        </h1>
+                    </div>
+                    <div class="pull-left">
+                        <label for="origin" class="oe_edit_only oe_inline" />
+                        <h1>
+                            <label string="," attrs="{'invisible':[('origin','=',False)]}" />
+                            <field name="origin" class="oe_inline" placeholder="e.g. PO0025" attrs="{'readonly': [('state', '!=', 'draft')]}" />
+                        </h1>
+                    </div>
+                    <!-- hidden by purchase_requisition_bid_selection -->
+                    <field name="exclusive" invisible="1"/>
+                    <group>
+                        <group>
+                            <field name="user_id" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'purchase_requisition.group_purchase_requisition_user', 'purchase.group_purchase_user', 'account.group_account_invoice']}" attrs="{'readonly': [('state','!=','draft')]}" />
+                            <field name="bid_tendering_mode" attrs="{'readonly': [('state','!=','draft')]}" /> <!-- purchase_requisition_bid_selection -->
+                            <field name="bid_receipt_mode" attrs="{'readonly': [('state','!=','draft')]}" />
+                        </group>
+                        <group>
+                            <field name="ordering_date" attrs="{'readonly': [('state','!=','draft')]}" />
+                            <field name="schedule_date" attrs="{'readonly': [('state','!=','draft')]}" />
+                            <field name="req_validity" attrs="{'readonly': [('state','!=','draft')]}" />
+                            <field name="date_end" attrs="{'readonly': [('state','!=','draft')]}" />
+                        </group>
+                        <group>
+                            <field name="multiple_rfq_per_supplier" attrs="{'readonly': [('state','!=','draft')]}" />
+                        </group>
+                    </group>
+                    <notebook>
+                        <page string="Products">
+                            <field name="line_ids" attrs="{'readonly': [('state','!=','draft')]}">
+                                <tree string="Products">
+                                    <field name="product_id" />
+                                    <field name="product_qty" />
+                                    <field name="product_uom_id" groups="product.group_uom" />
+                                    <field name="schedule_date" />
+                                    <field name="account_analytic_id" groups="purchase.group_analytic_accounting" />
+
+                                </tree>
+                                <form string="Products">
+                                    <group>
+                                        <group>
+                                            <field name="product_id" />
+                                            <field name="account_analytic_id" groups="purchase.group_analytic_accounting" />
+                                        </group>
+                                        <group>
+                                            <label for="product_qty" />
+                                            <div>
+                                                <field name="product_qty" class="oe_inline" />
+                                                <field name="product_uom_id" class="oe_inline" />
+                                            </div>
+                                            <field name="schedule_date" />
+                                            <field name="company_id" groups="base.group_multi_company" widget="selection" />
+                                        </group>
+                                        <!-- added by purchase_requisition_bid_selection -->
+                                        <group string="Remarks / Conditions">
+                                            <field name="remark" nolabel="1" class="oe_inline" />
+                                        </group>
+                                    </group>
+                                </form>
+                            </field>
+                            <div class="oe_right oe_button_box" style="margin-top: 10px">
+                                <!-- extended by purchase_requisition_bid_selection change invisible attrs -->
+                                <button name="%(purchase_requisition.action_purchase_requisition_list)d" type="action" string="Request a Quotation" icon="gtk-execute" attrs="{'invisible': ['|','|',('bid_tendering_mode','=','open'),('line_ids','=',[]),('state','!=','in_progress')]}" />
+                                <!-- added by purchase_requisition_bid_selection -->
+                                <button name="%(purchase_requisition_bid_selection.action_purchase_requisition_partner_draftbid)d" type="action" string="Encode a Bid" icon="gtk-execute" attrs="{'invisible': ['|','|',('bid_tendering_mode','=','restricted'),('line_ids','=',[]),('state','!=','in_progress')]}" />
+                                <!-- extended by purchase_requisition_bid_selection change invisible  attrs -->
+                                <button name="open_rfq" type="object" string="View RFQs/Bids" attrs="{'invisible': ['|',('purchase_ids','=',[]), ('state', 'in', ('draft'))]}" />
+                            </div>
+
+                            <!-- renamed by purchase_requisition_bid_selection -->
+                            <separator string="Requests for Quotation / Bids" />
+                            <field name="purchase_ids">
+                                <tree string="Purchase Order">
+                                    <field name="name" string="Reference" />
+                                    <field name="date_order" string="Order Date" />
+                                    <field name="partner_id" />
+                                    <field name="minimum_planned_date" invisible="1"/>
+                                    <field name="state" />
+                                    <!-- purchase_requisition_bid_selection removed button purchase_cancel -->
+                                    <!-- purchase_requisition_bid_selection removed button purchase_confirm -->
+                                    <!-- purchase_requisition_bid_selection removed button purchase_approve -->
+                                    <!-- purchase_requisition_bid_selection change button icon -->
+                                    <field name="bid_internal_remark" />
+                                    <button name="%(purchase_requisition_bid_selection.action_update_bid_internal_remark)d" type="action" string="Update internal remark" icon="gtk-ok" />
+                                    <button name="wkf_send_rfq" states="draft" string="Send RFQ by Email" type="object" context="{'send_rfq':True}" icon="gtk-apply" />
+                                </tree>
+                            </field>
+
+                            <group string="Selection reasons" attrs="{'invisible': [('state','not in',('open', 'selected', 'closed', 'done', 'cancel'))]}">
+                                <field name="selection_reasons" attrs="{'readonly': [('state','in',('closed', 'done'))]}" nolabel="1" />
+                            </group>
+
+                        </page>
+                        <page string="Transportation and delivery">
+                            <group>
+                                <group>
+                                    <field name="picking_type_id" string="Deliver To" domain="[('code','=','incoming')]" context="{'special_shortened_wh_name': True}" widget="selection" groups="stock.group_locations" attrs="{'readonly': [('state','!=','draft')]}" />
+                                </group>
+                                <group>
+                                    <field name="req_incoterm_id" attrs="{'readonly': [('state','!=','draft')]}" />
+                                    <field name="req_incoterm_address" attrs="{'readonly': [('state','!=','draft')]}" />
+                                </group>
+                            </group>
+                            <group string="Transport Documents">
+                                <field name="transport_document_ids" nolabel="1" colspan="4" attrs="{'readonly': [('state', '!=', 'draft')]}" />
+                            </group>
+                            <group string="Delivery Remarks">
+                                <field name="delivery_remark" colspan="4" nolabel="1" attrs="{'readonly': [('state', '!=', 'draft')]}" class="oe_inline" />
+                            </group>
+                        </page>
+                        <page string="Accounting and Currency">
+                            <group>
+                                <group>
+                                    <!-- added by purchase_requisition_bid_selecton -->
+                                    <field name="budget" attrs="{'readonly': [('state','!=','draft')]}" />
+                                    <field name="pricelist_id" attrs="{'readonly': [('state','!=','draft')]}" />
+                                    <field name="company_id" groups="base.group_multi_company" widget="selection" attrs="{'readonly': [('state','!=','draft')]}" />
+                                </group>
+                                <group>
+                                    <field name="req_payment_term_id" attrs="{'readonly': [('state', '!=', 'draft')]}" />
+                                    <field name="req_terms_of_payment" attrs="{'readonly': [('state', '!=', 'draft')]}" />
+                                    <field name="account_analytic_id" invisible="1" />
+                                </group>
+                            </group>
+                        </page>
+                        <page string="Terms and Conditions">
+                            <field name="description" attrs="{'readonly': [('state','!=','draft')]}" placeholder="Terms and Conditions..." />
+                        </page>
+                    </notebook>
+                </sheet>
+                <div class="oe_chatter">
+                    <field name="message_follower_ids" widget="mail_followers" />
+                    <field name="message_ids" widget="mail_thread" />
+                </div>
+            </form>
+        </field>
+    </record>
+
+    <!-- hidden by purchase_requisition_bid_selection -->
+    <record model="ir.ui.view" id="view_purchase_requisition_type_tree">
+        <field name="name">purchase.requisition.type.tree</field>
+        <field name="model">purchase.requisition.type</field>
+        <field name="arch" type="xml">
+            <form>
+                <group>
+                    <field name="exclusive"/>
+                </group>
+            </form>
+        </field>
+    </record>
+</odoo>
diff --git a/vertical_ngo/models/__init__.py b/vertical_ngo/models/__init__.py
index ab480f8b..981af6dd 100644
--- a/vertical_ngo/models/__init__.py
+++ b/vertical_ngo/models/__init__.py
@@ -1 +1,21 @@
+# -*- coding: utf-8 -*-
+#
+#
+#    Copyright 2015 Camptocamp SA
+#    Author: Alexandre Fayolle
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
 from . import res_config