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: write stock back to magento, implement tax sync #1

Open
wants to merge 61 commits into
base: 8.0-magento2
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
359e709
[IMP] Bind imported products to existing ones with the same code
StefanRijnhart Jul 5, 2016
fe65f07
[RFR] Make pushing prices to Magento optional
StefanRijnhart Aug 17, 2016
e2f815f
Add financial contributors for Odoo 8.0 migration
guewen Jan 9, 2017
5e23b5b
Fix E305 pep8 errors
guewen Jan 9, 2017
4ba96fb
Protect import of 'magento'
guewen Jan 9, 2017
b625b69
OCA Transbot updated translations from Transifex
oca-transbot Mar 11, 2017
70e16d3
OCA Transbot updated translations from Transifex
oca-transbot Mar 18, 2017
23c677d
Merge pull request #230 from StefanRijnhart/8.0-pricelist_no_update_p…
guewen Mar 23, 2017
ee554b1
OCA Transbot updated translations from Transifex
oca-transbot Mar 25, 2017
f3517f1
[UPD] addons table in README.md
OCA-git-bot Mar 25, 2017
ee858cf
[UPD] addons table in README.md
OCA-git-bot Mar 28, 2017
9b04e7f
OCA Transbot updated translations from Transifex
oca-transbot May 1, 2017
7c4cbe1
OCA Transbot updated translations from Transifex
oca-transbot May 6, 2017
235fd60
OCA Transbot updated translations from Transifex
oca-transbot May 13, 2017
630b839
Merge pull request #247 from guewen/8.0-add-financial-contributors
May 15, 2017
b70d8d9
OCA Transbot updated translations from Transifex
oca-transbot May 20, 2017
b679615
OCA Transbot updated translations from Transifex
oca-transbot Jun 3, 2017
0eab93a
OCA Transbot updated translations from Transifex
oca-transbot Jun 10, 2017
f34d601
OCA Transbot updated translations from Transifex
oca-transbot Jun 17, 2017
f9279c5
OCA Transbot updated translations from Transifex
oca-transbot Jun 24, 2017
28a682d
OCA Transbot updated translations from Transifex
oca-transbot Jul 1, 2017
021e0ba
OCA Transbot updated translations from Transifex
oca-transbot Jul 8, 2017
223b9d9
OCA Transbot updated translations from Transifex
oca-transbot Jul 15, 2017
d758455
OCA Transbot updated translations from Transifex
oca-transbot Jul 29, 2017
c47cc40
OCA Transbot updated translations from Transifex
oca-transbot Aug 19, 2017
3d76eca
OCA Transbot updated translations from Transifex
oca-transbot Sep 2, 2017
ccd7f69
OCA Transbot updated translations from Transifex
oca-transbot Oct 28, 2017
871ff65
OCA Transbot updated translations from Transifex
oca-transbot Nov 4, 2017
bb8d609
OCA Transbot updated translations from Transifex
oca-transbot Nov 11, 2017
f5d887f
OCA Transbot updated translations from Transifex
oca-transbot Nov 18, 2017
13fa451
OCA Transbot updated translations from Transifex
oca-transbot Nov 25, 2017
4f776c5
OCA Transbot updated translations from Transifex
oca-transbot Dec 2, 2017
d98878a
OCA Transbot updated translations from Transifex
oca-transbot Dec 30, 2017
6d2d4d1
OCA Transbot updated translations from Transifex
oca-transbot Jan 6, 2018
53736af
OCA Transbot updated translations from Transifex
oca-transbot Feb 3, 2018
c755ea1
OCA Transbot updated translations from Transifex
oca-transbot Mar 3, 2018
5429414
OCA Transbot updated translations from Transifex
oca-transbot Mar 17, 2018
0527ef1
OCA Transbot updated translations from Transifex
oca-transbot Apr 14, 2018
b4a748e
[ADD] setup.py [ci skip]
OCA-git-bot Apr 19, 2018
a4b545b
remove obsolete .pot files [ci skip]
sbidoul Jun 15, 2018
6adf802
trigger Travis build to generate .pot
sbidoul Jun 22, 2018
7a3760a
[UPD] Update customize_example.pot
oca-travis Jun 23, 2018
1409381
[UPD] Update magentoerpconnect.pot
oca-travis Jun 23, 2018
7f36450
[UPD] Update magentoerpconnect_pricing.pot
oca-travis Jun 23, 2018
689cc20
[UPD] Update server_env_magentoerpconnect.pot
oca-travis Jun 23, 2018
aecced4
Merge pull request #219 from StefanRijnhart/8.0-product_match_by_code
guewen Jul 18, 2018
9b99bcd
[UPD] Update magentoerpconnect.pot
oca-travis Jul 18, 2018
18771e7
Update translation files
oca-transbot Dec 9, 2018
85fc7ca
[ADD] Support for Magento 2.0
StefanRijnhart May 12, 2016
3ab11cc
[ADD] Allow to specify http method
StefanRijnhart Apr 12, 2017
f05acb7
[WIP] Post invoices to Magento
StefanRijnhart Apr 17, 2017
a0ca093
[ADD] Allow to specify storeview
StefanRijnhart Apr 29, 2017
a45a4fe
[ADD] Support configurable products with multiple subitems
StefanRijnhart May 31, 2017
eeb1ee1
[ADD] Support for Magento 2.0
StefanRijnhart May 12, 2016
613e8bd
WIP
thomaspaulb Jan 13, 2018
0c88f86
Bugfixes and WIP to add dependency of tax class to product. Currently…
thomaspaulb Jan 14, 2018
f5e1423
bugfixes
thomaspaulb Jan 15, 2018
d1a08b4
fix
thomaspaulb Jan 15, 2018
c9c5376
Dont overwrite partner if its already in the system
thomaspaulb Jan 16, 2018
bda2f15
fix
thomaspaulb Jan 16, 2018
baf6b26
[ADD] security
thomaspaulb May 21, 2021
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 README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ http://www.odoo-magento-connector.com
http://www.odoo-connector.com

[//]: # (addons)

Available addons
----------------
addon | version | summary
Expand All @@ -24,6 +25,7 @@ addon | version | summary
[magentoerpconnect_pricing](magentoerpconnect_pricing/) | 8.0.2.0.0 | Magento Connector - Pricing
[server_env_magentoerpconnect](server_env_magentoerpconnect/) | 8.0.1.0.0 | Server environment for Magento Connector


Unported addons
---------------
addon | version | summary
Expand Down
7 changes: 4 additions & 3 deletions customize_example/i18n/am.po
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * customize_example
#
#
# Translators:
msgid ""
msgstr ""
Expand All @@ -10,11 +10,12 @@ msgstr ""
"POT-Creation-Date: 2016-12-24 00:56+0000\n"
"PO-Revision-Date: 2015-07-08 12:07+0000\n"
"Last-Translator: <>\n"
"Language-Team: Amharic (http://www.transifex.com/oca/OCA-connector-magento-8-0/language/am/)\n"
"Language-Team: Amharic (http://www.transifex.com/oca/OCA-connector-"
"magento-8-0/language/am/)\n"
"Language: am\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Language: am\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"

#. module: customize_example
Expand Down
10 changes: 6 additions & 4 deletions customize_example/i18n/ar.po
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * customize_example
#
#
# Translators:
msgid ""
msgstr ""
Expand All @@ -10,12 +10,14 @@ msgstr ""
"POT-Creation-Date: 2016-12-24 00:56+0000\n"
"PO-Revision-Date: 2015-07-08 12:07+0000\n"
"Last-Translator: <>\n"
"Language-Team: Arabic (http://www.transifex.com/oca/OCA-connector-magento-8-0/language/ar/)\n"
"Language-Team: Arabic (http://www.transifex.com/oca/OCA-connector-"
"magento-8-0/language/ar/)\n"
"Language: ar\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Language: ar\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"

#. module: customize_example
#: field:magento.res.partner,created_in:0
Expand Down
7 changes: 4 additions & 3 deletions customize_example/i18n/bg.po
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * customize_example
#
#
# Translators:
msgid ""
msgstr ""
Expand All @@ -10,11 +10,12 @@ msgstr ""
"POT-Creation-Date: 2016-09-21 06:37+0000\n"
"PO-Revision-Date: 2015-07-08 12:07+0000\n"
"Last-Translator: <>\n"
"Language-Team: Bulgarian (http://www.transifex.com/oca/OCA-connector-magento-8-0/language/bg/)\n"
"Language-Team: Bulgarian (http://www.transifex.com/oca/OCA-connector-"
"magento-8-0/language/bg/)\n"
"Language: bg\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Language: bg\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

#. module: customize_example
Expand Down
10 changes: 6 additions & 4 deletions customize_example/i18n/bs.po
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * customize_example
#
#
# Translators:
msgid ""
msgstr ""
Expand All @@ -10,12 +10,14 @@ msgstr ""
"POT-Creation-Date: 2016-12-24 00:56+0000\n"
"PO-Revision-Date: 2015-07-08 12:07+0000\n"
"Last-Translator: <>\n"
"Language-Team: Bosnian (http://www.transifex.com/oca/OCA-connector-magento-8-0/language/bs/)\n"
"Language-Team: Bosnian (http://www.transifex.com/oca/OCA-connector-"
"magento-8-0/language/bs/)\n"
"Language: bs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Language: bs\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"

#. module: customize_example
#: field:magento.res.partner,created_in:0
Expand Down
7 changes: 4 additions & 3 deletions customize_example/i18n/ca.po
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * customize_example
#
#
# Translators:
msgid ""
msgstr ""
Expand All @@ -10,11 +10,12 @@ msgstr ""
"POT-Creation-Date: 2016-12-24 00:56+0000\n"
"PO-Revision-Date: 2015-07-08 12:07+0000\n"
"Last-Translator: <>\n"
"Language-Team: Catalan (http://www.transifex.com/oca/OCA-connector-magento-8-0/language/ca/)\n"
"Language-Team: Catalan (http://www.transifex.com/oca/OCA-connector-"
"magento-8-0/language/ca/)\n"
"Language: ca\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Language: ca\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

#. module: customize_example
Expand Down
7 changes: 4 additions & 3 deletions customize_example/i18n/cs.po
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * customize_example
#
#
# Translators:
msgid ""
msgstr ""
Expand All @@ -10,11 +10,12 @@ msgstr ""
"POT-Creation-Date: 2016-12-24 00:56+0000\n"
"PO-Revision-Date: 2015-07-08 12:07+0000\n"
"Last-Translator: <>\n"
"Language-Team: Czech (http://www.transifex.com/oca/OCA-connector-magento-8-0/language/cs/)\n"
"Language-Team: Czech (http://www.transifex.com/oca/OCA-connector-magento-8-0/"
"language/cs/)\n"
"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Language: cs\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"

#. module: customize_example
Expand Down
51 changes: 51 additions & 0 deletions customize_example/i18n/customize_example.pot
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * customize_example
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"

#. module: customize_example
#: field:magento.res.partner,created_in:0
msgid "Created In"
msgstr ""

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

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

#. module: customize_example
#: model:ir.model,name:customize_example.model_magento_backend
msgid "Magento Backend"
msgstr ""

#. module: customize_example
#: model:ir.model,name:customize_example.model_magento_res_partner
msgid "Magento Partner"
msgstr ""

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

#. module: customize_example
#: model:ir.model,name:customize_example.model_res_partner
msgid "Partner"
msgstr ""

7 changes: 4 additions & 3 deletions customize_example/i18n/da.po
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * customize_example
#
#
# Translators:
msgid ""
msgstr ""
Expand All @@ -10,11 +10,12 @@ msgstr ""
"POT-Creation-Date: 2016-09-21 06:37+0000\n"
"PO-Revision-Date: 2015-07-08 12:07+0000\n"
"Last-Translator: <>\n"
"Language-Team: Danish (http://www.transifex.com/oca/OCA-connector-magento-8-0/language/da/)\n"
"Language-Team: Danish (http://www.transifex.com/oca/OCA-connector-"
"magento-8-0/language/da/)\n"
"Language: da\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Language: da\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

#. module: customize_example
Expand Down
7 changes: 4 additions & 3 deletions customize_example/i18n/de.po
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * customize_example
#
#
# Translators:
# Antonio Trueba, 2016
# Bole <bole@dajmi5.com>, 2015
Expand All @@ -16,11 +16,12 @@ msgstr ""
"POT-Creation-Date: 2016-05-21 09:43+0000\n"
"PO-Revision-Date: 2016-01-14 13:48+0000\n"
"Last-Translator: Rudolf Schnapka <rs@techno-flex.de>\n"
"Language-Team: German (http://www.transifex.com/oca/OCA-connector-magento-8-0/language/de/)\n"
"Language-Team: German (http://www.transifex.com/oca/OCA-connector-"
"magento-8-0/language/de/)\n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

#. module: customize_example
Expand Down
7 changes: 4 additions & 3 deletions customize_example/i18n/el_GR.po
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * customize_example
#
#
# Translators:
msgid ""
msgstr ""
Expand All @@ -10,11 +10,12 @@ msgstr ""
"POT-Creation-Date: 2016-09-21 06:37+0000\n"
"PO-Revision-Date: 2015-07-08 12:07+0000\n"
"Last-Translator: <>\n"
"Language-Team: Greek (Greece) (http://www.transifex.com/oca/OCA-connector-magento-8-0/language/el_GR/)\n"
"Language-Team: Greek (Greece) (http://www.transifex.com/oca/OCA-connector-"
"magento-8-0/language/el_GR/)\n"
"Language: el_GR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Language: el_GR\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

#. module: customize_example
Expand Down
7 changes: 4 additions & 3 deletions customize_example/i18n/en_GB.po
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * customize_example
#
#
# Translators:
msgid ""
msgstr ""
Expand All @@ -10,11 +10,12 @@ msgstr ""
"POT-Creation-Date: 2016-12-24 00:56+0000\n"
"PO-Revision-Date: 2015-07-08 12:07+0000\n"
"Last-Translator: <>\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/oca/OCA-connector-magento-8-0/language/en_GB/)\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/oca/OCA-"
"connector-magento-8-0/language/en_GB/)\n"
"Language: en_GB\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Language: en_GB\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

#. module: customize_example
Expand Down
9 changes: 5 additions & 4 deletions customize_example/i18n/es.po
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * customize_example
#
#
# Translators:
msgid ""
msgstr ""
Expand All @@ -10,11 +10,12 @@ msgstr ""
"POT-Creation-Date: 2015-07-22 09:38+0000\n"
"PO-Revision-Date: 2015-07-08 12:07+0000\n"
"Last-Translator: <>\n"
"Language-Team: Spanish (http://www.transifex.com/oca/OCA-connector-magento-8-0/language/es/)\n"
"Language-Team: Spanish (http://www.transifex.com/oca/OCA-connector-"
"magento-8-0/language/es/)\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

#. module: customize_example
Expand All @@ -28,7 +29,7 @@ msgid "Female"
msgstr ""

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

Expand Down
7 changes: 4 additions & 3 deletions customize_example/i18n/es_CR.po
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * customize_example
#
#
# Translators:
msgid ""
msgstr ""
Expand All @@ -10,11 +10,12 @@ msgstr ""
"POT-Creation-Date: 2016-12-24 00:56+0000\n"
"PO-Revision-Date: 2015-07-08 12:07+0000\n"
"Last-Translator: <>\n"
"Language-Team: Spanish (Costa Rica) (http://www.transifex.com/oca/OCA-connector-magento-8-0/language/es_CR/)\n"
"Language-Team: Spanish (Costa Rica) (http://www.transifex.com/oca/OCA-"
"connector-magento-8-0/language/es_CR/)\n"
"Language: es_CR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Language: es_CR\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

#. module: customize_example
Expand Down
7 changes: 4 additions & 3 deletions customize_example/i18n/es_EC.po
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * customize_example
#
#
# Translators:
msgid ""
msgstr ""
Expand All @@ -10,11 +10,12 @@ msgstr ""
"POT-Creation-Date: 2016-12-24 00:56+0000\n"
"PO-Revision-Date: 2015-07-08 12:07+0000\n"
"Last-Translator: <>\n"
"Language-Team: Spanish (Ecuador) (http://www.transifex.com/oca/OCA-connector-magento-8-0/language/es_EC/)\n"
"Language-Team: Spanish (Ecuador) (http://www.transifex.com/oca/OCA-connector-"
"magento-8-0/language/es_EC/)\n"
"Language: es_EC\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Language: es_EC\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

#. module: customize_example
Expand Down
Loading