Merge lp:~openerp-ecuador/openobject-server/trunk-db-layer-unified into lp:openobject-server

Proposed by Cristian Salamea
Status: Rejected
Rejected by: Vo Minh Thu
Proposed branch: lp:~openerp-ecuador/openobject-server/trunk-db-layer-unified
Merge into: lp:openobject-server
Diff against target: 536 lines (+52/-47)
35 files modified
openerp/__init__.py (+2/-2)
openerp/addons/base/ir/ir_cron.py (+1/-1)
openerp/addons/base/ir/ir_model.py (+2/-1)
openerp/addons/base/ir/workflow/print_instance.py (+2/-1)
openerp/addons/base/module/module.py (+2/-1)
openerp/addons/base/module/wizard/base_export_language.py (+1/-1)
openerp/addons/base/module/wizard/base_module_upgrade.py (+1/-1)
openerp/addons/base/module/wizard/base_update_translations.py (+1/-1)
openerp/addons/base/res/res_config.py (+1/-1)
openerp/addons/base/res/res_partner.py (+1/-1)
openerp/addons/base/res/res_users.py (+1/-1)
openerp/cron.py (+1/-1)
openerp/db/__init__.py (+2/-0)
openerp/db/sql_db.py (+8/-8)
openerp/modules/graph.py (+1/-1)
openerp/modules/loading.py (+1/-1)
openerp/modules/migration.py (+1/-1)
openerp/modules/registry.py (+2/-2)
openerp/osv/osv.py (+2/-2)
openerp/report/custom.py (+1/-1)
openerp/report/interface.py (+1/-1)
openerp/report/print_xml.py (+1/-1)
openerp/report/printscreen/ps_form.py (+1/-1)
openerp/report/printscreen/ps_list.py (+1/-1)
openerp/report/report_sxw.py (+1/-1)
openerp/service/security.py (+1/-1)
openerp/service/web_services.py (+2/-2)
openerp/tools/convert.py (+1/-1)
openerp/tools/misc.py (+1/-1)
openerp/tools/translate.py (+2/-2)
openerp/tools/yaml_import.py (+2/-2)
openerp/wizard/__init__.py (+1/-1)
openerp/workflow/instance.py (+1/-1)
openerp/workflow/wkf_expr.py (+1/-1)
openerp/workflow/wkf_service.py (+1/-1)
To merge this branch: bzr merge lp:~openerp-ecuador/openobject-server/trunk-db-layer-unified
Reviewer Review Type Date Requested Status
Cristian Salamea (community) Needs Resubmitting
Stephane Wirtel (OpenERP) Needs Fixing
Review via email: mp+107271@code.launchpad.net

Description of the change

Moved PostgreSQL layer code to openerp.db package, as first part to clean the DB layer

To post a comment you must log in.
4174. By Nicolas Vanhoren (OpenERP)

[imp] uses m2mtags in partners view

4175. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4176. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4177. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4178. By Raphael Collet (OpenERP)

[MERGE] trunk-first_10_clicks-customer-mdi (improved menutip)

4179. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4180. By Fabien (Open ERP)

[IMP] search view on partners

4181. By Fabien (Open ERP)

[IMP] improved terminology

4182. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4183. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4184. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4185. By Fabien (Open ERP)

[merge] placeholders in view

4186. By Christophe Simonis (OpenERP)

[IMP] log exceptions in safe_eval

4187. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4188. By Olivier Dony (Odoo)

[FIX] orm: remove unused `module` parameter when creating constraints

This argument was not always present in the context
(e.g when _auto_init is invoked for newly created
custom fields via ir.model.field.create()), and was
thus preventing the creation of custom fields.
It was currently unused, and may be reintroduced
soon after the cleanup of model metadata storage.

4189. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4190. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4191. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4192. By Nicolas Vanhoren (OpenERP)

[IMP] Improved partners' view, changed kanban view of children to be more usable.

4193. By Fabien (Open ERP)

[MERGE] cleaning all form views

4194. By Olivier Dony (Odoo)

[REVERT] db: revert incorrect change to auto_install logic

The auto_install flag means that the module will be automatically
installed as soon as all its dependencies are satisfied.
It does *not* mean that the module will be automatically installed
upon database creation. It can be used for that purpose by
setting it on a module that has no dependencies however.

4195. By Olivier Dony (Odoo)

[MERGE] Repair RNG validation, enable rendering check, fix validation in update mode

- RNG validation restored for non 7.0-style views
- RNG schema document now cached for faster validation
- Extra view validation now performed by forcing a rendering
  of each created/updated view via fields_view_get, including
  inherited views
- Fixed fields_view_get when called during module update, i.e.
  while modules are only partially loaded - it will now only
  consider views belonging to already loaded modules only

4196. By Raphael Collet (OpenERP)

[MERGE] trunk-module_image_on_form-psi (improve module form view)

4197. By Fabien (Open ERP)

[IMP] improved comment TODO

4198. By Fabien (Open ERP)

[IMP] When you configure OpenERP, you need a full control on how to display the footer and bank accounts

4199. By Olivier Dony (Odoo)

[MERGE] One more step towards better view validation: RNG validation on rendered view

This will allow improved validation of inherited
views, which is not possible when only the raw
arch is validated on its own - without context
many things cannot be verified.
Calling fields_view_get() also catches early all
mistakes that require dynamic validation, like
wrong XPath expressions (parent view contains
no match).
In order to have current addons pass the improved
validation the RNG had to be fixed to support
the new @modifiers attribute added by fields_view_get()
itself on many view elements, and a few missing
valid attributes, like @invisible on <filter>
and <group>. The latter had never been used
as part of the view architecture but appear
as a result of the handling of @groups
restrictions on view elements, and must
be allowed by the RNG schema.

4200. By Olivier Dony (Odoo)

[MERGE] More user-friendly error messages for access rights violations

4201. By Stephane Wirtel (OpenERP)

[MERGE] lp:~openerp/openobject-server/trunk-clean_form_view-stw

4202. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4203. By Stephane Wirtel (OpenERP)

[MERGE] Merge the 'clean_form_view' branch with the new css styles

4204. By Raphael Collet (OpenERP)

[MERGE] trunk-first_10_clicks_sale-rco (various usability fixes related to sale)

4205. By Antony Lesuisse (OpenERP)

[MERGE] fix-server-log (server warning)

4206. By Quentin (OpenERP) <email address hidden>

[MERGE] merged the branch with the review of all search views

4207. By Fabien (Open ERP)

[IMP] clean UI for ir.model.data form and tree view

4208. By Raphael Collet (OpenERP)

[MERGE] trunk-application_setting_cleanup-atp (let config wizards deinstall modules)

4209. By Fabien (Open ERP)

[IMP] show_address in context of partners for multi-line addresses

4210. By Raphael Collet (OpenERP)

[MERGE] trunk-application_setting_cleanup-atp (fix for cancel button)

4211. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4212. By Antony Lesuisse (OpenERP)

[MERGE] placeholder translation

4213. By Antony Lesuisse (OpenERP)

[MERGE] module uninstall improvements

4214. By Antony Lesuisse (OpenERP)

[MERGE] Use Email everywhere

4215. By Fabien (Open ERP)

[IMP] css small fix

4216. By Fabien (Open ERP)

[IMP] Translations of static terms in views

4217. By Raphael Collet (OpenERP)

[MERGE] trunk-red-button (highlight the right buttons in all form views)

4218. By Olivier Dony (Odoo)

[MERGE] ir.actions.act_window: explicitly support res_id attribute

This attribute was allowed for inline action
definitions, but was not supported in the data
model, which is inconsistent. It also prevented
persisting an action with a res_id, or defining
on in module data files.

4219. By Xavier (Open ERP)

[IMP] massage all translatable attributes in a loop instead of copy/pasting a billion versions

4220. By Xavier (Open ERP)

[FIX] stupid

4221. By Xavier (Open ERP)

[FIX] using the newly translated string might be a better idea than putting the old one again

todo: stop committing at 9AM, still not woken up

4222. By Raphael Collet (OpenERP)

[IMP] orm translations: improve variable names

4223. By Fabien (Open ERP)

[FIX] whitespace lost in translation

4224. By Thibault Delavallée (OpenERP)

[MERGE] Mail state feature. Server-side branch of the mail state feature. This branch holds a modification to the ir.needaction model. The fields 'needaction_pending' is now searchable, because some
filters are based on it.

Comments also slighty updated.

4225. By Antony Lesuisse (OpenERP)

[FIX] always show users menu

4226. By Antony Lesuisse (OpenERP)

[IMP] improve technical menu, hide reporting for portal users

4227. By Fabien (Open ERP)

[IMP] better partner form view

4228. By Quentin (OpenERP) <email address hidden>

[MERGE] usability imp in res.partner.bank

4229. By Anto

[FIX] read companies addresses using openerp.SUPERUSER_ID instead of uid
this will avoid users who don't have the right to read partners getting an error while reading companies
e.g.: portal users, who can only read their own partner

4230. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4231. By Fabien (Open ERP)

[IMP] user preference form view

4232. By Fabien (Open ERP)

[IMP] user pref view

4233. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4234. By Quentin (OpenERP) <email address hidden>

[IMP] base: usability, review of attachment form view

4235. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4236. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4237. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4238. By Fabien (Open ERP)

[IMP] American addresses + better form lyout

4239. By Fabien (Open ERP)

[merge] trunk-it

4240. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4241. By Quentin (OpenERP) <email address hidden>

[MERGE] akretion's branches

4242. By Fabien (Open ERP)

[IMP] module form view

4243. By van der Essen Frédéric (OpenERP)

[FIX] missing name in a view form broke the point of sale

4244. By Fabien (Open ERP)

[IMP] address format

4245. By Fabien (Open ERP)

[IMP] partner kanban, holidays, meeting

4246. By Fabien (Open ERP)

[IMP] kanban views for cstomers and suppliers in accounting

4247. By Quentin (OpenERP) <email address hidden>

[MERGE] settings: usablity, review of form views

4248. By Fabien (Open ERP)

[IMP] better form view: users, modules, preferences, wizards

4249. By Fabien (Open ERP)

[IMP] form view partners

4250. By Fabien (Open ERP)

[IMP] load translation wizard

4251. By Fabien (Open ERP)

[IMP] remove icons

4252. By Fabien (Open ERP)

[IMP] remove menu_tips code

4253. By Fabien (Open ERP)

[IMP] removed separator='vertical'

4254. By Raphael Collet (OpenERP)

[FIX] base/publisher_warranty: fix xml in view

4255. By Quentin (OpenERP) <email address hidden>

[MERGE] usability of user's preferences form view

4256. By Raphael Collet (OpenERP)

[MERGE] trunk-first_10_clicks_sale-rco

4257. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4258. By Quentin (OpenERP) <email address hidden>

[MERGE] sales/crm: usability, review of form views

4259. By Anto

[MERGE] improve top level menu items numerotation

4260. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4261. By Raphael Collet (OpenERP)

[MERGE] trunk-module-summary (add field 'summary' on modules)

4262. By Thibault Delavallée (OpenERP)

[MERGE] Merged OpenChatter part3: The Return of the Composer Reloaded Strikes Back. Server-side part of OpenChatter part 3, holding the new message composer. This revision adds an override of res.partner name_create method to support custom creation: <email address hidden> (name and email <email address hidden>), and Raoul <email address hidden> (name Raoul, email <email address hidden>).

4263. By Anto

[MERGE] fix Sale's top menu item sequence number

4264. By Olivier Dony (Odoo)

[MERGE] orm,fields: fields.char's argument now all optional (especially @size) + minor cleanup

The size limit on fields.char is entirely cosmetics,
as it makes no difference in performance or size for
PostgreSQL storage. The size only has to be specified
when the field needs to be size-constrained for
business reasons, like fixed-length references, EAN, etc.

4265. By Nicolas Vanhoren (OpenERP)

[IMP] cosmetic improvement in partner view

4266. By Raphael Collet (OpenERP)

[MERGE] trunk-first_10_clicks_crm-mdi (usability in crm)

4267. By Raphael Collet (OpenERP)

[MERGE] trunk-first_10_clicks_sale-rco (usability improvements)

4268. By Nicolas Vanhoren (OpenERP)

[IMP] minor customization to partners view, added default_focus

4269. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4270. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4271. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4272. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4273. By Quentin (OpenERP) <email address hidden>

[MERGE] clean search view branch

4274. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4275. By Vo Minh Thu

[MERGE] _rec_name is less permissive and has now a fallback.

4276. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4277. By Stephane Wirtel (OpenERP)

[MERGE] lp:~openerp-dev/openobject-server/trunk-addons-issues3-base-base_imp-pna

4278. By Stephane Wirtel (OpenERP)

[TYPO] Set the right category for the Point Of Sale

4279. By Stephane Wirtel (OpenERP)

[IMP] base: use the shortdesc in the search view of the modules

4280. By Stephane Wirtel (OpenERP)

[IMP] Use the button_immediate_install in the form view of the modules

4281. By Stephane Wirtel (OpenERP)

[FIX] Review the layout of the partners

4282. By Xavier (Open ERP)

[IMP] error-level log when non-stored function field without fnct_search is searched

holding off on blowing up an error just yet, but it might be a good idea in the end

4283. By Xavier (Open ERP)

[ADD] search view for res.groups to avoid searching on the unsearchable full_name from the default search view

4284. By Xavier (Open ERP)

[IMP] add more information when searching on a non-searchable field using debug logging

4285. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4286. By Stephane Wirtel (OpenERP)

[FIX] base: remove the uninstall button and improve the filter domain of the modules

4287. By Stephane Wirtel (OpenERP)

[MERGE]

4288. By Stephane Wirtel (OpenERP)

[REVERT] Revert the previous patch about the button_uninstall in the modules

4289. By Antony Lesuisse (OpenERP)

[MERGE] trunk-config-wizard indentation fixes by abo

4290. By Olivier Dony (Odoo)

[MERGE] name_get: support more field types and improve previous name_get changes

Introduces an improved name_get implementation,
supporting a few more fields type used as _rec_name
(such as many2one). The actual rendering of the
"display name" is delegated to the column class,
and computed based on the value returned by read()
for the column.

Funky @classmethod stuff was necessary to allow
column types to delegate to other types, such as
function types which can delegate to the real
type they emulate.

The display_name term was used because it is
being discussed for the new API to add a virtual
display_name column to all models, allowing
clients to read the name_get value along with
regular columns. It looks appropriate too.

Also fixes a few shortcomings of the latest
patches to name_get, such as supporting inherited
columns and avoiding a useless read() call with
only the id column.

4291. By Fabien (Open ERP)

[IMP] improved menu tips

4292. By Fabien (Open ERP)

[IMP] introducing new file type: html

4293. By Fabien (Open ERP)

[IMP] no content partners menutip

4294. By Fabien (Open ERP)

imp

4295. By Fabien (Open ERP)

[IMP] removing unused ir.actions.todo.category object

4296. By Fabien (Open ERP)

[IMP] remove unused code

4297. By Fabien (Open ERP)

[FIX] removed ir.actions.todos category_id

4298. By Xavier (Open ERP)

[IMP] code style improvements

* Remove unused variables
* Simplify dict.get call in conditionals (default is None)
* Simplify dict.update calls (use kwargs)
* Merge dict.copy() with dict.update() as dict()
* Use isinstance instead of type() equality tests
* Simplify deeply nested code: merge conditionals and remove useless
  conditional, use dict.iteritems()
* Log traceback in exception handler logging

4299. By Antony Lesuisse (OpenERP)

[REM] fields float integer useless warning, required can be used to color the field in blue on form view

4300. By Fabien (Open ERP)

[IMP] cleaning views, reduced summary and module name fields (to avoid crap in apps.openerp.com)

4301. By Fabien (Open ERP)

[MERGE] improved placeholders

4302. By Stephane Wirtel (OpenERP)

[MERGE] lp:~openerp-dev/openobject-server/trunk-addons-issues3-base

4303. By Thibault Delavallée (OpenERP)

[MERGE] MyNotChatterTask: image resize.

This revision adds standard image field names and sizes (image: 1024x1024; image_medium: 180x180; image_small: 50x50, the last two being function fields). This server-side branch holds the tools functions for image resizing (with aspect ratio preserved), and update for res.partner and res.users.

4304. By Stephane Wirtel (OpenERP)

[IMP] base: Add a wizard to install a list of modules

4305. By Stephane Wirtel (OpenERP)

[FIX] base: Allow the quick create for a partner

4306. By Olivier Dony (Odoo)

[IMP] tools.reference_re: support matching model name as well

4307. By Fabien (Open ERP)

[IMP] internal notes as first tab

4308. By Fabien (Open ERP)

[IMP] contact in partners

4309. By Stephane Wirtel (OpenERP)

[FIX] module: Use the button_immediate_XYZ of the upgrade and uninstall buttons in the form view

4310. By Vo Minh Thu

[IMP] test addons: pushed the Tests menu to the far right (probably into the MOAR button).

4311. By Olivier Dony (Odoo)

[MERGE] db: module auto-install should work recursively during db bootstrap too

4312. By Antony Lesuisse (OpenERP)

[IMP] user preference is regular wizard

4313. By Antony Lesuisse (OpenERP)

[IMP] user preference is regular wizard, change password in a popup

4314. By Stephane Wirtel (OpenERP)

[MERGE] lp:~openerp-dev/openobject-server/trunk-res_bank_remove_footer-mdi

4315. By Quentin (OpenERP) <email address hidden>

[REV] reverted previous commit (4314) that removes footer field on res.partner.bank, because specs changed

4316. By Fabien Meghazi (OpenERP)

[FIX] res.users small and medium images has no default value

4317. By Fabien Meghazi (OpenERP)

[FIX] res.partners small and medium images has no default value

4318. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4319. By Vo Minh Thu

[MERGE] impex tests: added test module to unittest import/export.

4320. By Anto

[MERGE] add options='{"no_open": true} on some fields
with this modification, users won't be able to open countries or languages form views anymore, which didn't really make sense

4321. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4322. By Antony Lesuisse (OpenERP)

[IMP] act_window allow target inlineview

4323. By Fabien (Open ERP)

[MERGE] demo data

4324. By Fabien (Open ERP)

[IMP] removing structure

4325. By Fabien (Open ERP)

[IMP] uncommit hyearchical categories

4326. By Christophe Simonis (OpenERP)

[IMP] this is version 7

4327. By Christophe Simonis (OpenERP)

[IMP] add cursor() contextmanager on registry

4328. By Thibault Delavallée (OpenERP)

[MERGE] 'My Second Not-Chatter Merge of the Day': add a deprecated attribute on fields.

This revision adds a string 'deprecated' attribute on fields. If not False, the ORM makes a warning when attempting to read the read, or write on it.
Use: 'my_field': fields.char('Old field', size=64, deprecated="This field will be removed with version 42 of OpenERP. Please yse 'my_new_field' instead.")

4329. By Vo Minh Thu

[MERGE] merged view changes: the `type` is now a functional field derived from the arch.

4330. By Fabien (Open ERP)

[IMP] removing structure in partner tags

4331. By Fabien (Open ERP)

[IMP] removed categories in tags , fix

4332. By Fabien (Open ERP)

merge

4333. By Fabien (Open ERP)

fix

4334. By Antony Lesuisse (OpenERP)

[MERGE] res.users inherits res.partner

4335. By Antony Lesuisse (OpenERP)

[IMP] res_users check,login,authenticate cleanup

4336. By Thibault Delavallée (OpenERP)

[MERGE] Merged OpenChatter-3-5 followers refactoring. This server-side branch holds a small refactoring in many2many fields: the query has been taken in a method to be more easily overiden. Please note that this commit is likely to be trashed when merging trunk-mail-review.

4337. By Vo Minh Thu

[IMP] html_sanitize: remove dependency on pyquery.

Relying on pyquery is unnecessary (using etree alone is enough). This patch
reimplements the html_sanitize() function without pyquery. The new
implementation still goes through the provided test suite with success.

4338. By Christophe Simonis (OpenERP)

[IMP] handle menuitems with "server" and "client" type + ensure menu has a name

4339. By Christophe Simonis (OpenERP)

[FIX] res.users: context_get: read fields as root

4340. By Fabien Meghazi (OpenERP)

[REM] Kanban autoheight is now the default behavior in non grouped mode

4341. By Antony Lesuisse (OpenERP)

[FIX] preferences buttons

4342. By Quentin (OpenERP) <email address hidden>

[MERGE] merged branch with pictures of contacts (demo data)

4343. By Quentin (OpenERP) <email address hidden>

[FIX] base: removed address of main company. Having an address there is problematic because it automatically installs a COA

4344. By Quentin (OpenERP) <email address hidden>

[FIX] base: the label of vat field now displays 'TIN' instead of 'TVA'. A US term consistent with the default value of the language used.

4345. By Antony Lesuisse (OpenERP)

[MERGE] diagram view label

4346. By Quentin (OpenERP) <email address hidden>

[FIX] base: restored translations for label 'VAT' changed into 'TIN' in revision 4344

4347. By Nicolas Vanhoren (OpenERP)

[IMP] changed partners view to work correctly with linkedin module (still need improvements in the web client to support preview_image)

4348. By Nicolas Vanhoren (OpenERP)

[IMP] Even more improved images in partners

4349. By Nicolas Vanhoren (OpenERP)

[FIX] typo

4350. By Christophe Simonis (OpenERP)

[IMP] log exceptions as exceptions

4351. By Christophe Simonis (OpenERP)

[IMP] yaml import: log as TEST only for test files

4352. By Christophe Simonis (OpenERP)

[FIX] sequence testing

4353. By Christophe Simonis (OpenERP)

[IMP] remove unwanted log in test

4354. By Christophe Simonis (OpenERP)

[IMP] tools.misc.mute_logger can now be used as decorator

4355. By Christophe Simonis (OpenERP)

[FIX] remove loggging for test "test_out_of_range" of "test_impex" module

4356. By Vo Minh Thu

[FIX] tests: allow running the tests when installing a database created by XML-RPC.

4357. By Stephane Wirtel (OpenERP)

[FIX] base: remove the sequence field in a view

4358. By Anto

[MERGE] improve modules' descriptions
also properly render descriptions from RST into HTML

4359. By Vo Minh Thu

[FIX] setup.py: added docutils dependency introduced at revision 4341.3.1.

4360. By Olivier Dony (Odoo)

[MERGE] convert: fix previous partial patch for removing redundant @type for <menuitem>

4361. By Anto

[MERGE] minor improvements on @noupdate
also fix some indentation

4362. By Vo Minh Thu

[FIX] uninstall: pass IDs instead of names to _module_data_uninstall().

4363. By Vo Minh Thu

[FIX] uninstall: delete all given ir_model_relation/ir_model_constraint (still making sure the protected resource is not deleted if still referenced elsewhere).

4364. By Anto

[MERGE] module: improve modules' descriptions rendering and keep it translatable

4365. By Vo Minh Thu

[FIX] custom models: avoid calling twice __init__, use a correct _rec_name (calling twice __init__ caused the _rec_name to be `name` which does not exist on a custom model, and caused the assert on the _rec_name to fail.

Revision history for this message
Cristian Salamea (ovnicraft) wrote :

Any news around ?

4366. By Fabien (Open ERP)

[IMP] correct address format

4367. By Fabien (Open ERP)

merge

4368. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4369. By Stephane Wirtel (OpenERP)

[MERGE] Remove the pychart library, use the online version via pypi or the package manager

4370. By Fabien Meghazi (OpenERP)

[IMP] Use 'open' action in kanban views

4371. By Xavier (Open ERP)

[FIX] lxml 3.0a2 has been deployed to pypi for some reason, pin to lxml < 3 for now

4372. By Quentin (OpenERP) <email address hidden>

[MERGE] merged the branch with enhancements of ir.translation. Those changes are needed for base_gengo module

4373. By Minh Tran (OpenERP)

Random generation of avatar

4374. By Minh Tran (OpenERP)

fix merge crap

4375. By Minh Tran (OpenERP)

fix old avatar code

4376. By Stephane Wirtel (OpenERP)

[REF] Replace the user id 1 by openerp.SUPERUSER_ID

4377. By Stephane Wirtel (OpenERP)

[MERGE] base: fix the read method with the ids argument

4378. By Stephane Wirtel (OpenERP)

[FIX] base: Remove the default value for the image

4379. By Stephane Wirtel (OpenERP)

[ADD] Add a script to install all the modules in a trunk database with the tests

4380. By Fabien (Open ERP)

[IMP] usability partner logo as avatar class

4381. By Fabien (Open ERP)

[FIX] all image stuff on groups, users, partners

4382. By Vo Minh Thu

[FIX] yaml_import: really raise YamlImportExceptions.

4383. By Vo Minh Thu

[FIX] ad_paths: makes sure the server addons path is absolute (needed when using cProfile).

4384. By Vo Minh Thu

[FIX] test_ir_sequence: reduce the number of call to next() (to reduce test time).

4385. By Stephane Wirtel (OpenERP)

[FIX] Reset the right python environment

4386. By Olivier Dony (Odoo)

[MERGE] file_open: give precedence to directory before zip, courtesy of Florent Xicluna

4387. By Stephane Wirtel (OpenERP)

[FIX] amount_to_text: avoid to have a none in the concat

4388. By Stephane Wirtel (OpenERP)

[IMP] disable the document_ftp in the run_all_with_test script

4389. By Raphael Collet (OpenERP)

[MERGE] trunk-editable_list (add groups on views to disable some inherited views when composing a view)

4390. By Fabien Meghazi (OpenERP)

[ADD] ir.translation#translate_fields

4391. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4392. By Nicolas Vanhoren (OpenERP)

[IMP] modified all <li> to adjust to new default style

4393. By Raphael Collet (OpenERP)

[MERGE] trunk-access-ui-jam (in fields_view_get, add attributes in top element when user cannot create/edit/delete)

4394. By vta <email address hidden>

[FIX] Fixed width in div.address_format's spans.

4395. By Nicolas Vanhoren (OpenERP)

[REVERT] 4394, because Thu is stupid

4396. By Nicolas Vanhoren (OpenERP)

[IMP] removed dependency to pyquery

4397. By Fabien (Open ERP)

[IMP] correct logo of company for base.main_company

4398. By Olivier Dony (Odoo)

[MERGE] server part of mail/chatter complete review/refactoring

Attempt at cleaning up and simplifying the mail-related
APIs and code, including mail.thread, mail.message,
`needaction`, open-chatter and the related components.
The server part specifically deals with simplifying
the ir.needaction mechanism, as well as adding
support for callable `domain` properties on
one2many fields, and improving the ways to
create new partners based on a simple name
or email (name_create et al).
This branch has an addons part as well, taking care of
cleaning up the mail-related modules.

4399. By Fabien (Open ERP)

[IMP] folded columns in read_group

4400. By Fabien (Open ERP)

fix

4401. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4402. By Fabien (Open ERP)

[MERGE] currency

4403. By Olivier Dony (Odoo)

[FIX] debian/control: missing dependency on docutils

Was added to setup.py but not in deb packaging.

4404. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4405. By Xavier (Open ERP)

[ADD] test for retarded behavior when importing o2m _rec_name

4406. By Thibault Delavallée (OpenERP)

[MERGE] Small image cleaning
- moved the avatar colorize part of the image code to tools/image.py, where it should have been placed at revs 4373-4375
- added the option for not up-sizing image smaller than the resize limits
- default image_small size is now 64x64 px
- default image_medium size is now 128x128 px
- overall code and comments cleaning

4407. By Olivier Dony (Odoo)

[MERGE] Simplified report footer configuration per company - comes with corresponding addons branch

4408. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4409. By Stephane Wirtel (OpenERP)

[MERGE] report & netrpc protocol: Use the cPickle 2.0 protocol and clean the code of report

4410. By Fabien (Open ERP)

[IMP] clean address formatting per countries

4411. By Fabien (Open ERP)

[IMP] Address Format in Reports

4412. By Stephane Wirtel (OpenERP)

[MERGE] base: raise an exception if the format of the bank account is wrong

4413. By Stephane Wirtel (OpenERP)

[MERGE] raise an exception if it can't evaluate a string

4414. By Stephane Wirtel (OpenERP)

[MERGE] base: fix some address formats and some English

4415. By Stephane Wirtel (OpenERP)

[MERGE] base: fix typo of some languages

4416. By Stephane Wirtel (OpenERP)

[MERGE] Remove unused res.payterm

4417. By Fabien (Open ERP)

[IMP] quick create partners usability

4418. By Fabien (Open ERP)

[MERGE]

4419. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4420. By Stephane Wirtel (OpenERP)

[FIX] openerp.tools.misc.file_open: Very little fix to display coherent error message when file not found occurs.

4421. By Stephane Wirtel (OpenERP)

[MERGE] set the write_uid, write_date for the create

Revision history for this message
Stephane Wirtel (OpenERP) (stephane-openerp) wrote :

Could you update the code to the last trunk ?

Thanks

review: Needs Fixing
4422. By Stephane Wirtel (OpenERP)

[MERGE] improve the tools.misc.scan_languages function

4423. By Stephane Wirtel (OpenERP)

[MERGE] use the postgres db instead of template1 for the creation of a database

4424. By Stephane Wirtel (OpenERP)

[IMP] openerp.service.web_services.db: Use a contextmanager for the backup/restore functions.
Ported from lp:~openerp-dev/openobject-server/trunk-dump_and_restore_improvements-xmo

4425. By Fabien (Open ERP)

[IMP] partner views

4426. By Antony Lesuisse (OpenERP)

[MERGE] fields_view dont load translations if lang is not defined

4427. By Fabien (Open ERP)

[FIX] quick create of partners, better layout

4428. By Thibault Delavallée (OpenERP)

[MERGE] [FIX] Fixed image sharpening in tools; this requires an image converted into RGB.

4429. By Vo Minh Thu

[MERGE] fix: renamed thousand_sep to thousands_sep in test_impex, removed rml_footer1 and rml_footer2 from data as the fields were removed.

4430. By Raphael Collet (OpenERP)

[MERGE] trunk-res_rml_footer-rco (improve onchange on res.company form)

4431. By Anto

[FIX] fields_get check_access_right

4432. By Fabien (Open ERP)

[IMP] address format according to country of user on partners

4433. By Fabien (Open ERP)

[IMP] address format according to user's country

4434. By Fabien (Open ERP)

[IMP] rename coutnries

4435. By Fabien (Open ERP)

fix

4436. By Fabien (Open ERP)

[IMP] better layout for BE address

4437. By Vo Minh Thu

[IMP] report: added TTF font path (used in e.g. Arch Linux).

4438. By Fabien (Open ERP)

[IMP] cleaned ir.actions.todo to launch newly installed application

4439. By Fabien (Open ERP)

[FIX] open menu

4440. By Fabien (Open ERP)

[IMP] better algo for image thumbnails

Revision history for this message
Cristian Salamea (ovnicraft) wrote :

Thanks Stephane for your reply i am updating the code.

Regards,

Revision history for this message
Cristian Salamea (ovnicraft) wrote :

Updated code from revno 4440.

Regards,

Revision history for this message
Cristian Salamea (ovnicraft) wrote :

Additional i check an installation (w/o addons) and everything works fine also you can check the runbot results http://runbot.openerp.com/gnuthink.html

review: Needs Resubmitting
Revision history for this message
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) wrote :

Hello Cristian,

You should double-check your merge proposal, you had some conflicts and added some extra files in your changeset:
 - openerp/addons/base/publisher_warranty/publisher_warranty.py.THIS
 - openerp/addons/base/res/wizard/partner_wizard_ean_check.py.THIS

Why did you need to put sql_db.py in the .bzrignore file ?

Revision history for this message
Cristian Salamea (ovnicraft) wrote :

I found issues in addons when import pooler, i fix this in another addons to import
from openerp.db import pooler: https://code.launchpad.net/~ovnicraft/openobject-addons/trunk-imp-import-pooler

4441. By Cristian Salamea

[IMP] clean db layer and removed extra files

Revision history for this message
Cristian Salamea (ovnicraft) wrote :

I clear the commit and resubmit the merge proposal.
Is applied the changes around db layer, fix .bzrignore and .THIS files removed.

Regards,

review: Needs Resubmitting
Revision history for this message
Vo Minh Thu (thu) wrote :

The idea sounds good, but your merge proposal doesn't really improve the situation:

Importing sql_db and pooler as-is instead of moving things properly in openerp.db will solve less than half of the problem:

- You will import openerp.db.sql_db which doesn't sound really better than before.
- It is much better (if the former bullet point was ok) to really move things inside openerp.db and have some import in sql_db to re-export symbols for backward compatibility than the other way around.
- Moving things aroung without taking care of renaming (and otherwise make the API better) will require people to update their code twice: one for the renmaed imports, then one for the actual API cleaning.

Moving pooler in openerp.db is simply wrong: it is not a database connection pooler, it is the model pool (which is deprecated in favor of openerp.models.registry).

Revision history for this message
Cristian Salamea (ovnicraft) wrote :

Hello Vo, thanks for your comment and this is a first step to improve things, to know all about this level is hard that's why i propose here and wait for your feedback and your knowledge to get better this change.

About changes proposed, pooler is the only what impact in addons others are ok and works in API db level, i can keep the pooler in his place.

About openerp.db.sql_db could not sound better than before but to change it first move is put it there, next step take in care renaming, better modular services, re-export symbols.

If we dont tried it never change it.

What about ORM ? is not better put in openerp.db ? so i think:

>>> from openerp.db import model, fields #works better

Help me to write a good spec to get a better improve for this.

Wait for your feedback.

Regards,

Unmerged revisions

4441. By Cristian Salamea

[IMP] clean db layer and removed extra files

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openerp/__init__.py'
2--- openerp/__init__.py 2012-02-08 15:08:15 +0000
3+++ openerp/__init__.py 2012-09-19 06:19:28 +0000
4@@ -31,12 +31,12 @@
5 import modules
6 import netsvc
7 import osv
8-import pooler
9 import release
10 import report
11 import run_tests
12 import service
13-import sql_db
14+import db
15+#import sql_db
16 import test
17 import tiny_socket
18 import tools
19
20=== modified file 'openerp/addons/base/ir/ir_cron.py'
21--- openerp/addons/base/ir/ir_cron.py 2012-02-02 09:21:05 +0000
22+++ openerp/addons/base/ir/ir_cron.py 2012-09-19 06:19:28 +0000
23@@ -29,7 +29,7 @@
24
25 import netsvc
26 import openerp
27-import pooler
28+from openerp.db import pooler
29 import tools
30 from openerp.cron import WAKE_UP_NOW
31 from osv import fields, osv
32
33=== modified file 'openerp/addons/base/ir/ir_model.py'
34--- openerp/addons/base/ir/ir_model.py 2012-08-24 10:42:42 +0000
35+++ openerp/addons/base/ir/ir_model.py 2012-09-19 06:19:28 +0000
36@@ -25,7 +25,8 @@
37 import types
38
39 from openerp.osv import fields,osv
40-from openerp import netsvc, pooler, tools
41+from openerp import netsvc, tools
42+from openerp.db import pooler
43 from openerp.tools.safe_eval import safe_eval as eval
44 from openerp.tools import config
45 from openerp.tools.translate import _
46
47=== modified file 'openerp/addons/base/ir/workflow/print_instance.py'
48--- openerp/addons/base/ir/workflow/print_instance.py 2012-02-02 12:54:42 +0000
49+++ openerp/addons/base/ir/workflow/print_instance.py 2012-09-19 06:19:28 +0000
50@@ -23,7 +23,8 @@
51 import time, os
52
53 import netsvc
54-import report,pooler,tools
55+import report, tools
56+import openerp.db.pooler as pooler
57 from operator import itemgetter
58
59 _logger = logging.getLogger(__name__)
60
61=== modified file 'openerp/addons/base/module/module.py'
62--- openerp/addons/base/module/module.py 2012-08-31 13:11:18 +0000
63+++ openerp/addons/base/module/module.py 2012-09-19 06:19:28 +0000
64@@ -27,7 +27,8 @@
65 import urllib
66 import zipimport
67
68-from openerp import modules, pooler, release, tools, addons
69+from openerp import modules, release, tools, addons
70+from openerp.db import pooler
71 from openerp.tools.parse_version import parse_version
72 from openerp.tools.translate import _
73 from openerp.osv import fields, osv, orm
74
75=== modified file 'openerp/addons/base/module/wizard/base_export_language.py'
76--- openerp/addons/base/module/wizard/base_export_language.py 2012-05-10 09:35:27 +0000
77+++ openerp/addons/base/module/wizard/base_export_language.py 2012-09-19 06:19:28 +0000
78@@ -22,7 +22,7 @@
79 import tools
80 import base64
81 import cStringIO
82-import pooler
83+from openerp.db import pooler
84 from osv import fields,osv
85 from tools.translate import _
86 from tools.misc import get_iso_codes
87
88=== modified file 'openerp/addons/base/module/wizard/base_module_upgrade.py'
89--- openerp/addons/base/module/wizard/base_module_upgrade.py 2012-07-02 11:29:18 +0000
90+++ openerp/addons/base/module/wizard/base_module_upgrade.py 2012-09-19 06:19:28 +0000
91@@ -19,7 +19,7 @@
92 #
93 ##############################################################################
94
95-from openerp import pooler
96+from openerp.db import pooler
97 from openerp.osv import osv, fields
98 from openerp.tools.translate import _
99
100
101=== modified file 'openerp/addons/base/module/wizard/base_update_translations.py'
102--- openerp/addons/base/module/wizard/base_update_translations.py 2012-01-19 21:59:35 +0000
103+++ openerp/addons/base/module/wizard/base_update_translations.py 2012-09-19 06:19:28 +0000
104@@ -21,7 +21,7 @@
105
106 from osv import osv, fields
107 import tools
108-import pooler
109+from openerp.db import pooler
110 import cStringIO
111 from tools.translate import _
112
113
114=== modified file 'openerp/addons/base/res/res_config.py'
115--- openerp/addons/base/res/res_config.py 2012-08-29 05:34:23 +0000
116+++ openerp/addons/base/res/res_config.py 2012-09-19 06:19:28 +0000
117@@ -25,7 +25,7 @@
118 from tools.translate import _
119 import netsvc
120 from tools import ustr
121-import pooler
122+from openerp.db import pooler
123
124 _logger = logging.getLogger(__name__)
125
126
127=== modified file 'openerp/addons/base/res/res_partner.py'
128--- openerp/addons/base/res/res_partner.py 2012-09-13 18:27:36 +0000
129+++ openerp/addons/base/res/res_partner.py 2012-09-19 06:19:28 +0000
130@@ -26,7 +26,7 @@
131 import tools
132 from tools.translate import _
133 import logging
134-import pooler
135+from openerp.db import pooler
136 import pytz
137 from lxml import etree
138
139
140=== modified file 'openerp/addons/base/res/res_users.py'
141--- openerp/addons/base/res/res_users.py 2012-09-12 04:35:51 +0000
142+++ openerp/addons/base/res/res_users.py 2012-09-19 06:19:28 +0000
143@@ -31,7 +31,7 @@
144 import openerp.exceptions
145 from osv import fields,osv
146 from osv.orm import browse_record
147-import pooler
148+from openerp.db import pooler
149 import random
150 from service import security
151 import tools
152
153=== modified file 'openerp/cron.py'
154--- openerp/cron.py 2012-01-24 11:07:30 +0000
155+++ openerp/cron.py 2012-09-19 06:19:28 +0000
156@@ -177,7 +177,7 @@
157 if canceled:
158 continue
159 del _wakeup_by_db[db_name]
160- registry = openerp.pooler.get_pool(db_name)
161+ registry = openerp.db.pooler.get_pool(db_name)
162 if not registry._init:
163 _logger.debug("Database '%s' wake-up! Firing multi-threaded cron job processing", db_name)
164 registry['ir.cron']._run_jobs_multithread()
165
166=== modified file 'openerp/db/__init__.py'
167--- openerp/db/__init__.py 2011-04-20 15:27:18 +0000
168+++ openerp/db/__init__.py 2012-09-19 06:19:28 +0000
169@@ -27,4 +27,6 @@
170
171 """
172
173+import pooler
174+import sql_db
175 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
176
177=== renamed file 'openerp/pooler.py' => 'openerp/db/pooler.py'
178=== renamed file 'openerp/sql_db.py' => 'openerp/db/sql_db.py'
179--- openerp/sql_db.py 2012-02-06 20:31:51 +0000
180+++ openerp/db/sql_db.py 2012-09-19 06:19:28 +0000
181@@ -66,8 +66,8 @@
182 psycopg2.extensions.register_type(psycopg2.extensions.new_type((700, 701, 1700,), 'float', undecimalize))
183
184
185-import tools
186-from tools.func import frame_codeinfo
187+import openerp.tools
188+from openerp.tools.func import frame_codeinfo
189 from datetime import datetime as mdt
190 from datetime import timedelta
191 import threading
192@@ -241,7 +241,7 @@
193 def split_for_in_conditions(self, ids):
194 """Split a list of identifiers into one or more smaller tuples
195 safe for IN conditions, after uniquifying them."""
196- return tools.misc.split_every(self.IN_MAX, set(ids))
197+ return openerp.tools.misc.split_every(self.IN_MAX, set(ids))
198
199 def print_log(self):
200 global sql_counter
201@@ -299,7 +299,7 @@
202 if leak:
203 self._cnx.leaked = True
204 else:
205- chosen_template = tools.config['db_template']
206+ chosen_template = openerp.tools.config['db_template']
207 templates_list = tuple(set(['template0', 'template1', 'postgres', chosen_template]))
208 keep_in_pool = self.dbname not in templates_list
209 self._pool.give_back(self._cnx, keep_in_pool=keep_in_pool)
210@@ -387,7 +387,7 @@
211 self._debug('Borrow connection to %r', dsn)
212
213 # free leaked connections
214- for i, (cnx, _) in tools.reverse_enumerate(self._connections):
215+ for i, (cnx, _) in openerp.tools.reverse_enumerate(self._connections):
216 if cnx.closed:
217 self._connections.pop(i)
218 self._debug('Removing closed connection at index %d: %r', i, cnx.dsn)
219@@ -445,7 +445,7 @@
220 @locked
221 def close_all(self, dsn):
222 _logger.info('%r: Close all connections to %r', self, dsn)
223- for i, (cnx, used) in tools.reverse_enumerate(self._connections):
224+ for i, (cnx, used) in openerp.tools.reverse_enumerate(self._connections):
225 if dsn_are_equals(cnx.dsn, dsn):
226 cnx.close()
227 self._connections.pop(i)
228@@ -480,7 +480,7 @@
229 def dsn(db_name):
230 _dsn = ''
231 for p in ('host', 'port', 'user', 'password'):
232- cfg = tools.config['db_' + p]
233+ cfg = openerp.tools.config['db_' + p]
234 if cfg:
235 _dsn += '%s=%s ' % (p, cfg)
236
237@@ -499,7 +499,7 @@
238 def db_connect(db_name):
239 global _Pool
240 if _Pool is None:
241- _Pool = ConnectionPool(int(tools.config['db_maxconn']))
242+ _Pool = ConnectionPool(int(openerp.tools.config['db_maxconn']))
243 currentThread().dbname = db_name
244 return Connection(_Pool, db_name)
245
246
247=== modified file 'openerp/modules/graph.py'
248--- openerp/modules/graph.py 2012-01-24 12:42:52 +0000
249+++ openerp/modules/graph.py 2012-09-19 06:19:28 +0000
250@@ -33,7 +33,7 @@
251 import openerp.tools as tools
252 import openerp.tools.osutil as osutil
253 from openerp.tools.safe_eval import safe_eval as eval
254-import openerp.pooler as pooler
255+import openerp.db.pooler as pooler
256 from openerp.tools.translate import _
257
258 import openerp.netsvc as netsvc
259
260=== modified file 'openerp/modules/loading.py'
261--- openerp/modules/loading.py 2012-08-31 13:53:09 +0000
262+++ openerp/modules/loading.py 2012-09-19 06:19:28 +0000
263@@ -35,7 +35,7 @@
264 import openerp.modules.graph
265 import openerp.modules.migration
266 import openerp.osv as osv
267-import openerp.pooler as pooler
268+import openerp.db.pooler as pooler
269 import openerp.release as release
270 import openerp.tools as tools
271 import openerp.tools.assertion_report as assertion_report
272
273=== modified file 'openerp/modules/migration.py'
274--- openerp/modules/migration.py 2012-01-24 12:42:52 +0000
275+++ openerp/modules/migration.py 2012-09-19 06:19:28 +0000
276@@ -33,7 +33,7 @@
277 import openerp.tools as tools
278 import openerp.tools.osutil as osutil
279 from openerp.tools.safe_eval import safe_eval as eval
280-import openerp.pooler as pooler
281+import openerp.db.pooler as pooler
282 from openerp.tools.translate import _
283
284 import openerp.netsvc as netsvc
285
286=== modified file 'openerp/modules/registry.py'
287--- openerp/modules/registry.py 2012-08-13 15:05:01 +0000
288+++ openerp/modules/registry.py 2012-09-19 06:19:28 +0000
289@@ -26,7 +26,7 @@
290 import logging
291 import threading
292
293-import openerp.sql_db
294+from openerp.db import sql_db
295 import openerp.osv.orm
296 import openerp.cron
297 import openerp.tools
298@@ -54,7 +54,7 @@
299 self._init_modules = set()
300
301 self.db_name = db_name
302- self.db = openerp.sql_db.db_connect(db_name)
303+ self.db = openerp.db.sql_db.db_connect(db_name)
304
305 cr = self.db.cursor()
306 has_unaccent = openerp.modules.db.has_unaccent(cr)
307
308=== modified file 'openerp/osv/osv.py'
309--- openerp/osv/osv.py 2012-09-18 13:04:36 +0000
310+++ openerp/osv/osv.py 2012-09-19 06:19:28 +0000
311@@ -28,8 +28,8 @@
312 import orm
313 import openerp
314 import openerp.netsvc as netsvc
315-import openerp.pooler as pooler
316-import openerp.sql_db as sql_db
317+import openerp.db.pooler as pooler
318+import openerp.db.sql_db as sql_db
319 from openerp.tools.translate import translate
320 from openerp.osv.orm import MetaModel, Model, TransientModel, AbstractModel
321 import openerp.exceptions
322
323=== modified file 'openerp/report/custom.py'
324--- openerp/report/custom.py 2012-09-10 14:38:35 +0000
325+++ openerp/report/custom.py 2012-09-19 06:19:28 +0000
326@@ -31,7 +31,7 @@
327 from openerp.osv.osv import except_osv
328 from openerp.osv.orm import browse_null
329 from openerp.osv.orm import browse_record_list
330-import openerp.pooler as pooler
331+import openerp.db.pooler as pooler
332 from pychart import *
333 import misc
334 import cStringIO
335
336=== modified file 'openerp/report/interface.py'
337--- openerp/report/interface.py 2012-02-08 17:04:56 +0000
338+++ openerp/report/interface.py 2012-09-19 06:19:28 +0000
339@@ -24,7 +24,7 @@
340
341 from lxml import etree
342 import openerp.netsvc as netsvc
343-import openerp.pooler as pooler
344+import openerp.db.pooler as pooler
345
346 import openerp.tools as tools
347 import openerp.modules
348
349=== modified file 'openerp/report/print_xml.py'
350--- openerp/report/print_xml.py 2012-02-08 17:04:56 +0000
351+++ openerp/report/print_xml.py 2012-09-19 06:19:28 +0000
352@@ -24,7 +24,7 @@
353 from openerp.tools.safe_eval import safe_eval
354 import print_fnc
355 from openerp.osv.orm import browse_null, browse_record
356-import openerp.pooler as pooler
357+import openerp.db.pooler as pooler
358
359 class InheritDict(dict):
360 # Might be usefull when we're doing name lookup for call or eval.
361
362=== modified file 'openerp/report/printscreen/ps_form.py'
363--- openerp/report/printscreen/ps_form.py 2012-02-08 17:04:56 +0000
364+++ openerp/report/printscreen/ps_form.py 2012-09-19 06:19:28 +0000
365@@ -20,7 +20,7 @@
366 ##############################################################################
367
368 from openerp.report.interface import report_int
369-import openerp.pooler as pooler
370+import openerp.db.pooler as pooler
371 import openerp.tools as tools
372
373 from openerp.report import render
374
375=== modified file 'openerp/report/printscreen/ps_list.py'
376--- openerp/report/printscreen/ps_list.py 2012-02-08 17:02:17 +0000
377+++ openerp/report/printscreen/ps_list.py 2012-09-19 06:19:28 +0000
378@@ -20,7 +20,7 @@
379 ##############################################################################
380
381 from openerp.report.interface import report_int
382-import openerp.pooler as pooler
383+import openerp.db.pooler as pooler
384 import openerp.tools as tools
385 from openerp.tools.safe_eval import safe_eval as eval
386 from lxml import etree
387
388=== modified file 'openerp/report/report_sxw.py'
389--- openerp/report/report_sxw.py 2012-03-30 04:57:52 +0000
390+++ openerp/report/report_sxw.py 2012-09-19 06:19:28 +0000
391@@ -29,7 +29,7 @@
392 from interface import report_rml
393 import preprocess
394 import logging
395-import openerp.pooler as pooler
396+import openerp.db.pooler as pooler
397 import openerp.tools as tools
398 import zipfile
399 import common
400
401=== modified file 'openerp/service/security.py'
402--- openerp/service/security.py 2011-11-22 08:58:48 +0000
403+++ openerp/service/security.py 2012-09-19 06:19:28 +0000
404@@ -20,7 +20,7 @@
405 ##############################################################################
406
407 import openerp.exceptions
408-import openerp.pooler as pooler
409+import openerp.db.pooler as pooler
410 import openerp.tools as tools
411
412 #.apidoc title: Authentication helpers
413
414=== modified file 'openerp/service/web_services.py'
415--- openerp/service/web_services.py 2012-09-12 11:46:51 +0000
416+++ openerp/service/web_services.py 2012-09-19 06:19:28 +0000
417@@ -34,9 +34,9 @@
418 from cStringIO import StringIO
419 from openerp.tools.translate import _
420 import openerp.netsvc as netsvc
421-import openerp.pooler as pooler
422+import openerp.db.pooler as pooler
423 import openerp.release as release
424-import openerp.sql_db as sql_db
425+import openerp.db.sql_db as sql_db
426 import openerp.tools as tools
427 import openerp.modules
428 import openerp.exceptions
429
430=== modified file 'openerp/tools/convert.py'
431--- openerp/tools/convert.py 2012-09-11 14:53:25 +0000
432+++ openerp/tools/convert.py 2012-09-19 06:19:28 +0000
433@@ -47,7 +47,7 @@
434 from lxml import etree
435 import misc
436 import openerp.loglevels as loglevels
437-import openerp.pooler as pooler
438+import openerp.db.pooler as pooler
439 from config import config
440 from translate import _
441
442
443=== modified file 'openerp/tools/misc.py'
444--- openerp/tools/misc.py 2012-09-12 10:47:13 +0000
445+++ openerp/tools/misc.py 2012-09-19 06:19:28 +0000
446@@ -57,7 +57,7 @@
447 html2text = None
448
449 import openerp.loglevels as loglevels
450-import openerp.pooler as pooler
451+from openerp.db import pooler as pooler
452 from config import config
453 from cache import *
454
455
456=== modified file 'openerp/tools/translate.py'
457--- openerp/tools/translate.py 2012-08-31 13:53:09 +0000
458+++ openerp/tools/translate.py 2012-09-19 06:19:28 +0000
459@@ -26,8 +26,8 @@
460 import itertools
461 import locale
462 import os
463-import openerp.pooler as pooler
464-import openerp.sql_db as sql_db
465+import openerp.db.pooler as pooler
466+import openerp.db.sql_db as sql_db
467 import re
468 import logging
469 import tarfile
470
471=== modified file 'openerp/tools/yaml_import.py'
472--- openerp/tools/yaml_import.py 2012-09-11 15:07:24 +0000
473+++ openerp/tools/yaml_import.py 2012-09-19 06:19:28 +0000
474@@ -5,8 +5,8 @@
475 from datetime import datetime, timedelta
476 import logging
477
478-import openerp.pooler as pooler
479-import openerp.sql_db as sql_db
480+import openerp.db.pooler as pooler
481+from openerp.db import sql_db as sql_db
482 import misc
483 from config import config
484 import yaml_tag
485
486=== modified file 'openerp/wizard/__init__.py'
487--- openerp/wizard/__init__.py 2012-02-08 14:22:48 +0000
488+++ openerp/wizard/__init__.py 2012-09-19 06:19:28 +0000
489@@ -27,7 +27,7 @@
490 from openerp.tools.translate import translate
491 from lxml import etree
492
493-import openerp.pooler as pooler
494+import openerp.db.pooler as pooler
495
496 from openerp.osv.osv import except_osv
497 from openerp.osv.orm import except_orm
498
499=== modified file 'openerp/workflow/instance.py'
500--- openerp/workflow/instance.py 2011-02-07 12:57:23 +0000
501+++ openerp/workflow/instance.py 2012-09-19 06:19:28 +0000
502@@ -23,7 +23,7 @@
503 import workitem
504
505 import openerp.netsvc as netsvc
506-import openerp.pooler as pooler
507+import openerp.db.pooler as pooler
508
509 def create(cr, ident, wkf_id):
510 (uid,res_type,res_id) = ident
511
512=== modified file 'openerp/workflow/wkf_expr.py'
513--- openerp/workflow/wkf_expr.py 2011-09-14 10:25:05 +0000
514+++ openerp/workflow/wkf_expr.py 2012-09-19 06:19:28 +0000
515@@ -22,7 +22,7 @@
516 import sys
517 import openerp.netsvc as netsvc
518 import openerp.osv as base
519-import openerp.pooler as pooler
520+import openerp.db.pooler as pooler
521 from openerp.tools.safe_eval import safe_eval as eval
522
523 class Env(dict):
524
525=== modified file 'openerp/workflow/wkf_service.py'
526--- openerp/workflow/wkf_service.py 2011-09-24 14:52:58 +0000
527+++ openerp/workflow/wkf_service.py 2012-09-19 06:19:28 +0000
528@@ -24,7 +24,7 @@
529 import instance
530
531 import openerp.netsvc as netsvc
532-import openerp.pooler as pooler
533+import openerp.db.pooler as pooler
534
535 class workflow_service(netsvc.Service):
536 """