summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe Simonis <KangOl@users.noreply.github.com>2015-01-23 11:53:36 +0100
committerChristophe Simonis <KangOl@users.noreply.github.com>2015-01-23 11:53:36 +0100
commita3bcadd5f16bd8d0005eaba65f353cc2ac7d738e (patch)
treee8cc08719b7f549eafe8543bc876ee41a4fa99c4
parent373539425e268f41d7d74e3f4e6f9d622863dcd4 (diff)
parent3cae676619a1ed20ffe264ab06b8fc9e4b1b51ce (diff)
Merge pull request #4860 from odoo-dev/8.0-deb-packaging-aab
8.0 - Various fixes for Debian Packaging
-rw-r--r--MANIFEST.in3
-rw-r--r--addons/account/edi/invoice_action_data.xml2
-rw-r--r--addons/account/static/src/img/btn_paynowcc_lg.gifbin0 -> 2916 bytes
-rw-r--r--[-rwxr-xr-x]addons/account_asset/i18n/ca.po0
-rw-r--r--[-rwxr-xr-x]addons/account_asset/i18n/de.po0
-rw-r--r--[-rwxr-xr-x]addons/account_asset/i18n/es.po0
-rw-r--r--[-rwxr-xr-x]addons/account_asset/i18n/es_CR.po0
-rw-r--r--[-rwxr-xr-x]addons/account_asset/i18n/fr.po0
-rw-r--r--[-rwxr-xr-x]addons/account_asset/i18n/fr_BE.po0
-rw-r--r--[-rwxr-xr-x]addons/account_asset/i18n/pl.po0
-rw-r--r--[-rwxr-xr-x]addons/account_asset/i18n/pt.po0
-rw-r--r--[-rwxr-xr-x]addons/account_asset/i18n/sv.po0
-rw-r--r--addons/event_sale/event_demo.xml2
-rw-r--r--[-rwxr-xr-x]addons/im_chat/static/src/img/button-gloss.pngbin74 -> 74 bytes
-rw-r--r--[-rwxr-xr-x]addons/im_chat/static/src/img/glyphicons-halflings-white.pngbin8777 -> 8777 bytes
-rw-r--r--[-rwxr-xr-x]addons/im_chat/static/src/img/glyphicons-halflings.pngbin12799 -> 12799 bytes
-rw-r--r--[-rwxr-xr-x]addons/l10n_ae/static/description/icon.pngbin3162 -> 3162 bytes
-rw-r--r--[-rwxr-xr-x]addons/l10n_do/__init__.py0
-rw-r--r--[-rwxr-xr-x]addons/l10n_do/__openerp__.py0
-rw-r--r--[-rwxr-xr-x]addons/l10n_do/data/account.account.template.csv0
-rw-r--r--[-rwxr-xr-x]addons/l10n_do/data/account.account.type.csv0
-rw-r--r--[-rwxr-xr-x]addons/l10n_do/data/account.fiscal.position.tax.template.csv0
-rw-r--r--[-rwxr-xr-x]addons/l10n_do/data/account.fiscal.position.template.csv0
-rw-r--r--[-rwxr-xr-x]addons/l10n_do/data/account.tax.code.template.csv0
-rw-r--r--[-rwxr-xr-x]addons/l10n_do/data/account.tax.template.csv0
-rw-r--r--[-rwxr-xr-x]addons/l10n_do/data/account_chart_template.xml0
-rw-r--r--[-rwxr-xr-x]addons/l10n_do/data/account_journal.xml0
-rw-r--r--[-rwxr-xr-x]addons/l10n_do/data/ir_sequence.xml0
-rw-r--r--[-rwxr-xr-x]addons/l10n_do/data/ir_sequence_type.xml0
-rw-r--r--[-rwxr-xr-x]addons/l10n_do/data/l10n_do_base_data.xml0
-rw-r--r--[-rwxr-xr-x]addons/l10n_do/data/l10n_do_wizard.xml0
-rw-r--r--[-rwxr-xr-x]addons/l10n_do/static/description/icon.pngbin9278 -> 9278 bytes
-rw-r--r--[-rwxr-xr-x]addons/l10n_fr_hr_payroll/report/fiche_paye.py0
-rw-r--r--[-rwxr-xr-x]addons/l10n_pl/account_chart.xml0
-rw-r--r--[-rwxr-xr-x]addons/l10n_pl/account_tax.xml0
-rw-r--r--[-rwxr-xr-x]addons/l10n_pl/account_tax_code.xml0
-rw-r--r--[-rwxr-xr-x]addons/l10n_pl/country_pl.xml0
-rw-r--r--[-rwxr-xr-x]addons/l10n_pl/fiscal_position.xml0
-rw-r--r--[-rwxr-xr-x]addons/l10n_ro/__init__.py0
-rw-r--r--[-rwxr-xr-x]addons/l10n_ro/__openerp__.py0
-rw-r--r--[-rwxr-xr-x]addons/l10n_ro/account_chart.xml0
-rw-r--r--[-rwxr-xr-x]addons/l10n_ro/account_chart_template.xml0
-rw-r--r--[-rwxr-xr-x]addons/l10n_ro/account_tax_code_template.xml0
-rw-r--r--[-rwxr-xr-x]addons/l10n_ro/account_tax_template.xml0
-rw-r--r--[-rwxr-xr-x]addons/l10n_ro/fiscal_position_template.xml0
-rw-r--r--[-rwxr-xr-x]addons/l10n_ro/partner_view.xml0
-rw-r--r--[-rwxr-xr-x]addons/l10n_ro/res_partner.py0
-rw-r--r--[-rwxr-xr-x]addons/l10n_sg/static/description/icon.pngbin5290 -> 5290 bytes
-rw-r--r--[-rwxr-xr-x]addons/l10n_vn/account_chart.xml0
-rw-r--r--[-rwxr-xr-x]addons/l10n_vn/account_tax.xml0
-rw-r--r--[-rwxr-xr-x]addons/l10n_vn/account_tax_code.xml0
-rw-r--r--[-rwxr-xr-x]addons/l10n_vn/l10n_vn_wizard.xml0
-rw-r--r--[-rwxr-xr-x]addons/l10n_vn/static/description/icon.pngbin4196 -> 4196 bytes
-rw-r--r--addons/mrp/static/description/ebook-manufacturing.pngbin0 -> 48558 bytes
-rw-r--r--addons/mrp/static/description/index.html2
-rw-r--r--addons/point_of_sale/static/description/ebook-manufacturing.pngbin0 -> 48558 bytes
-rw-r--r--addons/point_of_sale/static/description/index.html2
-rw-r--r--[-rwxr-xr-x]addons/point_of_sale/static/src/fonts/font-awesome-4.0.3/fonts/fontawesome-webfont.eotbin38205 -> 38205 bytes
-rw-r--r--[-rwxr-xr-x]addons/point_of_sale/static/src/fonts/font-awesome-4.0.3/fonts/fontawesome-webfont.svg0
-rw-r--r--[-rwxr-xr-x]addons/point_of_sale/static/src/fonts/font-awesome-4.0.3/fonts/fontawesome-webfont.ttfbin80652 -> 80652 bytes
-rw-r--r--[-rwxr-xr-x]addons/point_of_sale/static/src/fonts/font-awesome-4.0.3/fonts/fontawesome-webfont.woffbin44432 -> 44432 bytes
-rw-r--r--addons/portal_sale/portal_sale_data.xml4
-rw-r--r--addons/product_email_template/data/product_demo.xml2
-rw-r--r--addons/product_email_template/static/img/online_training.pngbin0 -> 11682 bytes
-rw-r--r--addons/purchase/static/description/ebook-logistic.pngbin0 -> 48565 bytes
-rw-r--r--addons/purchase/static/description/index.html2
-rw-r--r--addons/sale/edi/sale_order_action_data.xml2
-rw-r--r--addons/sale/static/description/ebook-marketing.pngbin0 -> 69921 bytes
-rw-r--r--addons/sale/static/description/index.html2
-rw-r--r--addons/sale/static/img/btn_paynowcc_lg.gifbin0 -> 2916 bytes
-rw-r--r--addons/web/doc/_themes/flask_small/layout.html2
-rw-r--r--addons/web/doc/_themes/flask_small/static/forkme_right_darkblue_121621.pngbin0 -> 7791 bytes
-rw-r--r--[-rwxr-xr-x]addons/web/static/lib/fontawesome/fonts/fontawesome-webfont.eotbin56006 -> 56006 bytes
-rw-r--r--[-rwxr-xr-x]addons/web/static/lib/fontawesome/fonts/fontawesome-webfont.svg0
-rw-r--r--[-rwxr-xr-x]addons/web/static/lib/fontawesome/fonts/fontawesome-webfont.ttfbin112160 -> 112160 bytes
-rw-r--r--[-rwxr-xr-x]addons/web/static/lib/fontawesome/fonts/fontawesome-webfont.woffbin65452 -> 65452 bytes
-rw-r--r--addons/web/static/lib/qweb/qweb-test.js.html6
-rw-r--r--[-rwxr-xr-x]addons/web/static/src/font/entypo-webfont.eotbin29428 -> 29428 bytes
-rw-r--r--[-rwxr-xr-x]addons/web/static/src/font/entypo-webfont.ttfbin29264 -> 29264 bytes
-rw-r--r--[-rwxr-xr-x]addons/web/static/src/font/entypo-webfont.woffbin18772 -> 18772 bytes
-rw-r--r--[-rwxr-xr-x]addons/web/static/src/font/mnmliconsv21-webfont.eotbin24173 -> 24173 bytes
-rw-r--r--[-rwxr-xr-x]addons/web/static/src/font/mnmliconsv21-webfont.ttfbin39912 -> 39912 bytes
-rw-r--r--[-rwxr-xr-x]addons/web/static/src/font/mnmliconsv21-webfont.woffbin26348 -> 26348 bytes
-rw-r--r--addons/web/static/src/img/k-waiting1.gifbin0 -> 29257 bytes
-rw-r--r--addons/web/static/src/img/k-waiting2.gifbin0 -> 276059 bytes
-rw-r--r--addons/web/static/src/js/chrome.js2
-rw-r--r--addons/website/static/src/img/bootswatch/amelia_thumbnail.pngbin0 -> 27258 bytes
-rw-r--r--addons/website/static/src/img/bootswatch/bootswatch_default_thumbnail.png (renamed from addons/website/static/src/img/bootswatch_default_thumbnail.png)bin6219 -> 6219 bytes
-rw-r--r--addons/website/static/src/img/bootswatch/cerulean_thumbnail.pngbin0 -> 38843 bytes
-rw-r--r--addons/website/static/src/img/bootswatch/cosmo_thumbnail.pngbin0 -> 22825 bytes
-rw-r--r--addons/website/static/src/img/bootswatch/cyborg_thumbnail.pngbin0 -> 25410 bytes
-rw-r--r--addons/website/static/src/img/bootswatch/flatly_thumbnail.pngbin0 -> 24089 bytes
-rw-r--r--addons/website/static/src/img/bootswatch/journal_thumbnail.pngbin0 -> 27152 bytes
-rw-r--r--addons/website/static/src/img/bootswatch/readable_thumbnail.pngbin0 -> 28365 bytes
-rw-r--r--addons/website/static/src/img/bootswatch/simplex_thumbnail.pngbin0 -> 26736 bytes
-rw-r--r--addons/website/static/src/img/bootswatch/slate_thumbnail.pngbin0 -> 56970 bytes
-rw-r--r--addons/website/static/src/img/bootswatch/spacelab_thumbnail.pngbin0 -> 37531 bytes
-rw-r--r--addons/website/static/src/img/bootswatch/united_thumbnail.pngbin0 -> 23115 bytes
-rw-r--r--addons/website/static/src/img/bootswatch/yeti_thumbnail.pngbin0 -> 20421 bytes
-rw-r--r--addons/website/views/themes.xml26
-rw-r--r--addons/website_blog/data/website_blog_demo.xml1
-rw-r--r--addons/website_quote/data/website_quotation_data.xml4
-rw-r--r--addons/website_quote/data/website_quotation_demo.xml2
-rw-r--r--addons/website_quote/static/src/img/online_training.pngbin0 -> 11682 bytes
-rw-r--r--debian/control3
-rw-r--r--debian/copyright6
-rw-r--r--debian/init8
-rw-r--r--openerp/addons/base/static/img/logo_white.pngbin0 -> 7321 bytes
-rwxr-xr-xsetup/package.py11
109 files changed, 51 insertions, 43 deletions
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 766db9e1a99..938e5e67127 100644
--- a/addons/account/edi/invoice_action_data.xml
+++ b/addons/account/edi/invoice_action_data.xml
@@ -54,7 +54,7 @@
<br/>
<p>It is also possible to directly pay with Paypal:</p>
<a style="margin-left: 120px;" href="${object.paypal_url}">
- <img class="oe_edi_paypal_button" src="https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif"/>
+ <img class="oe_edi_paypal_button" src="/account/static/src/img/btn_paynowcc_lg.gif"/>
</a>
% endif
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
--- /dev/null
+++ b/addons/account/static/src/img/btn_paynowcc_lg.gif
Binary files differ
diff --git a/addons/account_asset/i18n/ca.po b/addons/account_asset/i18n/ca.po
index 821a329256b..821a329256b 100755..100644
--- a/addons/account_asset/i18n/ca.po
+++ b/addons/account_asset/i18n/ca.po
diff --git a/addons/account_asset/i18n/de.po b/addons/account_asset/i18n/de.po
index cf17a1b8be6..cf17a1b8be6 100755..100644
--- a/addons/account_asset/i18n/de.po
+++ b/addons/account_asset/i18n/de.po
diff --git a/addons/account_asset/i18n/es.po b/addons/account_asset/i18n/es.po
index d950281e6e6..d950281e6e6 100755..100644
--- a/addons/account_asset/i18n/es.po
+++ b/addons/account_asset/i18n/es.po
diff --git a/addons/account_asset/i18n/es_CR.po b/addons/account_asset/i18n/es_CR.po
index c44aa7b3956..c44aa7b3956 100755..100644
--- a/addons/account_asset/i18n/es_CR.po
+++ b/addons/account_asset/i18n/es_CR.po
diff --git a/addons/account_asset/i18n/fr.po b/addons/account_asset/i18n/fr.po
index 3fe54af8562..3fe54af8562 100755..100644
--- a/addons/account_asset/i18n/fr.po
+++ b/addons/account_asset/i18n/fr.po
diff --git a/addons/account_asset/i18n/fr_BE.po b/addons/account_asset/i18n/fr_BE.po
index 4aa2d9d3f00..4aa2d9d3f00 100755..100644
--- a/addons/account_asset/i18n/fr_BE.po
+++ b/addons/account_asset/i18n/fr_BE.po
diff --git a/addons/account_asset/i18n/pl.po b/addons/account_asset/i18n/pl.po
index 38ee640d704..38ee640d704 100755..100644
--- a/addons/account_asset/i18n/pl.po
+++ b/addons/account_asset/i18n/pl.po
diff --git a/addons/account_asset/i18n/pt.po b/addons/account_asset/i18n/pt.po
index 1897f308600..1897f308600 100755..100644
--- a/addons/account_asset/i18n/pt.po
+++ b/addons/account_asset/i18n/pt.po
diff --git a/addons/account_asset/i18n/sv.po b/addons/account_asset/i18n/sv.po
index 760b5bc1a26..760b5bc1a26 100755..100644
--- a/addons/account_asset/i18n/sv.po
+++ b/addons/account_asset/i18n/sv.po
diff --git a/addons/event_sale/event_demo.xml b/addons/event_sale/event_demo.xml
index 8a55172cd85..fc13d0feb9f 100644
--- a/addons/event_sale/event_demo.xml
+++ b/addons/event_sale/event_demo.xml
@@ -160,7 +160,7 @@
<small class="col-xs-3" style="float: left; padding-right: 0px; padding-left: 0px;">sponsored by</small>
<div class="col-xs-2" style="padding-right: 0px; padding-left: 0px;">
<span>
- <img class="img img-responsive" src="https://www.odoo.com/openerp_website/static/src/img/logo_white.png"/>
+ <img class="img img-responsive" src="/base/static/img/logo_white.png"/>
</span>
</div>
</div>
diff --git a/addons/im_chat/static/src/img/button-gloss.png b/addons/im_chat/static/src/img/button-gloss.png
index 6f3957702fe..6f3957702fe 100755..100644
--- a/addons/im_chat/static/src/img/button-gloss.png
+++ b/addons/im_chat/static/src/img/button-gloss.png
Binary files differ
diff --git a/addons/im_chat/static/src/img/glyphicons-halflings-white.png b/addons/im_chat/static/src/img/glyphicons-halflings-white.png
index 3bf6484a29d..3bf6484a29d 100755..100644
--- a/addons/im_chat/static/src/img/glyphicons-halflings-white.png
+++ b/addons/im_chat/static/src/img/glyphicons-halflings-white.png
Binary files differ
diff --git a/addons/im_chat/static/src/img/glyphicons-halflings.png b/addons/im_chat/static/src/img/glyphicons-halflings.png
index a9969993201..a9969993201 100755..100644
--- a/addons/im_chat/static/src/img/glyphicons-halflings.png
+++ b/addons/im_chat/static/src/img/glyphicons-halflings.png
Binary files differ
diff --git a/addons/l10n_ae/static/description/icon.png b/addons/l10n_ae/static/description/icon.png
index 1897a0e8bdd..1897a0e8bdd 100755..100644
--- a/addons/l10n_ae/static/description/icon.png
+++ b/addons/l10n_ae/static/description/icon.png
Binary files differ
diff --git a/addons/l10n_do/__init__.py b/addons/l10n_do/__init__.py
index 0a52ab3d290..0a52ab3d290 100755..100644
--- a/addons/l10n_do/__init__.py
+++ b/addons/l10n_do/__init__.py
diff --git a/addons/l10n_do/__openerp__.py b/addons/l10n_do/__openerp__.py
index ab97ea4f86b..ab97ea4f86b 100755..100644
--- a/addons/l10n_do/__openerp__.py
+++ b/addons/l10n_do/__openerp__.py
diff --git a/addons/l10n_do/data/account.account.template.csv b/addons/l10n_do/data/account.account.template.csv
index 9dccba4a9c0..9dccba4a9c0 100755..100644
--- a/addons/l10n_do/data/account.account.template.csv
+++ b/addons/l10n_do/data/account.account.template.csv
diff --git a/addons/l10n_do/data/account.account.type.csv b/addons/l10n_do/data/account.account.type.csv
index 3c43a2cd70e..3c43a2cd70e 100755..100644
--- a/addons/l10n_do/data/account.account.type.csv
+++ b/addons/l10n_do/data/account.account.type.csv
diff --git a/addons/l10n_do/data/account.fiscal.position.tax.template.csv b/addons/l10n_do/data/account.fiscal.position.tax.template.csv
index 8d0f2b6590d..8d0f2b6590d 100755..100644
--- a/addons/l10n_do/data/account.fiscal.position.tax.template.csv
+++ b/addons/l10n_do/data/account.fiscal.position.tax.template.csv
diff --git a/addons/l10n_do/data/account.fiscal.position.template.csv b/addons/l10n_do/data/account.fiscal.position.template.csv
index 926f8f2f915..926f8f2f915 100755..100644
--- a/addons/l10n_do/data/account.fiscal.position.template.csv
+++ b/addons/l10n_do/data/account.fiscal.position.template.csv
diff --git a/addons/l10n_do/data/account.tax.code.template.csv b/addons/l10n_do/data/account.tax.code.template.csv
index 8f862e17db2..8f862e17db2 100755..100644
--- a/addons/l10n_do/data/account.tax.code.template.csv
+++ b/addons/l10n_do/data/account.tax.code.template.csv
diff --git a/addons/l10n_do/data/account.tax.template.csv b/addons/l10n_do/data/account.tax.template.csv
index f483e0d6b6e..f483e0d6b6e 100755..100644
--- a/addons/l10n_do/data/account.tax.template.csv
+++ b/addons/l10n_do/data/account.tax.template.csv
diff --git a/addons/l10n_do/data/account_chart_template.xml b/addons/l10n_do/data/account_chart_template.xml
index 44c27fe294e..44c27fe294e 100755..100644
--- a/addons/l10n_do/data/account_chart_template.xml
+++ b/addons/l10n_do/data/account_chart_template.xml
diff --git a/addons/l10n_do/data/account_journal.xml b/addons/l10n_do/data/account_journal.xml
index 8319ae3bfb2..8319ae3bfb2 100755..100644
--- a/addons/l10n_do/data/account_journal.xml
+++ b/addons/l10n_do/data/account_journal.xml
diff --git a/addons/l10n_do/data/ir_sequence.xml b/addons/l10n_do/data/ir_sequence.xml
index 746fb8a31b7..746fb8a31b7 100755..100644
--- a/addons/l10n_do/data/ir_sequence.xml
+++ b/addons/l10n_do/data/ir_sequence.xml
diff --git a/addons/l10n_do/data/ir_sequence_type.xml b/addons/l10n_do/data/ir_sequence_type.xml
index 414876d173d..414876d173d 100755..100644
--- a/addons/l10n_do/data/ir_sequence_type.xml
+++ b/addons/l10n_do/data/ir_sequence_type.xml
diff --git a/addons/l10n_do/data/l10n_do_base_data.xml b/addons/l10n_do/data/l10n_do_base_data.xml
index aca3eeb785d..aca3eeb785d 100755..100644
--- a/addons/l10n_do/data/l10n_do_base_data.xml
+++ b/addons/l10n_do/data/l10n_do_base_data.xml
diff --git a/addons/l10n_do/data/l10n_do_wizard.xml b/addons/l10n_do/data/l10n_do_wizard.xml
index dde7a77516a..dde7a77516a 100755..100644
--- a/addons/l10n_do/data/l10n_do_wizard.xml
+++ b/addons/l10n_do/data/l10n_do_wizard.xml
diff --git a/addons/l10n_do/static/description/icon.png b/addons/l10n_do/static/description/icon.png
index 73ece6e47a8..73ece6e47a8 100755..100644
--- a/addons/l10n_do/static/description/icon.png
+++ b/addons/l10n_do/static/description/icon.png
Binary files differ
diff --git a/addons/l10n_fr_hr_payroll/report/fiche_paye.py b/addons/l10n_fr_hr_payroll/report/fiche_paye.py
index 18eb7f30b8a..18eb7f30b8a 100755..100644
--- a/addons/l10n_fr_hr_payroll/report/fiche_paye.py
+++ b/addons/l10n_fr_hr_payroll/report/fiche_paye.py
diff --git a/addons/l10n_pl/account_chart.xml b/addons/l10n_pl/account_chart.xml
index 2937950e442..2937950e442 100755..100644
--- a/addons/l10n_pl/account_chart.xml
+++ b/addons/l10n_pl/account_chart.xml
diff --git a/addons/l10n_pl/account_tax.xml b/addons/l10n_pl/account_tax.xml
index ebf7a301181..ebf7a301181 100755..100644
--- a/addons/l10n_pl/account_tax.xml
+++ b/addons/l10n_pl/account_tax.xml
diff --git a/addons/l10n_pl/account_tax_code.xml b/addons/l10n_pl/account_tax_code.xml
index d0b5c6dbaf3..d0b5c6dbaf3 100755..100644
--- a/addons/l10n_pl/account_tax_code.xml
+++ b/addons/l10n_pl/account_tax_code.xml
diff --git a/addons/l10n_pl/country_pl.xml b/addons/l10n_pl/country_pl.xml
index 0b3d45c6d15..0b3d45c6d15 100755..100644
--- a/addons/l10n_pl/country_pl.xml
+++ b/addons/l10n_pl/country_pl.xml
diff --git a/addons/l10n_pl/fiscal_position.xml b/addons/l10n_pl/fiscal_position.xml
index 46627c60cd5..46627c60cd5 100755..100644
--- a/addons/l10n_pl/fiscal_position.xml
+++ b/addons/l10n_pl/fiscal_position.xml
diff --git a/addons/l10n_ro/__init__.py b/addons/l10n_ro/__init__.py
index d761bca4a7f..d761bca4a7f 100755..100644
--- a/addons/l10n_ro/__init__.py
+++ b/addons/l10n_ro/__init__.py
diff --git a/addons/l10n_ro/__openerp__.py b/addons/l10n_ro/__openerp__.py
index 83a6b468469..83a6b468469 100755..100644
--- a/addons/l10n_ro/__openerp__.py
+++ b/addons/l10n_ro/__openerp__.py
diff --git a/addons/l10n_ro/account_chart.xml b/addons/l10n_ro/account_chart.xml
index 2f5dee7e9a3..2f5dee7e9a3 100755..100644
--- a/addons/l10n_ro/account_chart.xml
+++ b/addons/l10n_ro/account_chart.xml
diff --git a/addons/l10n_ro/account_chart_template.xml b/addons/l10n_ro/account_chart_template.xml
index 37215b5bbef..37215b5bbef 100755..100644
--- a/addons/l10n_ro/account_chart_template.xml
+++ b/addons/l10n_ro/account_chart_template.xml
diff --git a/addons/l10n_ro/account_tax_code_template.xml b/addons/l10n_ro/account_tax_code_template.xml
index 4ebf9b546b3..4ebf9b546b3 100755..100644
--- a/addons/l10n_ro/account_tax_code_template.xml
+++ b/addons/l10n_ro/account_tax_code_template.xml
diff --git a/addons/l10n_ro/account_tax_template.xml b/addons/l10n_ro/account_tax_template.xml
index f908368214b..f908368214b 100755..100644
--- a/addons/l10n_ro/account_tax_template.xml
+++ b/addons/l10n_ro/account_tax_template.xml
diff --git a/addons/l10n_ro/fiscal_position_template.xml b/addons/l10n_ro/fiscal_position_template.xml
index e46fa8786f2..e46fa8786f2 100755..100644
--- a/addons/l10n_ro/fiscal_position_template.xml
+++ b/addons/l10n_ro/fiscal_position_template.xml
diff --git a/addons/l10n_ro/partner_view.xml b/addons/l10n_ro/partner_view.xml
index 46c0cef1149..46c0cef1149 100755..100644
--- a/addons/l10n_ro/partner_view.xml
+++ b/addons/l10n_ro/partner_view.xml
diff --git a/addons/l10n_ro/res_partner.py b/addons/l10n_ro/res_partner.py
index 89226125157..89226125157 100755..100644
--- a/addons/l10n_ro/res_partner.py
+++ b/addons/l10n_ro/res_partner.py
diff --git a/addons/l10n_sg/static/description/icon.png b/addons/l10n_sg/static/description/icon.png
index 3204140dd03..3204140dd03 100755..100644
--- a/addons/l10n_sg/static/description/icon.png
+++ b/addons/l10n_sg/static/description/icon.png
Binary files differ
diff --git a/addons/l10n_vn/account_chart.xml b/addons/l10n_vn/account_chart.xml
index 4f7a5d90a49..4f7a5d90a49 100755..100644
--- a/addons/l10n_vn/account_chart.xml
+++ b/addons/l10n_vn/account_chart.xml
diff --git a/addons/l10n_vn/account_tax.xml b/addons/l10n_vn/account_tax.xml
index 85f068023c2..85f068023c2 100755..100644
--- a/addons/l10n_vn/account_tax.xml
+++ b/addons/l10n_vn/account_tax.xml
diff --git a/addons/l10n_vn/account_tax_code.xml b/addons/l10n_vn/account_tax_code.xml
index 4f3aee1bfc6..4f3aee1bfc6 100755..100644
--- a/addons/l10n_vn/account_tax_code.xml
+++ b/addons/l10n_vn/account_tax_code.xml
diff --git a/addons/l10n_vn/l10n_vn_wizard.xml b/addons/l10n_vn/l10n_vn_wizard.xml
index 368a3cbd8b3..368a3cbd8b3 100755..100644
--- a/addons/l10n_vn/l10n_vn_wizard.xml
+++ b/addons/l10n_vn/l10n_vn_wizard.xml
diff --git a/addons/l10n_vn/static/description/icon.png b/addons/l10n_vn/static/description/icon.png
index 241a2d3fa74..241a2d3fa74 100755..100644
--- a/addons/l10n_vn/static/description/icon.png
+++ b/addons/l10n_vn/static/description/icon.png
Binary files differ
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
--- /dev/null
+++ b/addons/mrp/static/description/ebook-manufacturing.png
Binary files 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.
<section class="oe_container oe_centeralign oe_padded oe_mb32">
<div class='oe_cover'>
- <img src="http://www.openerp.com/ebooks/manufacturing.png">
+ <img src="/mrp/static/description/ebook-manufacturing.png">
</div>
<a href="http://www.openerp.com/ebooks/manufacturing" target="_blank" class="oe_button oe_big">Download our free E-book</a>
</section>
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
--- /dev/null
+++ b/addons/point_of_sale/static/description/ebook-manufacturing.png
Binary files 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 @@
<section class="oe_container oe_centeralign oe_padded oe_mb32">
<div class='oe_cover'>
- <img src="http://www.openerp.com/ebooks/manufacturing.png">
+ <img src="/point_of_sale/static/description/ebook-manufacturing.png">
</div>
<a href="http://www.openerp.com/ebooks/manufacturing" target="_blank" class="oe_button oe_big">Download our free E-book</a>
</section>
diff --git a/addons/point_of_sale/static/src/fonts/font-awesome-4.0.3/fonts/fontawesome-webfont.eot b/addons/point_of_sale/static/src/fonts/font-awesome-4.0.3/fonts/fontawesome-webfont.eot
index 7c79c6a6bc9..7c79c6a6bc9 100755..100644
--- a/addons/point_of_sale/static/src/fonts/font-awesome-4.0.3/fonts/fontawesome-webfont.eot
+++ b/addons/point_of_sale/static/src/fonts/font-awesome-4.0.3/fonts/fontawesome-webfont.eot
Binary files differ
diff --git a/addons/point_of_sale/static/src/fonts/font-awesome-4.0.3/fonts/fontawesome-webfont.svg b/addons/point_of_sale/static/src/fonts/font-awesome-4.0.3/fonts/fontawesome-webfont.svg
index 45fdf338301..45fdf338301 100755..100644
--- a/addons/point_of_sale/static/src/fonts/font-awesome-4.0.3/fonts/fontawesome-webfont.svg
+++ b/addons/point_of_sale/static/src/fonts/font-awesome-4.0.3/fonts/fontawesome-webfont.svg
diff --git a/addons/point_of_sale/static/src/fonts/font-awesome-4.0.3/fonts/fontawesome-webfont.ttf b/addons/point_of_sale/static/src/fonts/font-awesome-4.0.3/fonts/fontawesome-webfont.ttf
index e89738de5ea..e89738de5ea 100755..100644
--- a/addons/point_of_sale/static/src/fonts/font-awesome-4.0.3/fonts/fontawesome-webfont.ttf
+++ b/addons/point_of_sale/static/src/fonts/font-awesome-4.0.3/fonts/fontawesome-webfont.ttf
Binary files differ
diff --git a/addons/point_of_sale/static/src/fonts/font-awesome-4.0.3/fonts/fontawesome-webfont.woff b/addons/point_of_sale/static/src/fonts/font-awesome-4.0.3/fonts/fontawesome-webfont.woff
index 8c1748aab7a..8c1748aab7a 100755..100644
--- a/addons/point_of_sale/static/src/fonts/font-awesome-4.0.3/fonts/fontawesome-webfont.woff
+++ b/addons/point_of_sale/static/src/fonts/font-awesome-4.0.3/fonts/fontawesome-webfont.woff
Binary files differ
diff --git a/addons/portal_sale/portal_sale_data.xml b/addons/portal_sale/portal_sale_data.xml
index 9deab37d07b..cd1bce6c4fc 100644
--- a/addons/portal_sale/portal_sale_data.xml
+++ b/addons/portal_sale/portal_sale_data.xml
@@ -51,7 +51,7 @@
<br/>
<p>It is also possible to directly pay with Paypal:</p>
<a style="margin-left: 120px;" href="${object.paypal_url}">
- <img class="oe_edi_paypal_button" src="https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif"/>
+ <img class="oe_edi_paypal_button" src="/sale/static/img/btn_paynowcc_lg.gif"/>
</a>
% endif
@@ -138,7 +138,7 @@
<br/>
<p>It is also possible to directly pay with Paypal:</p>
<a style="margin-left: 120px;" href="${object.paypal_url}">
- <img class="oe_edi_paypal_button" src="https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif"/>
+ <img class="oe_edi_paypal_button" src="/sale/static/img/btn_paynowcc_lg.gif"/>
</a>
% endif
diff --git a/addons/product_email_template/data/product_demo.xml b/addons/product_email_template/data/product_demo.xml
index d7c24dc97fe..87c2607332d 100644
--- a/addons/product_email_template/data/product_demo.xml
+++ b/addons/product_email_template/data/product_demo.xml
@@ -34,7 +34,7 @@
<table>
<tr>
<td>
- <img src="https://www.openerp.com/saas_master/static/site_new/img/layout/online_training.png"/>
+ <img src="/product_email_template/static/img/online_training.png"/>
</td>
<td style="height: auto;margin-top:10px;margin-bottom:10px;font-size:18px;color: #646464;">
<strong>There are three components to the training</strong>
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
--- /dev/null
+++ b/addons/product_email_template/static/img/online_training.png
Binary files 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
--- /dev/null
+++ b/addons/purchase/static/description/ebook-logistic.png
Binary files 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
<section class="oe_container oe_centeralign oe_padded oe_mb32">
<div class='oe_cover'>
- <img src="http://www.openerp.com/ebooks/logistic.png">
+ <img src="/purchase/static/description/ebook-logistic.png">
</div>
<a href="http://www.openerp.com/ebooks/logistic" target="_blank" class="oe_button oe_big">Download our free E-book</a>
</section>
diff --git a/addons/sale/edi/sale_order_action_data.xml b/addons/sale/edi/sale_order_action_data.xml
index d17443a7577..708329ed2dd 100644
--- a/addons/sale/edi/sale_order_action_data.xml
+++ b/addons/sale/edi/sale_order_action_data.xml
@@ -55,7 +55,7 @@
<br/>
<p>It is also possible to directly pay with Paypal:</p>
<a style="margin-left: 120px;" href="${object.paypal_url}">
- <img class="oe_edi_paypal_button" src="https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif"/>
+ <img class="oe_edi_paypal_button" src="/sale/static/img/btn_paynowcc_lg.gif"/>
</a>
% 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
--- /dev/null
+++ b/addons/sale/static/description/ebook-marketing.png
Binary files 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.
<section class="oe_container oe_centeralign oe_padded oe_mb32">
<div class='oe_cover'>
- <img src="http://www.openerp.com/ebooks/marketing.png">
+ <img src="/sale/static/description/ebook-marketing.png">
</div>
<a href="http://www.openerp.com/ebooks/marketing" target="_blank" class="oe_button oe_big">Download our free E-book</a>
</section>
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
--- /dev/null
+++ b/addons/sale/static/img/btn_paynowcc_lg.gif
Binary files 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 %}
<a href="http://github.com/{{ theme_github_fork }}"><img style="position: fixed; top: 0; right: 0; border: 0;"
- src="http://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png" alt="Fork me on GitHub" /></a>
+ src="static/forkme_right_darkblue_121621.png" alt="Fork me on GitHub" /></a>
{% 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
--- /dev/null
+++ b/addons/web/doc/_themes/flask_small/static/forkme_right_darkblue_121621.png
Binary files differ
diff --git a/addons/web/static/lib/fontawesome/fonts/fontawesome-webfont.eot b/addons/web/static/lib/fontawesome/fonts/fontawesome-webfont.eot
index 84677bc0c5f..84677bc0c5f 100755..100644
--- a/addons/web/static/lib/fontawesome/fonts/fontawesome-webfont.eot
+++ b/addons/web/static/lib/fontawesome/fonts/fontawesome-webfont.eot
Binary files differ
diff --git a/addons/web/static/lib/fontawesome/fonts/fontawesome-webfont.svg b/addons/web/static/lib/fontawesome/fonts/fontawesome-webfont.svg
index d907b25ae60..d907b25ae60 100755..100644
--- a/addons/web/static/lib/fontawesome/fonts/fontawesome-webfont.svg
+++ b/addons/web/static/lib/fontawesome/fonts/fontawesome-webfont.svg
diff --git a/addons/web/static/lib/fontawesome/fonts/fontawesome-webfont.ttf b/addons/web/static/lib/fontawesome/fonts/fontawesome-webfont.ttf
index 96a3639cdde..96a3639cdde 100755..100644
--- a/addons/web/static/lib/fontawesome/fonts/fontawesome-webfont.ttf
+++ b/addons/web/static/lib/fontawesome/fonts/fontawesome-webfont.ttf
Binary files differ
diff --git a/addons/web/static/lib/fontawesome/fonts/fontawesome-webfont.woff b/addons/web/static/lib/fontawesome/fonts/fontawesome-webfont.woff
index 628b6a52a87..628b6a52a87 100755..100644
--- a/addons/web/static/lib/fontawesome/fonts/fontawesome-webfont.woff
+++ b/addons/web/static/lib/fontawesome/fonts/fontawesome-webfont.woff
Binary files 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 @@
<!doctype html>
<html>
<head>
- <script src="http://code.jquery.com/jquery-2.1.1.min.js"></script>
- <link rel="stylesheet" href="http://code.jquery.com/qunit/qunit-1.15.0.css" type="text/css" media="screen"/>
- <script type="text/javascript" src="http://code.jquery.com/qunit/qunit-1.15.0.js"></script>
+ <script src="/web/static/lib/jquery/jquery.js"></script>
+ <link rel="stylesheet" href="/web/static/lib/qunit/qunit.css" type="text/css" media="screen"/>
+ <script type="text/javascript" src="/web/static/lib/qunit/qunit.js"></script>
<script type="text/javascript" src="qweb2.js"></script>
diff --git a/addons/web/static/src/font/entypo-webfont.eot b/addons/web/static/src/font/entypo-webfont.eot
index 2c09f336d57..2c09f336d57 100755..100644
--- a/addons/web/static/src/font/entypo-webfont.eot
+++ b/addons/web/static/src/font/entypo-webfont.eot
Binary files differ
diff --git a/addons/web/static/src/font/entypo-webfont.ttf b/addons/web/static/src/font/entypo-webfont.ttf
index 89b7a194cc7..89b7a194cc7 100755..100644
--- a/addons/web/static/src/font/entypo-webfont.ttf
+++ b/addons/web/static/src/font/entypo-webfont.ttf
Binary files differ
diff --git a/addons/web/static/src/font/entypo-webfont.woff b/addons/web/static/src/font/entypo-webfont.woff
index 3879f5b811e..3879f5b811e 100755..100644
--- a/addons/web/static/src/font/entypo-webfont.woff
+++ b/addons/web/static/src/font/entypo-webfont.woff
Binary files differ
diff --git a/addons/web/static/src/font/mnmliconsv21-webfont.eot b/addons/web/static/src/font/mnmliconsv21-webfont.eot
index 433ebb82e4b..433ebb82e4b 100755..100644
--- a/addons/web/static/src/font/mnmliconsv21-webfont.eot
+++ b/addons/web/static/src/font/mnmliconsv21-webfont.eot
Binary files differ
diff --git a/addons/web/static/src/font/mnmliconsv21-webfont.ttf b/addons/web/static/src/font/mnmliconsv21-webfont.ttf
index c38e59cf138..c38e59cf138 100755..100644
--- a/addons/web/static/src/font/mnmliconsv21-webfont.ttf
+++ b/addons/web/static/src/font/mnmliconsv21-webfont.ttf
Binary files differ
diff --git a/addons/web/static/src/font/mnmliconsv21-webfont.woff b/addons/web/static/src/font/mnmliconsv21-webfont.woff
index 3ddf14fb814..3ddf14fb814 100755..100644
--- a/addons/web/static/src/font/mnmliconsv21-webfont.woff
+++ b/addons/web/static/src/font/mnmliconsv21-webfont.woff
Binary files differ
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
--- /dev/null
+++ b/addons/web/static/src/img/k-waiting1.gif
Binary files 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
--- /dev/null
+++ b/addons/web/static/src/img/k-waiting2.gif
Binary files differ
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 0557dad2670..b18debb1d96 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -1221,7 +1221,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 = '<img src="http://www.amigrave.com/loading-kitten/' + imgkit + '.gif" class="loading-kitten">';
+ $.blockUI.defaults.message = '<img src="/web/static/src/img/k-waiting' + imgkit + '.gif" class="loading-kitten">';
}
},
/**
diff --git a/addons/website/static/src/img/bootswatch/amelia_thumbnail.png b/addons/website/static/src/img/bootswatch/amelia_thumbnail.png
new file mode 100644
index 00000000000..4392158ed4e
--- /dev/null
+++ b/addons/website/static/src/img/bootswatch/amelia_thumbnail.png
Binary files differ
diff --git a/addons/website/static/src/img/bootswatch_default_thumbnail.png b/addons/website/static/src/img/bootswatch/bootswatch_default_thumbnail.png
index 486429a0885..486429a0885 100644
--- a/addons/website/static/src/img/bootswatch_default_thumbnail.png
+++ b/addons/website/static/src/img/bootswatch/bootswatch_default_thumbnail.png
Binary files differ
diff --git a/addons/website/static/src/img/bootswatch/cerulean_thumbnail.png b/addons/website/static/src/img/bootswatch/cerulean_thumbnail.png
new file mode 100644
index 00000000000..f7ef994edaa
--- /dev/null
+++ b/addons/website/static/src/img/bootswatch/cerulean_thumbnail.png
Binary files differ
diff --git a/addons/website/static/src/img/bootswatch/cosmo_thumbnail.png b/addons/website/static/src/img/bootswatch/cosmo_thumbnail.png
new file mode 100644
index 00000000000..06915f439a2
--- /dev/null
+++ b/addons/website/static/src/img/bootswatch/cosmo_thumbnail.png
Binary files differ
diff --git a/addons/website/static/src/img/bootswatch/cyborg_thumbnail.png b/addons/website/static/src/img/bootswatch/cyborg_thumbnail.png
new file mode 100644
index 00000000000..cd89625b769
--- /dev/null
+++ b/addons/website/static/src/img/bootswatch/cyborg_thumbnail.png
Binary files differ
diff --git a/addons/website/static/src/img/bootswatch/flatly_thumbnail.png b/addons/website/static/src/img/bootswatch/flatly_thumbnail.png
new file mode 100644
index 00000000000..2c64a0db380
--- /dev/null
+++ b/addons/website/static/src/img/bootswatch/flatly_thumbnail.png
Binary files differ
diff --git a/addons/website/static/src/img/bootswatch/journal_thumbnail.png b/addons/website/static/src/img/bootswatch/journal_thumbnail.png
new file mode 100644
index 00000000000..530ad3bdc4b
--- /dev/null
+++ b/addons/website/static/src/img/bootswatch/journal_thumbnail.png
Binary files differ
diff --git a/addons/website/static/src/img/bootswatch/readable_thumbnail.png b/addons/website/static/src/img/bootswatch/readable_thumbnail.png
new file mode 100644
index 00000000000..24a6d9f7be0
--- /dev/null
+++ b/addons/website/static/src/img/bootswatch/readable_thumbnail.png
Binary files differ
diff --git a/addons/website/static/src/img/bootswatch/simplex_thumbnail.png b/addons/website/static/src/img/bootswatch/simplex_thumbnail.png
new file mode 100644
index 00000000000..754e8c54018
--- /dev/null
+++ b/addons/website/static/src/img/bootswatch/simplex_thumbnail.png
Binary files differ
diff --git a/addons/website/static/src/img/bootswatch/slate_thumbnail.png b/addons/website/static/src/img/bootswatch/slate_thumbnail.png
new file mode 100644
index 00000000000..b6cc60893d7
--- /dev/null
+++ b/addons/website/static/src/img/bootswatch/slate_thumbnail.png
Binary files differ
diff --git a/addons/website/static/src/img/bootswatch/spacelab_thumbnail.png b/addons/website/static/src/img/bootswatch/spacelab_thumbnail.png
new file mode 100644
index 00000000000..cba6be2e9a1
--- /dev/null
+++ b/addons/website/static/src/img/bootswatch/spacelab_thumbnail.png
Binary files differ
diff --git a/addons/website/static/src/img/bootswatch/united_thumbnail.png b/addons/website/static/src/img/bootswatch/united_thumbnail.png
new file mode 100644
index 00000000000..9e0ebac8af5
--- /dev/null
+++ b/addons/website/static/src/img/bootswatch/united_thumbnail.png
Binary files differ
diff --git a/addons/website/static/src/img/bootswatch/yeti_thumbnail.png b/addons/website/static/src/img/bootswatch/yeti_thumbnail.png
new file mode 100644
index 00000000000..97bb7bad8d1
--- /dev/null
+++ b/addons/website/static/src/img/bootswatch/yeti_thumbnail.png
Binary files differ
diff --git a/addons/website/views/themes.xml b/addons/website/views/themes.xml
index bfa0bd2e4b5..a62074dd08a 100644
--- a/addons/website/views/themes.xml
+++ b/addons/website/views/themes.xml
@@ -26,7 +26,7 @@
<div class="col-md-4">
<div class="well text-center">
<div class="image">
- <img src="/website/static/src/img/bootswatch_default_thumbnail.png" class="img-responsive" alt="Default Theme"/>
+ <img src="/website/static/src/img/bootswatch/bootswatch_default_thumbnail.png" class="img-responsive" alt="Default Theme"/>
</div>
<div class="options">
<h3>Default</h3>
@@ -39,7 +39,7 @@
<div class="col-md-4">
<div class="well text-center">
<div class="image">
- <img class="img-responsive" src="http://bootswatch.com/amelia/thumbnail.png" alt="Amelia"/>
+ <img class="img-responsive" src="/website/static/src/img/bootswatch/amelia_thumbnail.png" alt="Amelia"/>
</div>
<div class="options">
<h3>Amelia</h3>
@@ -52,7 +52,7 @@
<div class="col-md-4">
<div class="well text-center">
<div class="image">
- <img class="img-responsive" src="http://bootswatch.com/cerulean/thumbnail.png" alt="Cerulean"/>
+ <img class="img-responsive" src="/website/static/src/img/bootswatch/cerulean_thumbnail.png" alt="Cerulean"/>
</div>
<div class="options">
<h3>Cerulean</h3>
@@ -65,7 +65,7 @@
<div class="col-md-4">
<div class="well text-center">
<div class="image">
- <img class="img-responsive" src="http://bootswatch.com/cosmo/thumbnail.png" alt="Cosmo"/>
+ <img class="img-responsive" src="/website/static/src/img/bootswatch/cosmo_thumbnail.png" alt="Cosmo"/>
</div>
<div class="options">
<h3>Cosmo</h3>
@@ -78,7 +78,7 @@
<div class="col-md-4">
<div class="well text-center">
<div class="image">
- <img class="img-responsive" src="http://bootswatch.com/cyborg/thumbnail.png" alt="Cyborg"/>
+ <img class="img-responsive" src="/website/static/src/img/bootswatch/cyborg_thumbnail.png" alt="Cyborg"/>
</div>
<div class="options">
<h3>Cyborg</h3>
@@ -91,7 +91,7 @@
<div class="col-md-4">
<div class="well text-center">
<div class="image">
- <img class="img-responsive" src="http://bootswatch.com/flatly/thumbnail.png" alt="Flatly"/>
+ <img class="img-responsive" src="/website/static/src/img/bootswatch/flatly_thumbnail.png" alt="Flatly"/>
</div>
<div class="options">
<h3>Flatly</h3>
@@ -104,7 +104,7 @@
<div class="col-md-4">
<div class="well text-center">
<div class="image">
- <img class="img-responsive" src="http://bootswatch.com/journal/thumbnail.png" alt="Journal"/>
+ <img class="img-responsive" src="/website/static/src/img/bootswatch/journal_thumbnail.png" alt="Journal"/>
</div>
<div class="options">
<h3>Journal</h3>
@@ -117,7 +117,7 @@
<div class="col-md-4">
<div class="well text-center">
<div class="image">
- <img class="img-responsive" src="http://bootswatch.com/readable/thumbnail.png" alt="Readable"/>
+ <img class="img-responsive" src="/website/static/src/img/bootswatch/readable_thumbnail.png" alt="Readable"/>
</div>
<div class="options">
<h3>Readable</h3>
@@ -130,7 +130,7 @@
<div class="col-md-4">
<div class="well text-center">
<div class="image">
- <img class="img-responsive" src="http://bootswatch.com/simplex/thumbnail.png" alt="Simplex"/>
+ <img class="img-responsive" src="/website/static/src/img/bootswatch/simplex_thumbnail.png" alt="Simplex"/>
</div>
<div class="options">
<h3>Simplex</h3>
@@ -143,7 +143,7 @@
<div class="col-md-4">
<div class="well text-center">
<div class="image">
- <img class="img-responsive" src="http://bootswatch.com/slate/thumbnail.png" alt="Slate"/>
+ <img class="img-responsive" src="/website/static/src/img/bootswatch/slate_thumbnail.png" alt="Slate"/>
</div>
<div class="options">
<h3>Slate</h3>
@@ -156,7 +156,7 @@
<div class="col-md-4">
<div class="well text-center">
<div class="image">
- <img class="img-responsive" src="http://bootswatch.com/spacelab/thumbnail.png" alt="Spacelab"/>
+ <img class="img-responsive" src="/website/static/src/img/bootswatch/spacelab_thumbnail.png" alt="Spacelab"/>
</div>
<div class="options">
<h3>Spacelab</h3>
@@ -169,7 +169,7 @@
<div class="col-md-4">
<div class="well text-center">
<div class="image">
- <img class="img-responsive" src="http://bootswatch.com/united/thumbnail.png" alt="United"/>
+ <img class="img-responsive" src="/website/static/src/img/bootswatch/united_thumbnail.png" alt="United"/>
</div>
<div class="options">
<h3>United</h3>
@@ -182,7 +182,7 @@
<div class="col-md-4">
<div class="well text-center">
<div class="image">
- <img class="img-responsive" src="http://bootswatch.com/yeti/thumbnail.png" alt="Yeti"/>
+ <img class="img-responsive" src="/website/static/src/img/bootswatch/yeti_thumbnail.png" alt="Yeti"/>
</div>
<div class="options">
<h3>Yeti</h3>
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 @@
<field name="background_image">/website_blog/static/src/img/post1.jpg</field>
<field name="content"><![CDATA[
<section class="mt16 mb16 readable">
- <iframe width="361" height="200" src="http://www.youtube.com/embed/EkbBFmIWoTE" frameborder="0" allowfullscreen></iframe>
<p>
Emails are broken.
</p><p>
diff --git a/addons/website_quote/data/website_quotation_data.xml b/addons/website_quote/data/website_quotation_data.xml
index 86b831d6449..384b092e118 100644
--- a/addons/website_quote/data/website_quotation_data.xml
+++ b/addons/website_quote/data/website_quotation_data.xml
@@ -38,7 +38,7 @@
<br/>
<p>It is also possible to directly pay with Paypal:</p>
<a style="margin-left: 120px;" href="${object.paypal_url}">
- <img class="oe_edi_paypal_button" src="https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif"/>
+ <img class="oe_edi_paypal_button" src="/sale/static/img/btn_paynowcc_lg.gif"/>
</a>
% endif
@@ -135,7 +135,7 @@
<br/>
<p>It is also possible to directly pay with Paypal:</p>
<a style="margin-left: 120px;" href="${object.paypal_url}">
- <img class="oe_edi_paypal_button" src="https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif"/>
+ <img class="oe_edi_paypal_button" src="/sale/static/img/btn_paynowcc_lg.gif"/>
</a>
% endif
diff --git a/addons/website_quote/data/website_quotation_demo.xml b/addons/website_quote/data/website_quotation_demo.xml
index cdc0e589fa9..02f01a36776 100644
--- a/addons/website_quote/data/website_quotation_demo.xml
+++ b/addons/website_quote/data/website_quotation_demo.xml
@@ -275,7 +275,7 @@
<h2>Structure of the Training</h2>
</div>
<div class="col-md-5 col-md-offset-1 mt16 mb16">
- <img class="img img-responsive" src="https://www.openerp.com/saas_master/static/site_new/img/layout/online_training.png"/>
+ <img class="img img-responsive" src="/website_quote/static/src/img/online_training.png"/>
</div>
<div class="col-md-6 mt32">
<h4><strong>There are three components to the training</strong></h4>
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
--- /dev/null
+++ b/addons/website_quote/static/src/img/online_training.png
Binary files 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. <info@odoo.com>
+Uploaders: Aaron Bohy <aab@odoo.com>, Simon Lejeune <sle@odoo.com>
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 <info@odoo.com>
-Upstream-Homepage: http://www.odoo.com/
-Maintainer-Contact: Debian Odoo Maintainers <gnunet@lists.debian-maintainers.org>
-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/static/img/logo_white.png b/openerp/addons/base/static/img/logo_white.png
new file mode 100644
index 00000000000..84335cbf5cc
--- /dev/null
+++ b/openerp/addons/base/static/img/logo_white.png
Binary files differ
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: