c6f3186571
[MERGE] lp862140: phase_id in context of field survey_request_ids
...
bzr revid: qdp-launchpad@openerp.com-20111007123130-7dkjdmnprqnkntzu
2011-10-07 14:31:30 +02:00
3dc8168974
[FIX] Set the categories
...
bzr revid: stw@openerp.com-20111005141902-72du0lku4x176ix9
2011-10-05 16:19:02 +02:00
b8af9b3423
[FIX] hr_evaluation
...
bzr revid: fp@tinyerp.com-20111002155744-cpc21ctqd4bpmrsq
2011-10-02 17:57:44 +02:00
856d08e411
[IMP] hr evaluation
...
bzr revid: fp@tinyerp.com-20111001231711-it0w375uui2k3ssf
2011-10-02 01:17:11 +02:00
44bec2ef36
[FIX] hr : when creating a new record of evaluation
...
lp bug: https://launchpad.net/bugs/862140 fixed
bzr revid: bde@tinyerp.com-20110930091534-b5jp76qfbkm9yzus
2011-09-30 14:45:34 +05:30
26a58b22f2
[MERGE] config rework ir.action.todo stw
...
bzr revid: al@openerp.com-20110924142047-rdo7gwoluoydbfz4
2011-09-24 16:20:47 +02:00
c3a79fbc36
merge
...
bzr revid: fp@tinyerp.com-20110924091037-kpy965dboeutk5y4
2011-09-24 11:10:37 +02:00
e123082d88
[IMP] Add missing configuration wizards
...
bzr revid: stw@openerp.com-20110922131300-uudx3uwhkyaj3ry0
2011-09-22 15:13:00 +02:00
0e861ae34a
[MERGE]: Merge with latest trunk-addons and resolved conflicts in bank statement as new state was added in statement
...
bzr revid: rpa@tinyerp.com-20110922061419-cvaza3f5050o0b85
2011-09-22 11:44:19 +05:30
1be371c851
[IMP]account_voucher,crm_claim,crm_fundraising,marketing_campaign,stock,purchase_requisition:removed a quote from statusbar_colour as per suggestion
...
bzr revid: mma@tinyerp.com-20110921051720-ag458lyz42o64bhb
2011-09-21 10:47:20 +05:30
08ff02c21a
[FIX] hr_evalution improved the tooltips
...
bzr revid: jam@tinyerp.com-20110920101503-9vy1mqeo72mdti0r
2011-09-20 15:45:03 +05:30
48fa8eafdb
[IMP] hr_evalution - Renamed Current Filter to Pending
...
bzr revid: jam@tinyerp.com-20110920094608-e0mx5bcxfb875h8x
2011-09-20 15:16:08 +05:30
55cca7ad81
merge
...
bzr revid: fp@tinyerp.com-20110917144113-iz2j6r5heci9kw2w
2011-09-17 16:41:13 +02:00
05d6d35cc8
[Merge]
...
bzr revid: fp@tinyerp.com-20110917110317-34apz3spz1h9azjl
2011-09-17 13:03:17 +02:00
d979aad3de
[MERGE] branch merged with lp:openobject-addons
...
bzr revid: mtr@tinyerp.com-20110916054138-93b3caomaij5dyp4
2011-09-16 11:11:38 +05:30
3846b99e01
[IMP]stock:statusbar Improvement is Done as per suggestion
...
bzr revid: mma@tinyerp.com-20110915133052-di9iknwgnromr4s4
2011-09-15 19:00:52 +05:30
364f9aefa9
[IMP]stock,purchase_requisition,crm:statusbar Improvement is Done
...
bzr revid: mma@tinyerp.com-20110914131111-3o0jykg61r5eq98c
2011-09-14 18:41:11 +05:30
983a7d2fd2
[MERGE] latest trunk
...
bzr revid: odo@openerp.com-20110912123152-xswj0jlmhp7qpoz8
2011-09-12 14:31:52 +02:00
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
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
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
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
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
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
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
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
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
5a41a68bc2
[MERGE] from trunk
...
bzr revid: xmo@openerp.com-20110726111218-umzudy6z5wrn63j9
2011-07-26 13:12:18 +02:00
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
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
81a1eb18a1
[MERGE] from trunk
...
bzr revid: rco@openerp.com-20110718083424-kdaesx3gflza142a
2011-07-18 10:34:24 +02:00
a5fdb75ad6
[FIX] ir.actions.todo are now unskippable
...
bzr revid: xmo@openerp.com-20110714103725-6r6j35qegobhvx5u
2011-07-14 12:37:25 +02:00
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
292b4683b6
[MERGE] add field 'complexity' in modules
...
bzr revid: rco@openerp.com-20110708100307-5axn5hnn92qm8qiw
2011-07-08 12:03:07 +02:00
adafbc707a
[MERGE] from trunk
...
bzr revid: rco@openerp.com-20110708092232-mlezo4330k2j8vvw
2011-07-08 11:22:32 +02:00
1f5aa0643f
[IMP]: module is defined by its complexity
...
bzr revid: han@tinyerp.com-20110706122928-xvcpdu5inpkganfy
2011-07-06 17:59:28 +05:30
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
5bac583ce7
[FIX] analytic,hr,hr_evaluation,hr_expense,hr_recruitment: added multi-company access rules
...
lp bug: https://launchpad.net/bugs/788139 fixed
bzr revid: mtr@mtr-20110608072935-blig6ejq1oa36un5
2011-06-08 12:59:35 +05:30
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
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
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
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
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
5be7bbd5c3
[MERGE] merged with trunk development branch
...
bzr revid: hmo@tinyerp.com-20110428111210-llk36qlgkdz1ls54
2011-04-28 16:42:10 +05:30
Quentin (OpenERP)
Stephane Wirtel
Fabien Pinckaers
Yogesh(Open ERP)
Antony Lesuisse
Rucha (Open ERP)
Mayur Maheshwari (OpenERP)
Jigar Amin - OpenERP
Meera Trambadia (OpenERP)
Olivier Dony
Xavier Morel
Raphael Collet
Hardik Ansodariy (OpenERP)
mtr
aag (OpenERP)
Harry (OpenERP)