pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
42,644 Commits 1 Branch 0 Tags
4a94de154b58b9b2d133593dcff66d533f2ec2e0
Commit Graph
7 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
P. Christeas bec65af268 API doc: move settings file from bin/ to openerp/ 
bzr revid: xrg@linux.gr-20110623090807-0nqxrlsr3re8v8on
 2011-06-23 12:08:07 +03:00
P. Christeas d4f82fbd8c ir.module: Fix after e3770843a, don't call removed function 
bzr revid: xrg@linux.gr-20110608120407-6ydgv7ibgf9cb139
 2011-06-08 15:04:07 +03:00
P. Christeas 28e3960004 Revert "[IMP] translation: Added two columns to ir_translation to fix the res_ids after loading is done." 
This reverts commit a78cd642cd956afe3f3cee54558b214549f0a9a5.

Conflicts:

	openerp/addons/base/ir/ir_translation.py
	openerp/tools/translate.py

bzr revid: xrg@linux.gr-20110608092941-f2ycamq0k52y4nc8
 2011-06-08 12:29:41 +03:00
P. Christeas a2557925b6 yaml_import: fix ambiguous syntax at end of report 
When finishing a YAML import, the syntax ["str %d" % int + int] turns
out to be ambiguous and is resolved as [ ("str %d" % int) + int],
leading to a:
  TypeError: cannot concatenate 'str' and 'int' objects

This had been first fixed in commit f46966e044d18a644 (2010-06-30)
(cherry picked from commit cc0c584e5dfbf672d51f61e7207047f357e31471)

bzr revid: xrg@linux.gr-20110605135116-ie2h7gnvnx2kpdoy
 2011-06-05 16:51:16 +03:00
P. Christeas 5344e317ae yaml_import: fix ambiguous syntax at end of report 
When finishing a YAML import, the syntax ["str %d" % int + int] turns
out to be ambiguous and is resolved as [ ("str %d" % int) + int],
leading to a:
  TypeError: cannot concatenate 'str' and 'int' objects

This had been first fixed in commit f46966e044d18a644 (2010-06-30)
(cherry picked from commit cc0c584e5dfbf672d51f61e7207047f357e31471)

bzr revid: xrg@linux.gr-20110605113520-4jvooqvs2wbm1qs0
 2011-06-05 14:35:20 +03:00
Panos Christeas 32e09241ba [MERGE] sfd-adoons: base_synchro, openoffice-plugin 
bzr revid: hmo@tinyerp.com-20100918072446-gc1slo8lz82b2qli
 2010-09-18 12:54:46 +05:30
Panos Christeas 8d0b4a7418 [MERGE] merge from lp:~xrg/openobject-addons/doc2-5.2 
bzr revid: hmo@tinyerp.com-20091126135400-z32iycvadbt9so8n
 2009-11-26 19:24:00 +05:30