Commit Graph
136 Commits
Author SHA1 Message Date
HDA (OpenERP) 8a887ad4e0 Merged
bzr revid: hda@tinyerp.com-20100112104830-x35l4g08og2gacwo
2010-01-12 16:18:30 +05:30
Xavier Morel b90e33726c [merge] from trunk
bzr revid: xmo@tinyerp.com-20091215114912-3zt13paq2tne1ul0
2009-12-15 12:49:12 +01:00
nch@tinyerp.com e11130ec2f [REM,IMP]:removed mako package from server as it is added in setup.py
bzr revid: nch@tinyerp.com-20091215052239-64nu0xf330xs6fgz
2009-12-15 10:52:39 +05:30
hda (Tiny) 24cd74becf Merge
bzr revid: hda@tinyerp.com-20091208101246-5ave2zzgzsjqf0m8
2009-12-08 15:42:46 +05:30
Xavier Morel cf13b6c36e [merge] fix-shebang from 5.0 to trunk
bzr revid: hmo@tinyerp.com-20091202091102-r509b0bgogyul6yx
bzr revid: xmo@tinyerp.com-20091202101458-6a1mo240grkld6do
2009-12-02 11:14:58 +01:00
Xavier Morel 9bb02a1bb0 [fix] use env for python shebang rather than hardcoding /usr/bin/python
bzr revid: xmo@tinyerp.com-20091202100658-d2q66mu6kihgj8h5
2009-12-02 11:06:58 +01:00
Xavier Morel 91c515382c [merge] 5.0-lxml-fixes into trunk
bzr revid: xmo@tinyerp.com-20091202092042-36gz0wkbu27aetvc
bzr revid: xmo@tinyerp.com-20091202093008-9uwo63c0bwdh8eaw
2009-12-02 10:30:08 +01:00
Xavier Morel 70ab8c4607 [IMP] removal of usages of the deprecated node.getchildren call, better usage of the attributes & tostring ET APIs, style fixes
bzr revid: xmo@tinyerp.com-20091128115809-pk5zqrc3zp8h6pir
2009-11-28 12:58:09 +01:00
Xavier Morel 44a11226fe [IMP] improve usage of the ET API, use SubElement instead of Element/append, kwarg attributes setting instead of node.set
bzr revid: xmo@tinyerp.com-20091128104810-52uhz28fiw53joaz
2009-11-28 11:48:10 +01:00
Harry (Open ERP) fda2b950eb [IMP] change copyright with AGPL
bzr revid: hmo@tinyerp.com-20091127072348-5ktqotiyxhh99wh7
2009-11-27 12:53:48 +05:30
Harry (Open ERP) fba200b90a [IMP]trml2pdf : setfont
bzr revid: hmo@tinyerp.com-20091126082208-m910euc5gl1qggq2
2009-11-26 13:52:08 +05:30
Harry (Open ERP) 6cd866011f [MERGE]
bzr revid: hmo@tinyerp.com-20091126063020-6kuq4ph29esf0fwe
2009-11-26 12:00:20 +05:30
Harry (Open ERP) 5edcd54306 [FIX]customefont : fixed problem if ttf is not exits
bzr revid: hmo@tinyerp.com-20091125134116-n89ilj53bjmkcevw
2009-11-25 19:11:16 +05:30
Harry (Open ERP) d8ce3f1e2a [FIX] replaced <TAB> with four white space.
bzr revid: hmo@tinyerp.com-20091124144405-9mzd91chohvf0uu7
2009-11-24 20:14:05 +05:30
xrg dad1ff955b [merge] merge from lp:~xrg/openobject-server/optimize-5.0 and removed some confilts
bzr revid: hmo@tinyerp.com-20091120143104-tb6136unkdw7yfy9
2009-11-20 20:01:04 +05:30
HDA (OpenERP) 69036a94e0 Merged
bzr revid: hda@tinyerp.com-20091102091524-8sen0rrm3r50qo90
2009-11-02 14:45:24 +05:30
nch@tinyerp.com 371fe0f68f [IMP]:Added next previous counter
bzr revid: nch@tinyerp.com-20091102055006-727h8e26j7a53nlo
2009-11-02 11:20:06 +05:30
nch@tinyerp.com 48ff95502d [REF]:body formating
bzr revid: nch@tinyerp.com-20091030123811-tf8eoz7l1b8zjn3n
2009-10-30 18:08:11 +05:30
nch@tinyerp.com 36400b1e20 [IMP]:mako HTML2HTML reports: added previous next buttons also seperated the render for Mako reports
bzr revid: nch@tinyerp.com-20091030123359-oa8j6qk11w7mzsag
2009-10-30 18:03:59 +05:30
P. Christeas 5ee5a1caef Merge remote branch 'origin/master' into optimize
Conflicts:
	bin/osv/expression.py
	bin/osv/orm.py

bzr revid: p_christ@hol.gr-20091026105650-49wvuk3o7qw1ybkn
2009-10-26 12:56:50 +02:00
pap(openerp) 251b6720ca Changed encoding to coding ref: PEP: 0263
bzr revid: hda@tinyerp.com-20091020105223-2o94yr2iv2v10axr
2009-10-20 16:22:23 +05:30
PSO(OpenERP) 4d7134cd99 Changed licencing
bzr revid: hda@tinyerp.com-20091014123215-nuyqs18090whzt5o
2009-10-14 18:02:15 +05:30
Jay (Open ERP) 78ac7ac767 [FIX] Improved Previous bad commit for pagelayout error
[openobject-server @ jvo@tinyerp.com-20091008053344-rkh1m6oaxw2kjlwd]

bzr revid: p_christ@hol.gr-20091010111547-p5syr1cwu12f2kyh
2009-10-10 14:15:47 +03:00
HDA (OpenERP) f28de6ca44 merge
bzr revid: hda@tinyerp.com-20091009120926-53v9p0r8p72gvfvf
2009-10-09 17:39:26 +05:30
nch@tinyerp.com efc0d3b001 [REF]:notified channel when there is an exception in eval()
bzr revid: nch@tinyerp.com-20091009104547-t88ktqax7p5q57bz
2009-10-09 16:15:47 +05:30
nch@tinyerp.com dcf275be04 [FIX]:<seq> problem Report Engine
bzr revid: nch@tinyerp.com-20091009103354-u2z9v03jc864yekh
2009-10-09 16:03:54 +05:30
nch@tinyerp.com 20e8c4334a [REF]:Added Exception message in report engine when there is problem while eval(code)
bzr revid: nch@tinyerp.com-20091009053855-n320ioc366stvt08
2009-10-09 11:08:55 +05:30
P. Christeas ffb287777c Merge remote branch 'origin/master' into xrg
Conflicts:
	bin/addons/base/ir/ir_cron.py

bzr revid: p_christ@hol.gr-20091008195028-eth801qgzj78zrm1
2009-10-08 22:50:28 +03:00
Jay (Open ERP) bebd7fd223 [FIX] Improved Previous bad commit for pagelayout error
bzr revid: jvo@tinyerp.com-20091008053344-rkh1m6oaxw2kjlwd
2009-10-08 11:03:44 +05:30
Stephane Wirtel 3c28a101b9 [FIX] Use an alternative for the locale.RADIXCHAR if this one doesn't exist
lp bug: https://launchpad.net/bugs/400614 fixed

bzr revid: stephane@openerp.com-20091007123807-qsn2uk6jarosd7nz
2009-10-07 14:38:07 +02:00
P. Christeas 6e6329bb7d Merge origin/5.0.4 into xrg
Conflicts:
	bin/addons/base/i18n/base.pot

bzr revid: p_christ@hol.gr-20090828180203-xbavbj02nas6f0qy
2009-08-28 21:02:03 +03:00
NCH-OpenERP 20a0acd6cf [FIX] Pagecount probelm while all objects print on same page and printing special character on xsl report
bzr revid: hda@tinyerp.com-20090827100454-ph1ffi4ulanykb7s
2009-08-27 15:34:54 +05:30
P. Christeas 8cbe393b52 Merge commit 'origin/master' into xrg (5.0.3 official)
Conflicts:
	bin/netsvc.py
	bin/tools/config.py
	bin/workflow/instance.py

bzr revid: p_christ@hol.gr-20090823100210-2py390qp3hym8jlp
2009-08-23 13:02:10 +03:00
Olivier Laurent b29baf18e6 [FIX] report engine: fixed a bug when the xml tag is empty
bzr revid: olt@tinyerp.com-20090817123747-ets06zg2rym119ln
2009-08-17 14:37:47 +02:00
P. Christeas c3e569fb08 Merge commit 'origin/master' into xrg
Conflicts:
	bin/netsvc.py
	bin/report/report_sxw.py
	setup.py

bzr revid: p_christ@hol.gr-20090803072357-zz2cm1sycsagftnn
2009-08-03 10:23:57 +03:00
VRA(OpenERP) c7cc86b376 [FIX] Accented characters are displayed on footer now
lp bug: https://launchpad.net/bugs/406489 fixed

bzr revid: jvo@tinyerp.com-20090731085710-vzjiy4yuf7urmccz
2009-07-31 14:27:10 +05:30
NCH e2852ed13e [FIX] place tag
bzr revid: hda@hda-20090722104616-z497bh35iwfh6a7g
2009-07-22 16:16:16 +05:30
P. Christeas 2d64ce69d0 Merge origin/master into mdv-gpl3-py26
Conflicts:
	bin/addons/base_setup/i18n/base_setup.pot
	bin/openerp-server.py
	bin/report/preprocess.py
	bin/report/report_sxw.py
	bin/tools/translate.py

bzr revid: p_christ@hol.gr-20090709181253-fu8nxy9b3ykrrd1c
2009-07-09 21:12:53 +03:00
dsh (Open ERP) 004cb7d89c [IMP] attributes of barcode
bzr revid: dsh@tinyerp.com-20090701082850-e4uelitk1ijm30g0
2009-07-01 13:58:50 +05:30
Naresh Choksy f7638c85ce [FIX]:sxw and odt reports
bzr revid: nch@tinyerp.com-20090701064451-wlcwyeyqfeim7nqu
2009-07-01 12:14:51 +05:30
Naresh Choksy 798f5d5523 [FIX]:Fixed odt2odt reports printing
bzr revid: nch@tinyerp.com-20090630133626-n4je1b30khvfwpq2
2009-06-30 19:06:26 +05:30
nch a393946dec [FIX] xml encoding in header for &.<.>
lp bug: https://launchpad.net/bugs/392187 fixed

bzr revid: hda@hda-20090626112744-31d6y4m3pm3cj3d4
2009-06-26 16:57:44 +05:30
dsh (Open ERP) 12434e7292 [FIX] fix missing tail process and skip unnecessary whitespace characters
bzr revid: dsh@tinyerp.com-20090618122742-we73sy313qem28zu
2009-06-18 17:57:42 +05:30
Fabien Pinckaers 636b4c8831 merge
bzr revid: fp@tinyerp.com-20090616133833-1999c13bi13hxnse
2009-06-16 15:38:33 +02:00
Fabien Pinckaers 6e77121fb6 [FIX] report engine, better spacings -> like preceeding version
bzr revid: fp@tinyerp.com-20090616133750-nm9ttvoln74y2d1y
2009-06-16 15:37:50 +02:00
NCH 846db679fc [FIX] Bad commit
bzr revid: hda@hda-20090615083917-trbkrswmen8ne0kx
2009-06-15 14:09:17 +05:30
NCH 0b84fe5865 [FIX] Added PageCount tag in report engine
bzr revid: hda@hda-20090615063523-1vrjzg27w9iju4zs
2009-06-15 12:05:23 +05:30
Fabien Pinckaers d43511f613 merge
bzr revid: fp@tinyerp.com-20090612141334-hmetl32rubyl1yh1
2009-06-12 16:13:34 +02:00
Fabien Pinckaers ddd9fe9570 [FIX] bug in report engine
lp bug: https://launchpad.net/bugs/385297 fixed

bzr revid: fp@tinyerp.com-20090612141153-72tcjwwugwugouww
2009-06-12 16:11:53 +02:00
dsh (Open ERP) 58070343d2 [FIX] fix &,<,> problem for html2html-url report
bzr revid: dsh@tinyerp.com-20090610134919-x3hkueo10dlrqkn5
2009-06-10 19:19:19 +05:30