subh_pal_org
/
cor
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'development' into 'master' 

Development

See merge request prakash.jain/cor-odoo!2
This commit is contained in:
prakash.jain 2020-12-07 21:33:53 -08:00
parent 3bf4209b3f 12c27baff4
commit b53b6a275f
13 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
project_maintenance/__pycache__/__init__.cpython-36.pyc
View File

Binary file not shown.

BIN
project_maintenance/models/__pycache__/__init__.cpython-36.pyc
View File

Binary file not shown.

BIN
project_maintenance/models/__pycache__/analytic_account.cpython-36.pyc
View File

Binary file not shown.

BIN
project_maintenance/models/__pycache__/digest.cpython-36.pyc
View File

Binary file not shown.

BIN
project_maintenance/models/__pycache__/maintenance.cpython-36.pyc
View File

Binary file not shown.

BIN
project_maintenance/models/__pycache__/project.cpython-36.pyc
View File

Binary file not shown.

BIN
project_maintenance/models/__pycache__/project_task_recurrence.cpython-36.pyc
View File

Binary file not shown.

BIN
project_maintenance/models/__pycache__/res_config_settings.cpython-36.pyc
View File

Binary file not shown.

BIN
project_maintenance/models/__pycache__/res_partner.cpython-36.pyc
View File

Binary file not shown.

6
project_maintenance/models/maintenance.py
View File

@ -16,10 +16,6 @@ class ProjectMainenence(models.Model):
name = fields.Char('Maintenance', required=True, ondelete="restrict")
maintenance_type_id = fields.Many2one('project.maintenance.type', 'Manintenance Type', required=True, readonly=True, ondelete='cascade')
@api.model
def default_get(self, fields):
res = super(ProjectMainenence, self).default_get(fields)
print("self._context.get('active_model')>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>", res, self._context)
return res

BIN
project_maintenance/report/__pycache__/__init__.cpython-36.pyc
View File

Binary file not shown.

BIN
project_maintenance/report/__pycache__/maintenance_report.cpython-36.pyc
View File

Binary file not shown.

8
project_maintenance/views/project_view.xml
View File

@ -13,7 +13,7 @@
<tree>
<field name="maintenance_type_id"/>
<field name="line_ids"/>
<field name="total_amount" widget="monetary"/>
<field name="total_amount" sum="Total" widget="monetary"/>
<field name="currency_id" invisible="1"/>
</tree>
<form>
@ -23,15 +23,15 @@
<field name="currency_id" invisible="1"/>
</group>
<group>
<field name="line_ids" context="{'default_maintenance_id':1}" colspan="4" nolabel="1" widget="one2many">
<field name="line_ids" colspan="4" nolabel="1" widget="one2many">
<tree editable="top">
<field name="maintenance_id" domain="[('maintenance_type_id','=',parent.maintenance_type_id)]"/>
<field name="maintenance_id" context="{'default_maintenance_type_id':parent.maintenance_type_id}" domain="[('maintenance_type_id','=',parent.maintenance_type_id)]"/>
<field name="cost" widget="monetary" options="{'currency_field':'currency_id'}"/>
<field name="currency_id" invisible="1"/>
</tree>
<form>
<group>
<field name="maintenance_id" domain="[('maintenance_type_id','=',parent.maintenance_type_id)]"/>
<field name="maintenance_id" context="{'default_maintenance_type_id':parent.maintenance_type_id}" domain="[('maintenance_type_id','=',parent.maintenance_type_id)]"/>
<field name="cost" widget="monetary" options="{'currency_field':'currency_id'}"/>
<field name="currency_id" invisible="1"/>
</group>