Merge lp:~openerp-dev/openobject-addons/7.0-staging-mat into lp:openobject-addons/7.0

[Martin Trigaux (OpenERP)]

[lp:~openerp-dev/openobject-addons/7.0-staging-mat]

9408. By Martin Trigaux (OpenERP) on 2013-09-03

[MERGE] various changes

account: move button on analytic chart wizard to bottom
account: use button Target Moves in financial report views (bug lp:1078146)
project: set duplicated task in default stage instead of current

=== modified file 'account/project/wizard/account_analytic_chart_view.xml'
--- account/project/wizard/account_analytic_chart_view.xml	2012-11-29 22:26:45 +0000
+++ account/project/wizard/account_analytic_chart_view.xml	2013-09-03 09:28:13 +0000
@@ -7,16 +7,16 @@
             <field name="model">account.analytic.chart</field>
             <field name="arch" type="xml">
                 <form string="Analytic Account Charts" version="7.0">
-                    <header>
-                        <button name="analytic_account_chart_open_window" string="Open Charts" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group string="Select the Period for Analysis" col="4">
                         <field name="from_date"/>
                         <field name="to_date"/>
                         <label string="(Keep empty to open the current situation)" colspan="4"/>
                     </group>
+                    <footer>
+                        <button name="analytic_account_chart_open_window" string="Open Charts" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>

=== modified file 'account/report/account_financial_report.py'
--- account/report/account_financial_report.py	2013-04-19 11:39:43 +0000
+++ account/report/account_financial_report.py	2013-09-03 09:28:13 +0000
@@ -38,6 +38,7 @@
             'get_filter': self._get_filter,
             'get_start_date':self._get_start_date,
             'get_end_date':self._get_end_date,
+            'get_target_move': self._get_target_move,
         })
         self.context = context
 

=== modified file 'account/report/account_financial_report.rml'
--- account/report/account_financial_report.rml	2013-06-14 21:36:02 +0000
+++ account/report/account_financial_report.rml	2013-09-03 09:28:13 +0000
@@ -166,11 +166,12 @@
     <para style="Standard">
       <font color="white"> </font>
     </para>
-      <blockTable colWidths="163.0,163.0,163.0" style="Table2_header">
+      <blockTable colWidths="122.0,122.0,122.0,122.0" style="Table2_header">
       <tr>
         <td><para style="terp_tblheader_General_Centre">Chart of Accounts</para></td>
         <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
         <td><para style="terp_tblheader_General_Centre">Filter By [[ get_filter(data)!='No Filters' and get_filter(data) ]]</para></td>
+        <td><para style="terp_tblheader_General_Centre">Target Moves</para></td>
       </tr>
     <tr>
        <td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td>
@@ -197,6 +198,10 @@
                 </tr>
              </blockTable>
             </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ get_target_move(data) ]]</para>
+        </td>
+
     </tr>
     </blockTable>
     <para style="Standard">

=== modified file 'account/wizard/account_financial_report.py'
--- account/wizard/account_financial_report.py	2012-12-06 14:56:32 +0000
+++ account/wizard/account_financial_report.py	2013-09-03 09:28:13 +0000
@@ -54,7 +54,7 @@
             'target_move': 'posted',
             'account_report_id': _get_account_report,
     }
-
+    
     def _build_comparison_context(self, cr, uid, ids, data, context=None):
         if context is None:
             context = {}
@@ -62,6 +62,7 @@
         result['fiscalyear'] = 'fiscalyear_id_cmp' in data['form'] and data['form']['fiscalyear_id_cmp'] or False
         result['journal_ids'] = 'journal_ids' in data['form'] and data['form']['journal_ids'] or False
         result['chart_account_id'] = 'chart_account_id' in data['form'] and data['form']['chart_account_id'] or False
+        result['state'] = 'target_move' in data['form'] and data['form']['target_move'] or ''
         if data['form']['filter_cmp'] == 'filter_date':
             result['date_from'] = data['form']['date_from_cmp']
             result['date_to'] = data['form']['date_to_cmp']
@@ -86,7 +87,7 @@
         return res
 
     def _print_report(self, cr, uid, ids, data, context=None):
-        data['form'].update(self.read(cr, uid, ids, ['date_from_cmp',  'debit_credit', 'date_to_cmp',  'fiscalyear_id_cmp', 'period_from_cmp', 'period_to_cmp',  'filter_cmp', 'account_report_id', 'enable_filter', 'label_filter'], context=context)[0])
+        data['form'].update(self.read(cr, uid, ids, ['date_from_cmp',  'debit_credit', 'date_to_cmp',  'fiscalyear_id_cmp', 'period_from_cmp', 'period_to_cmp',  'filter_cmp', 'account_report_id', 'enable_filter', 'label_filter','target_move'], context=context)[0])
         return {
             'type': 'ir.actions.report.xml',
             'report_name': 'account.financial.report',

=== modified file 'account/wizard/account_report_common.py'
--- account/wizard/account_report_common.py	2013-07-26 09:21:34 +0000
+++ account/wizard/account_report_common.py	2013-09-03 09:28:13 +0000
@@ -154,6 +154,7 @@
         result['fiscalyear'] = 'fiscalyear_id' in data['form'] and data['form']['fiscalyear_id'] or False
         result['journal_ids'] = 'journal_ids' in data['form'] and data['form']['journal_ids'] or False
         result['chart_account_id'] = 'chart_account_id' in data['form'] and data['form']['chart_account_id'] or False
+        result['state'] = 'target_move' in data['form'] and data['form']['target_move'] or ''
         if data['form']['filter'] == 'filter_date':
             result['date_from'] = data['form']['date_from']
             result['date_to'] = data['form']['date_to']

=== modified file 'project/project.py'
--- project/project.py	2013-08-28 14:11:23 +0000
+++ project/project.py	2013-09-03 09:28:13 +0000
@@ -736,6 +736,16 @@
                 new_name = _("%s (copy)") % (default.get('name', ''))
                 default.update({'name':new_name})
         return super(task, self).copy_data(cr, uid, id, default, context)
+    
+    def copy(self, cr, uid, id, default=None, context=None):
+        if context is None:
+            context = {}
+        if default is None:
+            default = {}
+        stage = self._get_default_stage_id(cr, uid, context=context)
+        if stage:
+            default['stage_id'] = stage
+        return super(task, self).copy(cr, uid, id, default, context)
 
     def _is_template(self, cr, uid, ids, field_name, arg, context=None):
         res = {}