lp:~openerp-dev/openobject-addons/trunk-asset-bug-fix-ado

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:openobject-addons

OpenERP Core Team: Pending requested 2014-05-01

Diff: 318 lines (+76/-38)

5 files modified

account_asset/account_asset.py (+58/-14)
account_asset/account_asset_demo.xml (+10/-20)
account_asset/account_asset_view.xml (+2/-1)
account_asset/test/account_asset_demo.yml (+1/-1)
account_asset/wizard/account_asset_change_duration.py (+5/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

9428. By Amit Dodiya (OpenERP) on 2014-05-08

[FIX] asset: fixed some bug related to asset module

9427. By Géry Debongnie on 2014-05-08

[MERGE] merge trunk-claimcount-fix-ged

Add the claim_count_out field to its correct place (in addon claim_from_delivery). The field was removed because it was incorrectly added to stock.py instead of the addon claim_from_delivery. (note: it was renamed from claim_count to claim_count_out)

9426. By Launchpad Translations on behalf of openerp on 2014-05-08

Launchpad automatic translations update.

9425. By Quentin (OpenERP) <email address hidden> on 2014-05-07

[REV] partial revert of revision 9408 <email address hidden> where we wrongly beleive than stock depends on crm_claim... :( That code will probably be back _in the right module_

9424. By Fabien Meghazi (OpenERP) on 2014-05-07

[REM] completetly removed website#preprocess_request()

9423. By Christophe Simonis (OpenERP) on 2014-05-07

[MERGE] forward port of branch saas-4 up to revid 9410 <email address hidden>

9422. By Fabien Meghazi (OpenERP) on 2014-05-07

[REM] QWeb does not self close empty divs anymore

See web Rev#4011

9421. By Antony Lesuisse (OpenERP) on 2014-05-07

[MERGE] trunk-websit-al-refactor by chm
- allow fiscal position change on sale orders
- public user on website
- simplify website_sale sale.order and shopping cart code
- remove preprocess_request

9420. By Géry Debongnie on 2014-05-07

Large cleanups in addons

The code I merged in my branch stat buttons was sadly not up to our
standing... This branch improves the situation by removing harmful
try/excpet/pass statements, by using search_count when appropriate, by
removing unused one2many fields and by correcting some bugs

9419. By Xavier (Open ERP) on 2014-05-07

[IMP] mail: type fixes

* _get_tracked_fields should return a dict even when there's no tracked field
  (return an empty dict)

* in write, only call _get_tracked_fields once, initialize to None instead of
  a list (especially since it should be a dict in the first place)