Denis Ledoux fe83c11301 [MERGE] forward port of branch saas-4 up to b49755b ...

The forward port of the fix 3609ba10f2 will be done separately, as the mrp scheduler has been completely refactored from saas-5.

Conflicts:
	addons/l10n_be_coda/wizard/account_coda_import.py
	addons/point_of_sale/static/src/xml/pos.xml
	addons/procurement/schedulers.py

2014-08-13 10:45:36 +02:00

..

controllers

[REM] html_template and render_bootstrap_template()

2014-05-06 18:34:22 +02:00

doc

…

i18n

* Deleted: oe_m2o_dropdown_option_no_results_to_show AND REUSED oe_m2o_dropdown_option

2014-05-26 11:51:24 -05:00

static

[MERGE] forward port of branch saas-4 up to b49755b

2014-08-13 10:45:36 +02:00

tests

[MERGE] Web assets moved from manifests to ir.ui.view bundles

2014-04-30 17:13:02 +02:00

views

Seperate assets_common from other bundles

2014-05-20 17:06:25 +02:00

__init__.py

[FIX] web: no need to initialize wsgi handler in postload anymore

2014-03-24 10:30:38 +01:00

__openerp__.py

[IMP] Convered qunit test suite to template

2014-04-28 20:24:51 +02:00

.bowerrc

…

bower.json

…

Gruntfile.js

…

package.json

…