Merge pull request OCA#81 from guewen/8.0-frontport

Forward port of 7.0 up to 10e7608

.travis.yml

@@ -13,15 +13,15 @@ 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}
+  - travis_install_nightly
   - sudo pip install magento
-  - sudo pip install nltk
-  - git clone https://github.com/OCA/connector ${HOME}/connector -b 8.0
-  - git clone https://github.com/OCA/connector-ecommerce ${HOME}/connector-ecommerce -b 8.0
-  - git clone https://github.com/OCA/sale-workflow ${HOME}/sale-workflow -b 8.0
-  - git clone https://github.com/OCA/e-commerce ${HOME}/e-commerce -b 8.0
-  - git clone https://github.com/OCA/product-attribute ${HOME}/product-attribute -b 8.0
-  - git clone https://github.com/OCA/server-tools ${HOME}/server-tools -b 8.0
+  - sudo pip install beautifulsoup4
+  - git clone https://github.com/OCA/connector ${HOME}/connector -b ${VERSION}
+  - git clone https://github.com/OCA/connector-ecommerce ${HOME}/connector-ecommerce -b ${VERSION}
+  - git clone https://github.com/OCA/sale-workflow ${HOME}/sale-workflow -b ${VERSION}
+  - git clone https://github.com/OCA/e-commerce ${HOME}/e-commerce -b ${VERSION}
+  - git clone https://github.com/OCA/product-attribute ${HOME}/product-attribute -b ${VERSION}
+  - git clone https://github.com/OCA/server-tools ${HOME}/server-tools -b ${VERSION}
   - printf '[options]\n\nrunning_env = dev' > ${HOME}/.openerp_serverrc
 
 script:

README.md

@@ -11,5 +11,5 @@ This new release of MagentoERPconnect is based on the [OpenERP Connector framewo
 The mailing list for this project is on https://launchpad.net/~openerp-connector-community
 
 Documentation:
-http://www.openerp-magento-connector.com
-http://www.openerp-connector.com
+http://www.odoo-magento-connector.com
+http://www.odoo-connector.com

__unported__/__init__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import connector
-import backend
-import magento_model
-import partner
+from . import connector
+from . import backend
+from . import magento_model
+from . import partner

__unported__/magentoerpconnect/AUTHORS

@@ -1,4 +1,4 @@
-Last update: Tue May  6 17:45:23 CEST 2014
+Last update: Tue Jan  6 13:11:49 CET 2015
 
 * Guewen Baconnier at Camptocamp
 * Alexandre Fayolle at Camptocamp
@@ -17,3 +17,7 @@ Last update: Tue May  6 17:45:23 CEST 2014
 * Katja Matthes at initOS
 * Markus Schneider at initOS
 * Jan-Philipp Fischer at greencoding
+* Ondřej Kuzník at credativ
+* Matthieu Dietrich at Camptocamp
+* Florian da Costa at Akretion
+* Alberto Garcia at Factor Libre

__unported__/magentoerpconnect/CHANGES.rst

@@ -1,6 +1,28 @@
 Changelog
 ---------
 
+2.5.0 (2015-01-06)
+~~~~~~~~~~~~~~~~~~
+
+* The option for tax inclusion is now configurable by storeview #74
+* Add a backend adapter for the product categories #58
+* Add basic units to allow handling bundle products in submodules #13
+* Add mechanisms for the export of records (lock of bindings, helper for dependencies export) #33
+* 'New copy from quotation' rebinds the Magento order with the new copy #9
+* Better memory footprint and performance on update of stock quantity #11
+* Fix: Magento sometimes returns no invoice id #29
+* Fix: discount_amount with a None value #70
+* Fix: mapping for res.partner.title too broad (mix up "Herr and Herr Dr." #68
+* Fix: error when a binding have a ID "0" which happens with Magento #61
+* Fix: allow to copy a stock picking #60
+* Fix: compatibility with the fiscal position rules module #42
+* Fix: Prevent to create duplicate bindings on invoices #39
+* Fix: Remove trailing None on calls made to the Magento's API (PHP 5.4 compatibility) #28
+* Fix: avoid to send twice a tracking number #16
+* Fix: when a tracking's job is executed before the export of the picking, the tracking's job export the picking #16
+* Fix: replace nltk by Beautifulsoup #40
+* Fix:  Add a 'to date' boundary to batch jobs #17
+
 2.4.2 (2014-06-16)
 ~~~~~~~~~~~~~~~~~~
 

__unported__/magentoerpconnect/__init__.py

@@ -1,18 +1,18 @@
 # -*- coding: utf-8 -*-
-import setting
-import connector
-import backend
+from . import setting
+from . import connector
+from . import backend
 
-import magento_model
-import product
-import product_category
-import partner
-import partner_category
-import invoice
-import sale
-import delivery
-import stock_picking
-import stock_tracking
-import payment_invoice
+from . import magento_model
+from . import product
+from . import product_category
+from . import partner
+from . import partner_category
+from . import invoice
+from . import sale
+from . import delivery
+from . import stock_picking
+from . import stock_tracking
+from . import payment_invoice
 
-import consumer
+from . import consumer

__unported__/magentoerpconnect/__openerp__.py

@@ -21,7 +21,7 @@
 ##############################################################################
 
 {'name': 'Magento Connector',
- 'version': '2.4.2',
+ 'version': '2.5.0',
  'category': 'Connector',
  'depends': ['account',
              'product',
@@ -35,7 +35,7 @@
  },
  'author': 'Connector Core Editors',
  'license': 'AGPL-3',
- 'website': 'http://www.openerp-magento-connector.com',
+ 'website': 'http://www.odoo-magento-connector.com',
  'description': """
 Magento Connector
 =================

__unported__/magentoerpconnect/doc/_templates/layout.html

@@ -8,7 +8,7 @@
   m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
   })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
 
-  ga('create', 'UA-7628916-4', 'openerp-magento-connector.com');
+  ga('create', 'UA-7628916-4', 'odoo-magento-connector.com');
   ga('send', 'pageview');
 
 </script>

__unported__/magentoerpconnect/doc/conf.py

@@ -328,5 +328,5 @@
     'python': ('http://docs.python.org/2.6', None),
     'openerpweb': ('http://doc.openerp.com/trunk/developers/web', None),
     'openerpdev': ('http://doc.openerp.com/trunk/developers', None),
-    'openerpconnector': ('http://www.openerp-connector.com', None),
+    'openerpconnector': ('http://www.odoo-connector.com', None),
 }

__unported__/magentoerpconnect/doc/guides/installation_guide.rst

@@ -26,24 +26,24 @@ OpenERP to ensure a correct synchronization between them
 OpenERP
 =======
 
-Download the branches below in a path where you chosed to store the addons::
+Clone the repositories below in the path where you chosed to store the addons::
 
-    $ bzr branch lp:openerp-connector/7.0 openerp-connector
-    $ bzr branch lp:openerp-connector-ecommerce/7.0 openerp-connector-ecommerce
-    $ bzr branch lp:openerp-connector-magento/7.0 openerp-connector-magento
-    $ bzr branch lp:e-commerce-addons/7.0 e-commerce-addons
-    $ bzr branch lp:openerp-product-attributes/7.0 openerp-product-attributes
-    $ bzr branch lp:sale-wkfl/7.0 sale-wkfl
+    $ git clone [email protected]:OCA/connector.git -b 7.0
+    $ git clone [email protected]:OCA/connector-ecommerce.git -b 7.0
+    $ git clone [email protected]:OCA/connector-magento.git -b 7.0
+    $ git clone [email protected]:OCA/e-commerce.git -b 7.0
+    $ git clone [email protected]:OCA/product-attribute.git -b 7.0
+    $ git clone [email protected]:OCA/sale-workflow.git -b 7.0
 
-.. important:: Keep the Bazaar branches entire. Do not copy-paste the modules
+.. important:: Keep the git branches entire. Do not copy-paste the modules
                in another directory.
 
 Add the branches in the addons path, either using the server command
 line or adding them in the OpenERP server configuration file.
 
 Example using the command line argument::
 
-    $ /path/to/openerp-server --addons-path /path/to/openerp-connector,/path/to/openerp-connector-ecommerce,/path/to/openerp-connector-magento,/path/to/e-commerce-addons,/path/to/openerp-product-attributes,/path/to/sale-wkfl
+    $ /path/to/openerp-server --addons-path /path/to/connector,/path/to/connector-ecommerce,/path/to/connector-magento,/path/to/e-commerce,/path/to/product-attribute,/path/to/sale-workflow
 
 You also need to install the ``magento`` Python package.
 So install it with either pip or either easy_install::
@@ -69,7 +69,7 @@ For the time being, the Magento extension originally built by OpenLabs
 is still used  by the connector. But the version published on `Magento
 Connect` is outdated.
 
-Download the following branch and install it in Magento::
+Download the following ``Bazaar`` branch and install it in Magento::
 
     $ bzr branch lp:magentoerpconnect/magento-module-oerp6.x-stable magento-module
 

__unported__/magentoerpconnect/doc/guides/tutorial_customize.rst

@@ -28,7 +28,7 @@ to create your own module and apply your personalizations from there.
 As an example, throughout this tutorial, we'll create our own
 customization module, we'll name it, in a very original manner,
 ``customize_example``. The final example module can be found in the root
-of the ``magentoerpconnect`` bazaar branch.
+of the ``connector-magento`` repository.
 
 Common OpenERP files
 ====================

__unported__/magentoerpconnect/doc/index.rst

@@ -41,9 +41,9 @@ Core Features
 * Load testing results: **in a single day, successful import of more
   than 10'000 sales orders** from Magento to OpenERP!
 
-.. _`OpenERP Connector`: http://www.openerp-connector.com
+.. _`OpenERP Connector`: http://www.odoo-connector.com
 .. _Camptocamp: http://www.camptocamp.com
-.. _OpenERP: http://www.openerp.com
+.. _OpenERP: http://www.odoo.com
 .. _Magento: http://www.magento.com
 .. _Akretion: http://www.akretion.com
 .. _`source code is available on GitHub`: https://github.com/OCA/connector-magento/tree/7.0