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
bc13c2a3f2
Merged
...
bzr revid: hda@tinyerp.com-20091110072406-ifioj2p2oa7ybtok
2009-11-10 12:54:06 +05:30
762b5dd148
[IMP] improve view tree and search criteria on inherits
...
bzr revid: christophe.chauvet@syleam.fr-20091106144001-f3mnx237tv6cddpb
2009-11-06 15:40:01 +01:00
c436917517
[Merge] merge stable/5.0 branch
...
bzr revid: hmo@tinyerp.com-20091104064434-fijc4n2motwgsu13
2009-11-04 12:14:34 +05:30
c411d2cfe6
Merge remote branch 'origin/master' into optimize
...
bzr revid: p_christ@hol.gr-20091102182257-7vwfz9okfz815pes
2009-11-02 20:22:57 +02:00
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
15ed75c0af
Improved views
...
bzr revid: hda@tinyerp.com-20091029134643-vwrdtm63yrh7mq9n
2009-10-29 19:16:43 +05:30
db8f833229
[FIX] Record rule : domain evaluation problem corrected
...
lp bug: https://launchpad.net/bugs/410191 fixed
bzr revid: jvo@tinyerp.com-20091027131256-7q2gl9vzf21jsuir
2009-10-27 18:42:56 +05:30
ab09c43edd
[FIX] Ir_attachment : Context updation corrected on preview
...
lp bug: https://launchpad.net/bugs/460560 fixed
bzr revid: jvo@tinyerp.com-20091027055419-du965jjvgup05amh
2009-10-27 11:24:19 +05:30
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
8c64e3c18b
Remove sql injection problem
...
lp bug: https://launchpad.net/bugs/429327 fixed
bzr revid: hda@tinyerp.com-20091021072533-1p0q91xcxoj51k1n
2009-10-21 12:55:33 +05:30
251b6720ca
Changed encoding to coding ref: PEP: 0263
...
bzr revid: hda@tinyerp.com-20091020105223-2o94yr2iv2v10axr
2009-10-20 16:22:23 +05:30
012fd8d624
[FIX] recursive calls
...
bzr revid: fp@tinyerp.com-20091019182609-bkowmclnyfon4jeo
2009-10-19 20:26:09 +02:00
4d7134cd99
Changed licencing
...
bzr revid: hda@tinyerp.com-20091014123215-nuyqs18090whzt5o
2009-10-14 18:02:15 +05:30
be09477845
[IMP] default value for module
...
bzr revid: fp@tinyerp.com-20091013175813-vlqi304leu84x0wx
2009-10-13 19:58:13 +02:00
c6f5c91a96
Merged with stable
...
bzr revid: hda@tinyerp.com-20091009095236-2m1dt7sz4mr6iw0e
2009-10-09 15:22:36 +05:30
2162baddf1
Merge branch 'xrg' into optimize
...
bzr revid: p_christ@hol.gr-20091008195954-25470bnwhqeoyc17
2009-10-08 22:59:54 +03:00
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
f590b74318
[FIX] Import : Context of the action/screen passed,taken into consideration while importing
...
bzr revid: jvo@tinyerp.com-20091005121029-6sy1k3uvkpi2i8of
2009-10-05 17:40:29 +05:30
1b607549a7
[IMP] cron: check the arguments to avoid security issues
...
[IMP] cron: failed jobs are logged
[IMP] cron: clean code
lp bug: https://launchpad.net/bugs/433395 fixed
bzr revid: christophe@tinyerp.com-20091002160007-mw7a55oy0l6bp5xd
2009-10-02 18:00:07 +02:00
eefe57c93e
[MERGE]
...
bzr revid: hda@tinyerp.com-20091001120820-2tke1hk1ixd7nbb8
2009-10-01 17:38:20 +05:30
68017084b1
[FIX]:corrected menuitem's action allottment(Ref:hda,jvo),fixed Custom_shortcuts under administration does not work(ref:nch)
...
bzr revid: nch@tinyerp.com-20090930112035-1e5xxa03qnofmolh
2009-09-30 16:50:35 +05:30
0a0b1f711a
added html2html in report_xml
...
bzr revid: hda@tinyerp.com-20090929084914-j1vngxihd7n43tpq
2009-09-29 14:19:14 +05:30
afd06e6bf2
Merge remote branch 'origin/master' v5.0.6 into xrg
...
Conflicts:
bin/addons/base/ir/ir_cron.py
bin/netsvc.py
bzr revid: p_christ@hol.gr-20090925204910-uhwimwgfgm94hujn
2009-09-25 23:49:10 +03:00
71d5ee956a
Merge remote branch 'origin/master', v5.0.6 into optimize
...
Conflicts:
bin/addons/base/ir/ir_cron.py
bin/netsvc.py
bin/osv/orm.py
bzr revid: p_christ@hol.gr-20090925204745-352t3ngsltr4cj8a
2009-09-25 23:47:45 +03:00
fee82e1383
rename html2html to Mako2html Merging improvement in orm
...
bzr revid: hda@tinyerp.com-20090925124156-clmoug86pwwwl88d
2009-09-25 18:11:56 +05:30
6021b6dff3
Ir.attachment: improve SQL for access checks.
...
bzr revid: p_christ@hol.gr-20090922093255-f3iljq721pwbn9e0
2009-09-22 12:32:55 +03:00
c68600cc53
[Merged]
...
bzr revid: hda@tinyerp.com-20090917072712-l7220bbv1gq4uckc
2009-09-17 12:57:12 +05:30
d0f215df6a
[MERGE]: merging from the same branch
...
bzr revid: mga@tinyerp.com-20090916102642-c4niyojssbdwfso7
2009-09-16 15:56:42 +05:30
c92e018556
[REM]: remove the name search method, as this method was implemented for the email address field
...
this was looking for the related fields too in the action object, but now that is not required as
now email address can be located by object.object.object.....field
so its better to make this method close
bzr revid: mga@tinyerp.com-20090916102521-m5xmlbmle8y2zc64
2009-09-16 15:55:21 +05:30
c415a9d72f
[FIX]base : ir_cron : take minimun next_call from database for job waiting. if database does not has any job, it will take 1 day for job waiting
...
bzr revid: hmo@tinyerp.com-20090916092036-pevdiwq24d42zanl
2009-09-16 14:50:36 +05:30
2a16b99892
[Feature]: add condition to ir.sequence, let it be partitioned.
...
With this feature, multiple sequences may be defined per type. A weight
parameter will primarily order them. Then, the one whose condition is
true will be used.
This would let us write modules (calls to get() must be upgraded), where
the sequence numbering will depend on the data. Note that this is not
straghtforward, as the context passed must be carefully constructed. One
problem is that not all object data (eg category) may exist when the
sequence is called for a /new/ object (as a call for 'default').
The current code should be backwards compatible with old calls to get()
without a context.
bzr revid: p_christ@hol.gr-20090909203517-qahww8hika9t3zl8
2009-09-09 23:35:17 +03:00
02fd0eb506
[FIX] Translation issue with cache: it needed to restart server,SOLVED
...
lp bug: https://launchpad.net/bugs/399208 fixed
bzr revid: jvo@tinyerp.com-20090903124928-mbzr7ekxoo4sba49
2009-09-03 18:19:28 +05:30
0b5b67b336
Fix quoting of ids when passed to sql.
...
bzr revid: p_christ@hol.gr-20090903073240-cyydggro48990k2s
2009-09-03 10:32:40 +03:00
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
771fdd192b
[FIX] ir_cron :function and its arguements are now editable
...
lp bug: https://launchpad.net/bugs/415334 fixed
bzr revid: jvo@tinyerp.com-20090826095541-a6i4advqo4ywdkpa
2009-08-26 15:25:41 +05:30
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
48ed571bab
[FIX] do not get next sequence in its own cursor
...
lp bug: https://launchpad.net/bugs/415972 fixed
bzr revid: christophe@tinyerp.com-20090820091600-1wlzlr9s4f041lbq
2009-08-20 11:16:00 +02:00
7913a8c469
[FIX] sequences: avoid an sql error when locking table...
...
bzr revid: christophe@tinyerp.com-20090818120402-8pnaeouti6oi0kjk
2009-08-18 14:04:02 +02:00
aba9fd3e77
Merge commit 'origin/master' into xrg
...
bzr revid: p_christ@hol.gr-20090813010638-2uwue8bg4w5uv99o
bzr revid: p_christ@hol.gr-20090813010706-h9s7e7flcw2wwgt9
2009-08-13 04:07:06 +03:00
088410f069
[FIX] pass the context to check method of 'ir.model.access'
...
bzr revid: christophe@tinyerp.com-20090810162409-jhl8imt25vw92mmy
2009-08-10 18:24:09 +02:00
bcaf90c80b
[FIX] increase size of field "name" of ir.model.data
...
bzr revid: christophe@tinyerp.com-20090807135208-hr5pokupqh14dpao
2009-08-07 15:52:08 +02:00
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
ed3234e3c0
[FIX] Logger notification improved
...
bzr revid: jvo@tinyerp.com-20090729133649-clmwpd8wfbrrxbsl
2009-07-29 19:06:49 +05:30
0d6d1c4c6d
[FIX] ir_model : context key deletion
...
lp bug: https://launchpad.net/bugs/404733 fixed
bzr revid: jvo@tinyerp.com-20090728143131-i6oozfsb1bznj6r0
2009-07-28 20:01:31 +05:30
9148c7fcdf
[FIX] Added sql_constraint on adding field having size<1
...
lp bug: https://launchpad.net/bugs/399685 fixed
bzr revid: hda@hda-20090715134530-4aj0hth1olefcpdn
2009-07-15 19:15:30 +05:30
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
43318c5c55
[FIX] bug 369947
...
bzr revid: fp@tinyerp.com-20090706194909-foz20j4k0mh423a6
2009-07-06 21:49:09 +02:00
552de8630d
[FIX] bug 371768 bad tooltip
...
bzr revid: fp@tinyerp.com-20090706194153-asiybgnwywsdgwv9
2009-07-06 21:41:53 +02:00
f90988f325
merge
...
bzr revid: fp@tinyerp.com-20090706193326-z1dk5g6amhwcshmp
2009-07-06 21:33:26 +02:00
xrg
HDA (OpenERP)
Christophe Chauvet
Harry (Open ERP)
P. Christeas
Jay (Open ERP)
Fabien Pinckaers
Christophe Simonis
Mantavya Gajjar