[FW][BP]stock_landed_costs_ux: backport in 16.0

stock_landed_costs_ux/__manifest__.py

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 ##############################################################################
 #
 #    Copyright (C) 2015  ADHOC SA  (http://www.adhoc.com.ar)
@@ -38,3 +39,46 @@
     'application': False,
     'license': 'AGPL-3',
 }
+||||||| parent of c42f9ca6 (temp)
+=======
+##############################################################################
+#
+#    Copyright (C) 2015  ADHOC SA  (http://www.adhoc.com.ar)
+#    All Rights Reserved.
+#
+#    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': 'Stock Landed Costs UX',
+    'version': "16.0.1.0.0",
+    'category': 'Warehouse Management',
+    'sequence': 14,
+    'summary': '',
+    'author': 'ADHOC SA',
+    'website': 'www.adhoc.com.ar',
+    'images': [
+    ],
+    'depends': [
+        'stock_landed_costs',
+        'l10n_ar_ux',
+    ],
+    'data': [
+    ],
+    'installable': True,
+    'auto_install': True,
+    'application': False,
+    'license': 'AGPL-3',
+}
+>>>>>>> c42f9ca6 (temp)