10.0

.travis.yml

@@ -12,19 +12,18 @@ addons:
             - python-simplejson
             - python-serial
             - python-yaml
-            - python-sphinx
             - python-passlib
             - python-psycopg2
             - python-werkzeug
             - realpath
-    postgresql: "9.4"
+    postgresql: "9.6"
 
 env:
   - DB=openupgrade ODOO=./odoo-bin
 
 # Need flake8 for pep8 testing
 install:
-    - pip install flake8 coveralls
+    - pip install flake8==3.4.1 coveralls
 
 # Test with flake for:
 #   * migration scripts
@@ -48,24 +47,29 @@ script:
     - cat odoo/addons/base/migrations/*/tests/*.yml addons/*/migrations/*/tests/*.yml > ../test_data90.yml || true
     # Roundtrip to previous release to update the test database with additional test data
     # Loading and committing test data without triggering post tests needs https://github.com/odoo/odoo/pull/13146. This is now included in OpenUpgrade.
+    - old_commit="$(git rev-parse HEAD)"
     - git fetch --depth 2 origin 9.0
     - git reset --hard `git ls-remote |grep refs/heads/9.0 |awk '{print $1}'`
     - pip install -q -r requirements.txt
     # this crashes if there is no test data
     - if [ -s ../test_data90.yml ]; then ./openerp-server --database=$DB --test-file=`readlink -f ../test_data90.yml` --test-commit --stop-after-init; fi
-    # Line below may fail quite often due to Travis bug:
-    - git reset -q --hard $TRAVIS_COMMIT
+    - git reset -q --hard $old_commit
+    # Remove obsolete directories with .pyc files to prevent them from being imported (such as 'openerp')
+    - git clean -xfdq
     # Install Python requirements of target release
     - pip install -q -r requirements.txt
     # don't use pypi's openupgradelib, but the one from source to avoid choking
     # on unreleased features in openupgradelib
     - pip install --ignore-installed git+https://github.com/OCA/openupgradelib.git@master
     # select modules and perform the upgrade
-    - MODULES=base,$(sed -n '/^+========/,$p'  odoo/openupgrade/doc/source/modules90-100.rst | grep "Done\|Partial\|Nothing" | sed -n '/^|/ s/^|\([0-9a-z_]*\) *|.*$/\1/g p' | paste -d, -s)
-    - psql $DB -c "update ir_module_module set state='uninstalled' where name not in ('$(echo $MODULES | sed -e "s/,/','/g")')"
-    - echo Testing modules $MODULES
-    - OPENUPGRADE_TESTS=1 coverage run $ODOO --database=$DB --update=$MODULES --stop-after-init
+    - MODULES_OLD=base,$(sed -n '/^+========/,$p'  odoo/openupgrade/doc/source/modules90-100.rst | grep "Done\|Partial\|Nothing" | grep -v "l10n_be"  | grep -v "theme_" | sed -r -n 's/((^\| *\|del\| *)|^\|)([0-9a-z_]*) *\|.*$/\3/g p' | sed '/^\s*$/d' | paste -d, -s)
+    - MODULES_NEW=base,$(sed -n '/^+========/,$p'  odoo/openupgrade/doc/source/modules90-100.rst | grep "Done\|Partial\|Nothing" | grep -v "l10n_be"  | grep -v "theme_" | sed -r -n 's/((^\| *\|new\| *)|^\|)([0-9a-z_]*) *\|.*$/\3/g p' | sed '/^\s*$/d' | paste -d, -s)
+    - psql $DB -c "update ir_module_module set state='uninstalled' where name not in ('$(echo $MODULES_OLD | sed -e "s/,/','/g")')"
+    - echo Testing modules $MODULES_NEW
+    # Silence redundant logs from unlinking records (1 line is enough) to prevent Travis log overflow
+    - OPENUPGRADE_TESTS=1 $ODOO --database=$DB --update=$MODULES_NEW --stop-after-init --log-handler odoo.models.unlink:WARNING
     # try to build the documentation
+    - pip install sphinx
     - sh scripts/build_openupgrade_docs
 
 after_success:

MANIFEST.in

@@ -4,6 +4,7 @@ include README.md
 recursive-include odoo *.css
 recursive-include odoo *.csv
 recursive-include odoo *.doc
+recursive-include odoo *.docx
 recursive-include odoo *.eml
 recursive-include odoo *.eot
 recursive-include odoo *.gif
@@ -16,6 +17,8 @@ recursive-include odoo *.less
 recursive-include odoo *.md
 recursive-include odoo *.mp3
 recursive-include odoo *.ogg
+recursive-include odoo *.ods
+recursive-include odoo *.odt
 recursive-include odoo *.otf
 recursive-include odoo *.pdf
 recursive-include odoo *.png
@@ -35,7 +38,9 @@ recursive-include odoo *.wsdl
 recursive-include odoo *.xls
 recursive-include odoo *.xsd
 recursive-include odoo *.xsl
+recursive-include odoo *.xlsx
 recursive-include odoo *.xml
 recursive-include odoo *.yml
+recursive-include odoo *.zip
 recursive-exclude * *.py[co]
 recursive-exclude * *.hg*

addons/account/__manifest__.py

@@ -67,7 +67,6 @@
     ],
     'demo': [
         'demo/account_demo.xml',
-        'demo/openupgrade_account_demo.xml',
     ],
     'qweb': [
         "static/src/xml/account_reconciliation.xml",

addons/account/data/invoice_action_data.xml

@@ -65,13 +65,13 @@ from ${object.company_id.name}.
                 % set record = ctx.get('record')
                 % set company = record and record.company_id or user.company_id
                 <body style="margin: 0; padding: 0;">
-                <table border="0" width="100%" cellpadding="0" bgcolor="#ededed" style="padding: 20px; background-color: #ededed" summary="o_mail_notification">
+                <table border="0" width="100%" cellpadding="0" bgcolor="#ededed" style="padding: 20px; background-color: #ededed; border-collapse:separate;" summary="o_mail_notification">
                     <tbody>
 
                       <!-- HEADER -->
                       <tr>
                         <td align="center" style="min-width: 590px;">
-                          <table width="590" border="0" cellpadding="0" bgcolor="#875A7B" style="min-width: 590px; background-color: rgb(135,90,123); padding: 20px;">
+                          <table width="590" border="0" cellpadding="0" bgcolor="#875A7B" style="min-width: 590px; background-color: rgb(135,90,123); padding: 20px; border-collapse:separate;">
                             <tr>
                               <td valign="middle">
                                   <span style="font-size:20px; color:white; font-weight: bold;">
@@ -89,7 +89,7 @@ from ${object.company_id.name}.
                       <!-- CONTENT -->
                       <tr>
                         <td align="center" style="min-width: 590px;">
-                          <table width="590" border="0" cellpadding="0" bgcolor="#ffffff" style="min-width: 590px; background-color: rgb(255, 255, 255); padding: 20px;">
+                          <table width="590" border="0" cellpadding="0" bgcolor="#ffffff" style="min-width: 590px; background-color: rgb(255, 255, 255); padding: 20px; border-collapse:separate;">
                             <tbody>
                               <td valign="top" style="font-family:Arial,Helvetica,sans-serif; color: #555; font-size: 14px;">
                                 ${object.body | safe}
@@ -102,7 +102,7 @@ from ${object.company_id.name}.
                       <!-- FOOTER -->
                       <tr>
                         <td align="center" style="min-width: 590px;">
-                          <table width="590" border="0" cellpadding="0" bgcolor="#875A7B" style="min-width: 590px; background-color: rgb(135,90,123); padding: 20px;">
+                          <table width="590" border="0" cellpadding="0" bgcolor="#875A7B" style="min-width: 590px; background-color: rgb(135,90,123); padding: 20px; border-collapse:separate;">
                             <tr>
                               <td valign="middle" align="left" style="color: #fff; padding-top: 10px; padding-bottom: 10px; font-size: 12px;">
                                 ${company.name}<br/>

addons/account/demo/account_invoice_demo.yml

@@ -12,12 +12,10 @@
       - product_id: product.consu_delivery_02
         price_unit: 642.0
         quantity: 5
-        account_id: account.openupgrade_demo_sales_account
         name: 'consu_delivery_02'
       - product_id: product.consu_delivery_03
         price_unit: 280.0
         quantity: 5.0
-        account_id: account.openupgrade_demo_sales_account
         name: 'consu_delivery_03'
 -
   !python {model: account.invoice, id: demo_invoice_1}:
@@ -31,12 +29,10 @@
       - product_id: product.consu_delivery_03
         price_unit: 50.0
         quantity: 3
-        account_id: account.openupgrade_demo_sales_account
         name: 'consu_delivery_03'
       - product_id: product.consu_delivery_01
         price_unit: 25
         quantity: 20
-        account_id: account.openupgrade_demo_sales_account
         name: 'consu_delivery_01'
 -
   !python {model: account.invoice, id: demo_invoice_2}:
@@ -50,12 +46,10 @@
       - product_id: product.consu_delivery_01
         price_unit: 90.0
         quantity: 5
-        account_id: account.openupgrade_demo_sales_account
         name: 'consu_delivery_01'
       - product_id: product.consu_delivery_03
         price_unit: 15.0
         quantity: 5.0
-        account_id: account.openupgrade_demo_sales_account
         name: 'consu_delivery_03'
 -
   !python {model: account.invoice, id: demo_invoice_3}:
@@ -78,13 +72,11 @@
         quantity: 1.0
         product_id: product.product_delivery_01
         uom_id: product.product_uom_unit
-        account_id: account.openupgrade_demo_purchase_account
         name: 'product_delivery_01'
       - price_unit: 4.0
         quantity: 1.0
         product_id: product.product_order_01
         uom_id: product.product_uom_unit
-        account_id: account.openupgrade_demo_purchase_account
         name: 'product_order_01'
 -
   !record {model: account.invoice, id: demo_invoice_january_wages}:

addons/account/i18n/account.pot

@@ -1330,6 +1330,11 @@ msgstr ""
 msgid "Adjustment Tax"
 msgstr ""
 
+#. module: account
+#: model:ir.model.fields,field_description:account.field_tax_adjustments_wizard_adjustment_type
+msgid "Adjustment Type"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_tax_template_form
 #: model:ir.ui.view,arch_db:account.view_tax_form
@@ -1727,6 +1732,16 @@ msgstr ""
 msgid "Applicability"
 msgstr ""
 
+#. module: account
+#: selection:tax.adjustments.wizard,adjustment_type:0
+msgid "Applied on credit journal item"
+msgstr ""
+
+#. module: account
+#: selection:tax.adjustments.wizard,adjustment_type:0
+msgid "Applied on debit journal item"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_config_settings
 msgid "Apply"
@@ -1970,6 +1985,12 @@ msgstr ""
 msgid "Bank Statement"
 msgstr ""
 
+#. module: account
+#: code:addons/account/models/account_bank_statement.py:935
+#, python-format
+msgid "Bank Statement %s"
+msgstr ""
+
 #. module: account
 #: model:ir.model,name:account.model_account_bank_statement_line
 msgid "Bank Statement Line"
@@ -1987,6 +2008,11 @@ msgstr ""
 msgid "Bank Statements"
 msgstr ""
 
+#. module: account
+#: selection:account.journal,bank_statements_source:0
+msgid "Bank Synchronization"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.view,arch_db:account.partner_view_buttons
 msgid "Bank account(s)"
@@ -3155,6 +3181,12 @@ msgstr ""
 msgid "Currency exchange rate difference"
 msgstr ""
 
+#. module: account
+#: code:addons/account/models/account.py:309
+#, python-format
+msgid "Currency field should only be set if the journal's currency is different from the company's. Leave the field blank to use company currency."
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.data_account_type_current_assets
 #: model:ir.ui.view,arch_db:account.view_account_form
@@ -3296,6 +3328,18 @@ msgstr ""
 msgid "Day(s) after the invoice date"
 msgstr ""
 
+#. module: account
+#: model:res.company,overdue_msg:base.main_company
+msgid "Dear Sir/Madam,\n"
+"\n"
+"Our records indicate that some payments on your account are still due. Please find details below.\n"
+"If the amount has already been paid, please disregard this notice. Otherwise, please forward us the total amount stated below.\n"
+"If you have any queries regarding your account, Please contact us.\n"
+"\n"
+"Thank you in advance for your cooperation.\n"
+"Best Regards,"
+msgstr ""
+
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_move_line_debit
 #: model:ir.ui.view,arch_db:account.report_financial
@@ -8429,6 +8473,12 @@ msgstr ""
 msgid "The last line's computation type should be \"Balance\" to ensure that the whole amount will be allocated."
 msgstr ""
 
+#. module: account
+#: code:addons/account/models/company.py:80
+#, python-format
+msgid "The lock date for advisors is irreversible and can't be removed."
+msgstr ""
+
 #. module: account
 #: model:ir.model.fields,help:account.field_account_move_line_move_id
 msgid "The move of this entry line."
@@ -8446,6 +8496,12 @@ msgstr ""
 msgid "The name that will be used on account move lines"
 msgstr ""
 
+#. module: account
+#: code:addons/account/models/company.py:84
+#, python-format
+msgid "The new lock date for advisors must be set after the previous lock date."
+msgstr ""
+
 #. module: account
 #: model:ir.model.fields,help:account.field_account_bank_statement_line_currency_id
 #: model:ir.model.fields,help:account.field_account_move_line_currency_id
@@ -9481,11 +9537,16 @@ msgstr ""
 
 #. module: account
 #: sql_constraint:account.move.line:0
-msgid "Wrong credit or debit value in accounting entry !"
+msgid "Wrong credit or debit value in accounting entry! Credit and debit should be positive."
 msgstr ""
 
 #. module: account
-#: code:addons/account/models/account_move.py:845
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry! Credit or debit should be zero."
+msgstr ""
+
+#. module: account
+#: code:addons/account/models/account_move.py:931
 #, python-format
 msgid "You are trying to reconcile some entries that are already reconciled!"
 msgstr ""
@@ -9554,6 +9615,12 @@ msgstr ""
 msgid "You cannot cancel an invoice which is partially paid. You need to unreconcile related payment entries first."
 msgstr ""
 
+#. module: account
+#: code:addons/account/models/company.py:118
+#, python-format
+msgid "You cannot change the currency of the company since some journal items already exist"
+msgstr ""
+
 #. module: account
 #: code:addons/account/models/account.py:180
 #, python-format
@@ -9617,6 +9684,12 @@ msgstr ""
 msgid "You cannot have a receivable/payable account that is not reconciliable. (account code: %s)"
 msgstr ""
 
+#. module: account
+#: code:addons/account/models/company.py:95
+#, python-format
+msgid "You cannot lock a period that is not finished yet. Please make sure that the lock date for advisors is not set after the last day of the previous month."
+msgstr ""
+
 #. module: account
 #: code:addons/account/models/account_payment.py:132
 #, python-format
@@ -9674,6 +9747,12 @@ msgstr ""
 msgid "You have"
 msgstr ""
 
+#. module: account
+#: code:addons/account/models/account_payment.py:360
+#, python-format
+msgid "You have to define a sequence for %s in your company."
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_report_general_ledger.py:21
 #, python-format
@@ -10028,3 +10107,8 @@ msgstr ""
 msgid "→ Count"
 msgstr ""
 
+#. module: account
+#: code:addons/account/models/account.py:309
+#, python-format
+msgid "Currency field should only be set if the journal's currency is different from the company's. Leave the field blank to use company currency."
+msgstr ""