Merge lp:~unifield-team/unifield-web/UF_659_real_sum into lp:unifield-web

[jftempo]

[lp:~unifield-team/unifield-web/UF_659_real_sum]

4585. By Matthieu Dietrich <mdietrich@chloups211> on 2011-12-28

UF-659: [IMP] merge with current unifield-web

4586. By Matthieu Dietrich <mdietrich@chloups211> on 2011-12-28

UF-659: [IMP] merge with UF_536

4587. By Matthieu Dietrich <mdietrich@chloups211> on 2011-12-29

removed UF_536 for the time being

=== modified file 'addons/openerp/widgets/listgrid.py'
--- addons/openerp/widgets/listgrid.py	2011-11-28 16:19:08 +0000
+++ addons/openerp/widgets/listgrid.py	2011-12-29 10:44:27 +0000
@@ -41,12 +41,13 @@
     template = "/openerp/widgets/templates/listgrid/listgrid.mako"
     params = ['name', 'data', 'columns', 'headers', 'model', 'selectable', 'editable', 'noteditable', 
               'pageable', 'selector', 'source', 'offset', 'limit', 'show_links', 'editors', 'view_mode',
-              'hiddens', 'edit_inline', 'field_total', 'link', 'checkbox_name', 'm2m', 'min_rows', 'string', 'o2m', 'dashboard', 'impex', 'hide_new_button', 'hide_delete_button']
+              'hiddens', 'edit_inline', 'field_total', 'field_real_total', 'link', 'checkbox_name', 'm2m', 'min_rows', 'string', 'o2m', 'dashboard', 'impex', 'hide_new_button', 'hide_delete_button']
 
     member_widgets = ['pager', 'buttons', 'editors', 'concurrency_info']
 
     pager = None
     field_total = {}
+    field_real_total = {}
     editors = {}
     hiddens = []
     buttons = []
@@ -207,11 +208,15 @@
             data = kw['default_data']
 
         self.values = copy.deepcopy(data)
-        self.headers, self.hiddens, self.data, self.field_total, self.buttons = self.parse(root, fields, data)
+        self.headers, self.hiddens, self.data, self.field_total, self.field_real_total, self.buttons = self.parse(root, fields, data)
         
         for k, v in self.field_total.items():
             if(len([test[0] for test in self.hiddens if test[0] == k])) <= 0:
                 self.field_total[k][1] = self.do_sum(self.data, k)
+                
+        for k, v in self.field_real_total.items():
+            if(len([test[0] for test in self.hiddens if test[0] == k])) <= 0:
+                self.field_real_total[k][1] = self.do_real_sum(self.data, k)
 
         self.columns = len(self.headers)
 
@@ -277,6 +282,27 @@
         integer, digit = digits
         return format.format_decimal(sum or 0.0, digit)
 
+    def do_real_sum(self, data, field):
+        sum = 0.0
+
+        for d in data:
+            if d['line_type'].value != 'view':
+                value = d[field].value
+                sum += value
+
+        attrs = {}
+        if data:
+            d = data[0]
+            attrs = d[field].attrs
+
+        digits = attrs.get('digits', (16,2))
+        if isinstance(digits, basestring):
+            digits = eval(digits)
+
+        integer, digit = digits
+        return format.format_decimal(sum or 0.0, digit)
+
+
     def display(self, value=None, **params):
 
         # set editor values
@@ -354,6 +380,7 @@
         buttons = []
 
         field_total = {}
+        field_real_total = {}
         values  = [row.copy() for row in data]
 
         myfields = [] # check for duplicate fields
@@ -416,6 +443,9 @@
 
                     if 'sum' in attrs:
                         field_total[name] = [attrs['sum'], 0.0]
+                        
+                    if 'real_sum' in attrs:
+                        field_real_total[name] = [attrs['real_sum'], 0.0]
 
                     for i, row in enumerate(data):
                         row_value = values[i]
@@ -440,7 +470,7 @@
 
                     headers += [(name, fields[name])]
 
-        return headers, hiddens, data, field_total, buttons
+        return headers, hiddens, data, field_total, field_real_total, buttons
 
 class Char(TinyWidget):
     template = "/openerp/widgets/templates/listgrid/char.mako"

=== modified file 'addons/openerp/widgets/templates/listgrid/listgrid.mako'
--- addons/openerp/widgets/templates/listgrid/listgrid.mako	2011-11-23 16:17:27 +0000
+++ addons/openerp/widgets/templates/listgrid/listgrid.mako	2011-12-29 10:44:27 +0000
@@ -278,7 +278,7 @@
                                 </tr>
                             % endfor
                         </tbody>
-                        % if field_total:
+                        % if field_total or field_real_total:
                             <tfoot>
                                 <tr class="field_sum">
                                     % if selector:
@@ -298,6 +298,12 @@
                                                             <span class="sum_value_field" id="${field}">${val[1]}</span>
                                                         % endif
                                                     % endfor
+                                                % elif 'real_sum' in field_attrs:
+                                                    % for key, val in field_real_total.items():
+                                                        % if field == key:
+                                                            <span class="sum_value_field" id="${field}">${val[1]}</span>
+                                                        % endif
+                                                    % endfor
                                                 % else:
                                                     &nbsp;
                                                 % endif