Commit Graph

447 Commits

Author SHA1 Message Date
Vo Minh Thu 42f0c096f5 [MERGE] merged trunk.
bzr revid: vmt@openerp.com-20111202153143-0xw0yhlxutcpyhgu
2011-12-02 16:31:43 +01:00
Amit Bhavsar (Open ERP) a65a26d178 [polish3],rename the string and remove col
bzr revid: amb@tinyerp.com-20111130053426-3wjau1hcgmagq6hm
2011-11-30 11:04:26 +05:30
Naresh (OpenERP) 9f79b2aee3 [FIX]:Survey: Warnings:orm:No such field(s) in model survey.question: in_visible_single_text and in model survey.answer: in_visible_menu_choice, in_visible_rating_weight probably they were removed but demo data were left unchanged
bzr revid: nch@tinyerp.com-20111123125238-htffvxcut2pblraq
2011-11-23 18:22:38 +05:30
Amit Bhavsar (Open ERP) 1d74d0d635 [polish3],add sparetor at survey form
bzr revid: amb@tinyerp.com-20111118114211-bm4ayd8bs8x7k6he
2011-11-18 17:12:11 +05:30
Fabien Pinckaers 7d74398c57 [FIX] used field not in the object
bzr revid: fp@tinyerp.com-20111114213941-k8glvw58fzymx2er
2011-11-14 22:39:41 +01:00
MVA 6edf84e7bd [MERGE] lp: 869991
bzr revid: mva@openerp.com-20111114125033-uny1c5xbh4osid2w
2011-11-14 13:50:33 +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
Raphael Collet 93ecb97b48 [MERGE] survey: fix lp:862138, lp:862168, lp:882288
bzr revid: rco@openerp.com-20111109145231-5s71fdlep3z60ia8
2011-11-09 15:52:31 +01:00
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
Serpent Consulting Services 69a0c93e0a [FIX] Survey : Fixed a bunch of errors altogether
lp bug: https://launchpad.net/bugs/882288 fixed

bzr revid: support@serpentcs.com-20111026232839-3h5ux90w0qa1s1e3
2011-10-27 04:58:39 +05:30
Launchpad Translations on behalf of openerp 92b6ed1348 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20111022050022-6cqd9vg3u03gqfrz
2011-10-22 05:00:22 +00:00
Olivier Dony 7a28d118d8 [I18N] survey: fix duplicate msgid after last merge
bzr revid: odo@openerp.com-20111021144039-51hp4swkovxgfa2o
2011-10-21 16:40:39 +02:00
Olivier Dony 604c7ccac8 [I18N] survey: fix duplicate msgid after last merge
bzr revid: odo@openerp.com-20111021143313-7q4k857797w00u00
2011-10-21 16:33:13 +02:00
Serpent Consulting Services 2ce66e5779 [FIX] Survey : Typo corrections with xml and po files
bzr revid: support@serpentcs.com-20111021084347-a14ukyx6j02sz1nc
2011-10-21 14:13:47 +05:30
Kuldeep Joshi (OpenERP) dba2cebffe [FIX] survery: remove unused code and codition
bzr revid: kjo@tinyerp.com-20111020123742-aj6yjmvz3i5wu2b9
2011-10-20 18:07:42 +05:30
Raphael Collet fdab00ca82 [MERGE] lp:862344
bzr revid: rco@openerp.com-20111019100836-3r24u1wi0gbu08dy
2011-10-19 12:08:36 +02: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
Kuldeep Joshi (OpenERP) 80906f11e7 [FIX] survey: remove address_id field
bzr revid: kjo@tinyerp.com-20111010093515-wlwnecrdujk35uq5
2011-10-10 15:05:15 +05:30
Launchpad Translations on behalf of openerp 048cfa7804 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20111012044022-dt1ks2gwog40djxc
bzr revid: launchpad_translations_on_behalf_of_openerp-20111012044412-fk2rlfsfnmhkvaq1
2011-10-12 04:44:12 +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
Antony Lesuisse 45e0b0a671 [FIX] packaging rename doc python rpm build does not tolerate spaces in files
bzr revid: al@openerp.com-20111006030516-uy8p3b5y1d2pbia0
2011-10-06 05:05:16 +02:00
Stephane Wirtel 3dc8168974 [FIX] Set the categories
bzr revid: stw@openerp.com-20111005141902-72du0lku4x176ix9
2011-10-05 16:19:02 +02:00
Stephane Wirtel 7c93366eab [FIX] Update the categories of some modules
bzr revid: stw@openerp.com-20110930154646-9tr60seb389nw3yd
2011-09-30 17:46:46 +02:00
Jigar Amin - OpenERP 77f51325c6 [BUG/FIX] survey : safe_evaling the dict of the stored answer in select survey wizard defalt_get
bzr revid: jam@tinyerp.com-20110930072004-vkev6k0bsr6imld4
2011-09-30 12:50:04 +05:30
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