pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] Fixed subtotal footer in project and sale order form views

Browse Source 
bzr revid: fme@openerp.com-20120621160110-16bp8l8ej2rwagp0
This commit is contained in:
Fabien Meghazi
2012-06-21 18:01:10 +02:00
parent ab407563ed
commit ce9ddadc9b
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/project/project_view.xml
+3 -2
View File
@@ -384,15 +384,16 @@
<field name="hours" widget="float_time" sum="Spent Hours"/>
</tree>
</field>
<group class="oe_form_subtotal_footer" name="project_hours" groups="project.group_time_work_estimation_tasks">
<group class="oe_subtotal_footer oe_right" name="project_hours" groups="project.group_time_work_estimation_tasks">
<field name="effective_hours" widget="float_time"/>
<label for="remaining_hours" string="Remaining" groups="project.group_time_work_estimation_tasks"/>
<div>
<button name="%(action_project_task_reevaluate)d" string="Reevaluate" type="action" target="new" states="open,pending" icon="gtk-edit"/>
<field name="remaining_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" groups="project.group_time_work_estimation_tasks"/>
</div>
<field name="total_hours" widget="float_time" class="oe_form_subtotal_footer_separator"/>
<field name="total_hours" widget="float_time" class="oe_subtotal_footer_separator"/>
</group>
<div class="oe_clear"/>
</page>
<page string="Delegations History" groups="project.group_delegate_task">
<separator string="Parent Tasks"/>
addons/sale/sale_view.xml
+2 -2
View File
@@ -217,12 +217,12 @@
<field name="price_subtotal" groups="base.group_sale_notes_subtotal"/>
</tree>
</field>
<group class="oe_subtotal_footer" colspan="2" name="sale_total">
<group class="oe_subtotal_footer oe_right" colspan="2" name="sale_total">
<field name="amount_untaxed"/>
<field name="amount_tax"/>
<field name="amount_total" class="oe_subtotal_footer_separator"/>
</group>
<separator string="Notes"/>
<separator string="Notes" class="oe_clear"/>
<field name="note" placeholder="Add a global note on the sale order..."/>
</page>
<page string="Other Information">