Jalpesh Patel(OpenERP) has proposed merging
lp:~openerp-commiter/openobject-addons/trunk-configuration_wizard_improvement-atp-improve-general-setting-tooltip-on-portal-pja
into lp:~openerp-dev/openobject-addons/trunk-application_setting_cleanup-atp.
Requested reviews:
Atul Patel(OpenERP) (atp-openerp)
For more details, see:
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-configuration_wizard_improvement-atp-improve-general-setting-tooltip-on-portal-pja/+merge/109354
Hello,
i have improve configuration wizard General Settings tooltip on portal.
Thanks,
pja
--
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-configuration_wizard_improvement-atp-improve-general-setting-tooltip-on-portal-pja/+merge/109354
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-application_setting_cleanup-atp.
=== modified file 'base_setup/res_config.py'
--- base_setup/res_config.py 2012-05-31 07:37:26 +0000
+++ base_setup/res_config.py 2012-06-08 12:44:22 +0000
@@ -28,10 +28,20 @@
'module_multi_company': fields.boolean('Multi Company',
help="""Work in multi-company environments, with appropriate security access between companies.
This installs the module multi_company."""),
+<<<<<<< TREE
'module_portal': fields.boolean('Activate Customer Portal',
help="""The portal will give access to a series of documents for your customers; his quotations, his invoices, his projects, etc."""),
'module_share': fields.boolean('Allow Sharing Resources to External Users',
help="""As an example, you will be able to share a project or some tasks to your customers, or quotes/sales to several persons at your customer company, or your agenda availabilities to your contacts."""),
+=======
+ 'module_portal': fields.boolean('Portal',
+ help="""Define a portal for your customers or suppliers.
+ The portal is a group of external users that has specific access rights and rules.
+ This installs the module portal."""),
+ 'module_share': fields.boolean('Share',
+ help="""Share OpenERP documents (records) with external users.
+ This installs the module share."""),
+>>>>>>> MERGE-SOURCE
}
def open_company(self, cr, uid, ids, context=None):
_______________________________________________
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
