niv-openerp
11780a2267
Added some code to sanitize html
...
bzr revid: nicolas.vanhoren@openerp.com-20120813125307-d8cycdvtd7ad0f8e
2012-08-13 14:53:07 +02:00
Thibault Delavallée
ba61f0733a
[IMP] base_calendar: removed email_from from demo data, because this field does not exist; updated used categories, because some were not defined.
...
bzr revid: tde@openerp.com-20120813124704-qa70aa3aevh4s0qv
2012-08-13 14:47:04 +02:00
Frédéric van der Essen
01cb3ebb99
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20120813124439-izug22kl0plts08x
2012-08-13 14:44:39 +02:00
vta vta@openerp.com
7c3a72300c
[FIX] Fixed login to OpenERP with Google OAuth2. Still fails when redirecting an authenticated user.
...
bzr revid: vta@openerp.com-20120813123333-b4jwsrn106lakbnh
2012-08-13 14:33:33 +02:00
Thibault Delavallée
fd009ce95f
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120813123145-ruli48hzsfiu6g1y
2012-08-13 14:31:45 +02:00
Thibault Delavallée
9558419498
[IMP] base_calendar: removed annoying spaces in debug for tests.
...
bzr revid: tde@openerp.com-20120813123111-i224x123n2a1r8fx
2012-08-13 14:31:11 +02:00
Thibault Delavallée
2a22a88230
[FIX] mail_thread: fixed some forgotten \).
...
bzr revid: tde@openerp.com-20120813123051-5lxzx5011j2skrk8
2012-08-13 14:30:51 +02:00
Thibault Delavallée
f7d274850e
[IMP] [CLEAN] res_partner: image_medium used in view, because image_small was too small; cleaned some print statemetns in res_users.
...
bzr revid: tde@openerp.com-20120813122207-04f91lvor03g1xek
2012-08-13 14:22:07 +02:00
Frédéric van der Essen
4c3e048d40
[MERGE WIP] merging from trunk. Still some issues with the thumbnails
...
bzr revid: fva@openerp.com-20120813120801-gjufnck0f78ddivg
2012-08-13 14:08:01 +02:00
Thibault Delavallée
f37f9dcaec
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120813115802-wxjj2oubawzxclm9
2012-08-13 13:58:02 +02:00
Fabien Pinckaers
540a3c2b0a
[IMP] removing structure
...
bzr revid: fp@tinyerp.com-20120813115154-1ppf7mmaolbywku1
2012-08-13 13:51:54 +02:00
niv-openerp
d8796d429c
Now uses the html field type for cl editor
...
bzr revid: nicolas.vanhoren@openerp.com-20120813114638-pla647nupeha1tim
2012-08-13 13:46:38 +02:00
niv-openerp
7341bd30cc
Added html field type
...
bzr revid: nicolas.vanhoren@openerp.com-20120813114619-lqr9zu0rkz6737rp
2012-08-13 13:46:19 +02:00
Thibault Delavallée
c2c27b1858
[FIX$] This time, it's the good fix.
...
bzr revid: tde@openerp.com-20120813111521-uws1uophrd39krfg
2012-08-13 13:15:21 +02:00
Thibault Delavallée
f80c247812
[FIX] Still fixing stpid bugs.
...
bzr revid: tde@openerp.com-20120813105420-stxm7cjc981bj8fq
2012-08-13 12:54:20 +02:00
Rucha (Open ERP)
e79a418f93
[IMP,ADD]: crm: Improved and added mail messages for leads/opportunities
...
bzr revid: rpa@tinyerp.com-20120813105237-14cnt886cgyqlncv
2012-08-13 16:22:37 +05:30
Thibault Delavallée
f4402a1144
[FIX] Wrapper on onchange_address.
...
bzr revid: tde@openerp.com-20120813104135-6ft7wh4ssdl7ouid
2012-08-13 12:41:35 +02:00
Fabien Meghazi
b50dfe4f8f
[IMP] Adapt openerp.web.Dialog's position and maxHeight to the new jquery bootstrap theme.
...
bzr revid: fme@openerp.com-20120813103256-zhw7od30g9j406uv
2012-08-13 12:32:56 +02:00
Thibault Delavallée
b479fbf64a
[IMP] mail_thread: continuing to translate hasattr to something else.
...
bzr revid: tde@openerp.com-20120813103038-4o1xwtsmjnvjj0b4
2012-08-13 12:30:38 +02:00
Fabien Pinckaers
cdc3e2b333
[MERGE] demo data
...
bzr revid: fp@tinyerp.com-20120813103024-9yn1jrk80hk59bkz
2012-08-13 12:30:24 +02:00
Fabien Pinckaers
d9231871b4
[MERGE] demo data
...
bzr revid: fp@tinyerp.com-20120813102950-b1wl11rfcmofna6a
2012-08-13 12:29:50 +02:00
Thibault Delavallée
401bbbc940
[IMP] res.users: added a wrapper on onchange_address, for partner form view delegated to res.users.
...
bzr revid: tde@openerp.com-20120813101847-rmctiebnhm2pmfcz
2012-08-13 12:18:47 +02:00
Thibault Delavallée
0e554c738d
[FIX] Fixed last revision, about name removel in base.sql and so on.
...
bzr revid: tde@openerp.com-20120813100622-jhqv244dskhlh2er
2012-08-13 12:06:22 +02:00
Rucha (Open ERP)
2d7f9ea474
[FIX]: base: Fixed xml_id of country uk
...
bzr revid: rpa@tinyerp.com-20120813095010-3eak04yezq4aorix
2012-08-13 15:20:10 +05:30
Thibault Delavallée
4067f46ff7
[IMP] base.sql: no need to have a 'name' column on res.users I think.
...
bzr revid: tde@openerp.com-20120813093656-ywab7wjdpc5gwl02
2012-08-13 11:36:56 +02:00
Thibault Delavallée
659f3cc996
[FIX] Bloody res_partner should be res.partner.
...
bzr revid: tde@openerp.com-20120813093641-ssyfm4au52nupbi1
2012-08-13 11:36:41 +02:00
Rucha (Open ERP)
c2c6a912cc
[IMP]: base: Improved country_id search by direct reference of xml_id
...
bzr revid: rpa@tinyerp.com-20120813092552-q9mrusns0jok7ztl
2012-08-13 14:55:52 +05:30
Thibault Delavallée
e120d9a699
[REV] Reverted last fixes. Think it comes from outer space.
...
bzr revid: tde@openerp.com-20120813091719-6551uziq8ts4kj6a
2012-08-13 11:17:19 +02:00
Thibault Delavallée
55e9fdf360
[FIX] res.users: defer onchange_type calls from partner form view to the partner.
...
bzr revid: tde@openerp.com-20120813091627-nfv0vkfjo87jhplp
2012-08-13 11:16:27 +02:00
Tejas Tank
246b476020
Workflow editor label.
...
bzr revid: tta@openerp.com-20120813091519-lcxiemc2wojfx2d6
2012-08-13 14:45:19 +05:30
Thibault Delavallée
fd471af0d8
[IMP] mail_thread: replaced hasattr by check in columns.
...
bzr revid: tde@openerp.com-20120813090641-n8o08be2ecfxxtdz
2012-08-13 11:06:41 +02:00
Thibault Delavallée
db7e49ca91
[FIX] project_timesheet tests: user creation should also have its partner.
...
bzr revid: tde@openerp.com-20120813081054-csyaq8p7lf7e1nvh
2012-08-13 10:10:54 +02:00
Thibault Delavallée
18aaed7f4f
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120813073105-pz2vdiz7gc27triz
2012-08-13 09:31:05 +02:00
Thibault Delavallée
1583df6080
[MERGE] Merged with server/trunk.
...
bzr revid: tde@openerp.com-20120813073013-d10f8sc06pa4yqv6
2012-08-13 09:30:13 +02:00
Rucha (Open ERP)
5fd7ad04c1
[REM]: hr: Removed duplicate employee and department from demo
...
bzr revid: rpa@tinyerp.com-20120813072738-temucs10vhcubepv
2012-08-13 12:57:38 +05:30
Rucha (Open ERP)
98e591c2a7
[IMP]: point_of_sale: Improved remaining product name translation
...
bzr revid: rpa@tinyerp.com-20120813071720-kcsjouksbz4v0act
2012-08-13 12:47:20 +05:30
Launchpad Translations on behalf of openerp
2d10577000
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120813052537-ans6r1oi6i0xrzyy
2012-08-13 05:25:37 +00:00
Rucha (Open ERP)
dd7a2972d8
[MERGE]: Merge with latest trunk-addons
...
bzr revid: rpa@tinyerp.com-20120813051411-5no0xcudwbkw07c5
2012-08-13 10:44:11 +05:30
Rucha (Open ERP)
2aacbb3566
[MERGE]: Merge with latest trunk-server
...
bzr revid: rpa@tinyerp.com-20120813051138-ik70jclmgu1pexxn
2012-08-13 10:41:38 +05:30
Antony Lesuisse
d946d35ee0
oauth wip
...
bzr revid: al@openerp.com-20120813000149-lslqyhszzz8axhrv
2012-08-13 02:01:49 +02:00
Antony Lesuisse
7ff74cc4b1
oauth wip
...
bzr revid: al@openerp.com-20120812232612-9cib8w333no9hg3d
2012-08-13 01:26:12 +02:00
Antony Lesuisse
2a7d95ac75
[IMP] load all modules at boot in single db mode
...
bzr revid: al@openerp.com-20120812222901-tjz9443oylidd7sy
2012-08-13 00:29:01 +02:00
Antony Lesuisse
1d0c2968ce
[FIX] standalone client
...
bzr revid: al@openerp.com-20120812215517-qxqnd1fvc9hcxezh
2012-08-12 23:55:17 +02:00
Antony Lesuisse
aa93e7186d
[IMP] web controller helpers
...
- move helpers on top
- move some code from controllers to helpers
- deprecate module dependecy processing in standalone client
bzr revid: al@openerp.com-20120812214827-m1wrv7y1jvnro9ew
2012-08-12 23:48:27 +02:00
Antony Lesuisse
9e43be663b
[MERGE] trunk
...
bzr revid: al@openerp.com-20120812174337-wcnind98b8uvypf5
2012-08-12 19:43:37 +02:00
Antony Lesuisse
4dc0440cb1
wip options
...
bzr revid: al@openerp.com-20120812174306-p47bfuzo2r030r3t
2012-08-12 19:43:06 +02:00
Antony Lesuisse
875d7541d9
sign up with controller
...
bzr revid: al@openerp.com-20120812170603-mnp54q5xn9htg6vj
2012-08-12 19:06:03 +02:00
Antony Lesuisse
6a78b5dbd9
[FIX] authenticate optional env
...
bzr revid: al@openerp.com-20120812151532-gqt8dcqo6f5t2szb
2012-08-12 17:15:32 +02:00
vta vta@openerp.com
dd84bffaa8
[MERGE] Latest trunk
...
bzr revid: vta@openerp.com-20120812150835-zv2f1r9bdf9c406u
2012-08-12 17:08:35 +02:00
vta vta@openerp.com
d0ff623729
[ADD] Basic functionality.
...
bzr revid: vta@openerp.com-20120812150739-nrdwvxmnnnw8yr54
2012-08-12 17:07:39 +02:00