Commit Graph

422 Commits

Author SHA1 Message Date
Olivier Dony 5f91274850 [FIX] survey: correct osv_memory model to respect proper Model relationships + some cleanup
bzr revid: odo@openerp.com-20110927202843-d7yj3na2e9nkn8wp
2011-09-27 22:28:43 +02:00
Olivier Dony 1d3ff0e52f [MERGE] sync with latest trunk
bzr revid: odo@openerp.com-20110927165219-ux50zxkszwpcfssd
2011-09-27 18:52:19 +02:00
Fabien Pinckaers 2a89b0fd42 fix
bzr revid: fp@tinyerp.com-20110924135235-ks6rclkz25lnpg18
2011-09-24 15:52:35 +02:00
Fabien Pinckaers c3a79fbc36 merge
bzr revid: fp@tinyerp.com-20110924091037-kpy965dboeutk5y4
2011-09-24 11:10:37 +02:00
Olivier Dony 51e1259dce [MERGE] sync w/ latest trunk
bzr revid: odo@openerp.com-20110924020551-bv6rw8hj8p5din4n
2011-09-24 04:05:51 +02:00
Olivier Dony d81837fac6 [MERGE] synch with latest trunk
bzr revid: odo@openerp.com-20110922162538-x7xucux66zma5bp8
2011-09-22 18:25:38 +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
Jigar Amin - OpenERP 9efb9c7d0d [IMP] Idea Survey Anaysis Search View Rearranged the Filteres and Survey Renamed the button icons
bzr revid: jam@tinyerp.com-20110920103543-u52qciy5o84nw5fl
2011-09-20 16:05:43 +05:30
Jigar Amin - OpenERP 9511ec1138 [IMP] Survey - Added new Filter button for the new Survey and rOpen Surbey and Removed Current button
bzr revid: jam@tinyerp.com-20110920102422-tqj1qwbekytsogpg
2011-09-20 15:54:22 +05:30
Quentin (OpenERP) 2cd695b35d [FIX] survey: data_get code now returns the good type for sequence
bzr revid: qdp-launchpad@openerp.com-20110919120922-nv7rszc8pf182msh
2011-09-19 14:09:22 +02:00
Fabien Pinckaers f82898647b merge
bzr revid: fp@tinyerp.com-20110917141600-hx1krluh69y7ngwe
2011-09-17 16:16:00 +02:00
Fabien Pinckaers 05d6d35cc8 [Merge]
bzr revid: fp@tinyerp.com-20110917110317-34apz3spz1h9azjl
2011-09-17 13:03:17 +02:00
Mayur Maheshwari (OpenERP) d47cacfc9f [IMP]survey:remove a draft state and add a widget statusbar as per specification
bzr revid: mma@tinyerp.com-20110915111740-8x311rpkfw3ke113
2011-09-15 16:47:40 +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 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
Vo Minh Thu b657bea06f [FIX] survey: correctly cast selection fields to int, properly use a relation table for many2many fields.
bzr revid: vmt@openerp.com-20110824093527-e8u4d410zof48vpm
2011-08-24 11:35:27 +02: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
DBR (OpenERP) 896fbf8f9c [IMP]survey : Improve code for read() method of survey.name.wiz obj
bzr revid: dbr@tinyerp.com-20110819055945-jwgdlgne50ydutuk
2011-08-19 11:29:45 +05:30
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
Launchpad Translations on behalf of openerp 7fe942991c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110807043729-g8qz14f69cr0wpi6
bzr revid: launchpad_translations_on_behalf_of_openerp-20110808043648-93fd7m8c1sgdeu97
2011-08-08 04:36:48 +00:00
Raphael Collet 0b4d547900 [MERGE] from trunk
bzr revid: rco@openerp.com-20110805142118-0z8k0f897xfu2zll
2011-08-05 16:21:18 +02:00
Raphael Collet be0809a670 [MERGE] remove address_id from user
bzr revid: rco@openerp.com-20110803100602-75dcx4dqsh3sragi
2011-08-03 12:06:02 +02:00
DBR (OpenERP) 6d6a46b373 [IMP]Survey : remove extra initialization
bzr revid: dbr@tinyerp.com-20110803064824-6e3w97qjuf74j310
2011-08-03 12:18:24 +05:30
DBR (OpenERP) 1a1e896b82 [IMP]Survey : add a comman function
bzr revid: dbr@tinyerp.com-20110803063201-01h04ksqy6rpqc0x
2011-08-03 12:02:01 +05:30
Raphael Collet ba6342174e add group implications
bzr revid: rco@openerp.com-20110802130811-pkdmw43ufifz0tpj
2011-08-02 15:08:11 +02:00
DBR (OpenERP) cace654671 [FIX]survey : object of type int has no len()
lp bug: https://launchpad.net/bugs/819257 fixed

bzr revid: dbr@tinyerp.com-20110802130240-dtkvqvrgo0284rfk
2011-08-02 18:32:40 +05:30
Launchpad Translations on behalf of openerp 1bb79ca921 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110730050033-h7utz09178tvvetl
bzr revid: launchpad_translations_on_behalf_of_openerp-20110731043831-gj2tw6sdh1e8sf34
bzr revid: launchpad_translations_on_behalf_of_openerp-20110801043943-wwcxg26n160r0o21
2011-08-01 04:39:43 +00:00
RavishchanraMurari (Open ERP) caa3c07094 email.addresss_id_repalce_by_user_email
bzr revid: rmu@tinyerp.com-20110728061156-swmn5jz78zb3w4vd
2011-07-28 11:41:56 +05:30
Raphael Collet adafbc707a [MERGE] from trunk
bzr revid: rco@openerp.com-20110708092232-mlezo4330k2j8vvw
2011-07-08 11:22:32 +02:00
Olivier Dony 06fb14130a [IMP] removed method=True params from all fields.function
Server revision 3495 odo@openerp.com-20110701232328-flgxulxva70vnyxr
removed the need for passing method=True to function fields,
so this is the equivalent addons fix, removing it everywhere.
Please be careful from now on, and do not pass it anymore!

bzr revid: odo@openerp.com-20110701234124-a61zl0idvdfz3hyb
2011-07-02 01:41:24 +02:00
tfr@openerp.com 3819324e26 [FIX] builtbot warning by uco
bzr revid: tfr@openerp.com-20110630150616-3nyh1nug56lorqvj
2011-06-30 17:06:16 +02:00
tfr@openerp.com 712c2294e8 [MERGE] fix bug:784594 by asr
bzr revid: tfr@openerp.com-20110617091723-iec0px60dn4m4vmt
2011-06-17 11:17:23 +02:00
Bhumika (OpenERP) 8ef3e88a21 [Fix] survey: exception if state is open
bzr revid: sbh@tinyerp.com-20110616131211-fq5q9dd3yl6b1bv5
2011-06-16 18:42:11 +05:30
tfr@openerp.com 91c957b3f1 [MERGE] fix bug 792695 by jam
bzr revid: tfr@openerp.com-20110615122159-9tj1yzkk31g9csb7
2011-06-15 14:21:59 +02:00
Jigar Amin 975f519419 [BUG/FIX]survey : added message in ivitation if user not found than it hsoud show message for that email use, imporved view usabality
bzr revid: jam@tinyerp.com-20110606101359-74jgqtq3pguhffvj
2011-06-06 15:43:59 +05:30
Hardik Ansodariy (OpenERP) 5285ccfae5 [IMP]:survey, removed commented code
bzr revid: han@tinyerp.com-20110524131038-4s4rhg7b72bnage7
2011-05-24 18:40:38 +05:30
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
Ashutosh Srivastava (Open ERP) a506a7ab94 [IMP] Survey : Improve the error message
bzr revid: asr@tinyerp.com-20110520133335-dlr703289wo3mwyt
2011-05-20 19:03:35 +05:30
Ashutosh Srivastava (Open ERP) ada1cee936 [FIX] Fix the duplicate survey
lp bug: https://launchpad.net/bugs/784594 fixed

bzr revid: asr@tinyerp.com-20110520125136-s6gqhc847rr97c5d
2011-05-20 18:21:36 +05:30
Kuldeep Joshi (OpenERP) c49bc67dd2 [BUG/FIX] survey : set priority of the survey question form view
lp bug: https://launchpad.net/bugs/778299 fixed

bzr revid: kjo@tinyerp.com-20110509062310-v7zo9hxotvnwzmlr
2011-05-09 11:53:10 +05:30
Launchpad Translations on behalf of openerp 7f1251410b Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110503044034-t2jx9fsf8tufkggw
2011-05-03 04:40:34 +00:00
Olivier Dony bbb6ed05ef [FIX] survey: tduplicate msgid n POT file (manually fixed in rosetta earlier)
bzr revid: odo@openerp.com-20110502143738-dl7uxvoc31d8hitp
2011-05-02 16:37:38 +02:00
Launchpad Translations on behalf of openerp 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) 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) 96c65e3dbe [FIX]: improvements for attachment as dictionary
bzr revid: rha@tinyerp.com-20110420095458-0w53lpa10sv7wnep
2011-04-20 15:24:58 +05:30
Launchpad Translations on behalf of openerp 25da1b63a3 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110416045916-5ck4ifulww06owks
bzr revid: launchpad_translations_on_behalf_of_openerp-20110417043634-x8jqcrbbylxdj06l
2011-04-17 04:36:34 +00:00
Rifakat Haradwala (Open ERP) 63de8740bc [FIX] csv file semicolon error
bzr revid: rha@tinyerp.com-20110405061713-b9qmkeqqg64er6lf
2011-04-05 11:47:13 +05:30
Rifakat Haradwala (Open ERP) 47a85e9f8f [IMP] mail: rename module email to mail because of parsing error
bzr revid: rha@tinyerp.com-20110404094552-j2rdq2sbeqrbffgn
2011-04-04 15:15:52 +05:30