From d32ac16cf5df05550e3c777169cc2661f47e6f54 Mon Sep 17 00:00:00 2001
From: SHEREEF PT <shereef@cybrosys.in>
Date: Thu, 23 Mar 2017 11:08:18 +0530
Subject: [PATCH] Changed Manifest

---
 merge_same_products/__openerp__.py  |  4 +--
 merge_same_products/__openerp__.py~ | 40 +++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 merge_same_products/__openerp__.py~

diff --git a/merge_same_products/__openerp__.py b/merge_same_products/__openerp__.py
index 2d3f5c562..9183c5002 100644
--- a/merge_same_products/__openerp__.py
+++ b/merge_same_products/__openerp__.py
@@ -23,11 +23,11 @@
 {
     'name': 'Merge Same Products in Sale Order Lines',
     'version': '0.1',
-    'description': """Merge order lines with same products in sale order lines, purchase order lines & invoice lines""",
+    'description': """This module will merge order lines/invoice lines with same product in Sale, Purchase & Invoice""",
     'author': 'Cybrosys Techno Solutions',
     'company': 'Cybrosys Techno Solutions',
     'website': 'http://www.cybrosys.com',
-    'summary': "Merge order lines with same products in sale order lines, purchase order lines & invoice lines",
+    'summary': "This module will merge order lines/invoice lines with same product in Sale, Purchase & Invoice",
     'category': 'sale',
     'depends': ['account', 'base', 'sale', 'purchase'],
     'license': 'AGPL-3',
diff --git a/merge_same_products/__openerp__.py~ b/merge_same_products/__openerp__.py~
new file mode 100644
index 000000000..2d3f5c562
--- /dev/null
+++ b/merge_same_products/__openerp__.py~
@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Cybrosys Technologies Pvt. Ltd.
+#    Copyright (C) 2009-TODAY Cybrosys Technologies(<http://www.cybrosys.com>).
+#    Author: Niyas Raphy(<http://www.cybrosys.com>)
+#    you can modify it under the terms of the GNU LESSER
+#    GENERAL PUBLIC LICENSE (LGPL v3), Version 3.
+#
+#    It is forbidden to publish, distribute, sublicense, or sell copies
+#    of the Software or modified copies of the Software.
+#
+#    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 LESSER GENERAL PUBLIC LICENSE (LGPL v3) for more details.
+#
+#    You should have received a copy of the GNU LESSER GENERAL PUBLIC LICENSE
+#    GENERAL PUBLIC LICENSE (LGPL v3) along with this program.
+#    If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+{
+    'name': 'Merge Same Products in Sale Order Lines',
+    'version': '0.1',
+    'description': """Merge order lines with same products in sale order lines, purchase order lines & invoice lines""",
+    'author': 'Cybrosys Techno Solutions',
+    'company': 'Cybrosys Techno Solutions',
+    'website': 'http://www.cybrosys.com',
+    'summary': "Merge order lines with same products in sale order lines, purchase order lines & invoice lines",
+    'category': 'sale',
+    'depends': ['account', 'base', 'sale', 'purchase'],
+    'license': 'AGPL-3',
+    'data': [],
+    'demo': [],
+    'images': ['static/description/banner.jpg'],
+    'installable': True,
+    'auto_install': False,
+
+}