Commit Graph
462 Commits
Author SHA1 Message Date
Fabien Pinckaers e2fbf93799 [IMP] analysis view, filter OR year/month
bzr revid: fp@tinyerp.com-20111114091831-h6mx15bpnti694pa
2011-11-14 10:18:31 +01:00
Fabien Pinckaers b42892163b merge-evaluation
bzr revid: fp@tinyerp.com-20111111202946-y51gv8bsig75in3m
2011-11-11 21:29:46 +01:00
Fabien Pinckaers 6cbf19d815 [Merge] es_MX from Vauxoo
bzr revid: fp@tinyerp.com-20111111144930-5o37idpxdvyhtfri
2011-11-11 15:49:30 +01:00
Jagdish Panchal (Open ERP) 671a010604 [imp] improvement Analysis HR
bzr revid: jap@tinyerp.com-20111111104606-td601olh0ypgz2cz
2011-11-11 16:16:06 +05:30
Hardik Ansodariy (OpenERP) 33f266da1e [imp] hr periodic evaluation: improved access right and added demo data
bzr revid: han@tinyerp.com-20111111071413-3ozluq9bqmwgmty4
2011-11-11 12:44:13 +05:30
Ujjvala Collins (OpenERP) 1c37d6d169 [IMP] hr, hr_xxx: Improved yamls to save data fetched from on change methods.
bzr revid: uco@tinyerp.com-20111108093329-sgfisy6uyb6dr2bi
2011-11-08 15:03:29 +05:30
Ujjvala Collins (OpenERP) b99ce24793 [MERGE]: Merged with trunk-addons.
bzr revid: uco@tinyerp.com-20111108083655-tu5u488okyudvts0
2011-11-08 14:06:55 +05:30
Hardik Ansodariy (OpenERP) 57277b70ba [imp] rename evaluation to appraisal
bzr revid: han@tinyerp.com-20111108062007-mb4fi5wqyg1ud5oq
2011-11-08 11:50:07 +05:30
Launchpad Translations on behalf of openerp 6f77ce98c7 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20111105055805-1lmgpe8dot0mqkd3
bzr revid: launchpad_translations_on_behalf_of_openerp-20111105060437-gd0ilsg6cdytkvq2
2011-11-05 06:04:37 +00:00
Launchpad Translations on behalf of openerp e3ffcd94d6 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20111019044609-vzsrc1a6nn17ahbo
bzr revid: launchpad_translations_on_behalf_of_openerp-20111019055343-7s4rmkn8lpxvyt4n
bzr revid: launchpad_translations_on_behalf_of_openerp-20111019060521-3smagczfoys4j5wl
2011-10-19 06:05:21 +00:00
Israel Fermin Montilla 52b23d7040 [ADD] added es_MX.po translation files for each module
bzr revid: israel@openerp.com.ve-20111007201144-kap9ou7w8g92ai02
2011-10-07 16:11:44 -04:00
Israel Fermin Montilla 9b189d5a90 [ADD] added the es_VE.po translation files for each module
bzr revid: israel@openerp.com.ve-20111007193500-i7k8h9t28nhxioap
2011-10-07 15:35:00 -04:00
Quentin (OpenERP) 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
Stephane Wirtel 3dc8168974 [FIX] Set the categories
bzr revid: stw@openerp.com-20111005141902-72du0lku4x176ix9
2011-10-05 16:19:02 +02:00
Fabien Pinckaers b8af9b3423 [FIX] hr_evaluation
bzr revid: fp@tinyerp.com-20111002155744-cpc21ctqd4bpmrsq
2011-10-02 17:57:44 +02:00
Fabien Pinckaers 856d08e411 [IMP] hr evaluation
bzr revid: fp@tinyerp.com-20111001231711-it0w375uui2k3ssf
2011-10-02 01:17:11 +02:00
Yogesh(Open ERP) 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
Ujjvala Collins (OpenERP) bc75893824 [MERGE]: Merged with trunk-addons.
bzr revid: uco@tinyerp.com-20110928113535-55grblizb5c2ckrw
2011-09-28 17:05:35 +05:30
Antony Lesuisse 26a58b22f2 [MERGE] config rework ir.action.todo stw
bzr revid: al@openerp.com-20110924142047-rdo7gwoluoydbfz4
2011-09-24 16:20:47 +02:00
Fabien Pinckaers c3a79fbc36 merge
bzr revid: fp@tinyerp.com-20110924091037-kpy965dboeutk5y4
2011-09-24 11:10:37 +02:00
Stephane Wirtel e123082d88 [IMP] Add missing configuration wizards
bzr revid: stw@openerp.com-20110922131300-uudx3uwhkyaj3ry0
2011-09-22 15:13:00 +02:00
Rucha (Open ERP) 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
Ujjvala Collins (OpenERP) 1387699afc [IMP] hr_evaluation: Imrpoved yaml. Added some tests for remaining methods.
bzr revid: uco@tinyerp.com-20110921091959-oree9sk80ck87x6r
2011-09-21 14:49:59 +05:30
Mayur Maheshwari (OpenERP) 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
Jigar Amin - OpenERP 08ff02c21a [FIX] hr_evalution improved the tooltips
bzr revid: jam@tinyerp.com-20110920101503-9vy1mqeo72mdti0r
2011-09-20 15:45:03 +05:30
Jigar Amin - OpenERP 48fa8eafdb [IMP] hr_evalution - Renamed Current Filter to Pending
bzr revid: jam@tinyerp.com-20110920094608-e0mx5bcxfb875h8x
2011-09-20 15:16:08 +05:30
Fabien Pinckaers 55cca7ad81 merge
bzr revid: fp@tinyerp.com-20110917144113-iz2j6r5heci9kw2w
2011-09-17 16:41:13 +02:00
Fabien Pinckaers 05d6d35cc8 [Merge]
bzr revid: fp@tinyerp.com-20110917110317-34apz3spz1h9azjl
2011-09-17 13:03:17 +02:00
Meera Trambadia (OpenERP) d979aad3de [MERGE] branch merged with lp:openobject-addons
bzr revid: mtr@tinyerp.com-20110916054138-93b3caomaij5dyp4
2011-09-16 11:11:38 +05:30
Mayur Maheshwari (OpenERP) 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
Mayur Maheshwari (OpenERP) 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
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
Launchpad Translations on behalf of openerp 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
Launchpad Translations on behalf of openerp 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