Commit Graph

14 Commits

Author SHA1 Message Date
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
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
P. Christeas b8d5eac277 Merge branch 'master' of /home/panos/tmp/tinyerp/openobject-server/ into mdv-gpl3-py26
Conflicts:

	bin/tools/translate.py

bzr revid: p_christ@hol.gr-20090114075916-feh0125soh9euu1h
2009-01-14 09:59:16 +02:00
P. Christeas 1435d6d064 Merge branch 'master' of /home/panos/tmp/tinyerp/openobject-server/ into mdv-gpl3
bzr revid: p_christ@hol.gr-20090106094017-i26aufnjth5am64m
2009-01-06 11:40:17 +02:00
Stephane Wirtel c5923d87f2 [IMP] Use cStringIO
bzr revid: stephane@tinyerp.com-20090105210240-nkg2vm08dwhz2xtq
2009-01-05 22:02:40 +01:00
Stephane Wirtel 9d293d1f00 [IMP] Update the copyright to 2009
bzr revid: stephane@tinyerp.com-20090104221329-rem11cbgwu30xnji
2009-01-04 23:13:29 +01:00
P. Christeas 1b69658f88 render/simple.py: Restore command-line mode.
bzr revid: p_christ@hol.gr-20081124151831-r2hck7h2zs714jgg
2008-11-24 17:18:31 +02:00
Christophe Simonis e404e54e38 passing in GPL-3
bzr revid: christophe@tinyerp.com-20081103182716-6c6xyeewubx4uas0
2008-11-03 19:27:16 +01:00
Stephane Wirtel dbe1e8ca98 Rename Tiny ERP to OpenERP
Rename tinyerp to openerp

bzr revid: stephane@tinyerp.com-20080910084640-bg1h1bre7mwky8s0
2008-09-10 10:46:40 +02:00
Christophe Simonis 2eb6b8265b add encoding comment and vim comment
bzr revid: christophe@tinyerp.com-20080723150127-fmitw7zgeokcualh
2008-07-23 17:01:27 +02:00
Christophe Simonis 2dd9723b8b convert tabs to 4 spaces
bzr revid: christophe@tinyerp.com-20080722142436-143iu4ryy47w3av0
2008-07-22 16:24:36 +02:00
stw 7134784787 add Copyright and GPL license into the Header of Python files
bzr revid: stw-eb6ee9b006e577bda6338caa450ec9795b12f9bc
2008-06-16 11:00:21 +00:00
pinky 004a0b996f New trunk
bzr revid: pinky-3f10ee12cea3c4c75cef44ab04ad33ef47432907
2006-12-07 13:41:40 +00:00