Merge lp:~odossmann/unifield-wm/UFTP_363 into lp:unifield-wm

[jftempo]

=== modified file 'account_override/account.py'
--- account_override/account.py	2014-10-03 12:31:11 +0000
+++ account_override/account.py	2014-11-04 16:54:28 +0000
@@ -482,6 +482,7 @@
         'sequence_id': fields.many2one('ir.sequence', string='Lines Sequence', ondelete='cascade',
             help="This field contains the information related to the numbering of the lines of this journal entry."),
         'manual_name': fields.char('Description', size=64, required=True),
+        'imported': fields.boolean('Imported', help="Is this Journal Entry imported?", required=False, readonly=True),
     }
 
     _defaults = {
@@ -490,6 +491,7 @@
         'date': lambda *a: False,
         'period_id': lambda *a: '',
         'manual_name': lambda *a: '',
+        'imported': lambda *a: False,
    }
 
     def _check_document_date(self, cr, uid, ids, context=None):

=== modified file 'analytic_distribution/account_view.xml'
--- analytic_distribution/account_view.xml	2014-06-13 14:34:59 +0000
+++ analytic_distribution/account_view.xml	2014-11-04 16:54:28 +0000
@@ -80,11 +80,11 @@
             <field name="arch" type="xml">
               <data>
                     <xpath expr="/form/notebook" position="before">
-                        <group colspan="4" col="8" attrs="{'invisible': [('analytic_distribution_id', '=', False)]}">
+                        <group colspan="4" col="8" attrs="{'invisible': ['|', ('analytic_distribution_id', '=', False), ('imported', '=', True)]}">
                             <button name="button_analytic_distribution" string="Analytical Distribution" type="object" icon="terp-check" context="context" colspan="4" attrs="{'invisible': [('analytic_distribution_id', '=', False)]}"/>
                             <button name="button_reset_distribution" string="Reset AD at line level" type="object" icon="gtk-undelete" colspan="4" attrs="{'invisible': ['|', ('status', '!=', 'manu'), ('state', '!=', 'draft')]}"/>
                         </group>
-                        <group colspan="4" col="8" attrs="{'invisible': [('analytic_distribution_id', '!=', False)]}">
+                        <group colspan="4" col="8" attrs="{'invisible': ['|', ('analytic_distribution_id', '!=', False), ('imported', '=', True)]}">
                             <button name="button_analytic_distribution" string="Analytical Distribution" type="object" icon="terp-emblem-important" context="context" colspan="4" attrs="{'invisible': [('analytic_distribution_id', '!=', False)]}"/>
                             <button name="button_reset_distribution" string="Reset AD at line level" type="object" icon="gtk-undelete" colspan="4" attrs="{'invisible': ['|', ('status', '!=', 'manu'), ('state', '!=', 'draft')]}"/>
                         </group>

=== modified file 'analytic_distribution/wizard/analytic_distribution_wizard.py'
--- analytic_distribution/wizard/analytic_distribution_wizard.py	2014-10-08 11:58:26 +0000
+++ analytic_distribution/wizard/analytic_distribution_wizard.py	2014-11-04 16:54:28 +0000
@@ -509,10 +509,15 @@
             if el.sale_order_line_id and el.sale_order_line_id.order_id and el.sale_order_line_id.order_id.state not in ['draft', 'validated']:
                 res[el.id] = False
             # verify move state
+            # UFTP-363: Do not edit any element of JI or JE if the JE is imported
             if el.move_id and el.move_id.state not in ['draft']:
                 res[el.id] = False
+            if el.move_id and el.move_id.imported is True:
+                res[el.id] = False
             if el.move_line_id and el.move_line_id.move_id and el.move_line_id.move_id.state not in ['draft'] and not context.get('from_correction', False):
                 res[el.id] = False
+            if el.move_line_id and el.move_line_id.move_id and el.move_line_id.move_id.imported is True:
+                res[el.id] = False
         return res
 
     def _have_header(self, cr, uid, ids, name, args, context=None):

=== modified file 'finance/account_view.xml'
--- finance/account_view.xml	2014-09-22 14:54:53 +0000
+++ finance/account_view.xml	2014-11-04 16:54:28 +0000
@@ -70,22 +70,22 @@
                 <form string="Journal Entries" position="replace">
                     <form string="Journal Entries" hide_delete_button="1">
                         <group colspan="4" col="6">
-                            <field name="journal_id" on_change="onchange_journal_id(journal_id)" attrs="{'readonly': ['|', ('status', '=', 'sys'), ('state', '=', 'posted')]}"/>
+                            <field name="journal_id" on_change="onchange_journal_id(journal_id)" attrs="{'readonly': ['|', '|', ('status', '=', 'sys'), ('state', '=', 'posted'), ('imported', '=', True)]}"/>
                             <field name="name" readonly="1"/>
-                            <field name="period_id" on_change="onchange_period_id(period_id, date)" attrs="{'readonly': ['|', ('status', '=', 'sys'), ('state', '=', 'posted')]}"/>
-                            <field name="document_date" attrs="{'readonly': ['|', ('status', '=', 'sys'), ('state', '=', 'posted')]}"/>
-                            <field name="date" string="Posting Date" attrs="{'readonly': ['|', ('status', '=', 'sys'), ('state', '=', 'posted')]}"/>
+                            <field name="period_id" on_change="onchange_period_id(period_id, date)" attrs="{'readonly': ['|', '|', ('status', '=', 'sys'), ('state', '=', 'posted'), ('imported', '=', True)]}"/>
+                            <field name="document_date" attrs="{'readonly': ['|', '|', ('status', '=', 'sys'), ('state', '=', 'posted'), ('imported', '=', True)]}"/>
+                            <field name="date" string="Posting Date" attrs="{'readonly': ['|', '|', ('status', '=', 'sys'), ('state', '=', 'posted'), ('imported', '=', True)]}"/>
 
                             <group col="6" colspan="6">
                                 <group col="2" colspan="2">
                                     <group  attrs="{'invisible': [('status', '!=', 'sys')]}">
                                       <label string=""/>
                                     </group>
-                                    <field name="manual_name" attrs="{'readonly': ['|', ('status', '=', 'sys'), ('state', '=', 'posted')], 'invisible': [('status', '=', 'sys')]}"/>
+                                    <field name="manual_name" attrs="{'readonly': ['|', '|', ('status', '=', 'sys'), ('state', '=', 'posted'), ('imported', '=', True)], 'invisible': [('status', '=', 'sys')]}"/>
                                 </group>
-                                <field name="ref" attrs="{'readonly': [('status', '=', 'sys')]}"/>
+                                <field name="ref" attrs="{'readonly': ['|', ('status', '=', 'sys'), ('imported', '=', True)]}"/>
                                 <group colspan="2" col="2">
-                                    <field name="manual_currency_id" attrs="{'required': [('status', '=', 'manu')], 'readonly': ['|', '|', ('status', '=', 'sys'), ('block_manual_currency_id', '=', True), ('state', '=', 'posted')], 'invisible': [('status', '=', 'sys')]}"/>
+                                    <field name="manual_currency_id" attrs="{'required': [('status', '=', 'manu')], 'readonly': ['|', '|', ('status', '=', 'sys'), ('block_manual_currency_id', '=', True), ('state', '=', 'posted')], 'invisible': ['|', ('status', '=', 'sys'), ('imported', '=', True)]}"/>
                                     <field name="currency_id" readonly="True" attrs="{'invisible': [('status', '=', 'manu')]}"/>
                                 </group>
                           </group>
@@ -93,9 +93,10 @@
                         <field name="partner_id" invisible="1"/>
                         <field name="block_manual_currency_id" invisible="1"/>
                         <field name="amount" invisible="1"/>
+                        <field name="imported" invisible="1"/>
                         <notebook colspan="4">
                             <page string="Journal Items">
-                                <field colspan="4" name="line_id" nolabel="1" height="250" widget="one2many_list" default_get="{'lines': [], 'journal':journal_id, 'period_id':period_id, 'move_reference': ref}" attrs="{'readonly': [('status', '=', 'sys')]}">
+                                <field colspan="4" name="line_id" nolabel="1" height="250" widget="one2many_list" default_get="{'lines': [], 'journal':journal_id, 'period_id':period_id, 'move_reference': ref}" attrs="{'readonly': ['|', ('status', '=', 'sys'), ('imported', '=', True)]}">
                                     <tree colors="blue:state in ('draft');black:state in ('posted')" editable="top" string="Journal Items">
                                         <button name="button_duplicate" string="Duplicate" type="object" icon="gtk-copy" />
                                         <field name="name"/>
@@ -116,7 +117,7 @@
                         </notebook>
                         <group colspan="4" col="4">
                             <field name="state" colspan="2"/>
-                            <field name="status" invisible="0" readonly="1" colspan="2"/>
+                            <field name="status" readonly="1" colspan="2"/>
                         </group>
                         <group colspan="6" col="4">
                             <!--button name="button_cancel" states="posted" string="Cancel" type="object" icon="gtk-cancel"/-->

=== modified file 'msf_doc_import/account.py'
--- msf_doc_import/account.py	2014-09-16 14:09:24 +0000
+++ msf_doc_import/account.py	2014-11-04 16:54:28 +0000
@@ -97,6 +97,7 @@
                     'date': w.date,
                     'period_id': p_id,
                     'status': 'manu',
+                    'imported': True,
                 }
                 move_id = self.pool.get('account.move').create(cr, uid, move_vals, context)
                 for l_num, l in enumerate(available_currencies[(c_id, p_id)]):