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

[jftempo]

[lp:~mukunde/unifield-server/US-10105]

6279. By Gaël Mukunde on 2022-08-17

US-10105 [IMP] Fix Direct Invoice blocking pop up

=== modified file 'bin/addons/account/account_invoice_view.xml'
--- bin/addons/account/account_invoice_view.xml	2022-04-27 14:25:25 +0000
+++ bin/addons/account/account_invoice_view.xml	2022-08-17 15:43:09 +0000
@@ -164,6 +164,7 @@
                     <field name="residual" />
                     <field name="amount_total"/>
                     <field name="state"/>
+                    <field name="order_val" invisible="1"/>
                     <button name="invoice_open" states="draft,proforma2" type="object" string="Approve" icon="terp-camera_test"/>
                 </tree>
             </field>

=== modified file 'bin/addons/account/invoice.py'
--- bin/addons/account/invoice.py	2022-07-12 16:11:39 +0000
+++ bin/addons/account/invoice.py	2022-08-17 15:43:09 +0000
@@ -30,6 +30,8 @@
 from base import currency_date
 from tools.safe_eval import safe_eval
 
+from datetime import datetime
+
 class account_invoice(osv.osv):
     def _amount_all(self, cr, uid, ids, name, args, context=None):
         res = {}
@@ -243,7 +245,7 @@
 
     _name = "account.invoice"
     _description = 'Invoice'
-    _order = "id desc"
+    _order = 'order_val desc, date_invoice desc, number desc'
 
     _columns = {
         'name': fields.char('Description', size=256, select=True, readonly=True, states={'draft': [('readonly', False)]}),
@@ -343,7 +345,8 @@
                                                   type='many2many', string='Payments', store=False),
         'move_name': fields.char('Journal Entry', size=64, readonly=True, states={'draft':[('readonly',False)]}),
         'user_id': fields.many2one('res.users', 'Salesman', readonly=True, states={'draft':[('readonly',False)]}),
-        'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position', readonly=True, states={'draft':[('readonly',False)]})
+        'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position', readonly=True, states={'draft':[('readonly',False)]}),
+        'order_val': fields.date("Custom sort field"),  # US-10105
     }
     _defaults = {
         'type': _get_type,
@@ -456,6 +459,9 @@
     def create(self, cr, uid, vals, context=None):
         if context is None:
             context = {}
+        date_invoice = 'date_invoice' in vals and vals['date_invoice'] or datetime.today()
+        if date_invoice:
+            vals.update({'order_val': date_invoice, })  # US-10105 At creation of draft invoice
         try:
             res = super(account_invoice, self).create(cr, uid, vals, context)
             for inv_id, name in self.name_get(cr, uid, [res], context=context):
@@ -480,6 +486,26 @@
             else:
                 raise orm.except_orm(_('Unknown Error'), str(e))
 
+    def write(self, cr, uid, ids, vals, context=None):
+        """
+        Check document_date
+        """
+        if not ids:
+            return True
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        current_values = self.read(cr, uid, ids, ['date_invoice'], context=context)[0]
+        date_invoice = 'date_invoice' in vals and vals['date_invoice'] or current_values['date_invoice']
+        if date_invoice:
+            if 'state' in vals and vals['state'] == 'draft':
+                vals.update({'order_val': date_invoice })  # US-10105 At creation of draft invoice
+            elif 'state' in vals and vals['state'] != 'draft':
+                vals.update({'order_val': '1901-01-01'})
+        res = super(account_invoice, self).write(cr, uid, ids, vals, context=context)
+        return res
+
     def confirm_paid(self, cr, uid, ids, context=None):
         if context is None:
             context = {}

=== 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-08-17 15:43:09 +0000
@@ -52,6 +52,7 @@
                     <field name="residual"/>
                     <field name="amount_total"/>
                     <field name="state"/>
+                    <field name="order_val" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -151,6 +152,7 @@
                     <field name="currency_id"/>
                     <field name="amount_total"/>
                     <field name="state"/>
+                    <field name="order_val" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -314,6 +316,7 @@
                     <field name="currency_id"/>
                     <field name="amount_total"/>
                     <field name="state"/>
+                    <field name="order_val" invisible="1"/>
                 </tree>
             </field>
         </record>

=== modified file 'bin/addons/msf_profile/data/patches.xml'
--- bin/addons/msf_profile/data/patches.xml	2022-08-05 15:36:47 +0000
+++ bin/addons/msf_profile/data/patches.xml	2022-08-17 15:43:09 +0000
@@ -803,6 +803,7 @@
         <record id="fix_us_10163_ocbhq_funct_amount" model="patch.scripts">
             <field name="method">fix_us_10163_ocbhq_funct_amount</field>
         </record>
+<<<<<<< TREE
 
         <record id="us_8428_pi_type_migration" model="patch.scripts">
             <field name="method">us_8428_pi_type_migration</field>
@@ -811,5 +812,11 @@
         <record id="us_9229_fix_rt" model="patch.scripts">
             <field name="method">us_9229_fix_rt</field>
         </record>
+=======
+
+        <record id="us_10105_custom_order" model="patch.scripts">
+            <field name="method">us_10105_custom_order</field>
+        </record>
+>>>>>>> MERGE-SOURCE
     </data>
 </openerp>

=== modified file 'bin/addons/msf_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py	2022-08-05 15:36:47 +0000
+++ bin/addons/msf_profile/msf_profile.py	2022-08-17 15:43:09 +0000
@@ -56,6 +56,11 @@
         'model': lambda *a: 'patch.scripts',
     }
 
+    def us_10105_custom_order(self, cr, uid, *a, **b):
+        cr.execute("update account_invoice set order_val='1901-01-01' where state != 'draft'")
+        cr.execute("update account_invoice set order_val=date_invoice where state = 'draft'")
+        return True
+
     # UF26.0
     def fix_us_10163_ocbhq_funct_amount(self, cr, uid, *a, **b):
         ''' OCBHQ: fix amounts on EOY-2021-14020-OCBVE101-VES'''

=== modified file 'bin/addons/register_accounting/account_invoice_view.xml'
--- bin/addons/register_accounting/account_invoice_view.xml	2022-02-04 17:27:59 +0000
+++ bin/addons/register_accounting/account_invoice_view.xml	2022-08-17 15:43:09 +0000
@@ -258,6 +258,7 @@
                     <field name="amount_untaxed" sum="Untaxed Amount" invisible="1"/>
                     <field name="amount_total" sum="Total Amount"/>
                     <field name="state"/>
+                    <field name="order_val" invisible="1"/>
                 </tree>
             </field>
         </record>