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 | |
| parent | f9072c789d85e8c97e68325c02b46686f52d5bc3 (diff) | |
| parent | 972efbc0d11ab11cf2397e1a50b164833f562cee (diff) | |
[MERGE] forward port of branch 9.0 up to 972efbc
| -rw-r--r-- | addons/account_asset/account_asset.py | 2 | ||||
| -rw-r--r-- | addons/product/product_view.xml | 2 | ||||
| -rw-r--r-- | doc/cla/individual/toanant.md | 9 | ||||
| -rw-r--r-- | doc/setup/install.rst | 2 |
4 files changed, 12 insertions, 3 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> diff --git a/doc/cla/individual/toanant.md b/doc/cla/individual/toanant.md new file mode 100644 index 00000000000..22f382972a1 --- /dev/null +++ b/doc/cla/individual/toanant.md @@ -0,0 +1,9 @@ +India, 2016-06-14 + +I hereby agree to the terms of the Odoo Individual Contributor License Agreement v1.0. + +I declare that I am authorized and able to make this agreement and sign this declaration. + +Signed, + +Abhishek Kumar Singh abhishek4bhopati@gmail.com https://github.com/toanant diff --git a/doc/setup/install.rst b/doc/setup/install.rst index 41a8d3e2e4a..139cc244701 100644 --- a/doc/setup/install.rst +++ b/doc/setup/install.rst @@ -174,7 +174,7 @@ Or ``dpkg`` (handles less dependencies automatically): # apt-get install postgresql -y # dpkg -i <path_to_installation_package> # this probably fails with missing dependencies # apt-get install -f # should install the missing dependencies - # pdkg -i <path_to_installation_package> + # dpkg -i <path_to_installation_package> This will install Odoo as a service, create the necessary PostgreSQL_ user |