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

Merge branch 'development' of http://103.74.223.20:8085/prakash.jain/cor-odoo into development

This commit is contained in:
projectsodoo 2020-12-31 11:55:03 +05:30
parent 77b49e1e3a 54ffc22ab0
commit 2991de3d8f
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cor_custom/wizard/project_create_sale_order.py
View File

@ -172,9 +172,10 @@ class ProjectCreateSalesOrderLine(models.TransientModel):
employee_id = fields.Many2one('hr.employee', string="Consultant", help="Consultant that has timesheets on the project.")
budgeted_qty = fields.Float(string='Budgeted Qty', digits='Product Unit of Measure', default=1.0)
budgeted_qty = fields.Float(string='Budgeted Hour', digits='Product Unit of Measure', default=1.0)
budgeted_uom = fields.Many2one('uom.uom', string='Budgeted UOM', related='product_id.uom_id', readonly=True)
employee_price = fields.Float("Consultant Price")
price_unit = fields.Float("Hourly rate", help="Unit price of the sales order item.")

4
cor_custom/wizard/project_create_sale_order_views.xml
View File

@ -7,8 +7,8 @@
<field name="inherit_id" ref="sale_timesheet.project_create_sale_order_view_form"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='line_ids']//tree//field[@name='product_id']" position="after">
<field name="budgeted_qty" string="Qty"/> <!-- attrs="{'column_invisible': [('parent.pricing_type','=','fixed_rate')]}" -->
<field name="budgeted_uom" attrs="{'column_invisible': [('parent.pricing_type','=','fixed_rate')]}"/>
<field name="budgeted_qty" string="Budgeted Hour"/> <!-- attrs="{'column_invisible': [('parent.pricing_type','=','fixed_rate')]}" -->
<!--<field name="budgeted_uom" attrs="{'column_invisible': [('parent.pricing_type','=','fixed_rate')]}"/>-->
</xpath>
</field>
</record>