Paramjit Singh Sahota(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-remove-warnings-server-installation-auth-oauth-provider-psa
into
lp:~openerp-dev/openobject-addons/trunk-remove-warnings-server-installation.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-remove-warnings-server-installation-auth-oauth-provider-psa/+merge/121163
Hello Sir,
Created the access rule file for auth.oauth.provider which was not defined
in auth_oauth module.
Thankz You.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-remove-warnings-server-installation-auth-oauth-provider-psa/+merge/121163
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openobject-addons/trunk-remove-warnings-server-installation-auth-oauth-provider-psa
into
lp:~openerp-dev/openobject-addons/trunk-remove-warnings-server-installation.
=== modified file 'account/security/ir.model.access.csv'
--- account/security/ir.model.access.csv 2012-03-07 07:07:30 +0000
+++ account/security/ir.model.access.csv 2012-08-24 11:24:52 +0000
@@ -82,6 +82,7 @@
access_account_entries_report_employee,account.entries.report employee,model_account_entries_report,base.group_user,1,0,0,0
access_analytic_entries_report_manager,analytic.entries.report,model_analytic_entries_report,account.group_account_manager,1,0,0,0
access_account_cashbox_line,account.cashbox.line,model_account_cashbox_line,account.group_account_user,1,1,1,1
+access_account_journal_cashbox_line,account.journal.cashbox.line,model_account_journal_cashbox_line,account.group_account_user,1,1,1,0
access_account_journal_view_invoice,account.journal.view invoice,model_account_journal_view,account.group_account_invoice,1,1,1,1
access_account_journal_column_invoice,account.journal.column invoice,model_account_journal_column,account.group_account_invoice,1,1,1,1
access_account_invoice_tax_accountant,account.invoice.tax accountant,model_account_invoice_tax,account.group_account_user,1,0,0,0
=== modified file 'auth_oauth/__openerp__.py'
--- auth_oauth/__openerp__.py 2012-08-22 17:57:56 +0000
+++ auth_oauth/__openerp__.py 2012-08-24 11:24:52 +0000
@@ -34,11 +34,29 @@
'depends': ['base', 'web', 'base_setup'],
'data': [
'auth_oauth_data.xml',
+<<<<<<< TREE
'auth_oauth_view.xml'
],
'js': ['static/src/js/auth_oauth.js'],
'css': ['static/lib/zocial/css/zocial.css'],
'qweb': ['static/src/xml/auth_oauth.xml'],
+=======
+ 'security/ir.model.access.csv',
+ ],
+ 'update_xml': [
+ 'auth_oauth_view.xml',
+ 'res_config.xml',
+ ],
+ 'js': [
+ 'static/src/js/auth_oauth.js',
+ ],
+ 'css': [
+ 'static/lib/zocial/css/zocial.css',
+ ],
+ 'qweb': [
+ 'static/src/xml/auth_oauth.xml',
+ ],
+>>>>>>> MERGE-SOURCE
'installable': True,
'auto_install': False,
}
=== added directory 'auth_oauth/security'
=== added file 'auth_oauth/security/ir.model.access.csv'
--- auth_oauth/security/ir.model.access.csv 1970-01-01 00:00:00 +0000
+++ auth_oauth/security/ir.model.access.csv 2012-08-24 11:24:52 +0000
@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_auth_oauth_provider,auth_oauth_provider,model_auth_oauth_provider,base.group_system,1,1,1,1
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
