From f52b04fee3285ee5d0204a0806da52c91f7b8552 Mon Sep 17 00:00:00 2001
From: "Amit Bhavsar (Open ERP)" <amb@tinyerp.com>
Date: Tue, 19 Nov 2013 15:32:02 +0530
Subject: [PATCH] [Imp] Remove Unnecessary change.

bzr revid: amb@tinyerp.com-20131119100202-95y4r5t2g74a61of
---
 addons/account/account_invoice.py                    |  2 +-
 addons/point_of_sale/__openerp__.py                  |  2 +-
 addons/product/product_view.xml                      |  2 +-
 addons/product_visible_discount/__openerp__.py       |  2 +-
 .../product_visible_discount_data.xml                | 12 ------------
 addons/stock/product_view.xml                        |  2 +-
 6 files changed, 5 insertions(+), 17 deletions(-)
 delete mode 100644 addons/product_visible_discount/product_visible_discount_data.xml

diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index e089d23a6eb..42f3effd6f9 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -1534,7 +1534,7 @@ class account_invoice_line(osv.osv):
         if type in ('in_invoice', 'in_refund'):
             result.update( {'price_unit': price_unit or res.standard_price,'invoice_line_tax_id': tax_id} )
         else:
-            result.update({'price_unit': res.lst_price, 'invoice_line_tax_id': tax_id})
+            result.update({'price_unit': res.list_price, 'invoice_line_tax_id': tax_id})
 
         result['uos_id'] = uom_id or res.uom_id.id
 
diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py
index 75b77e28993..7a0e0698ff2 100644
--- a/addons/point_of_sale/__openerp__.py
+++ b/addons/point_of_sale/__openerp__.py
@@ -85,7 +85,7 @@ Main Features
     'test': [
         'test/01_order_to_payment.yml',
         'test/02_order_to_invoice.yml',
-        'test/point_of_sale_report.yml',
+        'test/point_of_sale_report.yml'
     ],
     'installable': True,
     'application': True,
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 9be90bca68a..e9fe4be911f 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -103,7 +103,7 @@
                                 <group name="procurement">
                                     <group name="general">
                                         <field name="cost_method" groups="product.group_costing_method"/>
-                                        <field name="standard_price" string="Base Cost Price" attrs="{'readonly':[('cost_method','=','average')]}"/>
+                                        <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
                                     </group>
                                     <group name="procurement_uom" groups="product.group_uom" string="Purchase">
                                         <field name="uom_po_id"/>
diff --git a/addons/product_visible_discount/__openerp__.py b/addons/product_visible_discount/__openerp__.py
index ac519b1624d..81b99b8ac0a 100644
--- a/addons/product_visible_discount/__openerp__.py
+++ b/addons/product_visible_discount/__openerp__.py
@@ -36,7 +36,7 @@ To this end, a new check box named 'Visible Discount' is added to the pricelist
     Unit price=225, Discount=0,00, Net price=225.
     """,
     'depends': ["sale","purchase"],
-    'demo': ['product_visible_discount_data.xml'],
+    'demo': [],
     'data': ['product_visible_discount_view.xml'],
     'auto_install': False,
     'installable': True,
diff --git a/addons/product_visible_discount/product_visible_discount_data.xml b/addons/product_visible_discount/product_visible_discount_data.xml
deleted file mode 100644
index de038aaee01..00000000000
--- a/addons/product_visible_discount/product_visible_discount_data.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data noupdate="1">
-        <!-- while use product_visible_discount module at that time sale order
-        line do not use lst_price(Public Sale Price). That's why override type
-        list_price to lst_price.   -->
-        <record id="product.list_price" model="product.price.type">
-                <field name="name">Public Price</field>
-                <field name="field">lst_price</field>
-        </record>
-    </data>
-</openerp>
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 6c6f7b6b2b7..22015f75346 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -139,7 +139,7 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <field name="standard_price" position="replace" version="7.0">
-                    <label string="Cost Price of Template" for="standard_price" align="1.0" groups="base.group_user"/>
+                    <label for="standard_price" align="1.0" groups="base.group_user"/>
                     <div groups="base.group_user">
                         <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}" nolabel="1"/>
                         <button name="%(action_view_change_standard_price)d" string="- update"