Christophe Simonis
b86eee378e
[MERGE] forward port of branch saas-1 up to revid 3743 chs@openerp.com-20130823145204-xwpnlwg0gg2259f6
...
bzr revid: chs@openerp.com-20130823145527-fz58kta3qpup4sb2
2013-08-23 16:55:27 +02:00
Christophe Matthieu
5a90cb546d
[FIX] website_sale: return to product after add to cart
...
bzr revid: chm@openerp.com-20130823144133-6qkx8flsra72crb4
2013-08-23 16:41:33 +02:00
Christophe Matthieu
cf1780d251
[FIX] website_sale: set pricelist
...
bzr revid: chm@openerp.com-20130823143757-81cc0pzajetu55m8
2013-08-23 16:37:57 +02:00
Christophe Simonis
58868227f9
[MERGE] forward port of branch 7.0 up to revid 9382 chs@openerp.com-20130823131214-ipouwtnz8r16mlvv
...
bzr revid: chs@openerp.com-20130823143114-83tdjhbsdes0kydr
2013-08-23 16:31:14 +02:00
bth-openerp
32b1bb5c1a
[IMP]Add label class.
...
bzr revid: bth@tinyerp.com-20130823135742-fzekahsa02lofobg
2013-08-23 19:27:42 +05:30
bth-openerp
4ad19e07ed
[IMP]Migrated website_event into bootstrap 3.0.
...
bzr revid: bth@tinyerp.com-20130823135250-t4mtewrmn3yyea9e
2013-08-23 19:22:50 +05:30
bth-openerp
6ae54e853d
[IMP]Migrated website_crm into bootstrap 3.0.
...
bzr revid: bth@tinyerp.com-20130823134747-dsgox69g78yuj2ld
2013-08-23 19:17:47 +05:30
Paramjit Singh Sahota
bc9afa1e72
[IMP] Improved code of 'website_contract' to make it compatible according to bootstrap 3.0
...
bzr revid: psa@tinyerp.com-20130823134441-024zi8tvgnuu7amu
2013-08-23 19:14:41 +05:30
bth-openerp
243bd13d2a
[MERGE]Merge lp:~openerp-dev/openobject-addons/trunk-website-al.
...
bzr revid: bth@tinyerp.com-20130823133638-9mwes61mqvl546qz
2013-08-23 19:06:38 +05:30
Christophe Matthieu
3602641e1d
[WIP] website_contract: reference view
...
bzr revid: chm@openerp.com-20130823133604-ujkiu67hrjtj4qtg
2013-08-23 15:36:04 +02:00
bth-openerp
91e85f18f2
[IMP]Migrated website_hr into bootstrap 3.0.
...
bzr revid: bth@tinyerp.com-20130823132829-399hwxt4gv4ad9j9
2013-08-23 18:58:29 +05:30
Atul Patel (OpenERP)
b53952e5d7
[MERGE]: Merged with addons
...
bzr revid: atp@tinyerp.com-20130823132627-jhyrbzgw51s6w05v
2013-08-23 18:56:27 +05:30
bth-openerp
e2c9e2a26e
[IMP]Added class name.
...
bzr revid: bth@tinyerp.com-20130823132138-tq40mj780juni8ky
2013-08-23 18:51:38 +05:30
bth-openerp
860f76a011
[IMP]IMproved bootstrap 3 in website_hr module.
...
bzr revid: bth@tinyerp.com-20130823131720-aueyal8plqv7ttky
2013-08-23 18:47:20 +05:30
Christophe Simonis
67d431bdb9
[FIX] stock: allow modification of stock.picking.{in,out} reports via report designer
...
bzr revid: chs@openerp.com-20130823131214-ipouwtnz8r16mlvv
2013-08-23 15:12:14 +02:00
Martin Trigaux
1b99f0c9db
[FIX] mrp, stock: permissions error on multicompany + add tests, courtesy of Camptocamp
...
bzr revid: mat@openerp.com-20130823132049-vah4d2ev03a9gb1v
2013-08-23 15:20:49 +02:00
Christophe Simonis
dd0d003353
[MERGE] project: migrate to aliases
...
bzr revid: chs@openerp.com-20130823130355-5f5mi76brx1xjdge
2013-08-23 15:03:55 +02:00
Paramjit Singh Sahota
7f0956b47e
[IMP] Improved code of 'website_crm' to make it compatible according to bootstrap 3.0
...
bzr revid: psa@tinyerp.com-20130823130108-j92k3izdr38nnyl0
2013-08-23 18:31:08 +05:30
bth-openerp
a709b80c94
[FIX]Fixed if statement.
...
bzr revid: bth@tinyerp.com-20130823125144-zjhm5bnaw85bdtl0
2013-08-23 18:21:44 +05:30
Thibault Delavallée
f0db93fe93
[MERGE] [FIX] mail: fixed wrong parsing of multipart/mixed emails. Alternative mode is computed when browsing the parts, not from the message content type.
...
Added tests.
Also added some notification_email_send=none in mail demo data to avoid sending emails in demo/data/update.
bzr revid: tde@openerp.com-20130823123716-anqlxg1gk6c19kdc
2013-08-23 14:37:16 +02:00
bth-openerp
1532cfa673
[IMP]Improved bootstrap 3 in website_mail module.
...
bzr revid: bth@tinyerp.com-20130823123634-ax6zm64ywzvp22e0
2013-08-23 18:06:34 +05:30
Cecile Tonglet
2c2ac536ce
[IMP] Use the migration function migrate_to_alias of object mail.alias on model project.project
...
bzr revid: cto@openerp.com-20130823122955-5bbn5ivdiqxti5py
2013-08-23 14:29:55 +02:00
ajay javiya (OpenERP)
d3b90baa3f
[IMP]: migrate website_event module from bootstrap 2.x to 3.0
...
bzr revid: aja@tinyerp.com-20130823121930-pryy1nq5nxels4u3
2013-08-23 17:49:30 +05:30
bth-openerp
94e2667e82
[IMP]Improved code for footer and icon.
...
bzr revid: bth@tinyerp.com-20130823121205-e3tsaj5pkyhyyq3i
2013-08-23 17:42:05 +05:30
Thibault Delavallée
d874d9980d
[FIX] mail: fixed wrong parsing of multipart/mixed emails.
...
alternative mode is computed when browsing the parts, not from
the message content type.
Added tests.
Also added some notification_email_send to none to avoid sending
emails in demo/data/update.
bzr revid: tde@openerp.com-20130823120611-0n4ull3c8gvwug2u
2013-08-23 14:06:11 +02:00
Martin Trigaux
22a3ba7d66
[IMP] stock: convert yml test to python
...
bzr revid: mat@openerp.com-20130823115851-36tcrj17n5bme3uu
2013-08-23 13:58:51 +02:00
Martin Trigaux
a0fa40ac16
[IMP] mrp: convert yml test to python
...
bzr revid: mat@openerp.com-20130823115248-5a7z35xge3ogpyvc
2013-08-23 13:52:48 +02:00
ajay javiya (OpenERP)
a76797b693
[IMP]: migrate website_mail module from bootstrap 2.x to 3.0
...
bzr revid: aja@tinyerp.com-20130823115211-6gcbq6h1upeeo50w
2013-08-23 17:22:11 +05:30
bth-openerp
a142d3a16b
[IMP]As per bootstrap 3.0 added class and tags.
...
bzr revid: bth@tinyerp.com-20130823105054-vgm8irxijayyfblg
2013-08-23 16:20:54 +05:30
Frédéric van der Essen
8b23e73241
[FIX] website: fix regression in carousel insertion:w
...
bzr revid: fva@openerp.com-20130823100221-bm3jd0lzrv8929g7
2013-08-23 12:02:21 +02:00
Frédéric van der Essen
b4ca228747
[IMP] website: clean up client side templates
...
bzr revid: fva@openerp.com-20130823100022-a2f0n4oc7f16glfd
2013-08-23 12:00:22 +02:00
Martin Trigaux
3d6dc36407
[MERGE] base mp, courtesy of Alexandre Fayolle (camptocamp)
...
lp bug: https://launchpad.net/bugs/1182111 fixed
bzr revid: mat@openerp.com-20130823095912-5kwshj6nkdzduejx
2013-08-23 11:59:12 +02:00
Fabien Pinckaers
7f92e03c13
[IMP] Code -> Sequence Type
...
bzr revid: fp@tinyerp.com-20130823095635-s3qvgp0y557sb2pb
2013-08-23 11:56:35 +02:00
Christophe Matthieu
651e511ed9
[IMP] website_sale: fix context value, get order line name insead of product name, wip payment
...
bzr revid: chm@openerp.com-20130823094017-90m72xi2oif4qkuj
2013-08-23 11:40:17 +02:00
DBR (OpenERP)
cb15c354dd
[IMP]:Update label
...
bzr revid: dbr@tinyerp.com-20130823093617-3aa3h798n6ydt0m1
2013-08-23 15:06:17 +05:30
ddm
4fc8193e46
CSS improvements
...
bzr revid: ddm@openerp.com-20130823092456-7g783rh2g0irlp63
2013-08-23 11:24:56 +02:00
Martin Trigaux
4bc20f2e2f
[MERGE] backport of revision 8862
...
mrp, sale_stock: minor usability improvements + properties in sale order lines
bzr revid: mat@openerp.com-20130823092231-w5aet41ivk4f7nd9
2013-08-23 11:22:31 +02:00
Frédéric van der Essen
d59a47f79c
[IMP] website: merge snippet insert and mutation drag & drop code
...
bzr revid: fva@openerp.com-20130823091647-uoatz0k1458idhf3
2013-08-23 11:16:47 +02:00
Frédéric van der Essen
3ad504ffc4
[IMP] website: cleanup drop zones css and sort out z-index issues
...
bzr revid: fva@openerp.com-20130823090757-ffqvcselr1merggk
2013-08-23 11:07:57 +02:00
Martin Trigaux
569d854403
[IMP] mrp: allow searching by components, better view for BoM structure
...
bzr revid: mat@openerp.com-20130823085138-bhxhitqof4m2hd7v
2013-08-23 10:51:38 +02:00
Frédéric van der Essen
84c0d68140
[MERGE] website: mutation snippets
...
bzr revid: fva@openerp.com-20130823083843-bky4qugrnb8jnidm
2013-08-23 10:38:43 +02:00
Frédéric van der Essen
678bb7c4a0
[MERGE] from upstream
...
bzr revid: fva@openerp.com-20130823083724-9jq4cjc1wea0b59q
2013-08-23 10:37:24 +02:00
Frédéric van der Essen
a2e4c9b7e0
[IMP] website: mutation snippets
...
bzr revid: fva@openerp.com-20130823082712-sdcke0hy5yspszkb
2013-08-23 10:27:12 +02:00
Martin Trigaux
4d87d76e43
[FIX] tree view: correct toggeling of hierarchic tree, correctly pass ids
...
bzr revid: mat@openerp.com-20130823081256-ab12551kejhjcqbv
2013-08-23 10:12:56 +02:00
bth-openerp
d264a49b37
[IMP]Added js and css of bootstrap 3.0 in website module.
...
bzr revid: bth@tinyerp.com-20130823062541-nabdko619qkphdcz
2013-08-23 11:55:41 +05:30
cac1f1f1ba
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130822054012-klsl0p3ylzlwe9w5
bzr revid: launchpad_translations_on_behalf_of_openerp-20130823055246-8rlzajaxcyy6zkja
2013-08-23 05:52:46 +00:00
2cec1eb045
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130822054004-iy1tgkww8vf91e5g
bzr revid: launchpad_translations_on_behalf_of_openerp-20130823055241-t379yr3ksuppirw0
2013-08-23 05:52:41 +00:00
Amit Bhavsar (Open ERP)
a8063ba55c
[imp] improve typo and on create employee behave at hr application.
...
bzr revid: amb@tinyerp.com-20130823053350-mpknggcrgl1504ta
2013-08-23 11:03:50 +05:30
Vidhin Mehta
476e30f869
[MERGE]Trunk.
...
bzr revid: vme@tinyerp.com-20130823052005-1ecpnw0590g8tzir
2013-08-23 10:50:05 +05:30
Vidhin Mehta
75ddd5ccbe
[MERGE]Trunk.
...
bzr revid: vme@tinyerp.com-20130823050602-33bqv07e7g8dhv7x
2013-08-23 10:36:02 +05:30
Christophe Simonis