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
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
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
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
Raphael Collet
ba6342174e
add group implications
...
bzr revid: rco@openerp.com-20110802130811-pkdmw43ufifz0tpj
2011-08-02 15:08:11 +02:00
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
3819324e26
[FIX] builtbot warning by uco
...
bzr revid: tfr@openerp.com-20110630150616-3nyh1nug56lorqvj
2011-06-30 17:06:16 +02:00
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
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
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
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
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
Ujjvala Collins (OpenERP)
241d8ffbf2
[REF] survey: Refactored.
...
bzr revid: uco@tinyerp.com-20110331104502-c2hdl8ldzgnpx38w
2011-03-31 16:15:02 +05:30
Ujjvala Collins (OpenERP)
49e83f054b
[FIX] survey: Fixed buildbot warning.
...
bzr revid: uco@tinyerp.com-20110331104118-wpkebdiysq7u1gc6
2011-03-31 16:11:18 +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
Ujjvala Collins (OpenERP)
75090b3fb0
[FIX] survey: Fixed Browse Answers error.
...
bzr revid: uco@tinyerp.com-20110330073026-tc9nwuihbuen7kq9
2011-03-30 13:00:26 +05:30
Ujjvala Collins (OpenERP)
0e4e5b67f1
[FIX] survey: Fixed survey demo data error.
...
bzr revid: uco@tinyerp.com-20110330061447-hngjt3l56gan3arz
2011-03-30 11:44:47 +05:30
Ujjvala Collins (OpenERP)
252abfebd5
[FIX] survey: Fixed survey page error.
...
bzr revid: uco@tinyerp.com-20110330061407-0b8lfjq225f2nx3r
2011-03-30 11:44:07 +05:30
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
Rifakat Haradwala (Open ERP)
2fe7c51e36
[REM] email.smtp_server: removed email.smtp_server and did changes in email module
...
bzr revid: rha@tinyerp.com-20110321133156-y57yw6sekshnw9ns
2011-03-21 19:01:56 +05:30
niv-openerp
cf07e58016
[MERGE] Other improvements of descriptions in module manifests.
...
bzr revid: nicolas.vanhoren@openerp.com-20110318140618-jg2jumv3gyacfb74
2011-03-18 15:06:18 +01:00
vro
437ed909c2
[IMP]: Module descriptions.
...
bzr revid: vro@tinyerp.com-20110318114737-znh9wtipt84hc5jd
2011-03-18 17:17:37 +05:30
niv-openerp
a898038b47
[MERGE] Merged module screenshots and improvements to module descriptions.
...
bzr revid: nicolas.vanhoren@openerp.com-20110318110816-f8bnmmlfzc9eqyu7
2011-03-18 12:08:16 +01:00
Rucha (Open ERP)
117d3f75a0
[MERGE]: Merge with latest trunk
...
bzr revid: rpa@tinyerp.com-20110317095800-l0sc4mj3uktsm8wa
2011-03-17 15:28:00 +05:30
vro
2ec3687a54
[ADD]: Images: subscription, survey, thunderbird, warning
...
bzr revid: vro@tinyerp.com-20110316111930-ft1yispclx6dvuqp
2011-03-16 16:49:30 +05:30
Quentin (OpenERP)
4185ba6f49
[FIX] survey: fixed action_next in survey (1 fix related to previous change on osv.memory read merge, another one related to wrong value passed for key sur_name_id in context (sur_id wasn't defined))
...
bzr revid: qdp-launchpad@openerp.com-20110315154324-70oh0npusr2v41ko
2011-03-15 16:43:24 +01:00
Quentin (OpenERP)
559e65c84e
[MERGE] merged the dev branch related to the change of read() of osv_memory in order to work by batch (server side change, revno: 3369, revision-id: odo@openerp.com-20110315132628-uhhpf95b9iyin482). It will now return a tuple (id, name) for the m2o instead and thus the osv_memory objects have been changed accordingly
...
bzr revid: qdp-launchpad@openerp.com-20110315132726-dpwcxa08a2l12yy6
2011-03-15 14:27:26 +01:00
Thibault Francois
5db90156e9
[MERGE] fix lp:731294
...
bzr revid: tfr@openerp.com-20110314122547-c5x3llhblzbdpusl
2011-03-14 13:25:47 +01:00
Rucha (Open ERP)
62b3abd6c0
[MERGE]: Merge with latest trunk
...
bzr revid: rpa@tinyerp.com-20110314102742-xsankh8h4q562lv8
2011-03-14 15:57:42 +05:30
Jigar Amin
ae526beef0
[MERGE] with lp:openobject-addons
...
bzr revid: jam@tinyerp.com-20110310130751-4khjwfq1d8yl2k7y
bzr revid: jam@tinyerp.com-20110311050353-7r08lpp060oozm0s
2011-03-11 10:33:53 +05:30
Olivier Dony