Elabore/odoo-usability
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '12.0' of github.com:akretion/odoo-usability into 12.0

Browse Source
This commit is contained in:
Alexis de Lattre
2019-03-05 17:17:59 +01:00
parent 528438586c f07d416034
commit e7638c239f
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
product_usability/product_view.xml
View File

@@ -18,6 +18,7 @@
<field name="product_id" invisible="not context.get('product_price_history_main_view')"/> <field name="product_id" invisible="not context.get('product_price_history_main_view')"/>
<field name="datetime"/> <field name="datetime"/>
<field name="cost" widget="monetary" options="{'currency_field': 'company_currency_id'}"/> <field name="cost" widget="monetary" options="{'currency_field': 'company_currency_id'}"/>
<field name="create_uid"/>
<field name="company_id" groups="base.group_multi_company"/> <field name="company_id" groups="base.group_multi_company"/>
<field name="company_currency_id" invisible="1"/> <field name="company_currency_id" invisible="1"/>
</group> </group>
@@ -33,6 +34,7 @@
<field name="product_id" invisible="not context.get('product_price_history_main_view')"/> <field name="product_id" invisible="not context.get('product_price_history_main_view')"/>
<field name="datetime"/> <field name="datetime"/>
<field name="cost" widget="monetary" options="{'currency_field': 'company_currency_id'}"/> <field name="cost" widget="monetary" options="{'currency_field': 'company_currency_id'}"/>
<field name="create_uid"/>
<field name="company_id" groups="base.group_multi_company"/> <field name="company_id" groups="base.group_multi_company"/>
<field name="company_currency_id" invisible="1"/> <field name="company_currency_id" invisible="1"/>
</tree> </tree>
@@ -48,6 +50,7 @@
<group string="Group By" name="groupby"> <group string="Group By" name="groupby">
<filter name="product_groupby" string="Product" context="{'group_by': 'product_id'}"/> <filter name="product_groupby" string="Product" context="{'group_by': 'product_id'}"/>
<filter name="datetime_groupby" string="Date" context="{'group_by': 'datetime:month'}"/> <filter name="datetime_groupby" string="Date" context="{'group_by': 'datetime:month'}"/>
<filter name="create_uid_groupby" string="Created by" context="{'group_by': 'create_uid'}"/>
</group> </group>
</search> </search>
</field> </field>

1
stock_usability/stock.py
View File

@@ -105,7 +105,6 @@ class StockMove(models.Model):
# ops.unlink() # ops.unlink()
class ProcurementGroup(models.Model): class ProcurementGroup(models.Model):
_inherit = 'procurement.group' _inherit = 'procurement.group'