Commit Graph

169 Commits

Author SHA1 Message Date
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
mra (Open ERP) 64878b5eb4 [ADD] add get_iso_code method on misc which will give file name for translation using locale name
bzr revid: mra@tinyerp.com-20091120114441-imwgyyu7nidjhuza
2009-11-20 17:14:41 +05:30
olt@tinyerp.com 511ecb2e7f [IMP] added a 'detect ip address' method (used in the DMS)
bzr revid: olt@tinyerp.com-20091117072014-8n2vu0qkgbdznhgz
2009-11-17 08:20:14 +01:00
Harry (Open ERP) c436917517 [Merge] merge stable/5.0 branch
bzr revid: hmo@tinyerp.com-20091104064434-fijc4n2motwgsu13
2009-11-04 12:14:34 +05:30
P. Christeas c411d2cfe6 Merge remote branch 'origin/master' into optimize
bzr revid: p_christ@hol.gr-20091102182257-7vwfz9okfz815pes
2009-11-02 20:22:57 +02:00
Jay (Open ERP) bbad963f1b [FIX] Config : wrong calculation if cached_timeout comes from config file
bzr revid: jvo@tinyerp.com-20091026125005-r8jbk8iqhpessa2c
2009-10-26 18:20:05 +05:30
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
HDA (OpenERP) 9c917f2827 Added language code for Klingon translation
bzr revid: hda@tinyerp.com-20091012075508-rt4v2ibuss3kgvqz
2009-10-12 13:25:08 +05:30
P. Christeas 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
P. Christeas 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
ACH(OpenERP) 460f3102bc [FIX] Send Mail : Unicode error handled
lp bug: https://launchpad.net/bugs/421162 fixed

bzr revid: jvo@tinyerp.com-20090902145354-5b43k67lpbe513cj
2009-09-02 20:23:54 +05:30
Christophe chauvet(Syleam) 1737b613a9 [FIX] Send mail : Non-English characters were throwing error.
lp bug: https://launchpad.net/bugs/421162 fixed

bzr revid: jvo@tinyerp.com-20090831062243-qm4bnnvvx93xvsyi
2009-08-31 11:52:43 +05:30
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
Christophe Simonis 3c1be5bec7 [IMP] add translation names
bzr revid: christophe@tinyerp.com-20090828161829-t09div4pnx0pfij2
2009-08-28 18:18:29 +02:00
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
Christophe Simonis b34691c2f6 [FIX] bug in cache system that altered some arguments passed to cached function
lp bug: https://launchpad.net/bugs/413586 fixed

bzr revid: christophe@tinyerp.com-20090814150506-04f3uficgdtd3uqu
2009-08-14 17:05:06 +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
P. Christeas fdb3ee7772 email_send: feature to place mails in a maildir, instead of smtp
At some testing/development scenarios, we may not want to send the mails
away, just place them at a dir for inspection.

bzr revid: p_christ@hol.gr-20090723222937-8udu15ncqqxiq2ye
2009-07-24 01:29:37 +03:00
Olivier Laurent 22ac7ba66e [FIX] RuntimeError in the cache system
lp bug: https://launchpad.net/bugs/310918 fixed

bzr revid: olt@tinyerp.com-20090718112110-0p29jjruvhiwjrp0
2009-07-18 13:21:10 +02:00
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
Christophe Simonis 60cf794c7d [FIX] upgrade doesn't try to delete modules
lp bug: https://launchpad.net/bugs/357045 fixed

bzr revid: christophe@tinyerp.com-20090612110033-hw8acue29oh0f2rx
2009-06-12 13:00:33 +02:00
P. Christeas 60a9263133 Merge commit 'origin/master' into mdv-gpl3-py26
bzr revid: p_christ@hol.gr-20090604071225-bqeycl17emwl1uo0
bzr revid: p_christ@hol.gr-20090604071307-yv52ry9pi3m8xfq6
2009-06-04 10:13:07 +03:00
P. Christeas a8174908dc Hack for multiple addons paths.
Using this, the addons can be spread accross multiple base dirs. This
may help developers, who put them in different repos.

bzr revid: p_christ@hol.gr-20090601182747-2ev3fqmu1d46ncjc
2009-06-01 21:27:47 +03:00
Jay (Open ERP) 8801abec64 misc
bzr revid: jvo@tinyerp.com-20090529073038-rz0klt69k2kiydem
2009-05-29 13:00:38 +05:30
Fabien Pinckaers 1d42a31a57 merge
bzr revid: fp@tinyerp.com-20090529002437-1awxwm8mymp6hpnm
2009-05-29 02:24:37 +02:00
Christophe Simonis 7a561ffcd8 [IMP] email_send: when debuging, output to the logger
bzr revid: christophe@tinyerp.com-20090528162735-9x5wvgjp05z1zwt9
2009-05-28 18:27:35 +02:00
Fabien Pinckaers cc920a782a merge
bzr revid: fp@tinyerp.com-20090525145704-5vdrw64fdr3uzsvz
2009-05-25 16:57:04 +02:00
P. Christeas 0da6edfdf1 Merge commit 'origin/master' into mdv-gpl3-py26
Conflicts:
	bin/addons/base/res/__init__.py
	setup.py

bzr revid: p_christ@hol.gr-20090521212526-1p9xohdfw2p7v9o6
2009-05-22 00:25:26 +03:00
Fabien Pinckaers 0d6b329df5 merge
bzr revid: fp@tinyerp.com-20090520112650-spuh3wzrg9yv9kwx
2009-05-20 13:26:50 +02:00
Fabien Pinckaers d6a4fdb1a9 Added Thai
bzr revid: fp@tinyerp.com-20090520112612-v2qnk7n2b0k9a1ro
2009-05-20 13:26:12 +02:00
Stephane Wirtel 33f4c81564 [MERGE]
bzr revid: stephane@tinyerp.com-20090519121503-9v5up9loel266ck0
2009-05-19 14:15:03 +02:00
Stephane Wirtel ca6e1c3451 [FIX] Add the certificate field in the ir_module_module table
[FIX] Insert the quality certificate in the description of the module (in ir_module_module)

bzr revid: stephane@tinyerp.com-20090519120941-bp1vpj5f2dr0uh36
2009-05-19 14:09:41 +02:00
Christophe Simonis 61ba1b3678 [FIX] fix in cache with skiparg > 2
bzr revid: christophe@tinyerp.com-20090519084030-ugx8sapnmx39dsiy
2009-05-19 10:40:30 +02:00
P. Christeas 3814e4dc73 Merge commit 'origin/master' into mdv-gpl3-py26
Conflicts:
	bin/report/interface.py
	bin/report/printscreen/ps_list.py
	bin/report/render/__init__.py
	bin/report/render/rml.py
	bin/report/render/rml2pdf/trml2pdf.py
	bin/sql_db.py

bzr revid: p_christ@hol.gr-20090506201813-qb71ec85xr08obb1
2009-05-06 23:18:13 +03:00
Christophe Simonis 8e1ab8207c [IMP] email sending: use OpenERP logger instead of logging...
bzr revid: christophe@tinyerp.com-20090428135045-qh3h94cv6igneakp
2009-04-28 15:50:45 +02:00
P. Christeas 59c0e4889a Merge commit 'origin/master' into mdv-gpl3-py26
bzr revid: p_christ@hol.gr-20090330173719-27jcy2nyw1v4w3bq
bzr revid: p_christ@hol.gr-20090330173755-o3pxayaintefn150
bzr revid: p_christ@hol.gr-20090330173849-heuqfveq1xdeoe6h
bzr revid: p_christ@hol.gr-20090406130641-9mrstydveuqjkkjv
2009-04-06 16:06:41 +03:00
ame (Tiny/Axelor) 0a3d0dc90a [FIX] invalid locale (en_EN)
lp bug: https://launchpad.net/bugs/338190 fixed

bzr revid: ame@tinyerp.com-20090316052211-wp1gjr3uxjovbz29
2009-03-16 10:52:11 +05:30
Fabien Pinckaers 45843a0a93 Ukrainian language
bzr revid: fp@tinyerp.com-20090315180017-ubuf9fqtomy9e8rn
2009-03-15 19:00:17 +01:00
P. Christeas 7cb394f380 Merge commit 'origin/master' into mdv-gpl3-py26
Conflicts:
	bin/addons/__init__.py
	bin/addons/base/ir/ir_cron.py
	bin/addons/base/rng/view.rng

bzr revid: p_christ@hol.gr-20090304073610-2ss5ju4lyyue79qv
bzr revid: p_christ@hol.gr-20090308214750-0bgr6yj85f8ixpjp
bzr revid: p_christ@hol.gr-20090312075024-1rqeqam5ipfofb9m
2009-03-12 09:50:24 +02:00
Stephane Wirtel 7ce18131ca [FIX] Set a default value if the x_headers argument has the value 'None'
lp bug: https://launchpad.net/bugs/340387 fixed

bzr revid: stephane@tinyerp.com-20090310100600-9lla8minamq9bq7w
2009-03-10 11:06:00 +01:00
Christophe Simonis 0f2f4d073b [FIX] unicode problem in mail sending
bzr revid: christophe@tinyerp.com-20090305121416-pn3jr87wyrnj220d
2009-03-05 13:14:16 +01:00
Stephane Wirtel 7811b928fd [MERGE] From Christophe Chauvet (Sylëam)
bzr revid: stephane@tinyerp.com-20090302140135-np2ucu001u3o77hy
2009-03-02 15:01:35 +01:00
Christophe Chauvet 3ff49ccb09 [IMP]
* Check if sender or default email in config file
 * Add X-Header (help filter on mail client)
 * Add dynamic X-Header on def method
 * Correct incoherent reply to when it exists

bzr revid: christophe.chauvet@syleam.fr-20090228135340-02gydu6xc009tb1j
2009-02-28 14:53:40 +01:00
Fabien Pinckaers e3bcb6b8be bugfix_lp_331245
bzr revid: fp@tinyerp.com-20090226201745-ot01ir2gy89n18xm
2009-02-26 21:17:45 +01:00
mga (Tiny/Axelor) 7eb762151c make sms function working for the local service
bzr revid: mga@tinyerp.com-20090219055532-5iybto8sdf183v55
2009-02-19 11:25:32 +05:30
P. Christeas f9f9fc5dde For python 2.6, don't try to use Exception.message
bzr revid: p_christ@hol.gr-20090216183933-4w10k79yzal4fcfl
2009-02-16 20:39:33 +02:00
P. Christeas 086e4a29c6 Merge commit 'origin/master' into mdv-gpl3-py26
Conflicts:
	bin/tools/translate.py
	setup.py

bzr revid: p_christ@hol.gr-20090213182359-arcslht0h9ix34qr
2009-02-13 20:23:59 +02:00
ame (Tiny/Axelor) b850cfe3e5 [FIX] unicode proble.
lp bug: https://launchpad.net/bugs/327294 fixed

bzr revid: ame@tinyerp.com-20090212133252-wludmq0d95irp6dm
2009-02-12 19:02:52 +05:30