From 512aaeedf350d409dc38326eac981fff87d2a22d Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 3 Mar 2021 15:32:31 +0100 Subject: [PATCH 1/9] [REM] odoo_sh: remove mentions about the (rip) feedback form --- odoo_sh/advanced/containers.rst | 8 +------- odoo_sh/overview/introduction.rst | 3 --- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/odoo_sh/advanced/containers.rst b/odoo_sh/advanced/containers.rst index d25457c9c..ba97ec549 100644 --- a/odoo_sh/advanced/containers.rst +++ b/odoo_sh/advanced/containers.rst @@ -9,15 +9,9 @@ Overview Each build is isolated within its own container (Linux namespaced container). -The base is an Ubuntu 16.04 system, where all of Odoo's required dependencies, +The base is an Ubuntu system, where all of Odoo's required dependencies, as well as common useful packages, are installed. -The Odoo.sh team is open to install system packages as long as they are -distributed in the official Ubuntu repositories and meets the platform's -`dependency requirements `_. -You can use `the feedback form `_ in order to -submit a package request to the Odoo.sh team. - If your project requires additional Python dependencies, or more recent releases, you can define a :file:`requirements.txt` file in the root of your branches listing them. The platform will take care to install these dependencies in your containers. diff --git a/odoo_sh/overview/introduction.rst b/odoo_sh/overview/introduction.rst index 80f7e0e0d..8e159edcf 100644 --- a/odoo_sh/overview/introduction.rst +++ b/odoo_sh/overview/introduction.rst @@ -10,6 +10,3 @@ Introduction to Odoo.sh :height: 394 The documentation will help you go live with your Odoo.sh project in no time. - -You can suggest new documentation topics -or report typos and inaccuracies by `contacting us `_. From 50cf6f29db01153b87ea6e55da330b7a44de85c5 Mon Sep 17 00:00:00 2001 From: Odoo Translation Bot Date: Sun, 7 Mar 2021 01:30:48 +0100 Subject: [PATCH 2/9] [I18N] Update translation terms from Transifex --- locale/es/LC_MESSAGES/accounting.po | 8 +++++--- locale/fr/LC_MESSAGES/accounting.po | 7 ++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/locale/es/LC_MESSAGES/accounting.po b/locale/es/LC_MESSAGES/accounting.po index 87d0cd5ec..ff1e7eedf 100644 --- a/locale/es/LC_MESSAGES/accounting.po +++ b/locale/es/LC_MESSAGES/accounting.po @@ -28,7 +28,6 @@ # Fairuoz Hussein Naranjo , 2020 # Loredana Pepe , 2020 # Mariana Santos Romo , 2020 -# Valentino Gaffuri Bedetta , 2020 # John Guardado , 2020 # Jesse Garza , 2020 # Osiris Román , 2020 @@ -61,6 +60,7 @@ # Jon Perez , 2021 # renodoo , 2021 # Wilson Pujols , 2021 +# Valentino , 2021 # #, fuzzy msgid "" @@ -69,7 +69,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-02-04 12:07+0100\n" "PO-Revision-Date: 2019-10-03 09:45+0000\n" -"Last-Translator: Wilson Pujols , 2021\n" +"Last-Translator: Valentino , 2021\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1880,7 +1880,7 @@ msgstr "Argentina" #: ../../accounting/fiscal_localizations/localizations/argentina.rst:6 #: ../../accounting/fiscal_localizations/localizations/colombia.rst:6 msgid "Webinars" -msgstr "" +msgstr "Webinars" #: ../../accounting/fiscal_localizations/localizations/argentina.rst:8 #: ../../accounting/fiscal_localizations/localizations/colombia.rst:8 @@ -1888,6 +1888,8 @@ msgid "" "Below you can find videos with a general description of the localization, " "and how to configure it." msgstr "" +"A continuación, puede encontrar videos con una descripción general de la " +"localización y cómo configurarla." #: ../../accounting/fiscal_localizations/localizations/argentina.rst:10 msgid "`VIDEO WEBINAR OF A COMPLETE DEMO `_." diff --git a/locale/fr/LC_MESSAGES/accounting.po b/locale/fr/LC_MESSAGES/accounting.po index 9b7b4c98f..99f16fb29 100644 --- a/locale/fr/LC_MESSAGES/accounting.po +++ b/locale/fr/LC_MESSAGES/accounting.po @@ -51,6 +51,7 @@ # Priscilla (prs) Odoo , 2021 # Pauline Thiry , 2021 # Vallen Delobel , 2021 +# Benjamin Stienon , 2021 # #, fuzzy msgid "" @@ -59,7 +60,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-02-04 12:07+0100\n" "PO-Revision-Date: 2019-10-03 09:45+0000\n" -"Last-Translator: Vallen Delobel , 2021\n" +"Last-Translator: Benjamin Stienon , 2021\n" "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1107,7 +1108,7 @@ msgstr "" #: ../../accounting/bank/reconciliation/reconciliation_models.rst:32 msgid "Manually create a write-off on clicked button" -msgstr "" +msgstr "Créer manuellement un write-off en appuyant sur le bouton" #: ../../accounting/bank/reconciliation/reconciliation_models.rst:34 msgid "" @@ -1130,7 +1131,7 @@ msgstr "" #: ../../accounting/bank/reconciliation/reconciliation_models.rst:57 msgid "Match existing invoices/bills" -msgstr "" +msgstr "Réconcilier avec les factures existantes." #: ../../accounting/bank/reconciliation/reconciliation_models.rst:59 msgid "" From a6b3f03d285ee3563c04d056690c2b370e0602b4 Mon Sep 17 00:00:00 2001 From: Odoo Translation Bot Date: Sun, 7 Mar 2021 02:30:21 +0100 Subject: [PATCH 3/9] [I18N] Update translation terms from Transifex --- locale/de/LC_MESSAGES/accounting.po | 4 ++-- locale/es/LC_MESSAGES/project.po | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/locale/de/LC_MESSAGES/accounting.po b/locale/de/LC_MESSAGES/accounting.po index 4871947e3..106793f79 100644 --- a/locale/de/LC_MESSAGES/accounting.po +++ b/locale/de/LC_MESSAGES/accounting.po @@ -5,10 +5,10 @@ # # Translators: # Thorsten Vocks , 2019 +# Johannes Croe , 2019 # e2f , 2019 # Philipp Hug , 2019 # f91684c3ff9ec3e650d5c8461e534581_686eae3 <449b96d9f63071f94d89e129677b83de_366193>, 2019 -# Johannes Croe , 2019 # Michael Schütt , 2019 # Leon Grill , 2019 # DE T2 , 2019 @@ -1403,7 +1403,7 @@ msgstr "" #: ../../accounting/bank/setup/create_bank_account.rst:0 msgid "Account Holder Name" -msgstr "Kontoinhaber" +msgstr "Abweichender Kontoinhaber" #: ../../accounting/bank/setup/create_bank_account.rst:0 msgid "" diff --git a/locale/es/LC_MESSAGES/project.po b/locale/es/LC_MESSAGES/project.po index 766e5091c..301f1a3cd 100644 --- a/locale/es/LC_MESSAGES/project.po +++ b/locale/es/LC_MESSAGES/project.po @@ -16,6 +16,7 @@ # Miguel Mendez , 2018 # Alejandro Kutulas , 2018 # Jon Perez , 2019 +# Ivan Garcia , 2021 # #, fuzzy msgid "" @@ -24,7 +25,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-09-16 15:50+0200\n" "PO-Revision-Date: 2018-10-19 08:15+0000\n" -"Last-Translator: Jon Perez , 2019\n" +"Last-Translator: Ivan Garcia , 2021\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1798,8 +1799,8 @@ msgid "" "Scheduling and forecasting tasks is another way to manage projects. In Odoo," " the Forecast option gives you access to the Gantt chart." msgstr "" -"Progrmar y pronosticar tareas es otra manera de manejar proyectos. En odoo, " -"la opción de pronósticos le da acceso a la tabla de Gantt." +"Programar y pronosticar tareas es otra manera de manejar proyectos. En odoo," +" la opción de pronósticos le da acceso a la tabla de Gantt." #: ../../project/planning/forecast.rst:11 msgid "" From 2843ee7d1127c30ed397b60f0e869b489775954a Mon Sep 17 00:00:00 2001 From: ossimantylahti Date: Fri, 12 Mar 2021 14:12:02 +0100 Subject: [PATCH 4/9] [IMP] discuss: document dedicated servers setup Added section about how to set up different dedicated servers for transactional and mass mails. --- discuss/advanced/email_servers.rst | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/discuss/advanced/email_servers.rst b/discuss/advanced/email_servers.rst index db69205ee..68649274a 100644 --- a/discuss/advanced/email_servers.rst +++ b/discuss/advanced/email_servers.rst @@ -179,3 +179,31 @@ alias in your mail server. .. _Office 365 documentation: https://support.office.com/en-us/article/how-to-set-up-a-multifunction-device-or-application-to-send-email-using-office-365-69f58e99-c550-4274-ad18-c805d654b4c4 + +Set up different dedicated servers for transactional and mass mails +=================================================================== + +Odoo's e-mail server has the capability of sending 200 e-mails per day on Odoo SH Cloud Platform. +However, if needed, you can use a separate Mail Transfer Agent (MTA) servers for transactional +e-mails and mass mailings. +Example: use Odoo's own mail server for transactional e-mails, and Sendgrid, Amazon SES, or Mailgun +for mass mailings. Another alternative is to use Postmark for transactional e-mails, and Amazon SES +or Sendgrid for mass mailings. + +.. note:: + A default outgoing email server is already configured. You should not create an alternative one + unless you want to use a specific external outgoing email server for technical reasons. + +To do this, you should first enable the :doc:`Developer mode +<../../general/developer_mode/activate>` and then go to :menuselection:`Settings --> Technical +--> Outgoing` e-mail servers. There you have to create two e-mail MTA server settings. One for +transactional e-mails and one for mass mail servers. Be sure to mark the priority of transactional +e-mail servers as low as the mass email servers. + +Now, go to :menuselection:`Email Marketing --> Settings` and enable *Dedicated Server*. +With these settings, Odoo uses the server with the lower priority for transactional emails, and the +server here selected for mass mails. +Note that in this case, you have to set your domain's Sender Policy Framework (SPF) records to +include both transactional and mass mail servers. If your server resides with xxxx.odoo.com, the +available options are Sendinblue and Mailchimp, as your e-mails would be originated from the +xxxx.odoo.com domain. \ No newline at end of file From ccb7f5a69c9657f69456ec9584918a01584775bb Mon Sep 17 00:00:00 2001 From: KBR <57449423+kbr-odoo@users.noreply.github.com> Date: Fri, 12 Mar 2021 15:44:29 +0100 Subject: [PATCH 5/9] [IMP] general: product share between companies (#882) Added information on note about the requirements for a product to be shared on a multi company environment. --- general/multi_companies/manage_multi_companies.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/general/multi_companies/manage_multi_companies.rst b/general/multi_companies/manage_multi_companies.rst index 815af9cc1..7fdb536a2 100644 --- a/general/multi_companies/manage_multi_companies.rst +++ b/general/multi_companies/manage_multi_companies.rst @@ -122,7 +122,7 @@ at an invoice/bills level or at a sales/purchase orders level. :alt: View of the purchase created on JS Store US from JS Store Belgium in Odoo .. note:: - Products have to be configured as *Can be sold*. + Products have to be configured as *Can be sold* and must be shared between the companies. .. tip:: Remember to test all workflows as an user other than the administrator. From cd4b15e9dca5c699540a379afd0dccb146248c78 Mon Sep 17 00:00:00 2001 From: Odoo Translation Bot Date: Sun, 14 Mar 2021 01:30:29 +0100 Subject: [PATCH 6/9] [I18N] Update translation terms from Transifex --- locale/fr/LC_MESSAGES/accounting.po | 5 +++-- locale/zh_CN/LC_MESSAGES/sales.po | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/locale/fr/LC_MESSAGES/accounting.po b/locale/fr/LC_MESSAGES/accounting.po index 99f16fb29..5e0047143 100644 --- a/locale/fr/LC_MESSAGES/accounting.po +++ b/locale/fr/LC_MESSAGES/accounting.po @@ -52,6 +52,7 @@ # Pauline Thiry , 2021 # Vallen Delobel , 2021 # Benjamin Stienon , 2021 +# Alexandra Jubert , 2021 # #, fuzzy msgid "" @@ -60,7 +61,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-02-04 12:07+0100\n" "PO-Revision-Date: 2019-10-03 09:45+0000\n" -"Last-Translator: Benjamin Stienon , 2021\n" +"Last-Translator: Alexandra Jubert , 2021\n" "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -8152,7 +8153,7 @@ msgstr "Comptabilité - Colombie" #: ../../accounting/fiscal_localizations/overview/localizations_list.rst:40 msgid "Colombian - Point of Sale" -msgstr "" +msgstr "Colombien - Point de Vente" #: ../../accounting/fiscal_localizations/overview/localizations_list.rst:42 msgid "Costa Rica - Accounting" diff --git a/locale/zh_CN/LC_MESSAGES/sales.po b/locale/zh_CN/LC_MESSAGES/sales.po index 3064c1fe5..4e692b454 100644 --- a/locale/zh_CN/LC_MESSAGES/sales.po +++ b/locale/zh_CN/LC_MESSAGES/sales.po @@ -24,8 +24,8 @@ # guohuadeng , 2020 # 敬雲 林 , 2020 # Felix Yang - Elico Corp , 2020 -# Mandy Choy , 2020 # Martin Trigaux, 2021 +# Mandy Choy , 2021 # #, fuzzy msgid "" @@ -34,7 +34,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-02-04 12:07+0100\n" "PO-Revision-Date: 2019-10-03 09:47+0000\n" -"Last-Translator: Martin Trigaux, 2021\n" +"Last-Translator: Mandy Choy , 2021\n" "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2872,7 +2872,7 @@ msgstr "创建自定义报价模板可节约大量时间。实际上，通过模 msgid "" "To enable this feature, go to :menuselection:`Sales --> Configuration --> " "Settings` and activate **Quotation Templates**." -msgstr "如要启用此功能，前往 :menuselection:`销售 --> 配置 --> 设置`并启用**报价模板**。" +msgstr "如要启用此功能，前往 :menuselection:`销售 --> 配置 --> 设置`并启用 **报价模板** 。" #: ../../sales/send_quotations/quote_template.rst:19 msgid "" From 2167002dd7da3cde420da7fec550b30e49ac8417 Mon Sep 17 00:00:00 2001 From: Victor Feyens Date: Tue, 23 Mar 2021 18:17:06 +0100 Subject: [PATCH 7/9] [MOV][FIX] *: place static files in their place of use Prepare the incoming documentation refactoring, ensuring the files used by a doc page are correcly moved together with the page, avoiding broken links during the reorganisation. Partial backport of https://github.com/odoo/documentation-user/commit/f7bedfce2ee782b42542f9d2f072f709e6ee80fb to ease forward-ports --- .../localizations}/files/certificate.cer | Bin .../localizations}/files/certificate.key | Bin accounting/localizations/mexico.rst | 6 ++--- ...d_party_application_product_categories.csv | 0 ...rnal_id_3rd_party_application_products.csv | 0 .../files}/database_import_test.sql | 0 .../base_import/files}/m2m_customers_tags.csv | 0 .../files}/o2m_customers_contacts.csv | 0 .../files}/o2m_purchase_order_lines.csv | 0 ...order_functional_error_line_cant_adpat.csv | 0 general/base_import/import_faq.rst | 23 +++++++++--------- .../files/vendor_pricelists_template.csv | 8 ++++++ purchase/purchases/master/import.rst | 3 +-- 13 files changed, 23 insertions(+), 17 deletions(-) rename {_static => accounting/localizations}/files/certificate.cer (100%) rename {_static => accounting/localizations}/files/certificate.key (100%) rename {_static/example_files => general/base_import/files}/External_id_3rd_party_application_product_categories.csv (100%) rename {_static/example_files => general/base_import/files}/External_id_3rd_party_application_products.csv (100%) rename {_static/example_files => general/base_import/files}/database_import_test.sql (100%) rename {_static/example_files => general/base_import/files}/m2m_customers_tags.csv (100%) rename {_static/example_files => general/base_import/files}/o2m_customers_contacts.csv (100%) rename {_static/example_files => general/base_import/files}/o2m_purchase_order_lines.csv (100%) rename {_static/example_files => general/base_import/files}/purchase.order_functional_error_line_cant_adpat.csv (100%) create mode 100644 purchase/purchases/master/files/vendor_pricelists_template.csv diff --git a/_static/files/certificate.cer b/accounting/localizations/files/certificate.cer similarity index 100% rename from _static/files/certificate.cer rename to accounting/localizations/files/certificate.cer diff --git a/_static/files/certificate.key b/accounting/localizations/files/certificate.key similarity index 100% rename from _static/files/certificate.key rename to accounting/localizations/files/certificate.key diff --git a/accounting/localizations/mexico.rst b/accounting/localizations/mexico.rst index 777783b38..db3b7f7e1 100644 --- a/accounting/localizations/mexico.rst +++ b/accounting/localizations/mexico.rst @@ -181,8 +181,8 @@ and then enter your PAC username and PAC password. Here is a SAT certificate you can use if you want to use the *Test Environment* for the Mexican Accounting Localization. - - `Certificate`_ - - `Certificate Key`_ + :download:` Certificate ` + :download:` Certificate Key ` - **Password:** 12345678a 7. Configure the tag in sales taxes @@ -661,5 +661,3 @@ FAQ .. _`given by the SAT`: http://sat.gob.mx/informacion_fiscal/factura_electronica/Documents/GuiaAnexo20DPA.pdf .. _`Anexo 24`: http://www.sat.gob.mx/fichas_tematicas/buzon_tributario/Documents/Anexo24_05012015.pdf .. _`official information here`: http://www.sat.gob.mx/fichas_tematicas/declaraciones_informativas/Paginas/declaracion_informativa_terceros.aspx -.. _`Certificate`: ../../_static/files/certificate.cer -.. _`Certificate Key`: ../../_static/files/certificate.key diff --git a/_static/example_files/External_id_3rd_party_application_product_categories.csv b/general/base_import/files/External_id_3rd_party_application_product_categories.csv similarity index 100% rename from _static/example_files/External_id_3rd_party_application_product_categories.csv rename to general/base_import/files/External_id_3rd_party_application_product_categories.csv diff --git a/_static/example_files/External_id_3rd_party_application_products.csv b/general/base_import/files/External_id_3rd_party_application_products.csv similarity index 100% rename from _static/example_files/External_id_3rd_party_application_products.csv rename to general/base_import/files/External_id_3rd_party_application_products.csv diff --git a/_static/example_files/database_import_test.sql b/general/base_import/files/database_import_test.sql similarity index 100% rename from _static/example_files/database_import_test.sql rename to general/base_import/files/database_import_test.sql diff --git a/_static/example_files/m2m_customers_tags.csv b/general/base_import/files/m2m_customers_tags.csv similarity index 100% rename from _static/example_files/m2m_customers_tags.csv rename to general/base_import/files/m2m_customers_tags.csv diff --git a/_static/example_files/o2m_customers_contacts.csv b/general/base_import/files/o2m_customers_contacts.csv similarity index 100% rename from _static/example_files/o2m_customers_contacts.csv rename to general/base_import/files/o2m_customers_contacts.csv diff --git a/_static/example_files/o2m_purchase_order_lines.csv b/general/base_import/files/o2m_purchase_order_lines.csv similarity index 100% rename from _static/example_files/o2m_purchase_order_lines.csv rename to general/base_import/files/o2m_purchase_order_lines.csv diff --git a/_static/example_files/purchase.order_functional_error_line_cant_adpat.csv b/general/base_import/files/purchase.order_functional_error_line_cant_adpat.csv similarity index 100% rename from _static/example_files/purchase.order_functional_error_line_cant_adpat.csv rename to general/base_import/files/purchase.order_functional_error_line_cant_adpat.csv diff --git a/general/base_import/import_faq.rst b/general/base_import/import_faq.rst index 8593d7ff7..d61e2478c 100644 --- a/general/base_import/import_faq.rst +++ b/general/base_import/import_faq.rst @@ -152,10 +152,11 @@ According to your need, you should use one of these 3 ways to reference records When you use External IDs, you can import CSV files with the "External ID" column to define the External ID of each record you import. Then, you will be able to make a reference to that record with columns like "Field/External ID". The following two CSV files give you an example for Products and their Categories. -`CSV file for categories <../../_static/example_files/External_id_3rd_party_application_product_categories.csv>`_. - -`CSV file for Products <../../_static/example_files/External_id_3rd_party_application_products.csv>`_. +:download:`CSV file for categories +`. +:download:`CSV file for Products +`. What can I do if I have multiple matches for a field? ----------------------------------------------------- @@ -171,8 +172,7 @@ How can I import a many2many relationship field (e.g. a customer that has multip The tags should be separated by a comma without any spacing. For example, if you want your customer to be linked to both tags 'Manufacturer' and 'Retailer' then you will encode "Manufacturer,Retailer" in the same column of your CSV file. -`CSV file for Manufacturer, Retailer <../../_static/example_files/m2m_customers_tags.csv>`_. - +:download:`CSV file for Manufacturer, Retailer ` How can I import a one2many relationship (e.g. several Order Lines of a Sales Order)? @@ -181,17 +181,15 @@ How can I import a one2many relationship (e.g. several Order Lines of a Sales Or If you want to import sales order having several order lines; for each order line, you need to reserve a specific row in the CSV file. The first order line will be imported on the same row as the information relative to order. Any additional lines will need an addtional row that does not have any information in the fields relative to the order. As an example, here is purchase.order_functional_error_line_cant_adpat.CSV file of some quotations you can import, based on demo data. -`File for some Quotations <../../_static/example_files/purchase.order_functional_error_line_cant_adpat.csv>`_. +:download:`File for some Quotations `. The following CSV file shows how to import purchase orders with their respective purchase order lines: -`Purchase orders with their respective purchase order lines <../../_static/example_files/o2m_purchase_order_lines.csv>`_. +:download:`Purchase orders with their respective purchase order lines `. The following CSV file shows how to import customers and their respective contacts: -`Customers and their respective contacts <../../_static/example_files/o2m_customers_contacts.csv>`_. - - +:download:`Customers and their respective contacts `. Can I import several times the same record? ------------------------------------------- @@ -216,7 +214,10 @@ If you need to import data from different tables, you will have to recreate rela To manage relations between tables, you can use the "External ID" facilities of Odoo. The "External ID" of a record is the unique identifier of this record in another application. This "External ID" must be unique accoss all the records of all objects, so it's a good practice to prefix this "External ID" with the name of the application or table. (like 'company_1', 'person_1' instead of '1') -As an example, suppose you have a SQL database with two tables you want to import: companies and persons. Each person belong to one company, so you will have to recreate the link between a person and the company he work for. (If you want to test this example, here is a dump of such a PostgreSQL database) +As an example, suppose you have a SQL database with two tables you want to import: companies and +persons. Each person belong to one company, so you will have to recreate the link between a person +and the company he work for. (If you want to test this example, here is a :download:`dump of such a +PostgreSQL database `) We will first export all companies and their "External ID". In PSQL, write the following command: diff --git a/purchase/purchases/master/files/vendor_pricelists_template.csv b/purchase/purchases/master/files/vendor_pricelists_template.csv new file mode 100644 index 000000000..dc8097faa --- /dev/null +++ b/purchase/purchases/master/files/vendor_pricelists_template.csv @@ -0,0 +1,8 @@ +Vendor,Product Template,Vendor Product Name,Vendor Product Code,Price,Minimal Quantity,Start Date,End Date,Delivery Lead Time +ASUSTeK,iMac,"Apple iMac 27""",ART439872,1299,5,,,2 +Camptocamp,iMac,"Apple iMac 27""",IT98764,1399,1,,,4 +ASUSTeK,"Switch, 24 ports",Bluetek Switch,ART439456,66,,,,4 +ASUSTeK,Datacard,LS DC02,ART672098,35,,,,5 +ASUSTeK,Laptop Customized,Asus ROG CS,ART439870,3300,,01/01/2018,12/31/2018,10 +ASUSTeK,"Mouse, Wireless",Logitech G950,ART859562,12.5,,,,3 +ASUSTeK,iPad Mini,Apple iPad Mini 32GB,ART547892,750,,01/01/2018,05/05/2018,3 \ No newline at end of file diff --git a/purchase/purchases/master/import.rst b/purchase/purchases/master/import.rst index 11ab9ac4c..f1e730d45 100644 --- a/purchase/purchases/master/import.rst +++ b/purchase/purchases/master/import.rst @@ -30,5 +30,4 @@ See below a template of the columns used. .. image:: media/import02.png :align: center -`Template -download `__ +:download:`Click here to download the template ` From b072241b9e1b48462a8fcd73c3605368c443b33a Mon Sep 17 00:00:00 2001 From: Jonathan Castillo Date: Tue, 23 Mar 2021 18:51:02 +0100 Subject: [PATCH 8/9] [FIX] inventory: typo in Units of Measure --- inventory/management/products/uom.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventory/management/products/uom.rst b/inventory/management/products/uom.rst index b13926c03..05b7ac436 100644 --- a/inventory/management/products/uom.rst +++ b/inventory/management/products/uom.rst @@ -58,7 +58,7 @@ the product. Transfer from One Unit to Another ================================= -Buy in the Pruchase UoM +Buy in the Purchase UoM ----------------------- In the *Purchase* application, *Create* a new request for quotation From eaa93a300619ffd4848007f4ed687afc6907e999 Mon Sep 17 00:00:00 2001 From: Victor Feyens Date: Wed, 24 Mar 2021 10:56:46 +0100 Subject: [PATCH 9/9] [REM] unused _static files * for coda, ofx & qif: the pages using those files do not exist anymore (cf #569) * for the vendor pricelist csv, the files was moved into its folder of use (in another commit) --- .../Ontvangen_CODA.2013-01-11-18.59.15.txt | 24 ----- _static/example_files/test_ofx.ofx | 100 ------------------ _static/example_files/test_qif.qif | 21 ---- .../vendor_pricelists_template.csv | 8 -- 4 files changed, 153 deletions(-) delete mode 100644 _static/example_files/Ontvangen_CODA.2013-01-11-18.59.15.txt delete mode 100644 _static/example_files/test_ofx.ofx delete mode 100644 _static/example_files/test_qif.qif delete mode 100644 _static/example_files/vendor_pricelists_template.csv diff --git a/_static/example_files/Ontvangen_CODA.2013-01-11-18.59.15.txt b/_static/example_files/Ontvangen_CODA.2013-01-11-18.59.15.txt deleted file mode 100644 index 158fa587b..000000000 --- a/_static/example_files/Ontvangen_CODA.2013-01-11-18.59.15.txt +++ /dev/null @@ -1,24 +0,0 @@ -0000011011172505 00178299 DE MEYER LUC KREDBEBB 00820512013 00000 2 -12135BE33737018595246 EUR0000000011812700270710NOVIAT NV KBC-Business Comfortrekening 003 -2100010000OL44483FW SCTOFBIONLO1000000000435000110111001010000MEDEDELING 11011113501 0 -2200010000 GKCCBEBB 1 0 -2300010000BE41063012345610 PARTNER 1 0 1 -3100010001OL44483FW SCTOFBIONLO001010001001PARTNER 1 0 0 -2100020000OL4414AC8BOVSOVSOVERS0000000003044450110111001500001101240283842818 11011113501 0 -2200020000 BBRUBEBB 1 0 -2300020000BE61310126985517 PARTNER 2 0 1 -3100020001OL4414AC8BOVSOVSOVERS001500001001PARTNER 2 1 0 -3200020001MOLENSTRAAT 60 9340 LEDE 0 0 -2100030000AFECA0BIS IKLINNINBIS1000000000479040110111313410000 KBC-INVESTERINGSKREDIET 737-6543210-21 11011113510 0 -2100030001AFECA0BIS IKLINNINBIS1000000000419920110111813410660 11011113500 0 -2100030002AFECA0BIS IKLINNINBIS1000000000059120110111813410020 11011113510 0 -2100040000AFECA0CVA IKLINNINNIG1000000000479040110111313410000 KBC-INVESTERINGSKREDIET 737-6543210-21 11011113510 0 -2100040001AFECA0CVA IKLINNINNIG1000000000419920110111813410660 11011113500 0 -2100040002AFECA0CVA IKLINNINNIG1000000000059120110111813410020 11011113510 0 -2100050000AOGM00160BSCTOBOGOVER0000000000063740110111001500000TERUGGAVE 37232481 8400083296 . 11011113501 0 -2200050000 362/363 KREDBEBB 1 0 -2300050000BE43730004200601 KBC VERZEKERINGEN NV 0 1 -3100050001AOGM00160BSCTOBOGOVER001500001001KBC VERZEKERINGEN NV 1 0 -3200050001VAN OVERSTRAETENPLEIN 2 3000 LEUVEN 0 0 -8135BE44734024486445 EUR0000000013646050110111 0 -9 000022000000001393080000000003108190 2 diff --git a/_static/example_files/test_ofx.ofx b/_static/example_files/test_ofx.ofx deleted file mode 100644 index 37df4d0c9..000000000 --- a/_static/example_files/test_ofx.ofx +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - - 0 - INFO - - 20130831165153.000[-8:PST] - ENG - - - - - 0 - - 0 - INFO - - - USD - - 000000123 - 123456 - CHECKING - - - 20130801 - 20130831165153.000[-8:PST] - - POS - 20130824080000 - -80 - 219378 - Agrolait - - - - 20130801 - 20130831165153.000[-8:PST] - - POS - 20130824080000 - -90 - 219379 - China Export - - - - 20130801 - 20130831165153.000[-8:PST] - - POS - 20130824080000 - -100 - 219380 - Axelor Scuba - - - - 20130801 - 20130831165153.000[-8:PST] - - POS - 20130824080000 - -90 - 219381 - China Scuba - - - - 2156.56 - 20130831165153 - - - - - - - 0 - - 0 - INFO - - - USD - - 123412341234 - - - - - -562.00 - 20130831165153 - - - - - diff --git a/_static/example_files/test_qif.qif b/_static/example_files/test_qif.qif deleted file mode 100644 index 5388e6dae..000000000 --- a/_static/example_files/test_qif.qif +++ /dev/null @@ -1,21 +0,0 @@ -!Type:Bank -D8/12/13 -T-1,000.00 -PDelta PC -^ -D8/15/13 -T-75.46 -PWalts Drugs -^ -D3/3/13 -T-379.00 -PEpic Technologies -^ -D3/4/13 -T-20.28 -PYOUR LOCAL SUPERMARKET -^ -D3/3/13 -T-421.35 -PSPRINGFIELD WATER UTILITY -^ diff --git a/_static/example_files/vendor_pricelists_template.csv b/_static/example_files/vendor_pricelists_template.csv deleted file mode 100644 index dc8097faa..000000000 --- a/_static/example_files/vendor_pricelists_template.csv +++ /dev/null @@ -1,8 +0,0 @@ -Vendor,Product Template,Vendor Product Name,Vendor Product Code,Price,Minimal Quantity,Start Date,End Date,Delivery Lead Time -ASUSTeK,iMac,"Apple iMac 27""",ART439872,1299,5,,,2 -Camptocamp,iMac,"Apple iMac 27""",IT98764,1399,1,,,4 -ASUSTeK,"Switch, 24 ports",Bluetek Switch,ART439456,66,,,,4 -ASUSTeK,Datacard,LS DC02,ART672098,35,,,,5 -ASUSTeK,Laptop Customized,Asus ROG CS,ART439870,3300,,01/01/2018,12/31/2018,10 -ASUSTeK,"Mouse, Wireless",Logitech G950,ART859562,12.5,,,,3 -ASUSTeK,iPad Mini,Apple iPad Mini 32GB,ART547892,750,,01/01/2018,05/05/2018,3 \ No newline at end of file