Merge lp:~julie-w/unifield-server/US-2391 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/account_override/account_invoice_view.xml'
--- bin/addons/account_override/account_invoice_view.xml	2017-05-22 16:04:34 +0000
+++ bin/addons/account_override/account_invoice_view.xml	2017-07-04 09:20:51 +0000
@@ -362,7 +362,10 @@
                         <field name="currency_id" width="50"/>
                         <button name="%(account.action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" />
                         <newline/>
-                        <field string="Donor" name="partner_id" domain="[('supplier', '=', True)]" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id, is_inkind_donation)" context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"/>
+                        <field string="Donor" name="partner_id"
+                               domain="[('supplier', '=', True), ('partner_type', 'in', ['external', 'section', 'esc'])]"
+                               on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id, is_inkind_donation)"
+                               context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"/>
                         <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id" string="Address"/>
                         <newline/>
                         <field name="document_date"/>
 
=== modified file 'bin/addons/finance/stock.py'
--- bin/addons/finance/stock.py	2014-03-17 10:45:24 +0000
+++ bin/addons/finance/stock.py	2017-07-04 09:20:51 +0000
@@ -86,7 +86,10 @@
             invoice_vals['date_invoice'] = time.strftime('%Y-%m-%d',time.localtime())
         journal_ids = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'inkind'),
                                                                         ('is_current_instance', '=', True)])
-        if picking and picking.purchase_id and picking.purchase_id.order_type == "in_kind":
+        # From US-2391 Donations before expiry and Standard donations linked to an intersection partner generate a Donation
+        donation_intersection = picking and picking.purchase_id and picking.purchase_id.order_type in ['donation_exp', 'donation_st'] \
+                                and picking.partner_id and picking.partner_id.partner_type == 'section'
+        if picking and picking.purchase_id and picking.purchase_id.order_type == "in_kind" or donation_intersection:
             if not journal_ids:
                 raise osv.except_osv(_('Error'), _('No In-kind donation journal found!'))
             account_id = picking.partner_id and picking.partner_id.donation_payable_account and picking.partner_id.donation_payable_account.id or False
 
=== modified file 'bin/addons/purchase_override/purchase.py'
--- bin/addons/purchase_override/purchase.py	2017-06-14 12:52:39 +0000
+++ bin/addons/purchase_override/purchase.py	2017-07-04 09:20:51 +0000
@@ -809,7 +809,9 @@
         for order in self.read(cr, uid, ids, ['partner_id', 'warehouse_id'], context=context):
             partner_type = res_partner_obj.read(cr, uid, vals.get('partner_id', order['partner_id'][0]), ['partner_type'], context=context)['partner_type']
             if vals.get('order_type'):
-                if vals.get('order_type') in ['donation_exp', 'donation_st', 'loan']:
+                if vals.get('order_type') in ['donation_exp', 'donation_st']:
+                    vals.update({'invoice_method': partner_type == 'section' and 'picking' or 'manual'})
+                elif vals.get('order_type') == 'loan':
                     vals.update({'invoice_method': 'manual'})
                 elif vals.get('order_type') in ['direct',] and partner_type != 'esc':
                     vals.update({'invoice_method': 'order'})
@@ -846,6 +848,7 @@
 #        d = {'partner_id': []}
         w = {}
         local_market = None
+        partner = partner_id and partner_obj.read(cr, uid, partner_id, ['partner_type']) or False
 
         if ids:
             order_types_dict = dict((x, y) for x, y in ORDER_TYPES_SELECTION)
@@ -903,7 +906,9 @@
                         'warning': {'title': 'Error',
                                     'message': 'The Field orders feature is not activated on your system, so, you cannot create a Loan Purchase Order !'}}
 
-        if order_type in ['donation_exp', 'donation_st', 'loan']:
+        if order_type in ['donation_exp', 'donation_st']:
+            v['invoice_method'] = partner and partner['partner_type'] == 'section' and 'picking' or 'manual'
+        elif order_type == 'loan':
             v['invoice_method'] = 'manual'
         elif order_type in ['direct']:
             v['invoice_method'] = 'order'
@@ -923,8 +928,7 @@
             cp_address_id = self.pool.get('res.partner').address_get(cr, uid, company_id, ['delivery'])['delivery']
             v.update({'dest_address_id': cp_address_id, 'dest_partner_id': company_id})
 
-        if partner_id and partner_id != local_market:
-            partner = partner_obj.read(cr, uid, partner_id, ['partner_type'])
+        if partner and partner_id != local_market:
             if partner['partner_type'] in ('internal', 'esc') and order_type in ('regular', 'direct'):
                 v['invoice_method'] = 'manual'
             elif partner['partner_type'] not in ('external', 'esc') and order_type == 'direct':
@@ -1100,7 +1104,9 @@
             except ValueError:
                 intermission_cc = 0
 
-            if po.order_type == 'in_kind' and not po.partner_id.donation_payable_account:
+            donation_intersection = po.order_type in ['donation_exp', 'donation_st'] and po.partner_type \
+                                    and po.partner_type == 'section'
+            if po.order_type == 'in_kind' or donation_intersection:
                 if not po.partner_id.donation_payable_account:
                     raise osv.except_osv(_('Error'), _('No donation account on this partner: %s') % (po.partner_id.name or '',))
 
@@ -2224,8 +2230,11 @@
             todo3 = []
             todo4 = {}
             to_invoice = set()
-            if order.partner_id.partner_type in ('internal', 'esc') and order.order_type == 'regular' or \
-                    order.order_type in ['donation_exp', 'donation_st', 'loan']:
+            regular_internal_esc = order.order_type == 'regular' and order.partner_id.partner_type in ('internal', 'esc')
+            loan = order.order_type == 'loan'
+            donation_not_intersection = order.order_type in ['donation_exp', 'donation_st'] \
+                                        and order.partner_id.partner_type != 'section'
+            if regular_internal_esc or loan or donation_not_intersection:
                 self.write(cr, uid, [order.id], {'invoice_method': 'manual'})
                 line_obj.write(cr, uid, [x.id for x in order.order_line], {'invoiced': 1})
 
@@ -2579,7 +2588,9 @@
             context = {}
 
         if vals.get('order_type'):
-            if vals.get('order_type') in ['donation_exp', 'donation_st', 'loan']:
+            if vals.get('order_type') in ['donation_exp', 'donation_st']:
+                vals.update({'invoice_method': vals.get('partner_type', '') == 'section' and 'picking' or 'manual'})
+            elif vals.get('order_type') == 'loan':
                 vals.update({'invoice_method': 'manual'})
             elif vals.get('order_type') in ['direct']:
                 vals.update({'invoice_method': 'order'})