Commit Graph
71110 Commits
Author SHA1 Message Date
Jitendra Prajapati (OpenERP) cf322c62ac [IMP]hr_holidays:Remove the extra space
bzr revid: prajapatijitendra7969@gmail.com-20130528063031-ad6gp45az42q9018
2013-05-28 12:00:31 +05:30
Jitendra Prajapati (OpenERP) c7c84a8695 [IMP]hr_recruitment: Improve code with active id and remove the extra field
bzr revid: prajapatijitendra7969@gmail.com-20130528054339-1dqdc6ytwu5nyi75
2013-05-28 11:13:39 +05:30
DBR (OpenERP) 1cdc9245e7 [IMP]Hr: Improve tooltip and labels
bzr revid: dbr@tinyerp.com-20130527121704-k7fyapvs0ogfdamx
2013-05-27 17:47:04 +05:30
DBR (OpenERP) efa3573c8c [Merge] lp:openobject-addons
bzr revid: dbr@tinyerp.com-20130502054827-5e8wdd32uqnt0pxu
bzr revid: dbr@tinyerp.com-20130522063702-wvvhxgecs499zx3f
bzr revid: dbr@tinyerp.com-20130527072743-2rtgky6nf2c15xqd
2013-05-27 12:57:43 +05:30
Fabien Pinckaers 0dc0d9f83c [IMP] modules manifest
bzr revid: fp@openerp.com-20130526205613-k4d8b5gb0mrxpm2f
2013-05-26 22:56:13 +02:00
Fabien Pinckaers d27f005906 [IMP] manifest social module
bzr revid: fp@openerp.com-20130526204743-9boe9gfdj7a4cdim
2013-05-26 22:47:43 +02:00
Fabien Pinckaers 11aac08f25 [IMP] manifest
bzr revid: fp@tinyerp.com-20130525143355-e1qxw1k4oy4wy6fy
2013-05-25 16:33:55 +02:00
Fabien Pinckaers 021b308ada [IMP] missing photo
bzr revid: fp@tinyerp.com-20130525142117-uujinuujh7ig20ef
2013-05-25 16:21:17 +02:00
Fabien Pinckaers 92eda4d460 [IMP] customer quotes
bzr revid: fp@tinyerp.com-20130525135501-ecmr63atek6632m2
2013-05-25 15:55:01 +02:00
Fabien Pinckaers afa307f9e7 [IMP] Invoicing manifest
bzr revid: fp@tinyerp.com-20130525131515-zy1778t7e2xpjkfa
2013-05-25 15:15:15 +02:00
Fabien Pinckaers 46f8926b97 [IMP] Mail manifest
bzr revid: fp@tinyerp.com-20130525105326-b7glz1anwirje561
2013-05-25 12:53:26 +02:00
Fabien Pinckaers 32a43cabd6 [IMP] manifest for ocial network module
bzr revid: fp@tinyerp.com-20130525102744-8szru8020ymxs6tf
2013-05-25 12:27:44 +02:00
Fabien Meghazi 078424d522 [FIX] note: typo in description
bzr revid: fme@openerp.com-20130523143936-wsbyhx239kjmpvye
2013-05-23 16:39:36 +02:00
Frédéric van der Essen a036561b53 [MERGE] app_descr: typo fixes
bzr revid: fva@openerp.com-20130523131217-vru3hbmldd7q25d0
2013-05-23 15:12:17 +02:00
Frédéric van der Essen 1e9b3733b4 [FIX] app_descriptions: typo
bzr revid: fva@openerp.com-20130523131139-5efifdek3f5bccqa
2013-05-23 15:11:39 +02:00
Martin Trigaux 116bfc7fa7 [MERGE] note: Rename Categories into Stages
bzr revid: mat@openerp.com-20130523125350-2kpxpxx7oec1eb58
2013-05-23 14:53:50 +02:00
Launchpad Translations on behalf of openerp e16f5b6e11 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130523051951-q7enzsoh36nps9nk
2013-05-23 05:19:51 +00:00
Christophe Simonis 6a3ace331d [REVERT] release.pu don't need to be forward ported
bzr revid: chs@openerp.com-20130522150912-rn45l1k5b831mqk6
2013-05-22 17:09:12 +02:00
Fabien Meghazi 3c0b65f5d1 [MERGE] application descriptions
bzr revid: fme@openerp.com-20130522140734-j6gw2u68zuu0suyf
2013-05-22 16:07:34 +02:00
Thibault Delavallée f6326c6917 [MERGE] [IMP] mail: improved management of links in notification emails.
A new server action is defined that handles the redirection. If the user has access to the document, it opens the form view of the document. A method is called that allows to define the form view to open in some specific models (such as lead/opportunities). If the user has no access to the document, it opens the inbox, filtered on the discussion. The inbox opened is different for employees and portal users.

This server action is called by the link included in notification emails. This way the redirection Inbox/document is done dynamically at login, and not statically when generating the email.

Added tests.

bzr revid: tde@openerp.com-20130522124930-21tgj52v83hw8cj0
2013-05-22 14:49:30 +02:00
Thibault Delavallée 978c76c5ea [MERGE] [IMP] mail: improved management of links in notification emails.
This branch adds the URL parameters in context.params.

bzr revid: tde@openerp.com-20130522124012-pf2m5efmmz1vuilc
2013-05-22 14:40:12 +02:00
Thibault Delavallée 6b572b8d90 [CLEAN] portal/mail_thread: cleaned a bit new code, using is_portal.
bzr revid: tde@openerp.com-20130522115549-ot3f31c5oty0zqya
2013-05-22 13:55:49 +02:00
Thibault Delavallée cd278d83ab [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20130522103305-yi5ql1chdx9qxxlx
bzr revid: tde@openerp.com-20130522114236-qi2s3i2dl2lemdvh
2013-05-22 13:42:36 +02:00
Thibault Delavallée d4d6e88266 [IMP] [IMP] mail: now defines a catchall email alias, used to format the
reply_to of notification emails when having a document without alias, or for
private discussions.

bzr revid: tde@openerp.com-20130522114007-vlbkzghz278545zn
2013-05-22 13:40:07 +02:00
Thibault Delavallée faefb9fad1 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20130522103426-wjn0ttqdbf72g713
2013-05-22 12:34:26 +02:00
Thibault Delavallée 0d01d958fa [MERGE] [FORWARD] Forward port of saas-1 branch until revision 8711 (that includes forward-port of 7.0 until 9143)
Revision ID: tde@openerp.com-20130521152657-v48pj2m0692rw9b5

bzr revid: tde@openerp.com-20130522102605-bbc5vrfhfro4ab90
2013-05-22 12:26:05 +02:00
Thibault Delavallée 218024570d [MERGE] [FORWARD] Forward-port of saas-1 branch until revision 4875
Revision ID: qdp-launchpad@openerp.com-20130507120149-p2m4ug20nfny234v

bzr revid: tde@openerp.com-20130522102240-ysni935cvnfvpe40
2013-05-22 12:22:40 +02:00
Martin Trigaux 5d47a52df3 [MERGE] fix various usability problems
bzr revid: mat@openerp.com-20130522095856-ol8igg97ctyh49sg
2013-05-22 11:58:56 +02:00
Martin Trigaux b86d62a297 [MERGE] fix various usability problems
bzr revid: mat@openerp.com-20130522095319-ls5d91bym2ry8ip6
2013-05-22 11:53:19 +02:00
Fabien Meghazi 435f022970 [REM] Remove point of sale testimonials
bzr revid: fme@openerp.com-20130522095027-61xih9viyrdadjxi
2013-05-22 11:50:27 +02:00
Thibault Delavallée 8aa85c2523 [FORWARD] Forward port of addons until revision 8711
bzr revid: tde@openerp.com-20130521133807-5n97jep45f3lf6uq
bzr revid: tde@openerp.com-20130522083012-4yry4ht2943sjatn
2013-05-22 10:30:12 +02:00
Thibault Delavallée d2acb63af6 [FORWARD] Forward-port of saas-1 branch until revision 4875
bzr revid: tde@openerp.com-20130522082935-rzzbc3p625rkmcdy
2013-05-22 10:29:35 +02:00
Turkesh Patel (Open ERP) 3d4c0a795a [MRG] merge with lp:openobject-addons
bzr revid: tpa@tinyerp.com-20130522063035-nype13o1f6oneq4h
2013-05-22 12:00:35 +05:30
Turkesh Patel (Open ERP) 83740f70f0 [MRG] merge with lp:openerp-web
bzr revid: tpa@tinyerp.com-20130522063018-q6oevmlcnrfl7i79
2013-05-22 12:00:18 +05:30
Fabien Meghazi 8b0b9e071c [ADD] testimonials photo for sale
bzr revid: fme@openerp.com-20130521154251-lhcb43x5uvmdn9px
2013-05-21 17:42:51 +02:00
Thibault Delavallée 176481a970 [FIX] mail: fixed link in notification email
bzr revid: tde@openerp.com-20130521152657-v48pj2m0692rw9b5
2013-05-21 17:26:57 +02:00
Fabien Meghazi 1fcc1515a3 [ADD] testimonials
bzr revid: fme@openerp.com-20130521150552-1krrc7y2xatjlb70
2013-05-21 17:05:52 +02:00
Thibault Delavallée 2663fd67b1 [FIX] auth_signup: fixed login_mode going to default when having another type given in parameter
bzr revid: tde@openerp.com-20130521145723-3os8q5qej9dr7dxo
2013-05-21 16:57:23 +02:00
Fabien Meghazi 212d847618 [ADD] project testimonials photo
bzr revid: fme@openerp.com-20130521143344-ik155j66fsgry3xk
2013-05-21 16:33:44 +02:00
Fabien Meghazi cd38569c0b [ADD] forgot image for project
bzr revid: fme@openerp.com-20130521134939-6cuh510lgtu21rkq
2013-05-21 15:49:39 +02:00
Fabien Meghazi 4a124e7678 [ADD] testimonials hr
bzr revid: fme@openerp.com-20130521134055-n4p1vb8bydrim6mf
2013-05-21 15:40:55 +02:00
Thibault Delavallée c1cb8bf765 [CLEAN] Removed debug code.
bzr revid: tde@openerp.com-20130521132924-cyb9y03tbkgvv6fl
2013-05-21 15:29:24 +02:00
Fabien Meghazi 3765705d08 [ADD] Testimonials hr
bzr revid: fme@openerp.com-20130521132254-pk5j24vrj4yayq2z
2013-05-21 15:22:54 +02:00
Fabien Meghazi d487ca7906 [IMP] testimonials
bzr revid: fme@openerp.com-20130521130630-thl2d5wgsaqeggp5
2013-05-21 15:06:30 +02:00
Thibault Delavallée 90c7ed2f83 [MERGE] [FORWARD] Forward-port of 7.0 branch until rev 9143.
bzr revid: tde@openerp.com-20130521130627-i7zff51rn8xl7dzk
2013-05-21 15:06:27 +02:00
Thibault Delavallée 23c5622e71 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20130521123730-06f931ihz43p2o63
2013-05-21 14:37:30 +02:00
Thibault Delavallée b1e0f9f6f2 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20130521123624-u6cqs144rbuzrmpo
2013-05-21 14:36:24 +02:00
Thibault Delavallée a05b0bebbe [FORWARD] Forward port of 7.0 branch until revision 9143.
bzr revid: tde@openerp.com-20130521122359-b5vii7gv8arluz06
2013-05-21 14:23:59 +02:00
Fabien Meghazi 0ce5edad43 [ADD] Application descriptions
bzr revid: fme@openerp.com-20130521094005-yt8h4w79182vvk8d
2013-05-21 11:40:05 +02:00
Frédéric van der Essen 39e99c1ce5 [MERGE] point_of_sale: fix for product packaging barcodes
bzr revid: fva@openerp.com-20130521093609-0y0z190ut9iggb0w
2013-05-21 11:36:09 +02:00