pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] upstream

Browse Source 
bzr revid: fme@openerp.com-20140114134148-kgjdoh70zpgfmcy3
This commit is contained in:
Fabien Meghazi
2014-01-14 14:41:48 +01:00
parent d80afb469f 58ff276887
commit 907532f72f
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openerp/addons/base/ir/ir_fields.py
-4
View File
@@ -5,14 +5,10 @@ import functools
import operator
import itertools
import time
import Image
import psycopg2
import pytz
import werkzeug.utils
import openerp.osv.fields
import openerp.tools.func
from openerp.osv import orm
from openerp.tools.translate import _
from openerp.tools.misc import DEFAULT_SERVER_DATE_FORMAT,\
openerp/addons/base/ir/ir_qweb.py
+1 -1
View File
@@ -11,8 +11,8 @@ import xml # FIXME use lxml and etree
import babel
import babel.dates
import dateutil.relativedelta
import Image
import werkzeug.utils
from PIL import Image
import openerp.tools
from openerp.osv import osv, orm, fields
openerp/addons/base/security/ir.model.access.csv
+2
View File
@@ -122,3 +122,5 @@ access_ir_qweb_field_many2one,access_ir_qweb_field_many2one,model_ir_qweb_field_
access_ir_qweb_field_html,access_ir_qweb_field_html,model_ir_qweb_field_html,,0,0,0,0
access_ir_qweb_field_image,access_ir_qweb_field_image,model_ir_qweb_field_image,,0,0,0,0
access_ir_qweb_field_monetary,access_ir_qweb_field_monetary,model_ir_qweb_field_monetary,,0,0,0,0
"access_res_font_all","res_res_font all","model_res_font",,1,0,0,0
"access_res_font_group_user","res_res_font group_user","model_res_font","group_user",1,1,1,1
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
122 access_ir_qweb_field_html access_ir_qweb_field_html model_ir_qweb_field_html 0 0 0 0
123 access_ir_qweb_field_image access_ir_qweb_field_image model_ir_qweb_field_image 0 0 0 0
124 access_ir_qweb_field_monetary access_ir_qweb_field_monetary model_ir_qweb_field_monetary 0 0 0 0
125 access_res_font_all res_res_font all model_res_font 1 0 0 0
126 access_res_font_group_user res_res_font group_user model_res_font group_user 1 1 1 1