projects / odoo / odoo.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8bfed06 58907da)
[MERGE] Sync with trunk, tries to solve conflicts. There are still some new images...
authorThibault Delavallée <tde@openerp.com>
Thu, 16 Jan 2014 10:39:10 +0000 (11:39 +0100)
committerThibault Delavallée <tde@openerp.com>
Thu, 16 Jan 2014 10:39:10 +0000 (11:39 +0100)
commit9cf78e93ccb6051731355e4ba5931a532b1f7f28
tree5ac937214c7646edc6c5a4f5ecad40a9f8463dbctree | snapshot
parent8bfed064590a19a7a78939ec6f0865715a33f13bcommit | diff
parent58907da3ee30be831083f6dcc804c31e7b73df5acommit | diff
[MERGE] Sync with trunk, tries to solve conflicts. There are still some new images to convert into images in xml files.

bzr revid: tde@openerp.com-20140116103910-qmm2y6kucmngplnk
36 files changed:
addons/crm_partner_assign/wizard/crm_forward_to_partner.py diff1 | diff2 | blob | history
addons/decimal_precision/decimal_precision.py diff1 | diff2 | blob | history
addons/email_template/email_template.py diff1 | diff2 | blob | history
addons/email_template/tests/test_mail.py diff1 | diff2 | blob | history
addons/email_template/wizard/mail_compose_message.py diff1 | diff2 | blob | history
addons/event_sale/event_demo.xml diff1 | diff2 | blob | history
addons/hr/hr_demo.xml diff1 | diff2 | blob | history
addons/hr_holidays/tests/test_holidays_flow.py diff1 | diff2 | blob | history
addons/hr_recruitment/hr_recruitment.py diff1 | diff2 | blob | history
addons/hr_recruitment/hr_recruitment_view.xml diff1 | diff2 | blob | history
addons/mail/mail_thread.py diff1 | diff2 | blob | history
addons/mail/static/src/js/mail.js diff1 | diff2 | blob | history
addons/membership/membership_demo.xml diff1 | diff2 | blob | history
addons/point_of_sale/controllers/main.py diff1 | diff2 | blob | history
addons/point_of_sale/point_of_sale.py diff1 | diff2 | blob | history
addons/point_of_sale/point_of_sale_demo.xml diff1 | diff2 | blob | history
addons/point_of_sale/point_of_sale_view.xml diff1 | diff2 | blob | history
addons/point_of_sale/static/src/js/db.js diff1 | diff2 | blob | history
addons/point_of_sale/static/src/js/models.js diff1 | diff2 | blob | history
addons/point_of_sale/static/src/js/widgets.js diff1 | diff2 | blob | history
addons/portal_hr_employees/hr_employee.py diff1 | diff2 | blob | history
addons/portal_project/tests/test_access_rights.py diff1 | diff2 | blob | history
addons/portal_project_issue/tests/test_access_rights.py diff1 | diff2 | blob | history
addons/product/product_image_demo.xml diff1 | diff2 | blob | history
addons/product/static/img/product_product_11-image.png | | blob
addons/product/static/img/product_product_4-image.jpg | diff2 | blob | history
addons/product/static/img/product_product_4-image.png | | blob
addons/product/static/img/product_product_5-image.png | | blob
addons/product/static/img/product_product_6-image.png | | blob
addons/product/static/img/product_product_7-image.png | diff2 | blob | history
addons/product/static/img/product_product_8-image.png | | blob
addons/product/static/img/product_product_9-image.png | | blob
addons/purchase/purchase.py diff1 | diff2 | blob | history
addons/sale/sale.py diff1 | diff2 | blob | history
addons/website/data/website_data.xml diff1 | | blob | history
addons/website/static/img/public_user-image.png | | blob
Unnamed repository; edit this file 'description' to name the repository.