Commit Graph
55824 Commits
Author SHA1 Message Date
Christophe Simonis b59d9213d6 merge upstream
bzr revid: chs@openerp.com-20120823155420-svuhqxa1kmn3mtf4
2012-08-23 17:54:20 +02:00
Christophe Simonis d73d78d4c8 [IMP] connect to test server
bzr revid: chs@openerp.com-20120823155234-welcel8i5odi6hh8
2012-08-23 17:52:34 +02:00
Antonin Bourguignon 9aff056e73 [MERGE] minor improvements on @noupdate
also fix some indentation

bzr revid: abo@openerp.com-20120823153322-30rp469l5xlgff0v
2012-08-23 17:33:22 +02:00
Antonin Bourguignon 6ebb35dc02 [MERGE] minor improvements on @noupdate
bzr revid: abo@openerp.com-20120823153243-1iv8cfqoeg9qt95f
2012-08-23 17:32:43 +02:00
Quentin (OpenERP) f6a4aae8c2 [FIX] lp: 1038173
bzr revid: qdp-launchpad@openerp.com-20120823143521-3517gexkbqkljnp1
2012-08-23 16:35:21 +02:00
Quentin (OpenERP) afa60ebc74 [FIX] lp: 1039013, where an id is given to name_get instead of a list of ids
lp bug: https://launchpad.net/bugs/1039013 fixed

bzr revid: qdp-launchpad@openerp.com-20120823142656-nsqml3jnyylpgzxu
2012-08-23 16:26:56 +02:00
Antonin Bourguignon 445ddc7594 [IMP] indentation
bzr revid: abo@openerp.com-20120823142036-e0kmr9ri1e8ns56d
2012-08-23 16:20:36 +02:00
Antonin Bourguignon a5a3f9b582 [IMP] indentation
bzr revid: abo@openerp.com-20120823141555-xexanpf1p1ebbcc1
2012-08-23 16:15:55 +02:00
Antonin Bourguignon 9f933d0ae3 [IMP] put @noupdate="1" back in place for xml security files
bzr revid: abo@openerp.com-20120823141531-l01abke754duh4z5
2012-08-23 16:15:31 +02:00
Quentin (OpenERP) 68c732272f [MERGE] lp: 997616
bzr revid: qdp-launchpad@openerp.com-20120823141221-akfyncw29ppodsyr
2012-08-23 16:12:21 +02:00
Antonin Bourguignon 89adfaf270 [IMP] remove some of the @noupdate=1 introduced in a previous merge targeting modules' descriptions improvement
this will preserve the previous behavior of modules update operation

bzr revid: abo@openerp.com-20120823140727-nu20t4wfwijgbf5p
2012-08-23 16:07:27 +02:00
Antonin Bourguignon d4b562d1e8 [MERGE] latest trunk
bzr revid: abo@openerp.com-20120823135704-662y3oedpg7hmb82
2012-08-23 15:57:04 +02:00
Quentin (OpenERP) 80bcef50bf [MERGE] lp:1016372
bzr revid: qdp-launchpad@openerp.com-20120823135654-mc708n5kx1s609yp
2012-08-23 15:56:54 +02:00
Stephane Wirtel fb57f89976 [IMP] hr_evaluation: improve the layout
bzr revid: stw@openerp.com-20120823131613-kvzv0awj1d3lysef
2012-08-23 15:16:13 +02:00
Quentin (OpenERP) c33449b43e [MERGE] misc fixes
bzr revid: qdp-launchpad@openerp.com-20120823125156-uddhlkwg9mddoer8
2012-08-23 14:51:56 +02:00
Stephane Wirtel f31bc1b40d [MERGE] board: we are able to change the title of a dashlet
bzr revid: stw@openerp.com-20120823124226-mx0s2wqeeq2jlo4k
2012-08-23 14:42:26 +02:00
Antonin Bourguignon bb8afe3a4a [IMP] remove some of the @noupdate=1 introduced in a previous merge targeting modules' descriptions improvement
this will preserve the previous behavior of modules update operation

bzr revid: abo@openerp.com-20120823122050-9fw0id92idc1m36l
2012-08-23 14:20:50 +02:00
Stephane Wirtel 5adcecf06e [MERGE] sale: add a label in the make invoice wizard
bzr revid: stw@openerp.com-20120823121952-zcl1swmcxjnryjis
2012-08-23 14:19:52 +02:00
Olivier Dony 816852490e [FIX] project_issue: incorrect override was causing double project creation
bzr revid: odo@openerp.com-20120823115218-nxbq3gk2d96seccc
2012-08-23 13:52:18 +02:00
Quentin (OpenERP) 4f430733df [MERGE] lp: 942373
bzr revid: qdp-launchpad@openerp.com-20120823114737-7roj7wmp8542hgbg
2012-08-23 13:47:37 +02:00
Olivier Dony 1ebf187ddf [MERGE] convert: fix previous partial patch for removing redundant @type for <menuitem>
bzr revid: odo@openerp.com-20120823105309-sivecokny7autqbz
2012-08-23 12:53:09 +02:00
Bharat Devnani(OpenERP) d48ff4be8f [IMP] Added label for sale order line selection on create invoice wizard
bzr revid: pso@tinyerp.com-20120823101917-8r8mvog04xsjq0cg
2012-08-23 15:49:17 +05:30
niv-openerp a732d1cdc5 [FIX] problem with set defaults
bzr revid: nicolas.vanhoren@openerp.com-20120823101601-mnknsr54dhv1lv83
2012-08-23 12:16:01 +02:00
Olivier Dony 7ddc6a2cd9 [FIX] convert: fix previous partial patch for removing redundant @type for <menuitem>
bzr revid: odo@openerp.com-20120823100504-q8w91ga5wbot20o5
2012-08-23 12:05:04 +02:00
Olivier Dony ebb3df4f8c [FIX] convert: fix previous partial fix for removing redundant @type for <menuitem>
bzr revid: odo@openerp.com-20120823100252-zmhpaocb2bb11c99
2012-08-23 12:02:52 +02:00
niv-openerp 79224ea672 [IMP] web_linkedin: changed the way the api key is configured
bzr revid: nicolas.vanhoren@openerp.com-20120823095314-ie3p04zufnyxs8db
2012-08-23 11:53:14 +02:00
pso (OpenERP) 381f1d194a [MERGE] Merged with main branch
bzr revid: pso@tinyerp.com-20120823094931-2cz1r2ezvjwpbzdf
2012-08-23 15:19:31 +05:30
Quentin (OpenERP) facff2a565 [MERGE] correction of a warning when mail module is installed
bzr revid: qdp-launchpad@openerp.com-20120823093003-ic0hs67sb1w60fnz
2012-08-23 11:30:03 +02:00
Quentin (OpenERP) ad18782b9c [MERGE] staging branch: fix in report picking and credit note creation from invoice
bzr revid: qdp-launchpad@openerp.com-20120823090900-fjnlus3j1kejf3ol
2012-08-23 11:09:00 +02:00
pso (OpenERP) c427933cbb [MERGE] Merged with main branch
bzr revid: pso@tinyerp.com-20120823090841-adebkbo3tfhn5bet
2012-08-23 14:38:41 +05:30
Bharat Devnani(OpenERP) 7fe9ca1ed6 [IMP] Added label for sale order line selection on create invoice wizard
bzr revid: pso@tinyerp.com-20120823085130-eczt22j1oozyni7v
2012-08-23 14:21:30 +05:30
Vo Minh Thu e82f52926c [FIX] setup.py: added docutils dependency introduced at revision 4341.3.1.
bzr revid: vmt@openerp.com-20120823083505-evk7pw3drx28rj1z
2012-08-23 10:35:05 +02:00
Quentin (OpenERP) fd29eccadd [MERGE] lp:1039557. Courtesy of Paulius Sladkevičius
bzr revid: qdp-launchpad@openerp.com-20120823075700-6cguwv1dxo92f0wg
2012-08-23 09:57:00 +02:00
Quentin (OpenERP) 557cfcbc53 [MERGE] lp:930209
bzr revid: qdp-launchpad@openerp.com-20120823073047-xizjutknmt8qrtm6
2012-08-23 09:30:47 +02:00
Jiten (OpenERP) 77bbe04bfc [REV] Revert last changes.
bzr revid: jra@tinyerp.com-20120823072010-wsx6sgy02luxa2wo
2012-08-23 12:50:10 +05:30
Jiten (OpenERP) c734278627 [IMP] Improved code by VME to save header in action (ir_act_window).
bzr revid: jra@tinyerp.com-20120823061954-egdcd82svsrov0tx
2012-08-23 11:49:54 +05:30
Vidhin Mehta (OpenERP) cece6655af [IMP]make changes in ir act window's name.
bzr revid: vme@tinyerp.com-20120823061022-fti5xixis5ffak1k
2012-08-23 11:40:22 +05:30
Jiten (OpenERP) bac7759522 [MERGE] Merged from trunk.
bzr revid: jra@tinyerp.com-20120823051133-1nm842y16hjvtsm4
2012-08-23 10:41:33 +05:30
Jiten (OpenERP) 6b89657fb6 [MERGE] Improved code for header of dashlat making editable in board.
bzr revid: jra@tinyerp.com-20120823050909-kq6dbvyh9yidr71p
2012-08-23 10:39:09 +05:30
Antonin Bourguignon 459f45a53e [MERGE] improve modules' descriptions
also properly render descriptions from RST into HTML

bzr revid: abo@openerp.com-20120822185057-dirf183dh83wgtjy
2012-08-22 20:50:57 +02:00
Antonin Bourguignon b12cac2bde [MERGE] improve modules' descriptions
bzr revid: abo@openerp.com-20120822184935-mmi41yf3ki8jitjl
2012-08-22 20:49:35 +02:00
Antonin Bourguignon c4b2e9fad2 [MERGE] improve modules' descriptions
bzr revid: abo@openerp.com-20120822184931-c1b72hdr8t0b2mpi
2012-08-22 20:49:31 +02:00
Antonin Bourguignon ae70fc7244 [MERGE] latest trunk
bzr revid: abo@openerp.com-20120822181127-mcs2n9b9l5ksonq0
2012-08-22 20:11:27 +02:00
Antonin Bourguignon 014ee6e5f8 [MERGE] project: remove useless dummy method
bzr revid: abo@openerp.com-20120822180432-6lf078nbpe7874yv
2012-08-22 20:04:32 +02:00
Antonin Bourguignon 031909d29e [MERGE] latest trunk
bzr revid: abo@openerp.com-20120822175835-jvy2b1m0e3rvlt06
2012-08-22 19:58:35 +02:00
Antonin Bourguignon 532570c363 [MERGE] latest trunk
bzr revid: abo@openerp.com-20120822175827-r6xls8w9w9ly1gai
2012-08-22 19:58:27 +02:00
Antonin Bourguignon 121b351b59 [MERGE] latest trunk
bzr revid: abo@openerp.com-20120822175756-ypym270e6cklpbds
2012-08-22 19:57:56 +02:00
Antonin Bourguignon 0b29e7579d [IMP] avoid re-computing the module's field by setting it to
bzr revid: abo@openerp.com-20120822174635-agqupq0iyqc0rn9v
2012-08-22 19:46:35 +02:00
Christophe Simonis 8736e1102a [IMP] remove apps
bzr revid: chs@openerp.com-20120822174413-dln0k2refi86g0lj
2012-08-22 19:44:13 +02:00
Olivier Dony e459388304 [MERGE] cleanup @type for <menuitem>, now inferred from action + replace explicit record when possible
The corresponding server-side patch is
rev.4358 rev-id odo@openerp.com-20120822171932-xz6i6k5nxurqfac9
in openobject-server.

bzr revid: odo@openerp.com-20120822172130-3n1v93uwwwfrj17b
2012-08-22 19:21:30 +02:00