Commit Graph
68208 Commits
Author SHA1 Message Date
Vishmita f3b0459705 [MERGE]Merge lp:openerp-web.
bzr revid: vja@tinyerp.com-20121116091147-yw0ri9uwp5vi4n7c
2012-11-16 14:41:47 +05:30
Arnaud Pineux dc3f98308d [FIX] audittrail
lp bug: https://launchpad.net/bugs/1055813 fixed

bzr revid: api@openerp.com-20121116085042-v8q78tof9jyuec07
2012-11-16 09:50:42 +01:00
Christophe Matthieu 7e5389cc95 [MERGE] web kanban: change css for remove hole in kanban view (float:left => display:inline-block)
bzr revid: chm@openerp.com-20121116081701-sz7cm35xxq94ftfn
2012-11-16 09:17:01 +01:00
Thibault Delavallée 2a61424ddb [FIX] mail, crm demo data: back to noupdate.
bzr revid: tde@openerp.com-20121116081657-kyua3pggy84awx4p
2012-11-16 09:16:57 +01:00
Thibault Delavallée 760da18368 [MERGE] Sync with trunk.
bzr revid: tde@openerp.com-20121116081533-k18e3rnl3u5mng06
2012-11-16 09:15:33 +01:00
Xavier Morel 82fc839c55 [ADD] program directive to doc
bzr revid: xmo@openerp.com-20121116080413-dv4q0bj161a2psv4
2012-11-16 09:04:13 +01:00
vta vta@openerp.com e92a31e2bb [IMP] Now portal users can subscribe to public content.
bzr revid: vta@openerp.com-20121116075744-tclpsjxi1ut6wvh8
2012-11-16 08:57:44 +01:00
vta vta@openerp.com d6ba13a394 [IMP] Minor improvements in portal views, such as contact and employees. Improved menus and string on empty views. Send the password when a partner is invited to portal via sidebar menu.
bzr revid: vta@openerp.com-20121116075305-4d0olu5zlvwsxeq8
2012-11-16 08:53:05 +01:00
Xavier Morel 09037e8a42 [REM] failing test code
committed by mistake

bzr revid: xmo@openerp.com-20121116073738-9f43bm0q6eojns3v
2012-11-16 08:37:38 +01:00
Xavier Morel d632471f64 [IMP] web test runner: pass execute's arguments to the function to avoid duplication
bzr revid: xmo@openerp.com-20121116072906-0di2j83p602a2l9i
2012-11-16 08:29:06 +01:00
Xavier Morel a9645151b6 [IMP] setup & teardown of test runner
simplify code and make setup & teardown processes more reliable

add testing.Stack tools which stacks promise-returning functions
around the actual promise-returning function to execute (the test case
itself).

testing.Stack returns an object with 3 methods, ``push([setup][,
teardown])``, ``unshift([setup][, teardown])`` and ``execute(fn,
*args)``. ``push`` and ``unshift`` create a new stack with the
provided setup and teardown added respectively at the top and bottom
of the stack.

``execute`` will walk the stack from bottom to top executing ``setup``
handlers (and waiting on their result), if all setup handlers execute
without failure the ``fn`` callback gets executed (and waited on) then
*all* ``teardown`` handlers are executed from top to bottom:

 |  setup
 |    setup
 |      setup
 |        setup
 |          fn
 |        teardown
 |      teardown
 |    teardown
 V  teardown

If a ``setup`` handler fails (the promise is rejected), teardowns will
start executing *from the previous level* (so the ``teardown``
matching the failed ``setup`` will *not* be run), but all
``teardowns`` below that will be run regardless, even if one fails the
next one will still be executed.

The stack will either ultimately return a promise rejection using the
*first* rejection it got (a rejection may be cascading, so the
rejection of a setup may also lead to or be linked to a teardown being
rejected later), or will return the resolution from ``fn``.

If ``execute`` is passed further arguments, those arguments will in
turn be forwarded to ``fn`` as well as all ``setup`` and ``teardown``
handlers.

bzr revid: xmo@openerp.com-20121116071712-zuld957icellezum
2012-11-16 08:17:12 +01:00
Atul Patel (OpenERP) 3f0b7feb21 [FIX]: Add date_From group by
bzr revid: atp@tinyerp.com-20121116065005-uecsl54sfbilp4o7
2012-11-16 12:20:05 +05:30
Atul Patel (OpenERP) 8e50c5df5e [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20121116061005-68rksxv7uz67hud3
2012-11-16 11:40:05 +05:30
Nimesh (Open ERP) 05e528953c [MERGE] lp:openobject-addons
bzr revid: nco@tinyerp.com-20121116052834-3hbo0ywsa7efiwbj
2012-11-16 10:58:34 +05:30
Jalpesh Patel (OpenERP) b2a1d5d9b1 [Merge] Merge with lp:openobject-server
bzr revid: pja@tinyerp.com-20121116050347-5w5v4h7stdn9oyhp
2012-11-16 10:33:47 +05:30
Launchpad Translations on behalf of openerp 0c9eb2920d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121108051818-bo8czxgye5kgj1ib
bzr revid: launchpad_translations_on_behalf_of_openerp-20121109050555-e3ad7qdzhtr7rtll
bzr revid: launchpad_translations_on_behalf_of_openerp-20121110052423-5ebiaihlmeqnngf7
bzr revid: launchpad_translations_on_behalf_of_openerp-20121111051216-icdvnmihkdnuqthu
bzr revid: launchpad_translations_on_behalf_of_openerp-20121112045241-nk3vmq6orvk30nzi
bzr revid: launchpad_translations_on_behalf_of_openerp-20121113055218-xb87ck3it2kbrs06
bzr revid: launchpad_translations_on_behalf_of_openerp-20121114050010-8xdtcgb3d8di6458
bzr revid: launchpad_translations_on_behalf_of_openerp-20121115051737-8029w6jc6jn93iku
bzr revid: launchpad_translations_on_behalf_of_openerp-20121116045757-xh0z6uoadkh0il5u
2012-11-16 04:57:57 +00:00
Nhomar Hernandez 58ce165627 [FIX] Doc compiled doesn't allow copy and paste, little fix to better use of docs
bzr revid: nhomar@gmail.com-20121116045112-8xygt4bib72dd51v
2012-11-16 00:21:12 -04:30
Launchpad Translations on behalf of openerp 3c8626efbb Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121116043620-snye1y94q79vggx4
2012-11-16 04:36:20 +00:00
Fabien Pinckaers fa93a1d65e [IMP] demo data
bzr revid: fp@openerp.com-20121115222751-y25pkf50caeajwg1
2012-11-15 23:27:51 +01:00
Fabien Pinckaers 3a8353a302 [IMP] demo data
bzr revid: fp@openerp.com-20121115220945-fws0ue11f9d05ttj
2012-11-15 23:09:45 +01:00
Fabien Pinckaers ae5f46af63 [IMP] dmeo data mail
bzr revid: fp@openerp.com-20121115204322-w4ry0ky4cna5t96c
2012-11-15 21:43:22 +01:00
Fabien Pinckaers 86be41b250 imp
bzr revid: fp@openerp.com-20121115195103-1b3v4quw0dllyyh1
2012-11-15 20:51:03 +01:00
Fabien Pinckaers f6ee56a083 [IMP] better demo data
bzr revid: fp@openerp.com-20121115194817-7c8sbmqymczovcra
2012-11-15 20:48:17 +01:00
Thibault Delavallée 8539249bdb [IMP] mail, crm: demo data largely updated.
bzr revid: tde@openerp.com-20121115182641-99ndilbr5m4x1oft
2012-11-15 19:26:41 +01:00
Fabien Meghazi 8c2764115f [FIX?] Probably fix something... ? See previous revision.
bzr revid: fme@openerp.com-20121115182331-0vz3beb6x2od9xhs
2012-11-15 19:23:31 +01:00
Thibault Delavallée 99c1145d81 [MERGE] Sync with trunk.
bzr revid: tde@openerp.com-20121115131824-60tl5f9hvxpca827
bzr revid: tde@openerp.com-20121115181930-ypj3zbdhg9bvcdf5
2012-11-15 19:19:30 +01:00
Fabien Meghazi cf2d4581be [FIX] Broken kanban images
bzr revid: fme@openerp.com-20121115181730-plfvy8ok9uykvu97
2012-11-15 19:17:30 +01:00
Antonin Bourguignon 9c909e55fc [IMP] add uid in the context, so the default salesman is properly set to the current user (when a opportunity is created through this action)
bzr revid: abo@openerp.com-20121115181045-fzttb2av7nrmment
2012-11-15 19:10:45 +01:00
Antonin Bourguignon 1158cff945 [IMP] indentation
bzr revid: abo@openerp.com-20121115181006-y5np3d61tyc9af2q
2012-11-15 19:10:06 +01:00
Thibault Delavallée 1201be06d0 [FIX] fetchmail: incoming emails on res.users does not lead to a crash anymore, due to missing mail.thread methods in res.users. The partner is also correctly added in recipients.
bzr revid: tde@openerp.com-20121115175404-pflf7lf5s5spalbu
2012-11-15 18:54:04 +01:00
Fabien Meghazi 2b7bfe4ecd [IMP] openerp logo img border 0 for IE
Can't merge nwi's branch right now so I do the bare minimum that hurts eyes

bzr revid: fme@openerp.com-20121115175146-5zn97xz8w3m5l5rx
2012-11-15 18:51:46 +01:00
Fabien Meghazi 8954271636 [CHG] Put IE specifics in base.sass using 'openerp_ie' class
bzr revid: fme@openerp.com-20121115174831-bpsr6k3upz6crbcz
2012-11-15 18:48:31 +01:00
Fabien Meghazi 6e7e07357d [MERGE] trunk
bzr revid: fme@openerp.com-20121115173656-jgyhg977m1y2b50l
2012-11-15 18:36:56 +01:00
Fabien Meghazi 79e1118c16 [IMP] Clean base.sass folding sections
bzr revid: fme@openerp.com-20121115173614-o5pchmm889yxz5cy
2012-11-15 18:36:14 +01:00
Denis Ledoux dle@openerp.com ade9f1edce [Merge]Latest trunk
bzr revid: dle@openerp.com-20121115173107-z1ydqwr2uujfebe3
2012-11-15 18:31:07 +01:00
Antonin Bourguignon 9591811eb4 [IMP] use a many2many_tags widget instead of an array for the salesmen field in the massive conversion wizard
bzr revid: abo@openerp.com-20121115171958-wdnkhjqfp18qdfi6
2012-11-15 18:19:58 +01:00
Thibault Delavallée 54090e8d92 [FIX] incomign email on a partner: fixed auto-inclusion of destination partner in recipients.
bzr revid: tde@openerp.com-20121115171830-0el4jrt1gjmtrts1
2012-11-15 18:18:30 +01:00
Antonin Bourguignon fda57cd226 [IMP] remove whitespaces
bzr revid: abo@openerp.com-20121115171457-al3d1r0qz0fv2s0c
2012-11-15 18:14:57 +01:00
Denis Ledoux dle@openerp.com a7c62c72ee [MERGE]trunk-bug-1077138-dle fix web shortcut
bzr revid: dle@openerp.com-20121115171413-18n22483nungxqda
2012-11-15 18:14:13 +01:00
Christophe Simonis 801927cb14 [FIX] make root menu links works
bzr revid: chs@openerp.com-20121115171201-76y7ul1jhjyi2e78
2012-11-15 18:12:01 +01:00
Antonin Bourguignon 0fe52dce5e [FIX] add 'default_' in the context's dictionnary to properly load the default values in the partner wizard
bzr revid: abo@openerp.com-20121115170159-w7vhthrgrigsx484
2012-11-15 18:01:59 +01:00
Fabien Meghazi 635380169c [MERGE] trunk
bzr revid: fme@openerp.com-20121115165250-tte33jdai1zc6b34
2012-11-15 17:52:50 +01:00
Fabien Meghazi cace9f7887 [IMP] Centralized 'openerp' class on top level elements. Also add openerp_ie class for MSIE
bzr revid: fme@openerp.com-20121115164132-i6a0u8zk3knm1zkv
2012-11-15 17:41:32 +01:00
Vo Minh Thu 071de66193 [FIX] base_import: added security csv file in __openerp__.py.
bzr revid: vmt@openerp.com-20121115163756-vfocdshvwo524dya
2012-11-15 17:37:56 +01:00
Vo Minh Thu 724f452f1e [IMP] fleet/porta/account_budget: removed some initialization warnings.
bzr revid: vmt@openerp.com-20121115160643-lc0b07n6xiaq1rl3
2012-11-15 17:06:43 +01:00
Vo Minh Thu 7c33378557 [IMP] loading: the warning about access rights give an example that can be copied.
bzr revid: vmt@openerp.com-20121115160611-9dkyx82d94pve2rx
2012-11-15 17:06:11 +01:00
Denis Ledoux dle@openerp.com e72542b6ec [FIX]Reload whole favorites (by rpc call) instead of adding the new one, otherwise the name of the new starred item is not structured like the other ones
lp bug: https://launchpad.net/bugs/1077138 fixed

bzr revid: dle@openerp.com-20121115160550-p5kc3j8swxu3lfv0
2012-11-15 17:05:50 +01:00
Thibault Delavallée 0cde689fa9 [FIX] fetchmail: fixed sending email on res.users aliases. This is done by using the message_update method of the related partner.
bzr revid: tde@openerp.com-20121115160008-gpz50ryhdw7h3f8b
2012-11-15 17:00:08 +01:00
Denis Ledoux dle@openerp.com bba12d9e95 [FIX]wrong out id when adding shortcut to system tray list
lp bug: https://launchpad.net/bugs/1077138 fixed

bzr revid: dle@openerp.com-20121115155708-vbz1djvtp15dit78
2012-11-15 16:57:08 +01:00
Arnaud Pineux 15281138ea [FIX] crypt and openid
lp bug: https://launchpad.net/bugs/1026784 fixed

bzr revid: api@openerp.com-20121115153056-ayj1do22pllon9ud
2012-11-15 16:30:56 +01:00