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:
Jiten (OpenERP) (jiten-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-remove-warnings-server-installation-auth-oauth-provider-psa/+merge/122251
Hello Sir,
Removed the conflicts and merged with the latest trunk.
Thankz You.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-remove-warnings-server-installation-auth-oauth-provider-psa/+merge/122251
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-remove-warnings-server-installation.
=== modified file 'account_analytic_analysis/account_analytic_analysis.py'
=== modified file 'auth_oauth/__openerp__.py'
--- auth_oauth/__openerp__.py 2012-08-22 17:57:56 +0000
+++ auth_oauth/__openerp__.py 2012-08-31 11:45:53 +0000
@@ -34,11 +34,20 @@
'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'],
+=======
+ 'auth_oauth_view.xml',
+ 'security/ir.model.access.csv',
+ ],
+ '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-31 11:45:53 +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
=== modified file 'hr_recruitment/hr_recruitment.py'
=== modified file 'mail/mail_alias.py'
=== modified file 'mail/mail_thread.py'
=== modified file 'point_of_sale/point_of_sale_view.xml'
--- point_of_sale/point_of_sale_view.xml 2012-08-31 10:16:59 +0000
+++ point_of_sale/point_of_sale_view.xml 2012-08-31 11:45:53 +0000
@@ -1064,6 +1064,7 @@
parent="menu_point_of_sale"
id="menu_pos_session_opening" sequence="0"/>
+<<<<<<< TREE
<record model="ir.ui.view" id="pos_ean13_generator">
<field name="name">pos.ean_wizard</field>
<field name="model">pos.ean_wizard</field>
@@ -1078,5 +1079,22 @@
</record>
+=======
+ <record model="ir.ui.view" id="pos_ean13_generator">
+ <field name="name">pos.ean_wizard</field>
+ <field name="model">pos.ean_wizard</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <form string="Ean13 Generator" version="7.0">
+ <field name="ean13_pattern"/>
+ <footer>
+ <button name="sanitize_ean13" type="object" string="Apply"/>
+ </footer>
+ </form>
+ </field>
+ </record>
+
+
+>>>>>>> MERGE-SOURCE
</data>
</openerp>
=== modified file 'point_of_sale/wizard/pos_session_opening.py'
--- point_of_sale/wizard/pos_session_opening.py 2012-08-21 15:06:12 +0000
+++ point_of_sale/wizard/pos_session_opening.py 2012-08-31 11:45:53 +0000
@@ -12,9 +12,19 @@
_columns = {
'pos_config_id' : fields.many2one('pos.config', 'Point of Sale', required=True),
'pos_session_id' : fields.many2one('pos.session', 'PoS Session'),
- 'pos_state' : fields.selection(pos_session.POS_SESSION_STATE,
- 'Session State', readonly=True),
- 'show_config' : fields.boolean('Show Config', readonly=True),
+<<<<<<< TREE
+ 'pos_state' : fields.selection(pos_session.POS_SESSION_STATE,
+ 'Session State', readonly=True),
+ 'show_config' : fields.boolean('Show Config', readonly=True),
+=======
+ 'pos_state' : fields.selection(pos_session.POS_SESSION_STATE,
+ 'Session State', readonly=True),
+ 'show_config' : fields.boolean('Show Config', readonly=True),
+ 'pos_session_name' : fields.related('pos_session_id', 'name',
+ type='char', size=64, readonly=True),
+ 'pos_session_username' : fields.related('pos_session_id', 'user_id', 'name',
+ type='char', size=64, readonly=True)
+>>>>>>> MERGE-SOURCE
}
def open_ui(self, cr, uid, ids, context=None):
@@ -66,7 +76,9 @@
def on_change_config(self, cr, uid, ids, config_id, context=None):
result = {
'pos_session_id': False,
- 'pos_state': False
+ 'pos_state': False,
+ 'pos_session_username' : False,
+ 'pos_session_name' : False,
}
if not config_id:
return {'value': result}
@@ -76,8 +88,11 @@
('config_id', '=', config_id),
], context=context)
if session_ids:
- result['pos_state'] = proxy.browse(cr, uid, session_ids[0], context=context).state
- result['pos_session_id'] = session_ids[0]
+ session = proxy.browse(cr, uid, session_ids[0], context=context)
+ result['pos_state'] = session.state
+ result['pos_session_id'] = session.id
+ result['pos_session_name'] = session.name
+ result['pos_session_username'] = session.user_id.name
return {'value' : result}
def default_get(self, cr, uid, fieldnames, context=None):
=== modified file 'point_of_sale/wizard/pos_session_opening.xml'
--- point_of_sale/wizard/pos_session_opening.xml 2012-08-21 15:06:12 +0000
+++ point_of_sale/wizard/pos_session_opening.xml 2012-08-31 11:45:53 +0000
@@ -44,6 +44,15 @@
interface.
</p>
</div>
+ <div attrs="{'invisible' : [('pos_state', '!=', 'opened')]}" class="oe_view_nocontent">
+ <p class="oe_view_nocontent_create">
+ Click to continue the session.
+ </p>
+ <p>
+ The session <field name="pos_session_name" class="oe_inline" /> (<field name="pos_session_username" class="oe_inline" />) is "<b><field name="pos_state" class="oe_inline" /></b>"<br/>
+ You can continue sales from the touchscreen interface by clicking on "<b>Settings</b>" or close the cash register session ?
+ </p>
+ </div>
</form>
</field>
=== modified file 'web_linkedin/web_linkedin_view.xml'
_______________________________________________
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
