diff --git a/MANIFEST.in b/MANIFEST.in index 034e06807ff..2ef37c2bb2e 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -23,4 +23,5 @@ recursive-include openerp *.woff recursive-include openerp *.xsl recursive-include openerp *.xml recursive-include openerp *.yml -recursive-exclude * *.py[co] \ No newline at end of file +recursive-exclude * *.py[co] +recursive-exclude * *.hg* diff --git a/addons/account/edi/invoice_action_data.xml b/addons/account/edi/invoice_action_data.xml index 5f8f8ec8784..48b4cd96cb5 100644 --- a/addons/account/edi/invoice_action_data.xml +++ b/addons/account/edi/invoice_action_data.xml @@ -52,7 +52,7 @@

It is also possible to directly pay with Paypal:

- + % endif diff --git a/addons/account/report/report_vat.py b/addons/account/report/report_vat.py index b7016af1b04..a86a180391c 100644 --- a/addons/account/report/report_vat.py +++ b/addons/account/report/report_vat.py @@ -31,6 +31,15 @@ class tax_report(report_sxw.rml_parse, common_report_header): def set_context(self, objects, data, ids, report_type=None): new_ids = ids res = {} + if not data: + company_id = self.pool['res.users'].browse(self.cr, self.uid, self.uid).company_id.id + data = { + 'form': { + 'based_on': 'invoices', + 'company_id': company_id, + 'display_detail': False, + } + } self.period_ids = [] period_obj = self.pool.get('account.period') self.display_detail = data['form']['display_detail'] diff --git a/addons/account/static/src/img/btn_paynowcc_lg.gif b/addons/account/static/src/img/btn_paynowcc_lg.gif new file mode 100644 index 00000000000..092c5542551 Binary files /dev/null and b/addons/account/static/src/img/btn_paynowcc_lg.gif differ diff --git a/addons/account_asset/i18n/ca.po b/addons/account_asset/i18n/ca.po old mode 100755 new mode 100644 diff --git a/addons/account_asset/i18n/de.po b/addons/account_asset/i18n/de.po old mode 100755 new mode 100644 diff --git a/addons/account_asset/i18n/es.po b/addons/account_asset/i18n/es.po old mode 100755 new mode 100644 diff --git a/addons/account_asset/i18n/es_CR.po b/addons/account_asset/i18n/es_CR.po old mode 100755 new mode 100644 diff --git a/addons/account_asset/i18n/fr.po b/addons/account_asset/i18n/fr.po old mode 100755 new mode 100644 diff --git a/addons/account_asset/i18n/fr_BE.po b/addons/account_asset/i18n/fr_BE.po old mode 100755 new mode 100644 diff --git a/addons/account_asset/i18n/pl.po b/addons/account_asset/i18n/pl.po old mode 100755 new mode 100644 diff --git a/addons/account_asset/i18n/pt.po b/addons/account_asset/i18n/pt.po old mode 100755 new mode 100644 diff --git a/addons/account_asset/i18n/sv.po b/addons/account_asset/i18n/sv.po old mode 100755 new mode 100644 diff --git a/addons/event_sale/event_demo.xml b/addons/event_sale/event_demo.xml index 9d0ed231897..459ec7b6493 100644 --- a/addons/event_sale/event_demo.xml +++ b/addons/event_sale/event_demo.xml @@ -160,7 +160,7 @@ sponsored by
- +
diff --git a/addons/l10n_ae/static/description/icon.png b/addons/l10n_ae/static/description/icon.png old mode 100755 new mode 100644 diff --git a/addons/l10n_do/__init__.py b/addons/l10n_do/__init__.py old mode 100755 new mode 100644 diff --git a/addons/l10n_do/__openerp__.py b/addons/l10n_do/__openerp__.py old mode 100755 new mode 100644 diff --git a/addons/l10n_do/data/account.account.template.csv b/addons/l10n_do/data/account.account.template.csv old mode 100755 new mode 100644 diff --git a/addons/l10n_do/data/account.account.type.csv b/addons/l10n_do/data/account.account.type.csv old mode 100755 new mode 100644 diff --git a/addons/l10n_do/data/account.fiscal.position.tax.template.csv b/addons/l10n_do/data/account.fiscal.position.tax.template.csv old mode 100755 new mode 100644 diff --git a/addons/l10n_do/data/account.fiscal.position.template.csv b/addons/l10n_do/data/account.fiscal.position.template.csv old mode 100755 new mode 100644 diff --git a/addons/l10n_do/data/account.tax.code.template.csv b/addons/l10n_do/data/account.tax.code.template.csv old mode 100755 new mode 100644 diff --git a/addons/l10n_do/data/account.tax.template.csv b/addons/l10n_do/data/account.tax.template.csv old mode 100755 new mode 100644 diff --git a/addons/l10n_do/data/account_chart_template.xml b/addons/l10n_do/data/account_chart_template.xml old mode 100755 new mode 100644 diff --git a/addons/l10n_do/data/account_journal.xml b/addons/l10n_do/data/account_journal.xml old mode 100755 new mode 100644 diff --git a/addons/l10n_do/data/ir_sequence.xml b/addons/l10n_do/data/ir_sequence.xml old mode 100755 new mode 100644 diff --git a/addons/l10n_do/data/l10n_do_base_data.xml b/addons/l10n_do/data/l10n_do_base_data.xml old mode 100755 new mode 100644 diff --git a/addons/l10n_do/data/l10n_do_wizard.xml b/addons/l10n_do/data/l10n_do_wizard.xml old mode 100755 new mode 100644 diff --git a/addons/l10n_do/static/description/icon.png b/addons/l10n_do/static/description/icon.png old mode 100755 new mode 100644 diff --git a/addons/l10n_fr_hr_payroll/report/fiche_paye.py b/addons/l10n_fr_hr_payroll/report/fiche_paye.py old mode 100755 new mode 100644 diff --git a/addons/l10n_pl/account_chart.xml b/addons/l10n_pl/account_chart.xml old mode 100755 new mode 100644 diff --git a/addons/l10n_pl/account_tax.xml b/addons/l10n_pl/account_tax.xml old mode 100755 new mode 100644 diff --git a/addons/l10n_pl/account_tax_code.xml b/addons/l10n_pl/account_tax_code.xml old mode 100755 new mode 100644 diff --git a/addons/l10n_pl/country_pl.xml b/addons/l10n_pl/country_pl.xml old mode 100755 new mode 100644 diff --git a/addons/l10n_pl/fiscal_position.xml b/addons/l10n_pl/fiscal_position.xml old mode 100755 new mode 100644 diff --git a/addons/l10n_ro/__init__.py b/addons/l10n_ro/__init__.py old mode 100755 new mode 100644 diff --git a/addons/l10n_ro/__openerp__.py b/addons/l10n_ro/__openerp__.py old mode 100755 new mode 100644 diff --git a/addons/l10n_ro/account_chart.xml b/addons/l10n_ro/account_chart.xml old mode 100755 new mode 100644 diff --git a/addons/l10n_ro/account_chart_template.xml b/addons/l10n_ro/account_chart_template.xml old mode 100755 new mode 100644 diff --git a/addons/l10n_ro/account_tax_code_template.xml b/addons/l10n_ro/account_tax_code_template.xml old mode 100755 new mode 100644 diff --git a/addons/l10n_ro/account_tax_template.xml b/addons/l10n_ro/account_tax_template.xml old mode 100755 new mode 100644 diff --git a/addons/l10n_ro/fiscal_position_template.xml b/addons/l10n_ro/fiscal_position_template.xml old mode 100755 new mode 100644 diff --git a/addons/l10n_ro/partner_view.xml b/addons/l10n_ro/partner_view.xml old mode 100755 new mode 100644 diff --git a/addons/l10n_ro/res_partner.py b/addons/l10n_ro/res_partner.py old mode 100755 new mode 100644 diff --git a/addons/l10n_sg/static/description/icon.png b/addons/l10n_sg/static/description/icon.png old mode 100755 new mode 100644 diff --git a/addons/l10n_vn/account_chart.xml b/addons/l10n_vn/account_chart.xml old mode 100755 new mode 100644 diff --git a/addons/l10n_vn/account_tax.xml b/addons/l10n_vn/account_tax.xml old mode 100755 new mode 100644 diff --git a/addons/l10n_vn/account_tax_code.xml b/addons/l10n_vn/account_tax_code.xml old mode 100755 new mode 100644 diff --git a/addons/l10n_vn/l10n_vn_wizard.xml b/addons/l10n_vn/l10n_vn_wizard.xml old mode 100755 new mode 100644 diff --git a/addons/l10n_vn/static/description/icon.png b/addons/l10n_vn/static/description/icon.png old mode 100755 new mode 100644 diff --git a/addons/mrp/static/description/ebook-manufacturing.png b/addons/mrp/static/description/ebook-manufacturing.png new file mode 100644 index 00000000000..ab8a42c3ef8 Binary files /dev/null and b/addons/mrp/static/description/ebook-manufacturing.png differ diff --git a/addons/mrp/static/description/index.html b/addons/mrp/static/description/index.html index 997aa5538ec..23be339473f 100644 --- a/addons/mrp/static/description/index.html +++ b/addons/mrp/static/description/index.html @@ -98,7 +98,7 @@ meets your delivery schedule dates.
- +
Download our free E-book
diff --git a/addons/point_of_sale/static/description/ebook-manufacturing.png b/addons/point_of_sale/static/description/ebook-manufacturing.png new file mode 100644 index 00000000000..ab8a42c3ef8 Binary files /dev/null and b/addons/point_of_sale/static/description/ebook-manufacturing.png differ diff --git a/addons/point_of_sale/static/description/index.html b/addons/point_of_sale/static/description/index.html index 0460ef8935d..2dc99af7f4d 100644 --- a/addons/point_of_sale/static/description/index.html +++ b/addons/point_of_sale/static/description/index.html @@ -88,7 +88,7 @@
- +
Download our free E-book
diff --git a/addons/portal_sale/portal_sale_data.xml b/addons/portal_sale/portal_sale_data.xml index deb8281e826..cfacd6bd917 100644 --- a/addons/portal_sale/portal_sale_data.xml +++ b/addons/portal_sale/portal_sale_data.xml @@ -54,7 +54,7 @@

It is also possible to directly pay with Paypal:

- + % endif @@ -141,7 +141,7 @@

It is also possible to directly pay with Paypal:

- + % endif diff --git a/addons/product_email_template/data/product_demo.xml b/addons/product_email_template/data/product_demo.xml index ccb880d512f..1fce4851696 100644 --- a/addons/product_email_template/data/product_demo.xml +++ b/addons/product_email_template/data/product_demo.xml @@ -34,7 +34,7 @@
- + There are three components to the training diff --git a/addons/product_email_template/static/img/online_training.png b/addons/product_email_template/static/img/online_training.png new file mode 100644 index 00000000000..cc03d0d7c35 Binary files /dev/null and b/addons/product_email_template/static/img/online_training.png differ diff --git a/addons/purchase/static/description/ebook-logistic.png b/addons/purchase/static/description/ebook-logistic.png new file mode 100644 index 00000000000..849b711bf70 Binary files /dev/null and b/addons/purchase/static/description/ebook-logistic.png differ diff --git a/addons/purchase/static/description/index.html b/addons/purchase/static/description/index.html index c165adf5e0c..92dbca8cf4f 100644 --- a/addons/purchase/static/description/index.html +++ b/addons/purchase/static/description/index.html @@ -57,7 +57,7 @@ Launch purchase tenders, integrate supplier's answers in the process and compare
- +
Download our free E-book
diff --git a/addons/sale/edi/sale_order_action_data.xml b/addons/sale/edi/sale_order_action_data.xml index 80738147027..66735b3198b 100644 --- a/addons/sale/edi/sale_order_action_data.xml +++ b/addons/sale/edi/sale_order_action_data.xml @@ -58,7 +58,7 @@

It is also possible to directly pay with Paypal:

- + % endif diff --git a/addons/sale/static/description/ebook-marketing.png b/addons/sale/static/description/ebook-marketing.png new file mode 100644 index 00000000000..1a046d6ce80 Binary files /dev/null and b/addons/sale/static/description/ebook-marketing.png differ diff --git a/addons/sale/static/description/index.html b/addons/sale/static/description/index.html index ddcde0ef085..37b448c8f66 100644 --- a/addons/sale/static/description/index.html +++ b/addons/sale/static/description/index.html @@ -68,7 +68,7 @@ Spend the extra time focusing on selling, not recording data.
- +
Download our free E-book
diff --git a/addons/sale/static/img/btn_paynowcc_lg.gif b/addons/sale/static/img/btn_paynowcc_lg.gif new file mode 100644 index 00000000000..092c5542551 Binary files /dev/null and b/addons/sale/static/img/btn_paynowcc_lg.gif differ diff --git a/addons/web/doc/_themes/flask_small/layout.html b/addons/web/doc/_themes/flask_small/layout.html index aa1716aaff0..c5c44efe357 100644 --- a/addons/web/doc/_themes/flask_small/layout.html +++ b/addons/web/doc/_themes/flask_small/layout.html @@ -15,7 +15,7 @@ {% block relbar2 %} {% if theme_github_fork %} Fork me on GitHub + src="static/forkme_right_darkblue_121621.png" alt="Fork me on GitHub" /> {% endif %} {% endblock %} {% block sidebar1 %}{% endblock %} diff --git a/addons/web/doc/_themes/flask_small/static/forkme_right_darkblue_121621.png b/addons/web/doc/_themes/flask_small/static/forkme_right_darkblue_121621.png new file mode 100644 index 00000000000..146ef8a8006 Binary files /dev/null and b/addons/web/doc/_themes/flask_small/static/forkme_right_darkblue_121621.png differ diff --git a/addons/web/static/lib/qweb/qweb-test.js.html b/addons/web/static/lib/qweb/qweb-test.js.html index aac579d04fe..59f82d150ae 100644 --- a/addons/web/static/lib/qweb/qweb-test.js.html +++ b/addons/web/static/lib/qweb/qweb-test.js.html @@ -1,9 +1,9 @@ - - - + + + diff --git a/addons/web/static/src/font/mnmliconsv21-webfont.eot b/addons/web/static/src/font/mnmliconsv21-webfont.eot old mode 100755 new mode 100644 diff --git a/addons/web/static/src/font/mnmliconsv21-webfont.ttf b/addons/web/static/src/font/mnmliconsv21-webfont.ttf old mode 100755 new mode 100644 diff --git a/addons/web/static/src/font/mnmliconsv21-webfont.woff b/addons/web/static/src/font/mnmliconsv21-webfont.woff old mode 100755 new mode 100644 diff --git a/addons/web/static/src/img/k-waiting1.gif b/addons/web/static/src/img/k-waiting1.gif new file mode 100644 index 00000000000..b76cdfaac23 Binary files /dev/null and b/addons/web/static/src/img/k-waiting1.gif differ diff --git a/addons/web/static/src/img/k-waiting2.gif b/addons/web/static/src/img/k-waiting2.gif new file mode 100644 index 00000000000..b0b79e80830 Binary files /dev/null and b/addons/web/static/src/img/k-waiting2.gif differ diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 7e42441b877..c316eafbee5 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -1310,7 +1310,7 @@ instance.web.WebClient = instance.web.Client.extend({ $("body").css("background-image", "url(" + instance.session.origin + "/web/static/src/img/back-enable.jpg" + ")"); if ($.blockUI) { var imgkit = Math.floor(Math.random() * 2 + 1); - $.blockUI.defaults.message = ''; + $.blockUI.defaults.message = ''; } }, /** diff --git a/addons/website_blog/data/website_blog_demo.xml b/addons/website_blog/data/website_blog_demo.xml index 4ba4e4eeeb2..838d8d5a1ce 100644 --- a/addons/website_blog/data/website_blog_demo.xml +++ b/addons/website_blog/data/website_blog_demo.xml @@ -23,7 +23,6 @@ /website_blog/static/src/img/post1.jpg -

Emails are broken.

diff --git a/addons/website_quote/data/website_quotation_data.xml b/addons/website_quote/data/website_quotation_data.xml index 38bffdae3fa..40335af3dff 100644 --- a/addons/website_quote/data/website_quotation_data.xml +++ b/addons/website_quote/data/website_quotation_data.xml @@ -48,7 +48,7 @@

It is also possible to directly pay with Paypal:

- + % endif @@ -214,7 +214,7 @@

It is also possible to directly pay with Paypal:

- + % endif diff --git a/addons/website_quote/data/website_quotation_demo.xml b/addons/website_quote/data/website_quotation_demo.xml index ed7eeb97555..e5713db6363 100644 --- a/addons/website_quote/data/website_quotation_demo.xml +++ b/addons/website_quote/data/website_quotation_demo.xml @@ -275,7 +275,7 @@

Structure of the Training

- +

There are three components to the training

diff --git a/addons/website_quote/static/src/img/online_training.png b/addons/website_quote/static/src/img/online_training.png new file mode 100644 index 00000000000..cc03d0d7c35 Binary files /dev/null and b/addons/website_quote/static/src/img/online_training.png differ diff --git a/debian/control b/debian/control index 0ec394a6377..f6982ecc396 100644 --- a/debian/control +++ b/debian/control @@ -2,13 +2,14 @@ Source: odoo Section: net Priority: optional Maintainer: Odoo S.A. +Uploaders: Aaron Bohy , Simon Lejeune Build-Depends: debhelper (>= 9.0), python, rsync +X-Python-Version: 2.7 Standards-Version: 3.9.5.0 Homepage: http://www.odoo.com/ Vcs-Git: https://github.com/odoo/odoo Package: odoo -Section: net Architecture: all Depends: ${misc:Depends}, diff --git a/debian/copyright b/debian/copyright index 0866450aa9a..2fb0ad4b115 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,10 +1,8 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Contact: Odoo -Upstream-Homepage: http://www.odoo.com/ -Maintainer-Contact: Debian Odoo Maintainers -Maintainer-Homepage: http://www.odoo.com/ Files: * -Copyright: (C) 2004-2014 OpenERP SA. (www.openerp.com) +Copyright: (C) 2004-2015 Odoo SA. (www.odoo.com) License: AGPL-3+ This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by diff --git a/debian/init b/debian/init index ee4c0120db5..2a3a165dbee 100644 --- a/debian/init +++ b/debian/init @@ -1,18 +1,20 @@ #!/bin/bash ### BEGIN INIT INFO -# Provides: openerp-server +# Provides: odoo.py # Required-Start: $remote_fs $syslog # Required-Stop: $remote_fs $syslog # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 -# Short-Description: Start openerp daemon at boot time +# Short-Description: Start odoo daemon at boot time # Description: Enable service provided by daemon. # X-Interactive: true ### END INIT INFO ## more info: http://wiki.debian.org/LSBInitScripts +. /lib/lsb/init-functions + PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin -DAEMON=/usr/bin/openerp-server +DAEMON=/usr/bin/odoo.py NAME=odoo DESC=odoo CONFIG=/etc/odoo/openerp-server.conf diff --git a/openerp/addons/base/res/res_currency_data.xml b/openerp/addons/base/res/res_currency_data.xml index e2a2514cfe6..2a889f8965c 100644 --- a/openerp/addons/base/res/res_currency_data.xml +++ b/openerp/addons/base/res/res_currency_data.xml @@ -133,7 +133,7 @@ 14352.00 - 2010-01-01 + 2009-01-01 11796.39 @@ -2086,17 +2086,5 @@ 2010-01-01 - - - XOF - CFA - 1 - 4 - - - 655.957 - - 2010-01-01 - diff --git a/openerp/addons/base/static/img/logo_white.png b/openerp/addons/base/static/img/logo_white.png new file mode 100644 index 00000000000..84335cbf5cc Binary files /dev/null and b/openerp/addons/base/static/img/logo_white.png differ diff --git a/openerp/report/render/rml2pdf/trml2pdf.py b/openerp/report/render/rml2pdf/trml2pdf.py index 6293b542547..463bcc88ae5 100644 --- a/openerp/report/render/rml2pdf/trml2pdf.py +++ b/openerp/report/render/rml2pdf/trml2pdf.py @@ -780,15 +780,10 @@ class _rml_flowable(object): style = self.styles.para_style_get(node) if extra_style: style.__dict__.update(extra_style) - result = [] - tag_text = '' - plain_text = '' - for i in self._textual(node).split('\n'): - instance = platypus.Paragraph(i, style, **(utils.attr_get(node, [], {'bulletText':'str'}))) - plain_text += instance.getPlainText().strip() - tag_text += instance.text.strip() - result.append(instance) - if LooseVersion(reportlab.Version) > LooseVersion('3.0') and not plain_text and tag_text: + text_node = self._textual(node).strip().replace('\n\n', '\n').replace('\n', '
') + instance = platypus.Paragraph(text_node, style, **(utils.attr_get(node, [], {'bulletText':'str'}))) + result = [instance] + if LooseVersion(reportlab.Version) > LooseVersion('3.0') and not instance.getPlainText().strip() and instance.text.strip(): result.append(platypus.Paragraph(' 
', style, **(utils.attr_get(node, [], {'bulletText': 'str'})))) return result elif node.tag=='barCode': diff --git a/setup/package.py b/setup/package.py index ce0db21bcf9..9ca97d19dd9 100755 --- a/setup/package.py +++ b/setup/package.py @@ -50,6 +50,9 @@ PUBLISH_DIRS = { 'tarball': 'src', 'windows': 'exe', } +ADDONS_NOT_TO_PUBLISH = [ + 'web_analytics' +] def mkdir(d): if not os.path.isdir(d): @@ -238,11 +241,14 @@ class KVMWinTestExe(KVM): #---------------------------------------------------------- # Stage: building #---------------------------------------------------------- -def _prepare_build_dir(o): +def _prepare_build_dir(o, win32=False): cmd = ['rsync', '-a', '--exclude', '.git', '--exclude', '*.pyc', '--exclude', '*.pyo'] + if not win32: + cmd += ['--exclude', 'setup/win32'] system(cmd + ['%s/' % o.odoo_dir, o.build_dir]) for i in glob(join(o.build_dir, 'addons/*')): - shutil.move(i, join(o.build_dir, 'openerp/addons')) + if i.split(os.path.sep)[-1] not in ADDONS_NOT_TO_PUBLISH: + shutil.move(i, join(o.build_dir, 'openerp/addons')) def build_tgz(o): system(['python2', 'setup.py', 'sdist', '--quiet', '--formats=gztar,zip'], o.build_dir) @@ -454,6 +460,7 @@ def main(): except Exception, e: print("Won't publish the rpm release.\n Exception: %s" % str(e)) if not o.no_windows: + _prepare_build_dir(o, win32=True) build_exe(o) try: if not o.no_testing: