Merge lp:~unifield-team/unifield-addons/jfb-utp-766 into lp:unifield-addons

[jftempo]

=== modified file 'account/account.py'
--- account/account.py	2013-07-12 14:29:50 +0000
+++ account/account.py	2013-10-15 09:04:06 +0000
@@ -1398,6 +1398,16 @@
 
         return True
 
+    def _hook_check_move_line(self, cr, uid, move_line, context=None):
+        """
+        Some checks on move line
+        """
+        if not context:
+            context = {}
+        if not move_line:
+            return False
+        return True
+
     #
     # Validate a balanced move. If it is a centralised journal, create a move.
     #
@@ -1429,6 +1439,8 @@
             line_draft_ids = []
             company_id = None
             for line in move.line_id:
+                # Hook to check line
+                self._hook_check_move_line(cr, uid, line, context=context)
                 amount += line.debit - line.credit
                 line_ids.append(line.id)
                 if line.state=='draft':

=== modified file 'account/account_move_line.py'
--- account/account_move_line.py	2013-05-24 15:37:40 +0000
+++ account/account_move_line.py	2013-10-15 09:04:06 +0000
@@ -1245,10 +1245,15 @@
         journal_obj = self.pool.get('account.journal')
         if context is None:
             context = {}
+        move_date = False
         if vals.get('move_id', False):
-            company_id = self.pool.get('account.move').read(cr, uid, vals['move_id'], ['company_id']).get('company_id', False)
-            if company_id:
-                vals['company_id'] = company_id[0]
+            move_data = self.pool.get('account.move').read(cr, uid, vals['move_id'], ['company_id', 'date'])
+            if move_data.get('company_id'):
+                vals['company_id'] = move_data['company_id'][0]
+            move_date = move_data.get('date')
+            if not vals.get('date') and move_date:
+                vals['date'] = move_date
+
         self._check_date(cr, uid, vals, context, check)
         if ('account_id' in vals) and not account_obj.read(cr, uid, vals['account_id'], ['active'])['active']:
             raise osv.except_osv(_('Bad account!'), _('You can not use an inactive account!'))
@@ -1391,6 +1396,8 @@
 
         if check and ((not context.get('no_store_function')) or journal.entry_posted):
             tmp = move_obj.validate(cr, uid, [vals['move_id']], context)
+            if vals.get('date') and vals.get('date') != move_date:
+                move_obj.write(cr, uid, [vals['move_id']], {'date': vals.get('date')}, context)
             if journal.entry_posted and tmp:
                 move_obj.button_validate(cr,uid, [vals['move_id']], context)
         return result