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/122269
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/122269
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/account.py'
--- account/account.py 2012-08-31 11:41:25 +0000
+++ account/account.py 2012-08-31 13:05:24 +0000
@@ -184,7 +184,7 @@
('income', _('Profit & Loss (Income account)')),
('expense', _('Profit & Loss (Expense account)')),
('asset', _('Balance Sheet (Asset account)')),
- ('liability', _('Balance Sheet (Liability account)'))], help="This field is used to generate legal reports: profit and loss, balance sheet.", required=True),
+ ('liability', _('Balance Sheet (Liability account)'))], store=True, help="This field is used to generate legal reports: profit and loss, balance sheet.", required=True),
'note': fields.text('Description'),
}
_defaults = {
=== modified file 'account_analytic_analysis/account_analytic_analysis.py'
=== modified file 'account_analytic_analysis/account_analytic_analysis_view.xml'
--- account_analytic_analysis/account_analytic_analysis_view.xml 2012-08-31 08:39:09 +0000
+++ account_analytic_analysis/account_analytic_analysis_view.xml 2012-08-31 13:05:24 +0000
@@ -22,7 +22,12 @@
<xpath expr='//div[@name="duration"]' position="after" version="7.0">
<label for="quantity_max"/>
<div>
- <field name="quantity_max" class="oe_inline"/>
+<<<<<<< TREE
+ <field name="quantity_max" class="oe_inline"/>
+=======
+ <field name="quantity_max" class="oe_inline"/>
+ <field name="company_uom_id" readonly="1" class="oe_inline"/>
+>>>>>>> MERGE-SOURCE
</div>
</xpath>
<xpath expr='//group[@name="invoice_on_timesheets"]' position="replace">
=== modified file 'auth_oauth/__openerp__.py'
--- auth_oauth/__openerp__.py 2012-08-22 17:57:56 +0000
+++ auth_oauth/__openerp__.py 2012-08-31 13:05:24 +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 13:05:24 +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 'mail/mail_thread.py'
=== modified file 'mrp/mrp_view.xml'
--- mrp/mrp_view.xml 2012-08-31 08:39:09 +0000
+++ mrp/mrp_view.xml 2012-08-31 13:05:24 +0000
@@ -985,11 +985,26 @@
</data>
</field>
</record>
+<<<<<<< TREE
<record id="product_normal_form_supply_view" model="ir.ui.view">
+=======
+ <record id="product_normal_form_supply_view" model="ir.ui.view">
<field name="name">product.normal.form.mrp.inherit</field>
<field name="model">product.product</field>
<field name="inherit_id" ref="product.product_normal_form_view"/>
<field name="arch" type="xml">
+ <xpath expr="//field[@name='procure_method']" position="after">
+ <field name="supply_method" groups="base.group_user"/>
+ </xpath>
+ </field>
+ </record>
+
+ <record id="product_normal_form_view" model="ir.ui.view">
+>>>>>>> MERGE-SOURCE
+ <field name="name">product.normal.form.mrp.inherit</field>
+ <field name="model">product.product</field>
+ <field name="inherit_id" ref="stock.view_normal_procurement_locations_form"/>
+ <field name="arch" type="xml">
<xpath expr="//field[@name='procure_method']" position="after">
<field name="supply_method" groups="base.group_user"/>
</xpath>
=== 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 13:05:24 +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 'procurement/procurement_view.xml'
--- procurement/procurement_view.xml 2012-08-31 08:39:09 +0000
+++ procurement/procurement_view.xml 2012-08-31 13:05:24 +0000
@@ -283,11 +283,31 @@
<menuitem id="menu_stock_procurement" name="Automatic Procurements" parent="stock.menu_stock_configuration" sequence="5"/>
<menuitem action="action_orderpoint_form" id="menu_stock_order_points" parent="stock.menu_stock_configuration" sequence="10"/>
+<<<<<<< TREE
<record model="ir.actions.act_window" id="product_open_orderpoint">
<field name="context">{'default_product_id': active_id, 'search_default_product_id': active_id}</field>
<field name="name">Orderpoints</field>
<field name="res_model">stock.warehouse.orderpoint</field>
+=======
+ <record id="product_normal_form_view" model="ir.ui.view">
+ <field name="name">product.normal.form.orderpoint.inherit</field>
+ <field name="model">product.product</field>
+ <field name="inherit_id" ref="stock.view_normal_procurement_locations_form"/>
+ <field name="arch" type="xml">
+ <page string="Procurement & Locations" position="inside">
+ <separator string="Minimum Stock Rules"/>
+ <field name="orderpoint_ids" widget="one2many_list" mode="tree" context="{'default_product_id': active_id}">
+ <tree string="Reordering Rules">
+ <field name="name"/>
+ <field name="warehouse_id"/>
+ <field name="product_min_qty"/>
+ <field name="product_max_qty"/>
+ </tree>
+ </field>
+ </page>
+ </field>
+>>>>>>> MERGE-SOURCE
</record>
<record model="ir.ui.view" id="product_form_view_procurement_button">
=== modified file 'product/product_view.xml'
=== 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
