commit
1d365f0d50
|
@ -300,7 +300,6 @@ class account_account(osv.osv):
|
|||
if aml_query.strip():
|
||||
wheres.append(aml_query.strip())
|
||||
filters = " AND ".join(wheres)
|
||||
_logger.debug('Filters: %s',(filters))
|
||||
# IN might not work ideally in case there are too many
|
||||
# children_and_consolidated, in that case join on a
|
||||
# values() e.g.:
|
||||
|
@ -316,7 +315,6 @@ class account_account(osv.osv):
|
|||
" GROUP BY l.account_id")
|
||||
params = (tuple(children_and_consolidated),) + query_params
|
||||
cr.execute(request, params)
|
||||
_logger.debug('Status: %s',(cr.statusmessage))
|
||||
|
||||
for row in cr.dictfetchall():
|
||||
accounts[row['id']] = row
|
||||
|
|
|
@ -26,8 +26,11 @@ try:
|
|||
from gdata.client import RequestError
|
||||
from gdata.docs.service import DOCUMENT_LABEL
|
||||
import gdata.auth
|
||||
from gdata.docs.data import Resource
|
||||
except ImportError:
|
||||
raise osv.except_osv(_('Google Docs Error!'), _('Please install gdata-python-client from http://code.google.com/p/gdata-python-client/downloads/list.'))
|
||||
import logging
|
||||
_logger = logging.getLogger(__name__)
|
||||
_logger.warning("Please install latest gdata-python-client from http://code.google.com/p/gdata-python-client/downloads/list")
|
||||
|
||||
class google_docs_ir_attachment(osv.osv):
|
||||
_inherit = 'ir.attachment'
|
||||
|
|
|
@ -18,11 +18,22 @@
|
|||
<field name="name">google_docs.config.form</field>
|
||||
<field name="model">google.docs.config</field>
|
||||
<field name="arch" type="xml">
|
||||
<group colspan='4'>
|
||||
<field name="model_id"/>
|
||||
<field name='gdocs_resource_id'/>
|
||||
<field name='name_template'/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="model_id"/>
|
||||
<label for='gdocs_resource_id'/>
|
||||
<div>
|
||||
<field name='gdocs_resource_id'/>
|
||||
<p class="oe_grey">
|
||||
This is the id of the template document, on google side. You can find it thanks to its URL:
|
||||
<ul>
|
||||
<li>for a text document with url like `https://docs.google.com/a/openerp.com/document/d/123456789/edit`, the ID is `document:123456789`</li>
|
||||
<li>for a spreadsheet document with url like `https://docs.google.com/a/openerp.com/spreadsheet/ccc?key=123456789#gid=0`, the ID is `spreadsheet:123456789`</li>
|
||||
<li>for a presentation (slide show) document with url like `https://docs.google.com/a/openerp.com/presentation/d/123456789/edit#slide=id.p`, the ID is `presentation:123456789`</li>
|
||||
<li>for a drawing document with url like `https://docs.google.com/a/openerp.com/drawings/d/123456789/edit`, the ID is `drawings:123456789`</li>
|
||||
</p>
|
||||
</div>
|
||||
<field name='name_template'/>
|
||||
</group>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
|
Loading…
Reference in New Issue