Commit Graph
71276 Commits
Author SHA1 Message Date
Sejal Bhut (OpenERP Trainee) dcf8b5e830 [FIX] Database Backup Problem
lp bug: https://launchpad.net/bugs/1100721 fixed

bzr revid: sejalpatel125@gmail.com-20130603092630-3rh4bewi3kihmub7
2013-06-03 14:56:30 +05:30
Martin Trigaux 8c0dfaa9b8 [MERGE] [IMP] company: add onchange on state to match country
bzr revid: mat@openerp.com-20130530141819-evvqnmm029uf486h
2013-05-30 16:18:19 +02:00
Martin Trigaux 7d88fa9443 [MERGE] [IMP] better event form view
bzr revid: mat@openerp.com-20130530134736-r5ol9ty83p10iwfl
2013-05-30 15:47:36 +02:00
Martin Trigaux 3a570c8f14 [MERGE] rename hr_timesheet module and add header on email message form view
bzr revid: mat@openerp.com-20130530125756-cnkj279owcq72kbk
2013-05-30 14:57:56 +02:00
Martin Trigaux 3085dbde98 [MERGE] [IMP] bounce effect on statusbar
bzr revid: mat@openerp.com-20130530121345-5xg7indlm3mgm217
2013-05-30 14:13:45 +02:00
Martin Trigaux 8f0b106e47 [MERGE] account_analytic_analysis: better tooltip on remaining time field
bzr revid: mat@openerp.com-20130530114426-u508zvb7zw5aj1fg
2013-05-30 13:44:26 +02:00
Martin Trigaux 2998d4cb58 [MERGE] [IMP] note: remove default context to display all notes
bzr revid: mat@openerp.com-20130530113359-an8s5wylaj0wqlju
2013-05-30 13:33:59 +02:00
Martin Trigaux 09a264a191 [MERGE] [IMP] account: When check group Analytic accounting in the accounting setting, the full accounting features should also be true
bzr revid: mat@openerp.com-20130530101833-gzoyvh7rj07cpm4k
2013-05-30 12:18:33 +02:00
Martin Trigaux 3b63e58960 [MERGE] hr_recruitment: Improve the kanban view to make it look like opportunity view
bzr revid: mat@openerp.com-20130530100852-xfb4vag9yyem4tcd
2013-05-30 12:08:52 +02:00
Martin Trigaux a9ecb71b2f [MERGE] [IMP] event: add responsible field to event
bzr revid: mat@openerp.com-20130530092204-jjo2cblryi3kmge7
2013-05-30 11:22:04 +02:00
Launchpad Translations on behalf of openerp f9223b5bb6 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130530060240-vglq7yjkt04wsw3s
2013-05-30 06:02:40 +00:00
Launchpad Translations on behalf of openerp 816e9713ed Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130530054519-ritlff842k1rzy3c
2013-05-30 05:45:19 +00:00
Launchpad Translations on behalf of openerp 3c4cf038b9 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130530054444-ue5dlgvg8lswmwr1
2013-05-30 05:44:44 +00:00
Fabien Pinckaers 36cd14400a [IMP] manifest modules
bzr revid: fp@openerp.com-20130529180527-x2uxuqdblkkpzeix
2013-05-29 20:05:27 +02:00
Martin Trigaux 1426e92253 [MERGE] mail: remove html tags from title; pos: use only integer as amount input
bzr revid: mat@openerp.com-20130529155031-ebtge446hvl3vdgm
2013-05-29 17:50:31 +02:00
Martin Trigaux c57336af8e [MERGE] [IMP] improve bounce effect on readonly form
bzr revid: mat@openerp.com-20130529154243-5y5psw3eqce91uxe
2013-05-29 17:42:43 +02:00
Martin Trigaux a33c762ba0 [IMP] sync with latest trunk
bzr revid: mat@openerp.com-20130529154059-g8yda797kblmfv18
2013-05-29 17:40:59 +02:00
Martin Trigaux d2fe0510e9 [MERGE] [FIX] kanban quick create, empty when lose focus
bzr revid: mat@openerp.com-20130529152802-xjg3roheqtin4tla
2013-05-29 17:28:02 +02:00
Martin Trigaux 743a427dc4 [MERGE] ps test week 48
[FIX] remove html tags from titles

bzr revid: mat@openerp.com-20130529150934-wi5w02ms4ylly7xb
2013-05-29 17:09:34 +02:00
Martin Trigaux 2e3ef3e687 [MERGE] ps test 48 [IMP] improve css for dropbdown
bzr revid: mat@openerp.com-20130529150858-z38l0r36w0ns4f3b
2013-05-29 17:08:58 +02:00
Launchpad Translations on behalf of openerp 814a121dab Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130528051715-j4ulg9nj7dri99fm
bzr revid: launchpad_translations_on_behalf_of_openerp-20130529053736-mcbrxavvttckchd7
2013-05-29 05:37:36 +00:00
Vidhin Mehta b34a430db9 [MERGE]Trunk.
bzr revid: vme@tinyerp.com-20130528103207-aant31zf1vq9zet2
2013-05-28 16:02:07 +05:30
Amit Bhavsar (Open ERP) 20210d96f8 [MERGE] merge with latest trunk
bzr revid: amb@tinyerp.com-20130528085853-33ak0wen7shv6af2
2013-05-28 14:28:53 +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
Vidhin Mehta 5fa8cdd305 bzr revid: vme@tinyerp.com-20130523071814-o5suitn0hcy12mie 2013-05-23 12:48:14 +05:30
Vidhin Mehta 82657c43a8 [IMP]Make indentation as it is.
bzr revid: vme@tinyerp.com-20130523070624-8q2d2zj2zjnn8l31
2013-05-23 12:36:24 +05:30
Vidhin Mehta 2f15045af4 [FIX]Fixes on, need fixing issues by MAT.
bzr revid: vme@tinyerp.com-20130523060223-hupizjpulghv8gsy
2013-05-23 11:32:23 +05:30
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
Vidhin Mehta c745a1d882 [MERGE]Trunk.
bzr revid: vme@tinyerp.com-20130514120110-gi2oehiapff1n3p0
bzr revid: vme@tinyerp.com-20130523051758-70etk8qp90k8e9ou
2013-05-23 10:47:58 +05:30
Vidhin Mehta e9fadb6ff8 [MERGE]Trunk.
bzr revid: vme@tinyerp.com-20130514120256-0xob1bgm77zrsp27
bzr revid: vme@tinyerp.com-20130523051407-vyl5oy2ubm1on2r3
2013-05-23 10:44:07 +05:30
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