Merge lp:~mukunde/unifield-server/US-9357 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/account_override/account_invoice_view.xml'
--- bin/addons/account_override/account_invoice_view.xml	2022-03-18 10:34:15 +0000
+++ bin/addons/account_override/account_invoice_view.xml	2022-07-04 14:56:21 +0000
@@ -164,7 +164,7 @@
             <field name="arch" type="xml">
                 <form string="In-kind Donation" noteditable="state=='cancel'">
                     <group colspan="4" col="8">
-                        <field name="journal_id" domain="[('inv_doc_type', '=', True), ('is_active', '=', True)]"/>
+                        <field name="journal_id" domain="[('inv_doc_type', '=', True), ('is_active', '=', True), ('code', '=', 'IKD')]"/>
                         <field name="number"/>
                         <field name="type" invisible="1"/>
                         <field name="is_inkind_donation" invisible="1"/>
@@ -618,7 +618,7 @@
                     </group>
                     <newline/>
                     <group col="8" colspan="4">
-                        <field name="journal_id" select='1' context="{'search_default_filter_is_active': 1}"/>
+                        <field name="fiscalyear_id" select='1'/>
                         <field name="period_id" select='1' string="Period" domain="[('state', 'not in', ['done', 'created'])]"/>
                         <field name="name"/>
                         <field name="amount_total"/>
@@ -646,7 +646,7 @@
             <field name="view_mode">tree,form,calendar,graph</field>
             <field eval="False" name="view_id"/>
             <field name="domain">[('doc_type', '=', 'donation')]</field>
-            <field name="context">{'doc_type': 'donation', 'type': 'in_invoice', 'journal_type': 'inkind', 'is_inkind_donation': '1', 'from_inv_form': True, 'search_default_draft': 1, 'search_default_open': 1}</field>
+            <field name="context">{'doc_type': 'donation', 'type': 'in_invoice', 'journal_type': 'inkind', 'is_inkind_donation': '1', 'from_inv_form': True, 'search_default_draft': 1, 'search_default_open': 0}</field>
             <field name="search_view_id" ref="view_account_invoice_filter_donation"/>
         </record>
 
 
=== modified file 'bin/addons/account_override/invoice.py'
--- bin/addons/account_override/invoice.py	2022-06-01 07:23:33 +0000
+++ bin/addons/account_override/invoice.py	2022-07-04 14:56:21 +0000
@@ -395,6 +395,34 @@
             dom = ['|', ('state', '=', 'draft'), '&', ('state', '=', 'cancel'), ('date_invoice', '=', False)]
         return dom
 
+    def _get_fiscalyear(self, cr, uid, ids, field_name=None, arg=None, context=None):
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        res = {}
+        fy_obj = self.pool.get('account.fiscalyear')
+        for inv in self.browse(cr, uid, ids, fields_to_fetch=['date_invoice'], context=context):
+            fy_id = fy_obj.search(cr, uid, [('date_start', '<=', inv.date_invoice), ('date_stop', '>=', inv.date_invoice)], context=context)[0]
+            if fy_id:
+                res[inv.id] = fy_id
+        return res
+
+    def _get_search_by_fiscalyear(self, cr, uid, obj=None, name=None, args=None, context=None):
+        if not args:
+            return []
+        if not args[0] or len(args[0]) < 3 or args[0][1] != '=':
+            raise osv.except_osv(_('Error'), _('Filter not implemented yet.'))
+        if context is None:
+            context = {}
+        fy_obj = self.pool.get('account.fiscalyear')
+        dom = []
+        if args[0][1] == '=' and args[0][2]:
+            fy_id = args[0][2]
+            fy = fy_obj.browse(cr, uid, fy_id, fields_to_fetch=['date_start', 'date_stop'], context=context)
+            dom = [('date_invoice', '>=', fy.date_start), ('date_invoice', '<=', fy.date_stop)]
+        return dom
+
     _columns = {
         'sequence_id': fields.many2one('ir.sequence', string='Lines Sequence', ondelete='cascade',
                                        help="This field contains the information related to the numbering of the lines of this order."),
@@ -436,6 +464,7 @@
                                     string='Document Type', store=False, fnct_search=_search_doc_type),
         'open_fy': fields.function(_get_fake, method=True, type='boolean', string='Open Fiscal Year', store=False,
                                    fnct_search=_search_open_fy),
+        'fiscalyear_id': fields.function(_get_fiscalyear, fnct_search=_get_search_by_fiscalyear, type='many2one', obj='account.fiscalyear', method=True, store=False, string='Fiscal year', readonly=True),
     }
 
     _defaults = {