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

[MERGE] Merged with addons/trunk.

Browse Source 
bzr revid: tde@openerp.com-20120824144007-4r11uoy3sux5f7cv
This commit is contained in:
Thibault Delavallée
2012-08-24 16:40:07 +02:00
parent 7423196143 45cf233538
commit f6fc11c48b
8 changed files with 42 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/anonymization/anonymization_view.xml
+2 -3
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<openerp>
<data noupdate="1">
<data>
<!-- FIELD LIST -->
@@ -76,7 +76,7 @@
</field>
</record>
<!-- ACTION -->
<!-- ACTION -->
<record model="ir.actions.act_window" id="action_ir_model_fields_anonymize_wizard">
<field name="name">Anonymize Database</field>
@@ -163,4 +163,3 @@
</data>
</openerp>
addons/base_report_designer/wizard/base_report_design_view.xml
+5 -4
View File
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data noupdate="1">
<data>
<record id="view_base_report_sxw" model="ir.ui.view">
<field name="name">Base Report sxw</field>
<field name="model">base.report.sxw</field>
@@ -17,7 +18,7 @@
</footer>
</form>
</field>
</record>
</record>
<record id="action_view_base_report_sxw" model="ir.actions.act_window">
<field name="name">Base Report sxw</field>
@@ -43,7 +44,8 @@
<label colspan="4" string="This is the template of your requested report.&#10;Save it as a .SXW file and open it with OpenOffice.&#10;Don't forget to install the OpenERP SA OpenOffice package to modify it.&#10;Once it is modified, re-upload it in OpenERP using this wizard." align="0.0"/>
</form>
</field>
</record>
</record>
<record id="view_base_report_file_rml" model="ir.ui.view">
<field name="name">Base Report File sxw</field>
<field name="model">base.report.rml.save</field>
@@ -55,6 +57,5 @@
</field>
</record>
</data>
</openerp>
addons/event_sale/event_demo.xml
+1
View File
File diff suppressed because one or more lines are too long
addons/point_of_sale/point_of_sale_view.xml
+11 -7
View File
@@ -877,13 +877,17 @@
<form string="Point of Sale Session" version="7.0">
<header>
<button name="open" type="workflow" string="Validate &amp; Open Session" states="opening_control" class="oe_highlight"/>
<button name="cashbox_control" type="workflow" string="End of Session" states="opened"
class="oe_highlight"/>
<button name="cashbox_control" type="workflow" string="End of Session"
attrs="{'invisible' : [('has_closing_control', '=', False),('state', '=', 'opened')]}"
class="oe_highlight" />
<button name="close" type="workflow" string="Validate Closing &amp; Post Entries"
attrs="{'invisible' : [('has_closing_control', '=', True),('state', '=', 'opened')]}"
class="oe_highlight" />
<button name="close" type="workflow" string="Validate Closing &amp; Post Entries" states="closing_control"
class="oe_highlight"/>
class="oe_highlight" />
<button name="open_frontend_cb" type="object" string="Continue Selling" states="opened"/>
<div class="oe_right">
<field name="state" widget="statusbar" statusbar_visible="opening_control,opened,closing_control,closed" nolabel="1"/>
<field name="state" widget="statusbar" statusbar_visible="opening_control,opened,closing_control,closed" nolabel="1" />
</div>
</header>
<sheet>
@@ -895,16 +899,16 @@
Session:
<field name="name" attrs="{'invisible': [('name','=','/')]}" class="oe_inline"/>
</h1>
<field name="has_opening_control" invisible="1" />
<field name="has_closing_control" invisible="1" />
<group>
<field name="has_opening_control" invisible="1" />
<field name="has_closing_control" invisible="1" />
<group>
<field name="user_id"/>
<field name="config_id" attrs="{'invisible' : [('config_id', '&lt;&gt;', False)]}"/>
</group>
<group>
<field name="start_at" attrs="{'invisible' : [('state', '=', 'opening_control')]}"/>
<field name="stop_at" attrs="{'invisible' : [('state', '&lt;&gt;', 'closed')]}"/>
<field name="stop_at" attrs="{'invisible' : [('state', '!=', 'closed')]}"/>
</group>
<newline/>
addons/product/product.py
+1 -1
View File
@@ -499,7 +499,7 @@ class product_product(osv.osv):
main_supplier = self._get_main_product_supplier(cr, uid, product, context=context)
result[product.id] = {
'seller_info_id': main_supplier and main_supplier.id or False,
'seller_delay': main_supplier and main_supplier.delay or 1,
'seller_delay': main_supplier.delay if main_supplier else 1,
'seller_qty': main_supplier and main_supplier.qty or 0.0,
'seller_id': main_supplier and main_supplier.name.id or False
}
addons/stock/stock.py
+3 -2
View File
@@ -2087,11 +2087,12 @@ class stock_move(osv.osv):
done.append(move.id)
pickings[move.picking_id.id] = 1
r = res.pop(0)
cr.execute('update stock_move set location_id=%s, product_qty=%s where id=%s', (r[1], r[0], move.id))
product_uos_qty = self.pool.get('stock.move').onchange_quantity(cr, uid, ids, move.product_id.id, r[0], move.product_id.uom_id.id, move.product_id.uos_id.id)['value']['product_uos_qty']
cr.execute('update stock_move set location_id=%s, product_qty=%s, product_uos_qty=%s where id=%s', (r[1], r[0],product_uos_qty, move.id))
while res:
r = res.pop(0)
move_id = self.copy(cr, uid, move.id, {'product_qty': r[0], 'location_id': r[1]})
move_id = self.copy(cr, uid, move.id, {'product_uos_qty': product_uos_qty, 'product_qty': r[0], 'location_id': r[1]})
done.append(move_id)
if done:
count += len(done)
addons/web_linkedin/web_linkedin.py
+3 -1
View File
@@ -43,11 +43,13 @@ class web_linkedin_settings(osv.osv_memory):
_inherit = 'res.config.settings'
_columns = {
'api_key': fields.char(string="API Key", size=50),
'server_domain': fields.char(size=100),
}
def get_default_linkedin(self, cr, uid, fields, context=None):
key = self.pool.get("ir.config_parameter").get_param(cr, uid, "web.linkedin.apikey") or ""
return {'api_key': key}
dom = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
return {'api_key': key, 'server_domain': dom,}
def set_linkedin(self, cr, uid, ids, context=None):
key = self.browse(cr, uid, ids[0], context)["api_key"] or ""
addons/web_linkedin/web_linkedin_view.xml
+16 -18
View File
@@ -23,24 +23,22 @@
or
<button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header>
<div>
<p>
To use the LinkedIn module with this database, an API Key is required. Please follow this procedure:
</p>
<ul>
<li>Go to this URL:
<a href="https://www.linkedin.com/secure/developer" target="_blank">https://www.linkedin.com/secure/developer</a>.
</li>
<li>Log into LinkedIn.</li>
<li>Add a new application and fill the form:
<ul>
<li>JavaScript API Domain: the domain of the url used to log into this database (example: http://localhost:8069)</li>
<li>The programming tool is Javascript</li>
</ul>
</li>
<li>Copy the API key down here:</li>
</ul>
</div>
<p>
To use the LinkedIn module with this database, an API Key is required. Please follow this procedure:
</p>
<ul>
<li>Go to this URL:
<a href="https://www.linkedin.com/secure/developer" target="_blank">https://www.linkedin.com/secure/developer</a>.
</li>
<li>Log into LinkedIn.</li>
<li>Add a new application and fill the form:
<ul>
<li>JavaScript API Domain: <field name="server_domain" readonly="1" style="width:0"/></li>
<li>The programming tool is Javascript</li>
</ul>
</li>
<li>Copy the API key down here:</li>
</ul>
<group>
<field name="api_key"/>
</group>