Antony Lesuisse
96b9454a32
[FIX] revert 5138 revid:fp@tinyerp.com-20110924090407-x4e0ptu2am495rpv incorrect tests
...
bzr revid: al@openerp.com-20110925095948-hgtg1djicpvcm3nc
2011-09-25 11:59:48 +02:00
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
Fabien Pinckaers
7b190983da
merge
...
bzr revid: fp@tinyerp.com-20110924090407-x4e0ptu2am495rpv
2011-09-24 11:04:07 +02:00
DBR (OpenERP)
f93536a356
[RMV]project_caldav: remove test file
...
bzr revid: dbr@tinyerp.com-20110923093820-3xfn39ju1dhq3w0c
2011-09-23 15:08:20 +05:30
DBR (OpenERP)
1d715a371f
Set parent_id for project in right place
...
bzr revid: dbr@tinyerp.com-20110923085704-872zdzhtgxsojet3
2011-09-23 14:27:04 +05:30
DBR (OpenERP)
17b98e058c
[IMP]Improve the code
...
bzr revid: dbr@tinyerp.com-20110923084855-j87vzna3gv39h6hm
2011-09-23 14:18:55 +05:30
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
DBR (OpenERP)
e8dd71569d
[Fix]project_issue: Remove the conflicts
...
bzr revid: dbr@tinyerp.com-20110921091700-xsbjwhnv074zf008
2011-09-21 14:47:00 +05:30
DBR (OpenERP)
582e640be7
[Merge]with: lp:openobject-addons
...
bzr revid: dbr@tinyerp.com-20110921063919-t3qcfbp6h6x46k0h
2011-09-21 12:09:19 +05:30
Atik Agewan (OpenERP)
0e0438a779
[IMP] ALL:change in all statusbar_colors quotes
...
bzr revid: aag@tinyerp.com-20110921050948-m2iezimspmspsvjs
2011-09-21 10:39:48 +05:30
DBR (OpenERP)
477a7f1d4e
[IMP] Improve the search views
...
bzr revid: dbr@tinyerp.com-20110920105829-ythiwkwv437qti30
2011-09-20 16:28:29 +05:30
DBR (OpenERP)
0af5ff77b3
[IMP]project : Improve the search view
...
bzr revid: dbr@tinyerp.com-20110919120916-skeyaztygd3bq2vf
2011-09-19 17:39:16 +05:30
Fabien Pinckaers
c4047f3936
[useability] better error/warning message
...
bzr revid: fp@tinyerp.com-20110918135310-sx5wzu22opr9cdwo
2011-09-18 15:53:10 +02:00
Fabien Pinckaers
05d6d35cc8
[Merge]
...
bzr revid: fp@tinyerp.com-20110917110317-34apz3spz1h9azjl
2011-09-17 13:03:17 +02:00
DBR (OpenERP)
87232b309f
[IMP]project_* : Improve the code
...
bzr revid: dbr@tinyerp.com-20110916114403-umbfkuhovq9z9qha
2011-09-16 17:14:03 +05:30
Atik Agewan (OpenERP)
882392394d
[IMP] ALL: Remove Space from attribute values
...
bzr revid: aag@tinyerp.com-20110915084914-kgbpw52ym5uz8ye0
2011-09-15 14:19:14 +05:30
Atik Agewan (OpenERP)
556233685f
[ADD] MRP,Project:Add widget=statusbar in state field.
...
bzr revid: aag@tinyerp.com-20110915054059-7iuj6qeg3nc4wm10
2011-09-15 11:10:59 +05:30
DBR (OpenERP)
e3fb37a734
[Merge]with: lp:openobject-addons
...
bzr revid: dbr@tinyerp.com-20110914051902-r73uw1yu1bck6xzn
2011-09-14 10:49:02 +05:30
Antony Lesuisse
ea2e8b64c4
[MERGE] trunk-kanban-ysa (manually because of uncommit in trunk)
...
bzr revid: al@openerp.com-20110913162907-4gvjesa21nvf8v95
2011-09-13 18:29:07 +02:00
DBR (OpenERP)
41f3bef4f2
[Merge]with: lp:openobject-addons
...
bzr revid: dbr@tinyerp.com-20110909045919-yem2739zo7oi25cj
bzr revid: dbr@tinyerp.com-20110912051050-f0vcgre02x6aiikp
bzr revid: dbr@tinyerp.com-20110913051152-5hla7hvxs58k6xmv
2011-09-13 10:41:52 +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
02b83e1040
[IMP] project: finish cleanup/integration of mail.compose.message wizard as task close wizard
...
bzr revid: odo@openerp.com-20110907224829-zd00lqshrfphpi31
2011-09-08 00:48:29 +02:00
DBR (OpenERP)
0c755d3a52
[IMP]project_* : Improve the statements
...
bzr revid: dbr@tinyerp.com-20110907092242-3d0ja7ffus1x59ha
2011-09-07 14:52:42 +05:30
DBR (OpenERP)
d0852a5145
[IMP]project : Improve the statements
...
bzr revid: dbr@tinyerp.com-20110907083505-qqnu2lau4yl7fhvu
2011-09-07 14:05:05 +05:30
DBR (OpenERP)
6b704f4662
[] wiMERGE]with: lp:openobject-addons
...
bzr revid: dbr@tinyerp.com-20110907045917-nsck0wkrbygm7fd0
2011-09-07 10:29:17 +05:30
DBR (OpenERP)
18b57e8e65
[IMP]project: Improve the test cases
...
bzr revid: dbr@tinyerp.com-20110907045747-3i7e2oroyrsole4t
2011-09-07 10:27:47 +05:30
DBR (OpenERP)
255846812b
[IMP]project: Improve the test cases
...
bzr revid: dbr@tinyerp.com-20110906125434-x2ure1gykpuo9tcf
2011-09-06 18:24:34 +05:30
Olivier Dony
f42126df0e
[MERGE] latest trunk
...
bzr revid: odo@openerp.com-20110906080846-lyi3haucchsaz7uo
2011-09-06 10:08:46 +02:00
Olivier Dony
c94116f41b
[IMP] project,crm: spellcheck/cleanup user_prefence->user_preference
...
bzr revid: odo@openerp.com-20110906073742-lzge2gphka2vmft7
2011-09-06 09:37:42 +02:00
DBR (OpenERP)
823a3f8bf0
[Merge]with: lp:openobject-addons
...
bzr revid: dbr@tinyerp.com-20110902052628-lxsoyzz0qlaev4tp
bzr revid: dbr@tinyerp.com-20110905055747-rk09ip9leb82umdn
bzr revid: dbr@tinyerp.com-20110906050725-bc453pgrz4m2t5ix
2011-09-06 10:37:25 +05:30
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
DBR (OpenERP)
09271cb1b1
[IMP]project: Improve the test cases for create and copy methods
...
bzr revid: dbr@tinyerp.com-20110831065117-rpabqqr5iwr82x9d
2011-08-31 12:21:17 +05:30
DBR (OpenERP)
3b42faa61f
[IMP]project: Improve the test cases
...
bzr revid: dbr@tinyerp.com-20110831054608-ddf25m58c4gvmq87
2011-08-31 11:16:08 +05:30
DBR (OpenERP)
81a93234ee
[IMP]project : Improve the code for state of project.task obj
...
bzr revid: dbr@tinyerp.com-20110829061705-ri0cbexs4pp6yjjo
2011-08-29 11:47:05 +05:30
Antony Lesuisse
71443ad49f
[MERGE] trunk
...
bzr revid: al@openerp.com-20110827211948-kmap692ves3ixo4k
2011-08-27 23:19:48 +02:00
DBR (OpenERP)
0710d3b8d4
[IMP]project : Improve the test cases
...
bzr revid: dbr@tinyerp.com-20110825054458-48t8ynjmom1b7u74
2011-08-25 11:14:58 +05:30
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
4fcb67bef1
[MERGE] latest trunk
...
bzr revid: odo@openerp.com-20110822171856-1zkyunpjyz5ffdth
2011-08-22 19:18:56 +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
063e28a83d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110820045348-7oh5zs7l4lr3zsq1
2011-08-20 04:53:48 +00:00
ac9c0e55b0
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110818043608-kjmi6rgmnpk2d36r
2011-08-18 04:36:08 +00:00
fp
fa7874cddc
[IMP] Improved bank account management, report footer, stages by default on projects
...
bzr revid: fp@fp-laptop-20110815142141-938zg1laoe8wtbkd
2011-08-15 16:21:41 +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
Antony Lesuisse
17e2f04cb7
[MERGE] trunk-usability rco
...
bzr revid: al@openerp.com-20110806002104-xpc258vhv54j5w53
2011-08-06 02:21:04 +02:00
Antony Lesuisse
65c43a1946
[MERGE] trunk
...
bzr revid: al@openerp.com-20110805211034-hc8z53m6zzwksipu
2011-08-05 23:10:34 +02:00
Raphael Collet
87f239fb33
[MERGE] remove extended filters
...
bzr revid: rco@openerp.com-20110804102635-2ixo1tmogsulj83u
2011-08-04 12:26:35 +02:00
Antony Lesuisse