git.inspyration.org Git - odoo/odoo.git/commit

author	Christophe Simonis <chs@odoo.com>
	Wed, 5 Nov 2014 19:30:40 +0000 (20:30 +0100)
committer	Christophe Simonis <chs@odoo.com>
	Wed, 5 Nov 2014 19:30:40 +0000 (20:30 +0100)
commit	5068cffbb043d7284014dcdd03b1794250631bc0
tree	9b942d8f8e193323aeb42665eab998f6831f1992	tree \| snapshot
parent	9c57268a4b191341c5c1377ec0b6e1f11c37c5cd	commit \| diff
parent	491372e865948765fdce241c7429419204ce6406	commit \| diff

[MERGE] forward port of branch 8.0 up to 491372e

45 files changed:

addons/account/account_invoice.py	diff1 \|	diff2 \|	blob \| history
addons/account/security/account_security.xml	diff1 \|	diff2 \|	blob \| history
addons/base_action_rule/base_action_rule.py	diff1 \|	diff2 \|	blob \| history
addons/crm/crm.py	diff1 \|	diff2 \|	blob \| history
addons/crm/crm_lead.py	diff1 \|	diff2 \|	blob \| history
addons/hr/hr.py	diff1 \|	diff2 \|	blob \| history
addons/mail/mail_mail.py	diff1 \|	diff2 \|	blob \| history
addons/mail/tests/test_mail_features.py	diff1 \|	diff2 \|	blob \| history
addons/marketing_campaign/marketing_campaign_view.xml	diff1 \|	diff2 \|	blob \| history
addons/mass_mailing/models/mass_mailing.py	diff1 \|	diff2 \|	blob \| history
addons/payment/models/payment_acquirer.py	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/point_of_sale.py	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/static/src/css/pos.css	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/static/src/js/screens.js	diff1 \|	diff2 \|	blob \| history
addons/product/product.py	diff1 \|	diff2 \|	blob \| history
addons/project_issue/project_issue.py	diff1 \|	diff2 \|	blob \| history
addons/purchase/purchase_view.xml	diff1 \|	diff2 \|	blob \| history
addons/report/static/src/js/qwebactionmanager.js	diff1 \|	diff2 \|	blob \| history
addons/share/wizard/share_wizard.py	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/view_form.js	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/views.js	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/xml/base.xml	diff1 \|	diff2 \|	blob \| history
addons/web_kanban/static/src/js/kanban.js	diff1 \|	diff2 \|	blob \| history
addons/website/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website/models/ir_qweb.py	diff1 \|	diff2 \|	blob \| history
addons/website/models/ir_ui_view.py	diff1 \|	diff2 \|	blob \| history
addons/website/models/website.py	diff1 \|	diff2 \|	blob \| history
addons/website/static/src/css/website.css	diff1 \|	diff2 \|	blob \| history
addons/website/static/src/css/website.sass	diff1 \|	diff2 \|	blob \| history
addons/website/views/website_templates.xml	diff1 \|	diff2 \|	blob \| history
addons/website_blog/views/website_blog_templates.xml	diff1 \|	diff2 \|	blob \| history
addons/website_crm/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website_forum/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website_forum/models/forum.py	diff1 \|	diff2 \|	blob \| history
addons/website_sale/controllers/main.py	diff1 \|	diff2 \|	blob \| history
doc/conf.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_model.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_qweb.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_ui_view.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/res/res_partner.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/res/res_users.py	diff1 \|	diff2 \|	blob \| history
openerp/models.py	diff1 \|	diff2 \|	blob \| history
openerp/service/server.py	diff1 \|	diff2 \|	blob \| history
openerp/tools/convert.py	diff1 \|	diff2 \|	blob \| history
openerp/tools/misc.py	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

addons/account/account_invoice.py	diff1 \|	diff2 \|	blob \| history
addons/account/security/account_security.xml	diff1 \|	diff2 \|	blob \| history
addons/base_action_rule/base_action_rule.py	diff1 \|	diff2 \|	blob \| history
addons/crm/crm.py	diff1 \|	diff2 \|	blob \| history
addons/crm/crm_lead.py	diff1 \|	diff2 \|	blob \| history
addons/hr/hr.py	diff1 \|	diff2 \|	blob \| history
addons/mail/mail_mail.py	diff1 \|	diff2 \|	blob \| history
addons/mail/tests/test_mail_features.py	diff1 \|	diff2 \|	blob \| history
addons/marketing_campaign/marketing_campaign_view.xml	diff1 \|	diff2 \|	blob \| history
addons/mass_mailing/models/mass_mailing.py	diff1 \|	diff2 \|	blob \| history
addons/payment/models/payment_acquirer.py	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/point_of_sale.py	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/static/src/css/pos.css	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/static/src/js/screens.js	diff1 \|	diff2 \|	blob \| history
addons/product/product.py	diff1 \|	diff2 \|	blob \| history
addons/project_issue/project_issue.py	diff1 \|	diff2 \|	blob \| history
addons/purchase/purchase_view.xml	diff1 \|	diff2 \|	blob \| history
addons/report/static/src/js/qwebactionmanager.js	diff1 \|	diff2 \|	blob \| history
addons/share/wizard/share_wizard.py	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/view_form.js	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/views.js	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/xml/base.xml	diff1 \|	diff2 \|	blob \| history
addons/web_kanban/static/src/js/kanban.js	diff1 \|	diff2 \|	blob \| history
addons/website/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website/models/ir_qweb.py	diff1 \|	diff2 \|	blob \| history
addons/website/models/ir_ui_view.py	diff1 \|	diff2 \|	blob \| history
addons/website/models/website.py	diff1 \|	diff2 \|	blob \| history
addons/website/static/src/css/website.css	diff1 \|	diff2 \|	blob \| history
addons/website/static/src/css/website.sass	diff1 \|	diff2 \|	blob \| history
addons/website/views/website_templates.xml	diff1 \|	diff2 \|	blob \| history
addons/website_blog/views/website_blog_templates.xml	diff1 \|	diff2 \|	blob \| history
addons/website_crm/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website_forum/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website_forum/models/forum.py	diff1 \|	diff2 \|	blob \| history
addons/website_sale/controllers/main.py	diff1 \|	diff2 \|	blob \| history
doc/conf.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_model.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_qweb.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_ui_view.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/res/res_partner.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/res/res_users.py	diff1 \|	diff2 \|	blob \| history
openerp/models.py	diff1 \|	diff2 \|	blob \| history
openerp/service/server.py	diff1 \|	diff2 \|	blob \| history
openerp/tools/convert.py	diff1 \|	diff2 \|	blob \| history
openerp/tools/misc.py	diff1 \|	diff2 \|	blob \| history