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

[MERGE] forward port branch 9.0 up to 3bad13d

Browse Source
This commit is contained in:
Christophe Simonis
2016-11-15 11:06:15 +01:00
parent 814c2e83cc 3bad13d650
commit 58f68ccb72
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/point_of_sale/security/ir.model.access.csv
+2
View File
@@ -32,3 +32,5 @@ access_barcode_nomenclature_pos_user,barcode.nomenclature.pos.user,barcodes.mode
access_barcode_nomenclature_pos_manager,barcode.nomenclature.pos.manager,barcodes.model_barcode_nomenclature,group_pos_manager,1,1,1,1 access_barcode_nomenclature_pos_manager,barcode.nomenclature.pos.manager,barcodes.model_barcode_nomenclature,group_pos_manager,1,1,1,1
access_barcode_rule_pos_user,barcode.rule.pos.user,barcodes.model_barcode_rule,group_pos_user,1,0,0,0 access_barcode_rule_pos_user,barcode.rule.pos.user,barcodes.model_barcode_rule,group_pos_user,1,0,0,0
access_barcode_rule_pos_manager,barcode.rule.pos.manager,barcodes.model_barcode_rule,group_pos_manager,1,1,1,1 access_barcode_rule_pos_manager,barcode.rule.pos.manager,barcodes.model_barcode_rule,group_pos_manager,1,1,1,1
access_bank_statement_cashbox_user,account.bank.statement.cashbox user,account.model_account_bank_statement_cashbox,group_pos_user,1,1,1,0
access_account_cashbox_line_user,account.cashbox.line user,account.model_account_cashbox_line,group_pos_user,1,1,1,0
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
32 access_barcode_nomenclature_pos_manager barcode.nomenclature.pos.manager barcodes.model_barcode_nomenclature group_pos_manager 1 1 1 1
33 access_barcode_rule_pos_user barcode.rule.pos.user barcodes.model_barcode_rule group_pos_user 1 0 0 0
34 access_barcode_rule_pos_manager barcode.rule.pos.manager barcodes.model_barcode_rule group_pos_manager 1 1 1 1
35 access_bank_statement_cashbox_user account.bank.statement.cashbox user account.model_account_bank_statement_cashbox group_pos_user 1 1 1 0
36 access_account_cashbox_line_user account.cashbox.line user account.model_account_cashbox_line group_pos_user 1 1 1 0
openerp/addons/base/ir/ir_http.py
+1 -1
View File
@@ -265,7 +265,7 @@ class IrHttp(models.AbstractModel):
module_path = os.path.join(os.path.normpath(module_path), '') # join ensures the path ends with '/' module_path = os.path.join(os.path.normpath(module_path), '') # join ensures the path ends with '/'
module_resource_path = os.path.normpath(module_resource_path) module_resource_path = os.path.normpath(module_resource_path)
if module_resource_path.startswith(module_path): if module_resource_path.startswith(module_path):
with open(module_resource_path, 'r') as f: with open(module_resource_path, 'rb') as f:
content = base64.b64encode(f.read()) content = base64.b64encode(f.read())
last_update = str(os.path.getmtime(module_resource_path)) last_update = str(os.path.getmtime(module_resource_path))