Merge lp:~unifield-team/unifield-wm/bklg-7 into lp:unifield-wm

[jftempo]

[lp:~unifield-team/unifield-wm/bklg-7]

2380. By Vincent GREINER on 2015-02-05

BKLG-7 [FIX] tools translate import was missing

2381. By Vincent GREINER on 2015-02-05

BKLG-7 [FIX] AJI m2o search field partner/emp tolerated ilike operator (as is default operator in search view) (but use internally = as m2o widget will display adoc value to search

2382. By Vincent GREINER on 2015-02-06

BKLG-7 [FIX] AJI third party search: manage ilike AND '=' search

2383. By Vincent GREINER on 2015-02-06

BKLG-7 [IMP] AJI search of third-party partner/emp: at project level if no third party m2o in AJI (sync case) only search the third-party non typed via partner_txt field

2384. By Vincent GREINER on 2015-02-09

BKLG-7 [FIX] AJI third party search, allow to search in partner_txt at project level when ilike operator is used

2385. By Vincent GREINER on 2015-02-09

BKLG-7 [FIX] AJI third party search, allow to search in partner_txt at project level when ilike operator is used

Unmerged revisions

2385. By Vincent GREINER on 2015-02-09

BKLG-7 [FIX] AJI third party search, allow to search in partner_txt at project level when ilike operator is used

2384. By Vincent GREINER on 2015-02-09

BKLG-7 [FIX] AJI third party search, allow to search in partner_txt at project level when ilike operator is used

2383. By Vincent GREINER on 2015-02-06

BKLG-7 [IMP] AJI search of third-party partner/emp: at project level if no third party m2o in AJI (sync case) only search the third-party non typed via partner_txt field

2382. By Vincent GREINER on 2015-02-06

BKLG-7 [FIX] AJI third party search: manage ilike AND '=' search

2381. By Vincent GREINER on 2015-02-05

BKLG-7 [FIX] AJI m2o search field partner/emp tolerated ilike operator (as is default operator in search view) (but use internally = as m2o widget will display adoc value to search

2380. By Vincent GREINER on 2015-02-05

BKLG-7 [FIX] tools translate import was missing

2379. By Vincent GREINER on 2015-01-29

BKLG-7 [FIX] AJI search view: analytical selector no journal search as internal transfer accounts have no AD

2378. By Vincent GREINER on 2015-01-29

BKLG-7 [IMP] AJI search view: partner and employee search fields (by third-party type)

2377. By Vincent GREINER on 2015-01-29

BKLG-7 [IMP] Analytical selector: AJI employee search field (as with partner_txt field we have not the third party type)

2376. By Vincent GREINER on 2015-01-29

BKLG-7 [IMP] Analytical selector: AJI partner search field from JI (as with partner_txt field we have not the partner type)

=== modified file 'account_mcdb/account_analytic_line.py'
--- account_mcdb/account_analytic_line.py	2014-04-15 08:35:03 +0000
+++ account_mcdb/account_analytic_line.py	2015-02-09 14:04:19 +0000
@@ -25,6 +25,7 @@
 from osv import fields
 from time import strftime
 from lxml import etree
+from tools.translate import _
 
 class account_analytic_line(osv.osv):
     _name = 'account.analytic.line'
@@ -69,6 +70,104 @@
             # or output_currency field
             res[ml.id]['output_currency'] = currency_id
         return res
+        
+    def _get_cheque_number(self, cr, uid, ids, name, args, context=None):
+        res = {}
+        if not ids:
+            return res
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        for self_br in self.browse(cr, uid, ids, context=context):
+            res[self_br.id] = self_br.move_id and \
+                self_br.move_id.cheque_number or ''
+        return res
+        
+    def _search_check_args(self, args, operators):
+        """
+        check domain for selector search fields
+        domain should have only 1 tuple element
+        :param args: search field domain to check
+        :type args: list
+        :param operators: allowed operator(s)
+        :type operators: str/list
+        """
+        if not len(args):
+            return []
+        if len(args) != 1:
+            msg = _("Domain %s not suported") % (str(args), )
+            raise osv.except_osv(_('Error'), msg)
+        if isinstance(operators, str):
+            operators = [operators]
+        if args[0][1] not in operators:
+            msg = _("Operator '%s' not suported") % (args[0][1], )
+            raise osv.except_osv(_('Error'), msg)
+        if not args[0][2]:
+            return []
+        return True
+        
+    def _search_cheque_number(self, cr, uid, ids, name, args, context=None):
+        operator = 'ilike'
+        args_check = self._search_check_args(args, [operator])
+        if not args_check:
+            return args_check
+        m_ids = self.pool.get('account.move.line').search(cr, uid,
+            [('cheque_number', operator, args[0][2])], context=context)
+        return [('move_id', 'in', m_ids)] if m_ids else [('id', 'in', [])]
+        
+    def _get_fake(self, cr, uid, ids, name, args, context=None):
+        res = {}
+        if not ids:
+            return res
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        for id in ids:
+            res[id] = False
+        return res
+        
+    def _search_third_party(self, cr, uid, model, foreign_key, args,
+        context=None):
+        args_check = self._search_check_args(args, ['ilike', '='])
+        if not args_check:
+            return args_check
+            
+        operator = args[0][1]
+        # search for matching ilike third party
+        if operator == 'ilike':
+            # search operand <=> text search
+            tp_ids = self.pool.get(model).search(cr, uid,
+                [('name', operator, args[0][2])], context=context)
+        else:
+            # = operator: search operand <=> third party id
+            tp_ids = [args[0][2], ]  # search operand <=> text search
+         
+        m_ids = False
+        if tp_ids:
+            m_ids = self.pool.get('account.move.line').search(cr, uid,
+                [(foreign_key, 'in', tp_ids)], context=context)
+        if not tp_ids or not m_ids:
+            # at project level, search by partner_txt field as AJI could have
+            # no thirdparty m2o link by sync (only partner_txt)
+            if self.pool.get('res.users').browse(cr, uid, [uid], 
+                context=context)[0].company_id.instance_id.level == 'project':
+                if operator == 'ilike':
+                    name = args[0][2]
+                else:
+                    # operator '=': get name from id
+                    model_r = self.pool.get(model).read(cr, uid, [args[0][2]],
+                        ['name'], context=context)[0]
+                    if model_r and model_r['name']:
+                        name = model_r['name']
+                if name:
+                    return [('partner_txt', operator, name)]
+        return [('move_id', 'in', m_ids)] if m_ids else [('id', 'in', [])]
+        
+    def _search_partner_id(self, cr, uid, ids, name, args, context=None):
+        return self._search_third_party(cr, uid, 'res.partner', 'partner_id',
+            args, context=context)
+        
+    def _search_employee_id(self, cr, uid, ids, name, args, context=None):
+        return self._search_third_party(cr, uid, 'hr.employee', 'employee_id',
+            args, context=context)
 
     _columns = {
         'output_amount': fields.function(_get_output, string="Output amount", type='float', method=True, store=False, multi="analytic_output_currency"),
@@ -76,6 +175,20 @@
         'output_amount_credit': fields.function(_get_output, string="Output credit", type='float', method=True, store=False, multi="analytic_output_currency"),
         'output_currency': fields.function(_get_output, string="Output curr.", type='many2one', relation='res.currency', method=True, store=False,
             multi="analytic_output_currency"),
+        # BKLG-7: selector move cheque number search and value
+        'cheque_number': fields.function(_get_cheque_number, type='char',
+            method=True, string='Cheque Number',
+            fnct_search=_search_cheque_number),
+        # BKLG-7: selector move third-party partner search
+        'partner_id': fields.function(_get_fake,
+            type='many2one', relation='res.partner',
+            method=True, string='Partner',
+            fnct_search=_search_partner_id),
+        # BKLG-7: selector move third-party employee search
+        'employee_id': fields.function(_get_fake,
+            type='many2one', relation='hr.employee',
+            method=True, string='Employee',
+            fnct_search=_search_employee_id),
     }
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
@@ -91,6 +204,28 @@
                 for field in element_fields:
                     tree.remove(field)
             view['arch'] = etree.tostring(tree)
+            
+        if view_type == 'tree' and \
+            context.get('selector_display_cheque_number', False):
+            # BKLG-7: cheque_number used in analytic selector: display it
+            view['fields']['cheque_number'] = {
+                'function': '_get_cheque_number',
+                'fnct_search': '_search_cheque_number',
+                'type': 'char',
+                'string': 'Cheque Number',
+            }
+            
+            tree = etree.fromstring(view['arch'])
+            
+            cheque_number_node = etree.Element('field', attrib={
+                'name': 'cheque_number',
+            })
+            # insert it after entry sequence
+            es_node = tree.find('.//field[@name="entry_sequence"]')
+            tree.insert(es_node.getparent().index(es_node) + 1,
+                cheque_number_node)
+            
+            view['arch'] = etree.tostring(tree)
         return view
 
     def copy(self, cr, uid, id, default=None, context=None):

=== modified file 'account_mcdb/account_mcdb.py'
--- account_mcdb/account_mcdb.py	2014-04-15 08:15:35 +0000
+++ account_mcdb/account_mcdb.py	2015-02-09 14:04:19 +0000
@@ -103,6 +103,7 @@
         'display_free1': fields.boolean('Display Free 1?'),
         'display_free2': fields.boolean('Display Free 2?'),
         'user': fields.many2one('res.users', "User"),
+        'cheque_number': fields.char('Cheque Number', size=120),  # BKLG-7
     }
 
     _defaults = {
@@ -303,9 +304,11 @@
                     domain.append((m2o[1], '=', getattr(wiz, m2o[0]).id))
             # Finally others fields
             # LOOKS LIKE fields
-            for ll in [('ref', 'ref'), ('name', 'name')]:
+            for ll in [('ref', 'ref'), ('name', 'name'), ('cheque_number', 'cheque_number')]:
                 if getattr(wiz, ll[0]):
                     domain.append((ll[1], 'ilike', '%%%s%%' % getattr(wiz, ll[0])))
+                    if ll[0] == 'cheque_number':
+                        context['selector_display_cheque_number'] = True
             # DOCUMENT CODE fields
             if wiz.document_code and wiz.document_code != '':
                 document_code_field = 'move_id.name'

=== modified file 'account_mcdb/account_mcdb_view.xml'
--- account_mcdb/account_mcdb_view.xml	2014-04-15 08:42:57 +0000
+++ account_mcdb/account_mcdb_view.xml	2015-02-09 14:04:19 +0000
@@ -286,6 +286,11 @@
                     <field name="reallocated" colspan="2"/>
                     <field name="reversed" colspan="2"/>
                     &currency;
+                    <group colspan="4" col="6">
+                        <separator string="Third Party" colspan="6"/>
+                        <field name="partner_id" colspan="2"/>
+                        <field name="employee_id" colspan="2" context="{'disrupt_inactive': True}"/>
+                    </group>
                     &end;
                 </form>
             </field>

=== modified file 'account_mcdb/account_move_line.py'
--- account_mcdb/account_move_line.py	2014-09-19 09:51:58 +0000
+++ account_mcdb/account_move_line.py	2015-02-09 14:04:19 +0000
@@ -122,6 +122,26 @@
                 for field in element_fields:
                     tree.remove(field)
             view['arch'] = etree.tostring(tree)
+            
+        if view_type == 'tree' and \
+            context.get('selector_display_cheque_number', False):
+            # BKLG-7: cheque_number used in G/L selector: display it
+            view['fields']['cheque_number'] = {
+                'type': 'char',
+                'string': 'Cheque Number',
+            }
+            
+            tree = etree.fromstring(view['arch'])
+            
+            cheque_number_node = etree.Element('field', attrib={
+                'name': 'cheque_number',
+            })
+            # insert it after entry sequence
+            es_node = tree.find('.//field[@name="move_id"]')
+            tree.insert(es_node.getparent().index(es_node) + 1,
+                cheque_number_node)
+            
+            view['arch'] = etree.tostring(tree)
         return view
 
 account_move_line()

=== modified file 'account_mcdb/mcdb_view_end.xml'
--- account_mcdb/mcdb_view_end.xml	2012-03-21 17:48:57 +0000
+++ account_mcdb/mcdb_view_end.xml	2015-02-09 14:04:19 +0000
@@ -1,6 +1,7 @@
                     <separator string="Others" colspan="4"/>
                     <field name="ref"/>
                     <field name="name"/>
+                    <field name="cheque_number"/>
                     <separator string=" " colspan="4"/>
                     <button name="button_clear" type="object" string="Clear" icon="gtk-clear" colspan="2"/>
                     <button name="button_validate" type="object" string="Search" icon="gtk-find" colspan="2"/>

=== modified file 'analytic_distribution/analytic_line_view.xml'
--- analytic_distribution/analytic_line_view.xml	2014-01-14 17:29:00 +0000
+++ analytic_distribution/analytic_line_view.xml	2015-02-09 14:04:19 +0000
@@ -37,6 +37,9 @@
                         <field name="cost_center_id" invisible="not context.get('display_fp', False)"/>
                         <field name="account_id" domain="[('category', '=', context.get('categ', False) and context.get('categ') or 'FUNDING'), ('type', '!=', 'view')]"/>
                         <field name="is_reallocated"/>
+                        <newline/>
+                        <field name="partner_id"/>
+                        <field name="employee_id"/>
                     </xpath>
                     <xpath expr="/search/group[1]/field[@name='name']" position='after'>
                         <field name="ref"/>