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

[MERGE] Forward-port saas-5 up to a5f7891

23 files changed:

addons/account/account_move_line.py	diff1 \|	diff2 \|	blob \| history
addons/crm/crm_phonecall.py	diff1 \|	diff2 \|	blob \| history
addons/delivery/delivery.py	diff1 \|	diff2 \|	blob \| history
addons/hr_attendance/hr_attendance.py	diff1 \|	diff2 \|	blob \| history
addons/hr_payroll/hr_payroll.py	diff1 \|	diff2 \|	blob \| history
addons/mail/mail_followers.py	diff1 \|	diff2 \|	blob \| history
addons/mail/mail_group.py	diff1 \|	diff2 \|	blob \| history
addons/mail/tests/test_mail_features.py	diff1 \|	diff2 \|	blob \| history
addons/procurement/wizard/schedulers_all.py	diff1 \|	diff2 \|	blob \| history
addons/product/product.py	diff1 \|	diff2 \|	blob \| history
addons/project/project_view.xml	diff1 \|	diff2 \|	blob \| history
addons/sale/sale.py	diff1 \|	diff2 \|	blob \| history
addons/sale_service/views/sale_service_view.xml	diff1 \|	\|	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_mail_group/models/mail_group.py	diff1 \|	diff2 \|	blob \| history
addons/website_mail_group/views/website_mail_group.xml	diff1 \|	diff2 \|	blob \| history
addons/website_sale/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website_sale/views/templates.xml	diff1 \|	diff2 \|	blob \| history
addons/website_sale_delivery/views/website_sale_delivery.xml	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_mail_server.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_values.py	diff1 \|	diff2 \|	blob \| history

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

addons/account/account_move_line.py	diff1 \|	diff2 \|	blob \| history
addons/crm/crm_phonecall.py	diff1 \|	diff2 \|	blob \| history
addons/delivery/delivery.py	diff1 \|	diff2 \|	blob \| history
addons/hr_attendance/hr_attendance.py	diff1 \|	diff2 \|	blob \| history
addons/hr_payroll/hr_payroll.py	diff1 \|	diff2 \|	blob \| history
addons/mail/mail_followers.py	diff1 \|	diff2 \|	blob \| history
addons/mail/mail_group.py	diff1 \|	diff2 \|	blob \| history
addons/mail/tests/test_mail_features.py	diff1 \|	diff2 \|	blob \| history
addons/procurement/wizard/schedulers_all.py	diff1 \|	diff2 \|	blob \| history
addons/product/product.py	diff1 \|	diff2 \|	blob \| history
addons/project/project_view.xml	diff1 \|	diff2 \|	blob \| history
addons/sale/sale.py	diff1 \|	diff2 \|	blob \| history
addons/sale_service/views/sale_service_view.xml	diff1 \|	\|	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_mail_group/models/mail_group.py	diff1 \|	diff2 \|	blob \| history
addons/website_mail_group/views/website_mail_group.xml	diff1 \|	diff2 \|	blob \| history
addons/website_sale/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website_sale/views/templates.xml	diff1 \|	diff2 \|	blob \| history
addons/website_sale_delivery/views/website_sale_delivery.xml	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_mail_server.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_values.py	diff1 \|	diff2 \|	blob \| history