From fedd3f9b7816d9f4337338a16ec48bbe2e16180d Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Thu, 11 Aug 2011 00:28:49 +0200
Subject: [PATCH] Some field cleanup

bzr revid: mit@openerp.com-20110810222849-hksoumxf7dmvnigk
---
 addons/point_of_sale/point_of_sale.py       | 3 ---
 addons/point_of_sale/point_of_sale_view.xml | 3 ---
 addons/point_of_sale/report/pos_receipt.rml | 1 -
 3 files changed, 7 deletions(-)

diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 62c5438389f..0f86030500c 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -287,7 +287,6 @@ class pos_order(osv.osv):
         'nb_print': fields.integer('Number of Print', readonly=True),
         'sale_journal': fields.many2one('account.journal', 'Journal', required=True, states={'draft': [('readonly', False)]}, readonly=True),
         'invoice_wanted': fields.boolean('Create Invoice'),
-        'note_2': fields.char('Customer Note', size=64),
         'type_rec': fields.char('Type of Receipt', size=64),
         'remboursed': fields.boolean('Remboursed'),
         'contract_number': fields.char('Contract Number', size=512, select=1),
@@ -1237,12 +1236,10 @@ class product_product(osv.osv):
         'am_out': fields.boolean('Control for Output Operations'),
         'disc_controle': fields.boolean('Discount Control'),
         'img': fields.binary('Pos Image, must be 50x50'),
-        'pos_ok': fields.boolean('Can be POS-sold'),
         'pos_categ_id': fields.many2one('pos.category','POS Category', change_default=True, domain="[('type','=','normal')]" ,help="Select a pos category for the current product")
     }
     _defaults = {
         'disc_controle': True,
-        'pos_ok': True,
     }
 product_product()
 
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 80db7ece330..64286d82acc 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -653,9 +653,6 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
-                  <field name="purchase_ok" position="after">
-                      <field name="pos_ok"/>
-                  </field>
                   <field name="active" position="after">
                       <field name="income_pdt"/>
                       <field name="expense_pdt"/>
diff --git a/addons/point_of_sale/report/pos_receipt.rml b/addons/point_of_sale/report/pos_receipt.rml
index b9da3f5e9a6..ea40450421a 100644
--- a/addons/point_of_sale/report/pos_receipt.rml
+++ b/addons/point_of_sale/report/pos_receipt.rml
@@ -165,6 +165,5 @@
         </td>
       </tr>
     </blockTable>
-    <para style="P3">[[o.note_2]]</para>
   </story>
 </document>