[MERGE]

bzr revid: mra@tinyerp.com-20100526045215-2yitn5wri6b18zwl

diff --cc addons/account/account_analytic_line.py
index 6350f32,ba33185..d02dec3
--- 1/addons/account/account_analytic_line.py
--- 2/addons/account/account_analytic_line.py
+++ b/addons/account/account_analytic_line.py
@@@ -164,10 -164,10 +164,10 @@@ timesheet_invoice(
  class res_partner(osv.osv):
      """ Inherits partner and adds contract information in the partner form """
      _inherit = 'res.partner'
 -    
 +
      _columns = {
                  'contract_ids': fields.one2many('account.analytic.account', \
-                                                     'partner_id', 'Contracts'),
 -                                                    'partner_id', 'Contracts', readonly=True), 
++                                                    'partner_id', 'Contracts', readonly=True),
                  }
  
  res_partner()

diff --cc addons/account/account_invoice_view.xml
Simple merge

diff --cc addons/hr/hr_view.xml
Simple merge

diff --cc addons/hr_holidays/hr_holidays_view.xml
Simple merge

diff --cc addons/hr_holidays/report/hr_holidays_report_view.xml
index a04e5f0,679eff9..ad8f833
--- 1/addons/hr_holidays/report/hr_holidays_report_view.xml
--- 2/addons/hr_holidays/report/hr_holidays_report_view.xml
+++ b/addons/hr_holidays/report/hr_holidays_report_view.xml
@@@ -153,4 -150,4 +153,4 @@@
          </field>
      </record>
              </data>
--</openerp>
++</openerp>

diff --cc addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
index 75c5435,7a12c5d..cfe61e9
--- 1/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
--- 2/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
@@@ -69,24 -69,24 +69,35 @@@
                            <field name="account_id"/>
                          <field name="product_id"/>
                      </group>
+                     <group expand="1" string="Group By...">
+                         <filter string="User" name="User" icon="terp-hr" context="{'group_by':'user_id'}"/>
+                         <separator orientation="vertical"/>
+                         <filter string="Account" icon="terp-hr" context="{'group_by':'account_id'}"/>
+                         <filter string="Product" icon="terp-hr" context="{'group_by':'product_id'}"/>
+                         <filter string="Invoice" icon="terp-hr" context="{'group_by':'invoice_id'}"/>
+                         <separator orientation="vertical"/>
+                         <filter string="Day" icon="terp-hr" context="{'group_by':'day'}"/>
+                         <filter string="Month" icon="terp-hr" context="{'group_by':'month'}"/>
+                         <filter string="Year" icon="terp-hr" context="{'group_by':'name'}"/>
+                     </group>
                      <newline/>
 -                      <group expand="0" string="Extended filters..." groups="base.group_extended">
 -                          <field name="date"/>
 -                          <separator orientation="vertical"/>
 -                          <field name="invoice_id" widget="selection"/>
 +                    <group expand="1" string="Group By..." colspan="10" col="12">
 +                        <filter string="User" name="User" icon="terp-hr" context="{'group_by':'user_id'}"/>
 +                        <separator orientation="vertical"/>
 +                        <filter string="Account" icon="terp-hr" context="{'group_by':'account_id'}"/>
 +                        <filter string="Product" icon="terp-hr" context="{'group_by':'product_id'}"/>
 +                        <filter string="Invoice" icon="terp-hr" context="{'group_by':'invoice_id'}"/>
 +                        <separator orientation="vertical"/>
 +                        <filter string="Day" icon="terp-hr" context="{'group_by':'day'}"/>
 +                        <filter string="Month" icon="terp-hr" context="{'group_by':'month'}"/>
 +                        <filter string="Year" icon="terp-hr" context="{'group_by':'name'}"/>
 +                    </group>
 +                    <newline/>
 +                    <group expand="0" string="Extended options..." colspan="10" col="12">
 +                        <field name="date"/>
 +                        <separator orientation="vertical"/>
 +                        <field name="invoice_id" widget="selection"/>
                      </group>
 -
                  </search>
              </field>
          </record>
@@@ -443,14 -443,14 +454,14 @@@
              <field name="arch" type="xml">
                  <search string="Search Timesheet Lines">
                     <group col='15' colspan='4'>
 -                      <field name="date"/>
 +                        <separator orientation="vertical"/>
 +                        <filter icon="terp-project" string="Current" default="1" domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"/>
 +                        <separator orientation="vertical"/>
                        <field name="user_id" widget="selection"/>
                        <field name="product_id" widget="selection"/>
 -                      <field name="analytic_account_id" widget="selection"/>
 -                      <field name="general_account_id" widget="selection"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="20">
+                    <group expand="1" string="Group By...">
                          <filter string="User" icon="terp-project" domain="[]" context="{'group_by':'user_id'}"/>
                          <filter string="Product" icon="terp-project" domain="[]" context="{'group_by':'product_id'}"/>
                          <filter string="Analytic Account" icon="terp-project" domain="[]" context="{'group_by':'analytic_account_id'}"/>

diff --cc addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
Simple merge

diff --cc addons/project/project_view.xml
Simple merge

diff --cc addons/project/report/project_report_view.xml
index db880ae,919bfc2..f0d843d
--- 1/addons/project/report/project_report_view.xml
--- 2/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@@ -96,24 -96,13 +96,13 @@@
                                                help="Non Assigned Tasks to users"
                                                domain="[('user_id','=',False)]"/>
                            </field>
 -                          <field name="project_id" widget="selection">
 +                          <field name="project_id">
                                <filter icon="terp-project"
-                                               string="Non assigned tasks to projects"
-                                               help ="Non assigned tasks to projects"
-                                               domain="[('project_id','=',False"/>
+                                               string="My Projects"
+                                               help="My Projects"
+                                               domain="[('project_id','=',context.get('project_id', False)]"/>
                            </field>
                      </group>
-                     <newline/>
-                       <group expand="0" string="Extended options..." colspan="10" col="12">
-                           <field name="type" widget="selection"/>
-                           <separator orientation="vertical"/>
-                         <field name="date_start"/>
-                         <field name="date_deadline"/>
-                           <separator orientation="vertical"/>
-                           <field name="priority"/>
-                           <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                     </group>
-                     <newline/>
                      <group expand="1" string="Group By..." colspan="10" col="11">
                          <filter string="User" name="User" icon="terp-project" context="{'group_by':'user_id'}" />
                          <filter string="Project" icon="terp-project" context="{'group_by':'project_id'}"/>

diff --cc addons/project_long_term/project_long_term_view.xml
Simple merge

diff --cc addons/scrum/scrum_view.xml
Simple merge