diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-06-15 12:14:21 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-06-15 12:14:21 +0200 |
| commit | 1d81bb06a47b1aee1b7a0dcdaa03084ddedf8b7b (patch) | |
| tree | bc689f908f2c6f01b26fe7f074c13595d9184070 /addons | |
| parent | f9072c789d85e8c97e68325c02b46686f52d5bc3 (diff) | |
| parent | 972efbc0d11ab11cf2397e1a50b164833f562cee (diff) | |
[MERGE] forward port of branch 9.0 up to 972efbc
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/account_asset/account_asset.py | 2 | ||||
| -rw-r--r-- | addons/product/product_view.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py index 4118d531cac..951c28a8a7a 100644 --- a/addons/account_asset/account_asset.py +++ b/addons/account_asset/account_asset.py @@ -154,7 +154,7 @@ class AccountAssetAsset(models.Model): def compute_depreciation_board(self): self.ensure_one() - posted_depreciation_line_ids = self.depreciation_line_ids.filtered(lambda x: x.move_check).sorted(key=lambda l: l.depreciation_date, reverse=True) + posted_depreciation_line_ids = self.depreciation_line_ids.filtered(lambda x: x.move_check).sorted(key=lambda l: l.depreciation_date) unposted_depreciation_line_ids = self.depreciation_line_ids.filtered(lambda x: not x.move_check) # Remove old unposted depreciation lines. We cannot use unlink() with One2many field diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml index a886500cdee..593fa56f59e 100644 --- a/addons/product/product_view.xml +++ b/addons/product/product_view.xml @@ -59,7 +59,7 @@ <field name="weight"/> <field name="categ_id"/> <field name="type"/> - <field name="state"/> + <field name="state" invisible="1"/> <field name="uom_id" invisible="1"/> </tree> </field> |