Merge lp:~unifield-team/unifield-wm/us-948b into lp:unifield-wm

[jftempo]

Unmerged revisions

2777. By Vincent GREINER on 2016-02-26

US-948 [IMP] update cash behaviour: always cary over end of month balance (whereas frozen or not)

2776. By Vincent GREINER on 2016-02-26

US-948 carry over CashBox Balance at cashbox confirm (frozen)

2775. By Vincent GREINER on 2016-02-26

US-948 [FIX] draft/open register always carry end of month balance (manual accountant) to next register

2774. By Vincent GREINER on 2016-02-26

US-948 [IMP] next register creation: carry over IB for bank AND cash, take always the manual accountant amout as reference

2773. By Vincent GREINER on 2016-02-25

US-948/US-645 [FIX] next register create wizard: carry other the end month bal to the next register IB using the adhoc field (when eom not frozen/no entries, no total amount for msf_calculated_balance => pick bank statement balance)

2772. By Vincent GREINER on 2016-02-25

US-948 [FIX]

1: carry over end of month balance even if 0. (was wrongly not carry over with vals.get() default False)

2: carry over end of month balance to next registers if
   the source register is not 'end of month balance' frozen

2771. By Vincent GREINER on 2016-02-25

US-948/1 [FIX] cancel US-645 as the true issue is the point 2) of US-948

=== modified file 'register_accounting/account_bank_statement.py'
--- register_accounting/account_bank_statement.py	2016-02-22 16:20:10 +0000
+++ register_accounting/account_bank_statement.py	2016-02-29 08:12:45 +0000
@@ -423,7 +423,7 @@
         """
         Confirm that the closing balance could not be editable.
         """
-        if not context:
+        if context is None:
             context = {}
         if isinstance(ids, (int, long)):
             ids = [ids]

=== modified file 'register_accounting/account_cash_statement.py'
--- register_accounting/account_cash_statement.py	2015-12-22 07:49:20 +0000
+++ register_accounting/account_cash_statement.py	2016-02-29 08:12:45 +0000
@@ -96,18 +96,26 @@
 
         # @@@end
         # Observe register state
+        prev_reg = False
         prev_reg_id = vals.get('prev_reg_id', False)
         if prev_reg_id:
             prev_reg = self.browse(cr, uid, [prev_reg_id], context=context)[0]
             # if previous register closing balance is freezed, then retrieving previous closing balance
             # US_410: retrieving previous closing balance even closing balance is not freezed
             # if prev_reg.closing_balance_frozen:
+            # US-948: carry over for bank, and always carry over bank
+            # accountant manual field
             if journal.type == 'bank':
-                vals.update({'balance_start': prev_reg.balance_end_real})
+                vals.update({'balance_start': prev_reg.balance_end_real, })
         res_id = osv.osv.create(self, cr, uid, vals, context=context)
         # take on previous lines if exists (or discard if they come from sync)
-        if prev_reg_id and not sync_update:
+        if journal.type == 'cash' and prev_reg_id and not sync_update:
             create_cashbox_lines(self, cr, uid, [prev_reg_id], ending=True, context=context)
+            if prev_reg:
+                # Since US-948: created register IB is previous cashbox balance
+                self.write(cr, uid, [res_id],
+                    {'balance_start': prev_reg.balance_end_cash, },
+                    context=context)
         # update balance_end
         self._get_starting_balance(cr, uid, [res_id], context=context)
         return res_id
@@ -116,16 +124,26 @@
         if context is None:
             context = {}
 
-        if not context.get('sync_update_execution') and vals.get('balance_end_real', False):
-            new_vals = {'balance_start': vals['balance_end_real']}
-            to_write_id_list = []
-            for id in ids:
-                args = [('prev_reg_id', '=', id)]
-                search_ids = self.search(cr, uid, args, context=context)
-                to_write_id_list.extend(search_ids)
-            self.write(cr, uid, to_write_id_list, new_vals, context=context)
+        if not context.get('sync_update_execution'):
+            if 'balance_end_real' in vals:
+                new_vals = {'balance_start': vals['balance_end_real']}
+                # US-948/2: carry over end of month balance to next registers if
+                # the source register is not 'end of month balance' frozen
+                # note: the last carry over is processed via
+                # 'button_confirm_closing_bank_balance' button
+                to_write_id_list = []
+                for r in self.read(cr, uid, ids, ['closing_balance_frozen', ],
+                    context=context):
+                    if not r['closing_balance_frozen']:
+                        args = [('prev_reg_id', '=', r['id'])]
+                        search_ids = self.search(cr, uid, args, context=context)
+                        if search_ids:
+                            to_write_id_list.extend(search_ids)
+                self.write(cr, uid, to_write_id_list, new_vals, context=context)
 
-        return super(account_cash_statement, self).write(cr, uid, ids, vals, context=context)
+        res = super(account_cash_statement, self).write(cr, uid, ids, vals,
+            context=context)
+        return res
 
     def button_open_cash(self, cr, uid, ids, context=None):
         if not context:
@@ -245,7 +263,8 @@
         """
         Sum of opening balance (balance_start) and sum of cash transaction (total_entry_encoding)
         """
-        # Prepare some values
+        if context is None:
+            context = {}
         res = {}
         for st in self.browse(cr, uid, ids):
             amount = (st.balance_start or 0.0) + (st.total_entry_encoding or 0.0)
@@ -255,7 +274,10 @@
                 next_st_ids = self.search(cr, uid, [('prev_reg_id', '=', st.id)])
                 for next_st in self.browse(cr, uid, next_st_ids):
                     if next_st.state != 'confirm':
-                        self.write(cr, uid, [next_st.id], {'balance_start': amount})
+                        # US-948: since cash register is not eom bal
+                        # frozen, carry over Cashbox balance
+                        # (when creating next register or updating)
+                        self.write(cr, uid, [next_st.id], {'balance_start': st.balance_end_cash})
         return res
 
     def _get_sum_entry_encoding(self, cr, uid, ids, field_name=None, arg=None, context=None):

=== modified file 'register_accounting/register_tools.py'
--- register_accounting/register_tools.py	2015-11-16 14:27:39 +0000
+++ register_accounting/register_tools.py	2016-02-29 08:12:45 +0000
@@ -366,7 +366,9 @@
                         starting_vals.update({'number': 0.0,})
                     cashbox_line_obj.create(cr, uid, starting_vals, context=context)
             # update new register balance_start
-            balance = st_obj._get_starting_balance(cr, uid, [next_reg_id], context=context)[next_reg_id].get('balance_start', False)
+            # US-948: carry over CashBox Balance at confirm
+            #balance = st_obj._get_starting_balance(cr, uid, [next_reg_id], context=context)[next_reg_id].get('balance_start', False)
+            balance = st.balance_end_cash
             if balance:
                 st_obj.write(cr, uid, [next_reg_id], {'balance_start': balance}, context=context)
     return True