From 8ead0c3d1b402747cd0cdc353cfe40a025c199bf Mon Sep 17 00:00:00 2001
From: Sandy Carter <sandy.carter@savoirfairelinux.com>
Date: Mon, 6 Oct 2014 11:29:14 -0400
Subject: [PATCH 1/2] Update meta

---
 .coveragerc | 17 -----------------
 .travis.yml | 10 +++++-----
 2 files changed, 5 insertions(+), 22 deletions(-)
 delete mode 100644 .coveragerc

diff --git a/.coveragerc b/.coveragerc
deleted file mode 100644
index b060d18e3..000000000
--- a/.coveragerc
+++ /dev/null
@@ -1,17 +0,0 @@
-# Config file .coveragerc
-
-[report]
-include =
-    */manufacture/*
-
-omit =
-    */tests/*
-    *__init__.py
-
-# Regexes for lines to exclude from consideration
-exclude_lines =
-    # Have to re-enable the standard pragma
-    pragma: no cover
-
-    # Don't complain about null context checking
-    if context is None:
diff --git a/.travis.yml b/.travis.yml
index 83c4a04e9..4d7bceabf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,9 @@ python:
   - "2.7"
 
 env:
-  - VERSION="7.0"
+  - VERSION="7.0" ODOO_REPO="odoo/odoo"
+  - VERSION="7.0" ODOO_REPO="OCA/OCB"
+  - VERSION="7.0" UNIT_TEST="1"
 
 virtualenv:
   system_site_packages: true
@@ -12,12 +14,10 @@ virtualenv:
 install:
   - git clone https://github.com/OCA/maintainer-quality-tools.git ${HOME}/maintainer-quality-tools
   - export PATH=${HOME}/maintainer-quality-tools/travis:${PATH}
-  - travis_install_nightly ${VERSION}
-  - $HOME/maintainer-quality-tools/travis/travis_install_nightly ${VERSION}
+  - travis_install_nightly
 
 script:
-  - travis_run_flake8
-  - travis_run_tests ${VERSION}
+  - travis_run_tests
 
 after_success:
   coveralls

From f01ace02d64020b9ad0dfacb1d714c7dbaf3302e Mon Sep 17 00:00:00 2001
From: Sandy Carter <sandy.carter@savoirfairelinux.com>
Date: Mon, 6 Oct 2014 11:34:38 -0400
Subject: [PATCH 2/2] Fix line lengths

---
 mrp_bom_product_details/mrp_bom_product_details.py   | 12 ++++++++++--
 mrp_industrial_design_bom/__openerp__.py             |  6 ++++--
 .../report/bom_structure_industrial_design.py        | 12 +++++++-----
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/mrp_bom_product_details/mrp_bom_product_details.py b/mrp_bom_product_details/mrp_bom_product_details.py
index 07175e77d..a21507add 100644
--- a/mrp_bom_product_details/mrp_bom_product_details.py
+++ b/mrp_bom_product_details/mrp_bom_product_details.py
@@ -27,9 +27,17 @@ class mrp_bom(orm.Model):
     _inherit = 'mrp.bom'
     _columns = {
         'product_standard_price': fields.related(
-            'product_id', 'standard_price', type='float', string='Cost Price', readonly=True
+            'product_id',
+            'standard_price',
+            type='float',
+            string='Cost Price',
+            readonly=True,
         ),
         'product_qty_available': fields.related(
-            'product_id', 'qty_available', type='float', string='Quantity On Hand', readonly=True
+            'product_id',
+            'qty_available',
+            type='float',
+            string='Quantity on Hand',
+            readonly=True,
         ),
     }
diff --git a/mrp_industrial_design_bom/__openerp__.py b/mrp_industrial_design_bom/__openerp__.py
index 27584893f..3a0a5ae23 100644
--- a/mrp_industrial_design_bom/__openerp__.py
+++ b/mrp_industrial_design_bom/__openerp__.py
@@ -30,9 +30,11 @@
     'depends': ['mrp'],
     "data": ['mrp_industrial_design.xml'],
     'description': """
-This module adds the fields 'Bubble Number' and 'RefDes' (reference description) to a component in BoM view.
+This module adds the fields 'Bubble Number' and 'RefDes'
+(reference description) to a component in BoM view.
 
-It also point the BOM Structure report to a new version that uses the new fields.
+It also point the BOM Structure report to a new version that uses the new
+fields.
 """,
     'auto_install': False,
     'installable': True
diff --git a/mrp_industrial_design_bom/report/bom_structure_industrial_design.py b/mrp_industrial_design_bom/report/bom_structure_industrial_design.py
index bf94211b9..c57bb9b94 100644
--- a/mrp_industrial_design_bom/report/bom_structure_industrial_design.py
+++ b/mrp_industrial_design_bom/report/bom_structure_industrial_design.py
@@ -59,8 +59,10 @@ class bom_structure(report_sxw.rml_parse):
 
         return children
 
-report_sxw.report_sxw('report.industrialdesign.bom.structure',
-                      'mrp.bom',
-                      'mrp_industrial_design_bom/report/bom_structure_industrial_design.rml',
-                      parser=bom_structure,
-                      header='internal')
+report_sxw.report_sxw(
+    'report.industrialdesign.bom.structure',
+    'mrp.bom',
+    'mrp_industrial_design_bom/report/bom_structure_industrial_design.rml',
+    parser=bom_structure,
+    header='internal',
+)