Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Magentoerpconnect catalog simple #146

Closed
wants to merge 94 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
94 commits
Select commit Hold shift + click to select a range
10e15d0
Update the mailing list address
guewen Oct 30, 2015
43665bd
IMP. Account analytic account and Fiscal Position on Sale Order.
lmignon Nov 26, 2015
ce2c435
Prepare ground for a simple product catalog export
sebastienbeau Jun 18, 2014
60eefb7
Add a finalizer and mapper ConnectorUnit for products imports
guewen Sep 8, 2015
c0420e1
[FIX] remove 'status' field from view because 'status' field does not…
damdam-s Sep 9, 2015
fe54722
fixup! Add a finalizer and mapper ConnectorUnit for products imports
guewen Sep 9, 2015
0648b9e
Add README.rst
nbessi Jul 29, 2015
881e829
Porting server_env_magentoerpconnect
nbessi Jul 29, 2015
54eeb65
Fix import
nbessi Jul 29, 2015
c4da29f
Add docstring
nbessi Jul 29, 2015
664b76f
Add symlink to server_environment_files
nbessi Aug 11, 2015
6df5d6a
[ADD] add module 'magentoerpconnect_catalog_simple'
damdam-s Sep 8, 2015
96eea47
Organize the folders with subdirectories
guewen Sep 8, 2015
700e3fb
[IMP] add import of attribute set when importing product
damdam-s Sep 9, 2015
5b63a82
[IMP] use 'import_dependency' method instead of rewriting importation
damdam-s Sep 10, 2015
de85d04
[IMP] import attribute.set in base connector
damdam-s Sep 10, 2015
19f7db0
[FIX] special binder for magento object which are not inherits from odoo
damdam-s Sep 11, 2015
8a5f97b
[IMP] add export functionnality (default required fields in Magento)
damdam-s Sep 11, 2015
6281288
[IMP] do not allow to edit 'magento.attribute.set' in form view
damdam-s Sep 11, 2015
eb4083b
[IMP] export/import tax_class_id field on magento
damdam-s Sep 11, 2015
d70a25d
[IMP] add translation exporter for product.product
damdam-s Sep 14, 2015
fdcbbd0
[IMP] remove readonly on some fields for export functionality
damdam-s Sep 16, 2015
6875f3b
[IMP] export translations
damdam-s Sep 16, 2015
141ebd2
[FIX] tests
damdam-s Sep 17, 2015
e2d6340
[FIX] test
damdam-s Sep 17, 2015
e2ed19b
[IMP] fix tests because of new required fields
damdam-s Sep 17, 2015
1500871
[FIX] remove required on attribute_set_id field on product.template o…
damdam-s Sep 17, 2015
25e16e0
[FIX] do not export a product twice
damdam-s Sep 17, 2015
822dddf
[IMP] start testing product export
damdam-s Sep 17, 2015
19b6b1d
[FIX] tests
damdam-s Sep 22, 2015
ac4d2ec
[FIX] tests
damdam-s Sep 23, 2015
96a87a1
[IMP] test write
damdam-s Sep 23, 2015
1a6fdaf
[FIX] export inventory on create product in Magento to be able to see it
damdam-s Oct 13, 2015
5a3e1fe
[IMP] add autobinding functionality
damdam-s Oct 13, 2015
0b75fbe
[IMP] add access rights
damdam-s Oct 14, 2015
506f62e
[IMP] export attribute set
damdam-s Oct 28, 2015
04f358a
[FIX] do not autobind when importing a product
damdam-s Nov 2, 2015
e0c0105
[FIX] flake8
damdam-s Nov 27, 2015
c11fdbf
[FIX] travis file
damdam-s Nov 30, 2015
8b450d6
Adjust docs build to use 'dependencies' path
guewen Dec 1, 2015
74283e1
[8.0] add missing ACL to allow warehouse user to deliver an order
Dec 2, 2015
f458d07
Merge pull request #180 from acsone/8.0-magentoerpconnect-fix-acl-cpi
pedrobaeza Dec 4, 2015
1f58d50
Merge pull request #177 from guewen/fix-docs
gurneyalex Dec 4, 2015
54ceae9
Merge pull request #160 from guewen/8.0-ml-url
guewen Dec 15, 2015
4c323b4
Merge pull request #176 from acsone/8.0-sale_order_import_options-lmi
guewen Dec 16, 2015
a5fc5e3
OCA Transbot updated translations from Transifex
oca-transbot Dec 19, 2015
6479994
normalize version number
sbidoul Dec 29, 2015
b6d2f8c
Merge pull request #187 from OCA/sbidoul-patch-1
sbidoul Jan 4, 2016
127448d
[UPD] addons table in README.md
OCA-git-bot Jan 5, 2016
426f8fe
[fix] compute function of many2one now returns record not int
gfcapalbo Jan 15, 2016
01879be
OCA Transbot updated translations from Transifex
oca-transbot Jan 23, 2016
59fab51
Fix flake8 warning, operator after line break
guewen Jan 28, 2016
dba88b4
Merge pull request #194 from gfcapalbo/8.0-magentoerp_pricing_fix_def…
guewen Feb 12, 2016
468a86a
Merge pull request #195 from guewen/fix-flake8
StefanRijnhart Feb 12, 2016
ed765fd
OCA Transbot updated translations from Transifex
oca-transbot Feb 27, 2016
7a9c5f5
Prepare ground for a simple product catalog export
sebastienbeau Jun 18, 2014
3793a1a
Add a finalizer and mapper ConnectorUnit for products imports
guewen Sep 8, 2015
c93fc33
[FIX] remove 'status' field from view because 'status' field does not…
damdam-s Sep 9, 2015
c7ef646
fixup! Add a finalizer and mapper ConnectorUnit for products imports
guewen Sep 9, 2015
2d0197a
Add README.rst
nbessi Jul 29, 2015
6e03bb5
Porting server_env_magentoerpconnect
nbessi Jul 29, 2015
c7eac6c
Fix import
nbessi Jul 29, 2015
9aabd54
Add docstring
nbessi Jul 29, 2015
532f3d3
Add symlink to server_environment_files
nbessi Aug 11, 2015
318fc07
[ADD] add module 'magentoerpconnect_catalog_simple'
damdam-s Sep 8, 2015
05334be
Organize the folders with subdirectories
guewen Sep 8, 2015
1e29e26
[IMP] add import of attribute set when importing product
damdam-s Sep 9, 2015
d2a06ea
[IMP] use 'import_dependency' method instead of rewriting importation
damdam-s Sep 10, 2015
9f1baf2
[IMP] import attribute.set in base connector
damdam-s Sep 10, 2015
6052288
[FIX] special binder for magento object which are not inherits from odoo
damdam-s Sep 11, 2015
e9d3348
[IMP] add export functionnality (default required fields in Magento)
damdam-s Sep 11, 2015
91e3dbe
[IMP] do not allow to edit 'magento.attribute.set' in form view
damdam-s Sep 11, 2015
45fd86d
[IMP] export/import tax_class_id field on magento
damdam-s Sep 11, 2015
3818cb7
[IMP] add translation exporter for product.product
damdam-s Sep 14, 2015
c7ce9ec
[IMP] remove readonly on some fields for export functionality
damdam-s Sep 16, 2015
be2ca67
[IMP] export translations
damdam-s Sep 16, 2015
6107905
[FIX] tests
damdam-s Sep 17, 2015
1a42db9
[FIX] test
damdam-s Sep 17, 2015
f6af845
[IMP] fix tests because of new required fields
damdam-s Sep 17, 2015
ba24681
[FIX] remove required on attribute_set_id field on product.template o…
damdam-s Sep 17, 2015
1270d1d
[FIX] do not export a product twice
damdam-s Sep 17, 2015
1b9a627
[IMP] start testing product export
damdam-s Sep 17, 2015
ac9cb23
[FIX] tests
damdam-s Sep 22, 2015
797f14e
[FIX] tests
damdam-s Sep 23, 2015
576782f
[IMP] test write
damdam-s Sep 23, 2015
8676a6e
[FIX] export inventory on create product in Magento to be able to see it
damdam-s Oct 13, 2015
00da162
[IMP] add autobinding functionality
damdam-s Oct 13, 2015
a167925
[IMP] add access rights
damdam-s Oct 14, 2015
711d5d4
[IMP] export attribute set
damdam-s Oct 28, 2015
47f5d14
[FIX] do not autobind when importing a product
damdam-s Nov 2, 2015
b38e8f2
[FIX] flake8
damdam-s Nov 27, 2015
6ae51ca
[FIX] travis file
damdam-s Nov 30, 2015
5dda187
Merge branch 'magentoerpconnect_catalog_simple' of github.com:damdam-…
damdam-s Mar 11, 2016
1c9deec
[FIX] flake8
damdam-s Mar 11, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ addons:
packages:
- expect-dev # provides unbuffer utility
- python-lxml # because pip installation is slow
- tree

language: python

Expand Down Expand Up @@ -43,6 +44,7 @@ install:
- pip install beautifulsoup4
- pip install sphinx sphinx_bootstrap_theme sphinx-intl odoo-sphinx-autodoc
- printf '[options]\n\nrunning_env = dev' > ${HOME}/.openerp_serverrc
- if [ "$LINT_CHECK" != "1" ] ; then ln -s ${HOME}/dependencies/server-tools/server_environment_files_sample ${HOME}/dependencies/server-tools/server_environment_files; fi

script:
- if [ "$DOCS" != "1" ] ; then travis_run_tests; fi
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Odoo Connector Magento Modules

This new release of MagentoERPconnect is based on the [OpenERP Connector framework](https://github.com/OCA/connector).

The mailing list for this project is on https://launchpad.net/~openerp-connector-community
The mailing list for this project is named 'Connectors' and is on https://odoo-community.org/groups

Documentation:
http://www.odoo-magento-connector.com
Expand All @@ -21,7 +21,7 @@ addon | version | summary
--- | --- | ---
[customize_example](customize_example/) | 8.0.1.0.0 | Magento Connector Customization Example
[magentoerpconnect](magentoerpconnect/) | 8.0.3.0.0 | Magento Connector
[magentoerpconnect_pricing](magentoerpconnect_pricing/) | 2.0.0 | Magento Connector - Pricing
[magentoerpconnect_pricing](magentoerpconnect_pricing/) | 8.0.2.0.0 | Magento Connector - Pricing

Unported addons
---------------
Expand Down
15 changes: 8 additions & 7 deletions customize_example/i18n/de.po
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@
# * customize_example
#
# Translators:
# Rudolf Schnapka <[email protected]>, 2016
msgid ""
msgstr ""
"Project-Id-Version: connector-magento (8.0)\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-07-22 09:38+0000\n"
"PO-Revision-Date: 2015-07-08 12:07+0000\n"
"Last-Translator: <>\n"
"POT-Creation-Date: 2016-01-05 01:39+0000\n"
"PO-Revision-Date: 2016-01-14 13:48+0000\n"
"Last-Translator: Rudolf Schnapka <[email protected]>\n"
"Language-Team: German (http://www.transifex.com/oca/OCA-connector-magento-8-0/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand All @@ -20,17 +21,17 @@ msgstr ""
#. module: customize_example
#: field:magento.res.partner,created_in:0
msgid "Created In"
msgstr ""
msgstr "Angelegt in"

#. module: customize_example
#: selection:res.partner,gender:0
msgid "Female"
msgstr ""
msgstr "Weiblich"

#. module: customize_example
#: field:res.partner,gender:0
msgid "Gender"
msgstr ""
msgstr "Geschlecht"

#. module: customize_example
#: model:ir.model,name:customize_example.model_magento_backend
Expand All @@ -45,7 +46,7 @@ msgstr "Magento-Partner"
#. module: customize_example
#: selection:res.partner,gender:0
msgid "Male"
msgstr ""
msgstr "Männlich"

#. module: customize_example
#: model:ir.model,name:customize_example.model_res_partner
Expand Down
13 changes: 13 additions & 0 deletions magentoerpconnect/consumer.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,19 @@ def delay_export_all_bindings(session, model_name, record_id, vals):
fields=fields)


def delay_unlink_all_bindings(session, model_name, record_id):
""" Delay jobs which delete all the bindings of a record.

In this case, it is called on records of normal models and will delay
the deletion for all the bindings.
"""
if session.context.get('connector_no_export'):
return
record = session.env[model_name].browse(record_id)
for binding in record.magento_bind_ids:
delay_unlink(session, binding._model._name, binding.id)


def delay_unlink(session, model_name, record_id):
""" Delay a job which delete a record on Magento.

Expand Down
20 changes: 8 additions & 12 deletions magentoerpconnect/doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,16 @@
if os.environ.get('TRAVIS_BUILD_DIR') and os.environ.get('VERSION'):
# build from travis
repos_home = os.environ['HOME']
deps_path = os.path.join(repos_home, 'dependencies')
odoo_folder = 'odoo-8.0'
odoo_root = os.path.join(repos_home, odoo_folder)
build_path = os.environ['TRAVIS_BUILD_DIR']
else:
# build from a buildout
odoo_root = os.path.abspath('../../../odoo')
repos_home = os.path.abspath('../../..')
deps_path = os.path.abspath('../../..')
build_path = os.path.abspath('../..')

repos = [repo for repo in os.listdir(repos_home)
if os.path.isdir(os.path.join(repos_home, repo))
and not repo.startswith('.')]

addons_paths = []


Expand All @@ -46,13 +43,12 @@ def add_path(*paths):
add_path(odoo_root, 'addons')
add_path(build_path)

# filter addons-paths which are not dependencies (we have other
# directories such as "builds" on travis)
with open('../../oca_dependencies.txt', 'r') as depfile:
dependencies = depfile.read().split()
for repo in repos:
if repo in dependencies:
add_path(repos_home, repo)
deps_repos = [repo for repo in os.listdir(deps_path)
if os.path.isdir(os.path.join(deps_path, repo)) and
not repo.startswith('.')]

for repo in deps_repos:
add_path(deps_path, repo)

addons = [x for x in os.listdir(build_path)
if not x.startswith(('.', '__')) and
Expand Down
4 changes: 2 additions & 2 deletions magentoerpconnect/doc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ MagentoERPconnect has been initiated by `Camptocamp`_ and is mainly
developed and maintained by `Camptocamp`_ and `Akretion`_ with several other
:ref:`contributors`.

*Subscribe to the* `project's mailing list`_
*Subscribe to the* `project's mailing list (name: Connectors)`_

*Learn how to contribute with the* :ref:`contribute`

Expand Down Expand Up @@ -48,7 +48,7 @@ Core Features
.. _Akretion: http://www.akretion.com
.. _`source code is available on GitHub`: https://github.com/OCA/connector-magento
.. _`AGPL version 3`: http://www.gnu.org/licenses/agpl-3.0.html
.. _`project's mailing list`: https://launchpad.net/~openerp-connector-community
.. _`project's mailing list (name: Connectors)`: https://odoo-community.org/groups

********
Workflow
Expand Down
3 changes: 1 addition & 2 deletions magentoerpconnect/doc/project/contribute.rst
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,7 @@ Mailing list
============

The main channel for the discussion is the mailing list, you are invited to
join the team on: https://launchpad.net/~openerp-connector-community and
subscribe to the mailing list.
subscribe on the list named 'Connectors' on: https://odoo-community.org/groups

File an Issue
=============
Expand Down
Loading