Merge lp:~unifield-team/unifield-wm/UFTP-130 into lp:unifield-wm

[jftempo]

[lp:~unifield-team/unifield-wm/UFTP-130]

2116. By Sean Carroll <sean@sean-msf> on 2014-04-16

UFTP-142:[FIX] report issues for all entries

2117. By Sean Carroll <sean@sean-msf> on 2014-04-17

UF-2370: [FIX] physical import fixed BM / ED issues

2118. By Sean Carroll <sean@sean-msf> on 2014-04-17

UFTP-148: [FIX] quantity loaded into uom field

Unmerged revisions

2118. By Sean Carroll <sean@sean-msf> on 2014-04-17

UFTP-148: [FIX] quantity loaded into uom field

2117. By Sean Carroll <sean@sean-msf> on 2014-04-17

UF-2370: [FIX] physical import fixed BM / ED issues

2116. By Sean Carroll <sean@sean-msf> on 2014-04-16

UFTP-142:[FIX] report issues for all entries

=== modified file 'account_mcdb/report/mcdb_result.py'
--- account_mcdb/report/mcdb_result.py	2014-01-10 17:16:09 +0000
+++ account_mcdb/report/mcdb_result.py	2014-04-17 14:22:37 +0000
@@ -35,9 +35,13 @@
 def getIds(self, cr, uid, ids, limit=5000, context=None):
     if not context:
         context = {}
-    if context.get('from_domain') and 'search_domain' in context and not context.get('export_selected'):
-        table_obj = pooler.get_pool(cr.dbname).get(self.table)
-        ids = table_obj.search(cr, uid, context.get('search_domain'), limit=limit)
+    #if context.get('from_domain') and 'search_domain' in context and not context.get('export_selected'):
+    if context.get('from_domain') and not context.get('export_selected'):
+        table_obj = pooler.get_pool(cr.dbname).get(context['active_model'])
+        if context.get('search_domain'):
+            ids = table_obj.search(cr, uid, context.get('search_domain'), limit=limit)
+        else:
+            ids = table_obj.search(cr, uid, [(True,'=',True)], limit=limit)
     return ids
 
 def getObjects(self, cr, uid, ids, context):
 
=== modified file 'finance/report/account_partner_balance_tree.py'
--- finance/report/account_partner_balance_tree.py	2014-03-14 15:47:48 +0000
+++ finance/report/account_partner_balance_tree.py	2014-04-17 14:22:37 +0000
@@ -210,6 +210,6 @@
     def create(self, cr, uid, ids, data, context=None):
         a = super(account_partner_balance_tree_xls, self).create(cr, uid, ids, data, context)
         return (a[0], 'xls')
-account_partner_balance_tree_xls('report.account.partner.balance.tree_xls', 'account.partner.balance.tree', 'account_override/report/account_partner_balance_tree_xls.mako', parser=account_partner_balance_tree, header='internal')
+account_partner_balance_tree_xls('report.account.partner.balance.tree_xls', 'account.partner.balance.tree', 'finance/report/account_partner_balance_tree_xls.mako', parser=account_partner_balance_tree, header='internal')
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'finance/wizard/account_report_partner_balance_tree.py'
--- finance/wizard/account_report_partner_balance_tree.py	2014-03-14 15:47:48 +0000
+++ finance/wizard/account_report_partner_balance_tree.py	2014-04-17 14:22:37 +0000
@@ -115,7 +115,7 @@
             query += "ac.type = '" + account_type + "'" \
             " AND am.state IN " + move_state + ""
         if where:
-            query += " AND " + where + ""
+            query += " AND " + where + "" 
         cr.execute(query)
         res = cr.fetchall()
         if res:
@@ -163,16 +163,20 @@
             context = {}
         context['data'] = data
         self._delete_previous_data(cr, uid, context=context)
+        
+        if type(data) is tuple:
+            data = data[0]
 
         comp_currency_id = self._get_company_currency(cr, uid, context=context)
         output_currency_id = data['form'].get('output_currency', comp_currency_id)
 
         res = self._execute_query_partners(cr, uid, data)
 
-        for r in res:
+        for r in res[0]:
             if not r.get('partner_name', False):
-                r.update({'partner_name': _('Unknown Partner')})
-
+                 partner_name = r['partner_name']
+                 r.update({'partner_name': _('Unknown Partner')})
+            #r = rs[0]
             vals = {
                 'uid': uid,
                 'build_ts': data['build_ts'],
@@ -397,7 +401,7 @@
         return {
             'type': 'ir.actions.report.xml',
             'report_name': 'account.partner.balance',
-            'datas': data,
+            'datas': data[0],
         }
 
     def print_xls(self, cr, uid, ids, context=None):
@@ -410,7 +414,7 @@
         return {
             'type': 'ir.actions.report.xml',
             'report_name': 'account.partner.balance.tree_xls',
-            'datas': data,
+            'datas': data[0],
         }
 
     def remove_journals(self, cr, uid, ids, context=None):
 
=== modified file 'msf_doc_import/check_line.py'
--- msf_doc_import/check_line.py	2014-04-08 12:50:14 +0000
+++ msf_doc_import/check_line.py	2014-04-17 14:22:37 +0000
@@ -334,7 +334,7 @@
     uom_id = kwargs['to_write'].get('uom_id', False)
     # The tender line may have a default UOM if it is not found
     obj_data = kwargs['obj_data']
-    cell_nb = kwargs.get('cell_nb', 4)
+    cell_nb = kwargs.get('cell_nb', 3)
     msg = ''
     try:
         if row.cells[cell_nb] and row.cells[cell_nb].data is not None:
 
=== modified file 'msf_doc_import/initial_stock_inventory.py'
--- msf_doc_import/initial_stock_inventory.py	2014-01-14 16:46:36 +0000
+++ msf_doc_import/initial_stock_inventory.py	2014-04-17 14:22:37 +0000
@@ -250,7 +250,7 @@
                 product = product_obj.browse(cr, uid, product_id)
                 product_uom = product.uom_id.id
                 hidden_batch_management_mandatory = product.batch_management
-                hidden_perishable_mandatory = product.perishable and not product.batch_management
+                hidden_perishable_mandatory = product.perishable 
                 if hidden_batch_management_mandatory and not batch:
                     comment += _('Batch is missing.\n')
                 if hidden_perishable_mandatory and not expiry:
 
=== modified file 'msf_doc_import/wizard/wizard_import_picking_line.py'
--- msf_doc_import/wizard/wizard_import_picking_line.py	2013-11-20 09:07:13 +0000
+++ msf_doc_import/wizard/wizard_import_picking_line.py	2014-04-17 14:22:37 +0000
@@ -231,7 +231,7 @@
                                                                                 date_format=date_format,
                                                                                 product_id=to_write.get('product_id'),)
                             to_write.update({'prodlot_id': batch_value['prodlot_id'],
-                                             'expired_date': batch_value['expired_date'],
+                                             'expiry_date': batch_value['expiry_date'],
                                              'error_list': batch_value['error_list']})
 
 
 
=== modified file 'stock_override/stock_view.xml'
--- stock_override/stock_view.xml	2014-04-04 15:15:56 +0000
+++ stock_override/stock_view.xml	2014-04-17 14:22:37 +0000
@@ -1005,7 +1005,7 @@
                     <field name="name" attrs="{'readonly': [('state', '!=', 'draft')]}"/>
                     <field name="date" attrs="{'readonly': [('state', '!=', 'draft')]}"/>
                     <notebook colspan="4">
-                    <page string="General Informations">
+                    <page string="General Information">
                         <field colspan="4" name="inventory_line_id" nolabel="1" widget="one2many_list"  attrs="{'readonly': [('state', '!=', 'draft')]}">
                             <tree string="Products" editable="bottom" colors="red: has_problem == True">
                                 <field colspan="4" domain="[('usage','=','internal')]" name="location_id" required="True"