Stephane Wirtel
36aaaf4a32
[MERGE]
...
bzr revid: stw@openerp.com-20120813145708-botpw2f1shkhv3on
2012-08-13 16:57:08 +02:00
Fabien Pinckaers
b79db6f0b3
[IMP] useability, hide fields on partners when not used
...
bzr revid: fp@tinyerp.com-20120813143731-8omk52y879rgbjc1
2012-08-13 16:37:31 +02:00
Vo Minh Thu
7a0abed231
[MERGE] merged trunk.
...
bzr revid: vmt@openerp.com-20120813142443-73d6zm10bqhm17mp
2012-08-13 16:24:43 +02:00
Fabien Pinckaers
e94136a6d8
[IMP] uncommit hyearchical categories
...
bzr revid: fp@tinyerp.com-20120813141101-sd95pzkc1qsy9lox
2012-08-13 16:11:01 +02:00
Christophe Simonis
6ce8b7cf04
[IMP] this is version 7
...
bzr revid: chs@openerp.com-20120813140402-x67r7rk7tr6718jb
2012-08-13 16:04:02 +02:00
Christophe Simonis
0f1aa3300d
[FIX] do not autocorrect location header in redirects
...
bzr revid: chs@openerp.com-20120813135927-k32eih6tg6y28ivl
2012-08-13 15:59:27 +02:00
Fabien Meghazi
41791f7e2f
[FIX] Fix bug in binary/image controller
...
bzr revid: fme@openerp.com-20120813135653-zvk21ch7dc9rs66w
2012-08-13 15:56:53 +02:00
Antonin Bourguignon
b8ba2d279b
[IMP] portal's jobs are now a mail group (no more relation with hr_recruitment)
...
bzr revid: abo@openerp.com-20120813133827-ta4zh1s2gbl4a4ib
2012-08-13 15:38:27 +02:00
Stephane Wirtel
c356b0ea47
[MERGE] procurement: Fix a part of the code
...
bzr revid: stw@openerp.com-20120813133528-1n8sykpenpjkgi74
2012-08-13 15:35:28 +02:00
Thibault Delavallée
9a3deaf3da
[IMP] crm: fixed some categ_id remaining.
...
bzr revid: tde@openerp.com-20120813131207-lu1c271q5dh27vlr
2012-08-13 15:12:07 +02:00
Christophe Simonis
e543552dbd
[FIX] do not mess up the headers in the DisableCacheMiddleware
...
bzr revid: chs@openerp.com-20120813130955-1fwkyahlceotln5o
2012-08-13 15:09:55 +02:00
Thibault Delavallée
ae6d1fe900
[FIX] crm_lead: categ_id -> now categ_ids.
...
bzr revid: tde@openerp.com-20120813125822-1knqrg2adg90xxpy
2012-08-13 14:58:22 +02:00
Thibault Delavallée
9db0a94280
[IMP] CRM demo data: subtype -> content_subtype. Please check your logs before merging ...
...
bzr revid: tde@openerp.com-20120813125803-sodjl70yrnk3i2v0
2012-08-13 14:58:03 +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
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
Fabien Pinckaers
540a3c2b0a
[IMP] removing structure
...
bzr revid: fp@tinyerp.com-20120813115154-1ppf7mmaolbywku1
2012-08-13 13:51:54 +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
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
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
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
6a78b5dbd9
[FIX] authenticate optional env
...
bzr revid: al@openerp.com-20120812151532-gqt8dcqo6f5t2szb
2012-08-12 17:15:32 +02:00
Antony Lesuisse
9211174a6f
[MERGE] document_page aka wiki
...
it still uses the wiki syntax, switch to full html will occur after the
autosizing of cleditor
bzr revid: al@openerp.com-20120812144730-nxgxz8c77afczfr9
2012-08-12 16:47:30 +02:00
Antony Lesuisse
0de43d05c2
fix config wizard
...
bzr revid: al@openerp.com-20120812135319-bcwu9blrd71wepig
2012-08-12 15:53:19 +02:00
Antony Lesuisse
d9624f3e76
[FIX] database manager languages
...
bzr revid: al@openerp.com-20120812134857-yfdwxbszmm8o6q7q
2012-08-12 15:48:57 +02:00
Antony Lesuisse
ecbc9a4446
fix config wizard
...
bzr revid: al@openerp.com-20120812130527-6ffgm7vxjbm2vlft
2012-08-12 15:05:27 +02:00
Antony Lesuisse
d7fc09e8ab
fix config wizard
...
bzr revid: al@openerp.com-20120811234327-5dy2khgh7ldiqvnr
2012-08-12 01:43:27 +02:00
Antony Lesuisse
86fac976de
[MERGE] database manager look
...
bzr revid: al@openerp.com-20120811214809-uhj4hatw5bmi5710
2012-08-11 23:48:09 +02:00
Antony Lesuisse
e1bc12fb27
[MERGE] preference change password fixe
...
bzr revid: al@openerp.com-20120811195354-sayk1u53wy42vqc1
2012-08-11 21:53:54 +02:00
Antony Lesuisse
ddfd83d9ff
fixes test
...
bzr revid: al@openerp.com-20120811185610-o95wfdvtwfg4f4g6
2012-08-11 20:56:10 +02:00
Antony Lesuisse
d2a01d78a4
fixes css, demo, js
...
bzr revid: al@openerp.com-20120811183444-0wwagnum2tm964i6
2012-08-11 20:34:44 +02:00
Antony Lesuisse
2d2cb0b80b
[IMP] act_window allow target inlineview
...
bzr revid: al@openerp.com-20120811182250-c37jbjbh944zzy5m
2012-08-11 20:22:50 +02:00
Antony Lesuisse
683edea774
[IMP] inlineview and minor cleanups
...
bzr revid: al@openerp.com-20120811175852-kde116e50scn9ugs
2012-08-11 19:58:52 +02:00
Fabien Pinckaers
9bc2064028
[FIX] PoS import order from UI, return money
...
bzr revid: fp@openerp.com-20120811143309-pd44zfw6l67j7x7l
2012-08-11 16:33:09 +02:00
Fabien Pinckaers
c17b2443e7
[IMP] improved UI for PoS - mainly forms version=7.0
...
bzr revid: fp@openerp.com-20120811133406-jvso3qhmozmgnj3j
2012-08-11 15:34:06 +02:00
Fabien Pinckaers
c5c7ed79e3
[IMP] better menu tips and todo wizards
...
bzr revid: fp@openerp.com-20120811100322-jeh50k4c4wnbpmom
2012-08-11 12:03:22 +02:00
Launchpad Translations on behalf of openerp
d402784c74
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120811054547-ebfnq6hteui8geba
bzr revid: launchpad_translations_on_behalf_of_openerp-20120811054607-chyn98m3ivp16qg3
2012-08-11 05:46:07 +00:00
Antony Lesuisse
d8e8f22b3f
fix css
...
bzr revid: al@openerp.com-20120810233534-dqcuim7ip990gj6c
2012-08-11 01:35:34 +02:00
Antony Lesuisse
1f4d92ba8b
fix index
...
bzr revid: al@openerp.com-20120810231307-w9rgwiaybhm1gdyk
2012-08-11 01:13:07 +02:00
Antony Lesuisse
e991f474c3
[MERGE] trunk
...
bzr revid: al@openerp.com-20120810225211-0t3wn5b6u1pdosay
2012-08-11 00:52:11 +02:00