openerp-dev-web team mailing list archive

[Jigar Amin - OpenERP <jam@xxxxxxxxxxx>]

Jigar Amin - OpenERP has proposed merging lp:~openerp-dev/openobject-addons/trunk-bug-usabality_fixes-jam into lp:~openerp-dev/openobject-addons/trunk-bugfixes-Ind.

Requested reviews:
  OpenERP Core Team (openerp)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-usabality_fixes-jam/+merge/58232

Hello,
   Fixes in Merge Proposal
   + Contract : Form View Text Area was Anonymous. Added Separator for the field
   + Project : In Task form View on "Planned Hour" Field widget="float_time" was missing added it.
   + HR TimeSheet Line has Field User it should be read-only in Time-sheet Form View.
  Kindly Review this.
Thank You
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-usabality_fixes-jam/+merge/58232
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bugfixes-Ind.

=== modified file 'hr_contract/hr_contract_view.xml'
--- hr_contract/hr_contract_view.xml	2011-01-27 09:49:39 +0000
+++ hr_contract/hr_contract_view.xml	2011-04-19 06:30:59 +0000
@@ -183,6 +183,7 @@
                         <separator colspan="2" string="Advantages"/>
                         <field name="advantages_net"/>
                         <field name="advantages_gross"/>
+                        <separator colspan="2" string="Advantages Description"/>
                         <field name="advantages" nolabel="1" colspan="2"/>
                         </group>
                         <separator colspan="4" string="Notes"/>

=== modified file 'hr_timesheet_sheet/hr_timesheet_sheet_view.xml'
--- hr_timesheet_sheet/hr_timesheet_sheet_view.xml	2011-04-07 09:27:30 +0000
+++ hr_timesheet_sheet/hr_timesheet_sheet_view.xml	2011-04-19 06:30:59 +0000
@@ -120,7 +120,7 @@
                                     <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)"/>
                                     <field name="amount"/>
                                     <field name="general_account_id"/>
-                                    <field name="user_id" required="1"/>
+                                    <field name="user_id" readonly='1' />
                                 </form>
                             </field>
                             <field name="total_difference_day" widget="float_time"/>

=== modified file 'project/project.py'
--- project/project.py	2011-04-07 11:41:45 +0000
+++ project/project.py	2011-04-19 06:30:59 +0000
@@ -405,12 +405,6 @@
                  default.update({'name':new_name})
         return super(task, self).copy_data(cr, uid, id, default, context)
 
-    def _check_dates(self, cr, uid, ids, context=None):
-        task = self.read(cr, uid, ids[0], ['date_start', 'date_end'])
-        if task['date_start'] and task['date_end']:
-             if task['date_start'] > task['date_end']:
-                 return False
-        return True
 
     def _is_template(self, cr, uid, ids, field_name, arg, context=None):
         res = {}

=== modified file 'project/project_view.xml'
--- project/project_view.xml	2011-01-27 09:49:39 +0000
+++ project/project_view.xml	2011-04-19 06:30:59 +0000
@@ -325,7 +325,7 @@
                     <field name="user_id" invisible="context.get('user_invisible', False)"/>
                     <field name="delegated_user_id" invisible="context.get('show_delegated', True)"/>
                     <field name="total_hours" invisible="1"/>
-                     <field name="planned_hours"/>
+                     <field name="planned_hours" widget="float_time"/>
                     <field name="effective_hours" widget="float_time" sum="Spent Hours" invisible="1"/>
                     <field name="remaining_hours" widget="float_time" sum="Remaining Hours" on_change="onchange_remaining(remaining_hours,planned_hours)"/>
                     <field name="date_deadline" invisible="context.get('deadline_visible',True)"/>