bth-openerp
e5665f8868
[MERGE]Merge lp:~openerp-dev/openobject-addons/trunk-website-al.
...
bzr revid: bth@tinyerp.com-20130827055533-ybsdhedhetgclv6a
2013-08-27 11:25:33 +05:30
Paramjit Singh Sahota
b4d13e3c3d
[IMP] Improved the product_id in yml.
...
bzr revid: psa@tinyerp.com-20130827054608-ppf03r3xzu9td4db
2013-08-27 11:16:08 +05:30
642311aa26
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130827050316-c3hzsnzygj4np1qh
2013-08-27 05:03:16 +00:00
Frédéric van der Essen
ae1687c6ab
[WIP] website: trying to make inpage snippet drag and drop work
...
bzr revid: fva@openerp.com-20130826143921-myctckmddoexa1fv
2013-08-26 16:39:21 +02:00
niv-openerp
00d3d9a4b6
[FIX] im: multiple bugs
...
bzr revid: nicolas.vanhoren@openerp.com-20130826135135-93tmyi6a1fpju8vy
2013-08-26 15:51:35 +02:00
bth-openerp
cf2dab4851
[IMP]IMproved code or class and navigation.
...
bzr revid: bth@tinyerp.com-20130826134729-b0olyv7di2oq5xrk
2013-08-26 19:17:29 +05:30
bth-openerp
c45b813743
[IMP]Migrated website_sale into bootstrap 3.0.
...
bzr revid: bth@tinyerp.com-20130826133824-kj4ed1etmddcx9mo
2013-08-26 19:08:24 +05:30
Paramjit Singh Sahota
3a0d36b4d4
[IMP] Imprved for Search box.
...
bzr revid: psa@tinyerp.com-20130826133129-6l5576r39qcjj73i
2013-08-26 19:01:29 +05:30
Martin Trigaux
98541c5827
[FIX] mrp: display Bill of Materials as a list, not as a tree
...
bzr revid: mat@openerp.com-20130826132943-mp8f331mxafb3z9z
2013-08-26 15:29:43 +02:00
ishwar.malvi-openerp
ff444b7040
[IMP]added chatter notification for email sent to attendee(s).
...
bzr revid: ishwarmalvi13@gmail.com-20130826131510-ab0sluzt0no6vr6h
2013-08-26 18:45:10 +05:30
niv-openerp
05a1a5ffe6
merge trunk
...
bzr revid: nicolas.vanhoren@openerp.com-20130826131051-c7aatnvew9q52iw6
2013-08-26 15:10:51 +02:00
niv-openerp
5e8315730b
Solved a few bugs
...
bzr revid: nicolas.vanhoren@openerp.com-20130826125254-smlkkh5m3n36cklw
2013-08-26 14:52:54 +02:00
Olivier Dony
20e5751e62
[IMP] email_template: add datetime and dateutil.relativedelta in the global rendering context for templates
...
The `dateutil` package is not included directly in the globals because
`dateutil.relativedelta.relativedelta` is an old-style class and jinja2
does not appear to support instantiating old-style classes within an
expression, so `relativedelta` support is provided using a "lambda proxy".
bzr revid: odo@openerp.com-20130826124405-bixzwyhl65c7v75b
2013-08-26 14:44:05 +02:00
niv-openerp
8ee25f9856
Refactored to avoid user duplication problem
...
bzr revid: nicolas.vanhoren@openerp.com-20130826123947-alcsov647beqge0c
2013-08-26 14:39:47 +02:00
Paramjit Singh Sahota
41a0186daa
[IMP]Improved the billing form
...
bzr revid: psa@tinyerp.com-20130826121509-fds3sx1sw8p1eedg
2013-08-26 17:45:09 +05:30
Paramjit Singh Sahota
ee41159e86
[REVERT] Reverted the changes of index.html file of website_sale
...
bzr revid: psa@tinyerp.com-20130826115133-f9n26296a9wilfdv
2013-08-26 17:21:33 +05:30
Paramjit Singh Sahota
199e945460
[IMP]Little Improved
...
bzr revid: psa@tinyerp.com-20130826111437-640etfb9ypsipeyx
2013-08-26 16:44:37 +05:30
Paramjit Singh Sahota
07d067a544
[IMP]Improved
...
bzr revid: psa@tinyerp.com-20130826110531-mnqj1q62l6epxvws
2013-08-26 16:35:31 +05:30
ishwar.malvi-openerp
f6b5d5879d
[IMP]improved typo of accept invitation.
...
bzr revid: ishwarmalvi13@gmail.com-20130826105930-cv3tpy3dsv1zivdx
2013-08-26 16:29:30 +05:30
Amit Bhavsar (Open ERP)
0121007fc8
[imp] remove arrow from job position menu.
...
bzr revid: amb@tinyerp.com-20130826105454-4umit3zxy6c3mbah
2013-08-26 16:24:54 +05:30
Christophe Matthieu
667d96ff0c
[FIX] website: catch and dispatch error for rendering
...
bzr revid: chm@openerp.com-20130826101615-t1ouij4flhtdthxe
2013-08-26 12:16:15 +02:00
ishwar.malvi-openerp
3724e11aa6
[MERGE]: with trunk.
...
bzr revid: ishwarmalvi13@gmail.com-20130826100735-ie1wvf44j6ra2j40
2013-08-26 15:37:35 +05:30
Frédéric van der Essen
04f97cf6e3
[IMP] website: missing commits for the snippet editor
...
bzr revid: fva@openerp.com-20130826100126-j26u21dchvwjijnh
2013-08-26 12:01:26 +02:00
Mahendra Barad (OpenERP Trainee)
31539318e0
[IMP] improve the code for context
...
bzr revid: baradmahendra344@gmail.com-20130826095819-nxilquw6ym5fue4m
2013-08-26 15:28:19 +05:30
Thibault Delavallée
3a67d7dc99
[FIX] crm: fixed a bug introduced when merging trunk
...
bzr revid: tde@openerp.com-20130826095600-bgvdzah9nwb2vu0l
2013-08-26 11:56:00 +02:00
Paramjit Singh Sahota
e6b47051ea
MERGED lp:~openerp-dev/openobject-addons/trunk-website-bootstrap-3.0-bth and resolved conflicts
...
bzr revid: psa@tinyerp.com-20130826093529-3o64l5r3osuxm6i4
2013-08-26 15:05:29 +05:30
Frédéric van der Essen
7e8ad30842
[MERGE] from upstream
...
bzr revid: fva@openerp.com-20130826092905-jvrvnnskmwhv61le
2013-08-26 11:29:05 +02:00
Paramjit Singh Sahota
011e195f3f
Improved code.
...
bzr revid: psa@tinyerp.com-20130826092641-mbirfw9t322wn9am
2013-08-26 14:56:41 +05:30
Frédéric van der Essen
6c220f78bb
[MERGE] website: mutation snippets
...
bzr revid: fva@openerp.com-20130826091819-z5nbw0jww7w7ydbl
2013-08-26 11:18:19 +02:00
Frédéric van der Essen
e3a472170c
[MERGE] from upstream
...
bzr revid: fva@openerp.com-20130826091703-qmipfeith2arjyr8
2013-08-26 11:17:03 +02:00
Thibault Delavallée
21d57f5e9d
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20130826085410-qngwkw6eyxol4192
2013-08-26 10:54:10 +02:00
niv-openerp
7bce27c528
Now uses im.user's images
...
bzr revid: nicolas.vanhoren@openerp.com-20130826085212-od9oxv6h4jtkd6nf
2013-08-26 10:52:12 +02:00
niv-openerp
8f33049f2f
Changed user field to user_id and added unique constraint
...
bzr revid: nicolas.vanhoren@openerp.com-20130826084554-221ts80q8c5jvqv1
2013-08-26 10:45:54 +02:00
0a9e09b6bf
Merge with trunk
...
bzr revid: rgaopenerp-20130826082915-6sgmv9t0yym8n13c
2013-08-26 13:59:15 +05:30
Paramjit Singh Sahota
c4f58b7466
[IMP] improved css for checkout form and others.
...
bzr revid: psa@tinyerp.com-20130826074016-bejnsnij9ly9df93
2013-08-26 13:10:16 +05:30
Amit Bhavsar (Open ERP)
93a6e3e4e2
[imp] improve job position onchange and create employee behave.
...
bzr revid: amb@tinyerp.com-20130826072657-g878z32sxr2qbb6i
2013-08-26 12:56:57 +05:30
bth-openerp
af2306a29f
[IMP]Migrated website_contract into bootstrap 3.0.
...
bzr revid: bth@tinyerp.com-20130826070854-uin768rdyrdn0uxc
2013-08-26 12:38:54 +05:30
Paramjit Singh Sahota
7e718a6804
[MERGE] Merged lp:~openerp-dev/openobject-addons/trunk-website-bootstrap-3.0-bth
...
bzr revid: psa@tinyerp.com-20130826061942-dr9m4iv3jvtl77ib
2013-08-26 11:49:42 +05:30
Paramjit Singh Sahota
ed6452c74f
[IMP]Improved label-default.
...
bzr revid: psa@tinyerp.com-20130826061024-q5y4t2emq55rpr5f
2013-08-26 11:40:24 +05:30
bth-openerp
a0dc6a502e
[MERGE]Merge lp:~openerp-dev/openobject-addons/trunk-website-al.
...
bzr revid: bth@tinyerp.com-20130826060243-3yhxlioyv3bgkikd
2013-08-26 11:32:43 +05:30
bth-openerp
5352e96a4d
[IMP]IMproved code for pager.
...
bzr revid: bth@tinyerp.com-20130826060057-0r61yfh36319y45a
2013-08-26 11:30:57 +05:30
Paramjit Singh Sahota
8f5068d8a1
[IMP] Improved code for 'website_sale' to make it compatible according to bootstrap 3.0
...
bzr revid: psa@tinyerp.com-20130826054441-g0xl17kvhcnbw3ck
2013-08-26 11:14:41 +05:30
Paramjit Singh Sahota
af7d52ed07
[IMP] Improved code of 'website_contract' to make it compatible according to bootstrap 3.0
...
bzr revid: psa@tinyerp.com-20130826053030-66aoebw4zidrdqsc
2013-08-26 11:00:30 +05:30
dc07d21f86
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130824053459-k3vf5zjfz0sjn6t6
bzr revid: launchpad_translations_on_behalf_of_openerp-20130825051935-7croxf3zpoo1cvwk
bzr revid: launchpad_translations_on_behalf_of_openerp-20130824053520-dpq7ulxrh0e06fd4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130825051953-hv03d787cy2sc9l4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130825051959-4r4bun8nvl6neyi5
bzr revid: launchpad_translations_on_behalf_of_openerp-20130826051253-70i5qzbp5ttpsmb7
2013-08-26 05:12:53 +00:00
Paramjit Singh Sahota
2e9463c664
[MERGe] Merged lp:~openerp-dev/openobject-addons/trunk-website-bootstrap-3.0-bth and removed conflicts.
...
bzr revid: psa@tinyerp.com-20130826045131-iuog4r9ijlilq3cv
2013-08-26 10:21:31 +05:30
Atul Patel (OpenERP)
4ccbbba7c8
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20130826045058-4ipsemxtca1rdagy
2013-08-26 10:20:58 +05:30
7294b0ebfa
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130824050400-vvklljkx8p2e77no
2013-08-24 05:04:00 +00:00
Christophe Simonis
f751ce30b7
[FIX] project: correct migrate_to_alias call
...
bzr revid: chs@openerp.com-20130823161810-417zchlc06mbzcb8
2013-08-23 18:18:10 +02:00
Frédéric van der Essen
306138327f
[IMP] website: snippet resizing
...
bzr revid: fva@openerp.com-20130823160411-xoxek62wwhi5w3by
2013-08-23 18:04:11 +02:00
Christophe Simonis
5343c48c5f
[MERGE] forward port of branch saas-1 up to revid 8760 chs@openerp.com-20130823143114-83tdjhbsdes0kydr
...
bzr revid: chs@openerp.com-20130823154655-blm2wyfivmg8qi2z
2013-08-23 17:46:55 +02:00
bth-openerp