Olivier Dony
983a7d2fd2
[MERGE] latest trunk
...
bzr revid: odo@openerp.com-20110912123152-xswj0jlmhp7qpoz8
2011-09-12 14:31:52 +02:00
Xavier Morel
178fec5c64
[FIX] str 'in' str (singletons missing tuple-building comma), in @colors attributes. Replace by string equality
...
bzr revid: xmo@openerp.com-20110911135025-v9yct8pnjfj21tyj
2011-09-11 15:50:25 +02:00
Olivier Dony
d5d2099658
[IMP] mail*: rename mail.compose.wizard extension, for consistency
...
bzr revid: odo@openerp.com-20110909131045-mzuspzazkv34ns3q
2011-09-09 15:10:45 +02:00
Olivier Dony
1db8e54425
[IMP] all: unified context params for mail composition wizard
...
A single common `mail.compose.message.mode` key is now
used in the context, avoiding name collisions and being
more consistent.
bzr revid: odo@openerp.com-20110906093228-itbilwzpv4wl07j9
2011-09-06 11:32:28 +02:00
Olivier Dony
f42126df0e
[MERGE] latest trunk
...
bzr revid: odo@openerp.com-20110906080846-lyi3haucchsaz7uo
2011-09-06 10:08:46 +02:00
752df5acbd
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110905055933-cld0r3vv3jmiu5bx
bzr revid: launchpad_translations_on_behalf_of_openerp-20110906044018-ajk9u7zfqoiatufs
2011-09-06 04:40:18 +00:00
Antony Lesuisse
71443ad49f
[MERGE] trunk
...
bzr revid: al@openerp.com-20110827211948-kmap692ves3ixo4k
2011-08-27 23:19:48 +02:00
ae7b1699cb
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110823050537-7q5lx6k2wq8n70ld
bzr revid: launchpad_translations_on_behalf_of_openerp-20110824043728-ri9o75i5hp2tss1x
2011-08-24 04:37:28 +00:00
Olivier Dony
8f9f45ea94
[IMP] all: next pass of review/renaming for new mail API
...
bzr revid: odo@openerp.com-20110822171659-zxho36a6n628i10q
2011-08-22 19:16:59 +02:00
Olivier Dony
50507512cb
[MERGE] latest trunk
...
This was a helluva merge, with hundreds of conflicts resolved manually!!
I hope I did not break too many things, but a full review of the mail-related
features (where most of the conflicts occurred) must still be done before
this feature branch can be merged.
bzr revid: odo@openerp.com-20110809234428-3dsvxrt6t54ju0cf
2011-08-10 01:44:28 +02:00
Xavier Morel
09cf4d40d0
[FIX] convert ir.actions.todo fields to match model definition changes
...
* type = special => type = automatic
* type = recurring | normal => type = normal
* default type special => normal
* state = hidden => state = done
bzr revid: xmo@openerp.com-20110729140324-0nxus4p8ufj46z9y
2011-07-29 16:03:24 +02:00
Xavier Morel
cc13113641
[REF] reformat xml files before applying automated search&replace on them
...
bzr revid: xmo@openerp.com-20110729134810-oiqptqs2omvo7o7c
2011-07-29 15:48:10 +02:00
Xavier Morel
5a41a68bc2
[MERGE] from trunk
...
bzr revid: xmo@openerp.com-20110726111218-umzudy6z5wrn63j9
2011-07-26 13:12:18 +02:00
Olivier Dony
899f79d944
[FIX] hr_evaluation: isample data must be noupdate=True
...
bzr revid: odo@openerp.com-20110722155707-wlyeg9ywc5prj4mx
2011-07-22 17:57:07 +02:00
Olivier Dony
6f1fd6c29a
[FIX] hr_evaluation: include missing file in descriptor - quickfix for previous commit breaking the tests
...
bzr revid: odo@openerp.com-20110722155110-vw2zsqxtw2a11wmb
2011-07-22 17:51:10 +02:00
Raphael Collet
81a1eb18a1
[MERGE] from trunk
...
bzr revid: rco@openerp.com-20110718083424-kdaesx3gflza142a
2011-07-18 10:34:24 +02:00
Xavier Morel
a5fdb75ad6
[FIX] ir.actions.todo are now unskippable
...
bzr revid: xmo@openerp.com-20110714103725-6r6j35qegobhvx5u
2011-07-14 12:37:25 +02:00
Antony Lesuisse
d3d8c5762c
[FIX] hr_evaluation test fix, marital is a selection
...
bzr revid: al@openerp.com-20110712134615-huxbhop8wjryfqb5
2011-07-12 15:46:15 +02:00
Raphael Collet
292b4683b6
[MERGE] add field 'complexity' in modules
...
bzr revid: rco@openerp.com-20110708100307-5axn5hnn92qm8qiw
2011-07-08 12:03:07 +02:00
Raphael Collet
adafbc707a
[MERGE] from trunk
...
bzr revid: rco@openerp.com-20110708092232-mlezo4330k2j8vvw
2011-07-08 11:22:32 +02:00
Hardik Ansodariy (OpenERP)
1f5aa0643f
[IMP]: module is defined by its complexity
...
bzr revid: han@tinyerp.com-20110706122928-xvcpdu5inpkganfy
2011-07-06 17:59:28 +05:30
Quentin (OpenERP)
664ba7bba3
[MERGE] merge with main addons branch
...
bzr revid: qdp-launchpad@openerp.com-20110630133009-i0qxzrn9up9e0bog
2011-06-30 15:30:09 +02:00
eedefe1ebc
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110628044031-fyrldmppur3u2vso
2011-06-28 04:40:31 +00:00
154addd6bb
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110607043551-4rpi9kkxnhsqxd0n
bzr revid: launchpad_translations_on_behalf_of_openerp-20110608043635-x9rtk2xkh75xlvq5
bzr revid: launchpad_translations_on_behalf_of_openerp-20110609043554-qetee7pedmsdwjm8
bzr revid: launchpad_translations_on_behalf_of_openerp-20110610043735-3d5rff99pe1zho3w
2011-06-10 04:37:35 +00:00
aag (OpenERP)
8d93ae6cd0
[IMP]hr_evalution:Define Your Department Structure in HR Management -5 categ
...
bzr revid: aag@tinyerp.co.in-20110603130956-m5nr7yp2x86zgfn2
2011-06-03 18:39:56 +05:30
aag (OpenERP)
923bf18e78
[ADD]hr_evalution:Define Your Department Structure add to Human Resource -3 seq category
...
bzr revid: aag@tinyerp.co.in-20110602104157-e446vzuv1llwq60n
2011-06-02 16:11:57 +05:30
d08352c14e
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110526043628-iggxpe3dtuzm615i
bzr revid: launchpad_translations_on_behalf_of_openerp-20110527044622-w39rbfftxxgek3f8
bzr revid: launchpad_translations_on_behalf_of_openerp-20110529043625-9tpnzf4lz10ypg5f
bzr revid: launchpad_translations_on_behalf_of_openerp-20110530045915-u5a8nm8u0h54ujyv
2011-05-30 04:59:15 +00:00
Hardik Ansodariy (OpenERP)
26d26a234b
[IMP]:hr_evaluation:i have add two data in this module 1)Employee Evaluation 2)job Survey
...
bzr revid: han@tinyerp.com-20110524125703-6nt9o8hgckwh2c6i
2011-05-24 18:27:03 +05:30
aag (OpenERP)
eb983943d5
[IMP]hr_evaluation: Add help to Define Your Department Structure
...
bzr revid: aag@tinyerp.co.in-20110509103926-g0kz04bzv3uqk3br
2011-05-09 16:09:26 +05:30
aag (OpenERP)
651da049b8
[IMP]hr_evaluation : Define Your Department Structure - open in list view instead of form view
...
bzr revid: aag@tinyerp.co.in-20110503134131-ff0l8ziygkl1vqzq
2011-05-03 19:11:31 +05:30
d553615695
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110429055618-q15rvfmlvfsl2im5
bzr revid: launchpad_translations_on_behalf_of_openerp-20110430045341-qzlphdlvqf2aa1zx
bzr revid: launchpad_translations_on_behalf_of_openerp-20110501045420-py2vl38b1o3mfs7o
bzr revid: launchpad_translations_on_behalf_of_openerp-20110502043731-ym2tvgj2djoitk8f
2011-05-02 04:37:31 +00:00
Harry (OpenERP)
5be7bbd5c3
[MERGE] merged with trunk development branch
...
bzr revid: hmo@tinyerp.com-20110428111210-llk36qlgkdz1ls54
2011-04-28 16:42:10 +05:30
Rifakat Haradwala (Open ERP)
1ac3e387b2
[FIX] hr_evaluation: act_window
...
bzr revid: rha@tinyerp.com-20110428072913-jvc9eckai7g82wm2
2011-04-28 12:59:13 +05:30
Rifakat Haradwala (Open ERP)
d8c8c20a62
[MERGE] : merge with lp:~openerp-dev/openobject-addons/emails-framework-addons
...
bzr revid: rha@tinyerp.com-20110428072503-nrset8wqcsgewwev
2011-04-28 12:55:03 +05:30
Rifakat Haradwala (Open ERP)
7f84fb5857
[IMP] hr_evaluation:
...
*removed compose wizard from the menu
*added wizard in Inteview Requests form
bzr revid: rha@tinyerp.com-20110428065300-bq90bkpdvjql9hxt
2011-04-28 12:23:00 +05:30
Rucha (Open ERP)
1d5fa6ca4c
[IMP]: *: Reviewed config wizards of all modules and changed type + state in order to follow the behaviour described below:
...
* After a fresh installation of a DB if we dont select and application to install nothing will come
* If I select HR module first time, this module will be installed and all special wizards of this module should be appeared
* If I select HR module(its installed) again from application list, all special wizards of this module should be set as todo in order to display when clicking next
* For any other wizards we have to go to list of config wizards and run them manually (for web client these are supposed to be there in config panel)
bzr revid: rpa@tinyerp.com-20110427133518-52mawayc3rgoyx9h
2011-04-27 19:05:18 +05:30
Rucha (Open ERP)
b6428f5b9d
[MERGE]: Merge with latest trunk
...
bzr revid: rpa@tinyerp.com-20110415092039-94d5dn2qiq388m7b
bzr revid: rpa@tinyerp.com-20110426064148-nqu2870kk5y59fym
bzr revid: rpa@tinyerp.com-20110427044613-zx55jv7o3t209meb
2011-04-27 10:16:13 +05:30
Harry (OpenERP)
0577796333
[MERGE] merged addons trunk development branch after resolving conflicts
...
bzr revid: hmo@tinyerp.com-20110421080156-3c8gg29i01089rgo
2011-04-21 13:31:56 +05:30
Rifakat Haradwala (Open ERP)
44bcca9f2f
[IMP] email.compose.message: useability improvements
...
bzr revid: rha@tinyerp.com-20110419115850-8vsbd9yv3vhedgss
2011-04-19 17:28:50 +05:30
ksa (Open ERP)
e3b787689f
[IMP]: Improve ir.actions.todo replace restart=type
...
bzr revid: ksa@tinyerp.co.in-20110411131719-b5x6i11xvq8gdqjc
2011-04-11 18:47:19 +05:30
ksa (Open ERP)
0fa464b1b7
[IMP]: Improve code
...
bzr revid: ksa@tinyerp.co.in-20110408125758-6soa3t29oels77ym
2011-04-08 18:27:58 +05:30
Rifakat Haradwala (Open ERP)
dbf82a8fb4
[FIX] rename name, descrition field to subject and body to remaining modules
...
bzr revid: rha@tinyerp.com-20110408072853-bhoeuqdfgoqx3tyb
2011-04-08 12:58:53 +05:30
ksa (Open ERP)
f00fb439fc
[IMP]: Improvement
...
bzr revid: ksa@tinyerp.co.in-20110407132956-1o67jgwlmahvvi3m
2011-04-07 18:59:56 +05:30
Rifakat Haradwala (Open ERP)
f53ee6053a
[IMP] email.message.common: implemented active_id and active_model in default_get() and fix reference of fields subject and body
...
bzr revid: rha@tinyerp.com-20110407125024-4354406jcb4ih2k9
2011-04-07 18:20:24 +05:30
ksa (Open ERP)
cbfe43975a
[ADD]: config wizard for hr_evaluation
...
bzr revid: ksa@tinyerp.co.in-20110407050635-6wvhwajq88x712id
2011-04-07 10:36:35 +05:30
AMP (OpenERP)
dba0f62620
[FIX] hr_evaluation : Fixes the syntex problem on filter
...
bzr revid: amp@tinyerp.com-20110405115015-uymwebdn8b9b7j3e
2011-04-05 17:20:15 +05:30
Rifakat Haradwala (Open ERP)
9a9c100595
[Merge]: merge with lp:~openerp-dev/openobject-addons/emails-framework-addons
...
bzr revid: rha@tinyerp.com-20110330092614-sgnniorxit17zvxn
2011-03-30 14:56:14 +05:30
408b9e64bb
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110330043747-xs97mruw4g9scs4z
2011-03-30 04:37:47 +00:00
Harry (OpenERP)
cf7c73310d
[MERGE] merged with trunk addods development branch
...
bzr revid: hmo@tinyerp.com-20110329122736-78igudbed2jz7lf4
2011-03-29 17:57:36 +05:30
c5ca5a565f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110326050046-dq45skrem9w4mvec
bzr revid: launchpad_translations_on_behalf_of_openerp-20110327045332-0qk3wj2yahi6f7ty
bzr revid: launchpad_translations_on_behalf_of_openerp-20110328043636-fm3ded2ur36t8x6q
2011-03-28 04:36:36 +00:00
Olivier Dony