Merge pull request OpenG2P#176 from lalithkota/15.0-develop

G2P Connect PM: Fixed null status check cron. Precommit: Fixed errors
mkumar-02 · Jan 17, 2024 · a28d4d2 · a28d4d2
2 parents 724d854 + e13cda9
commit a28d4d2
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/g2p_payment_g2p_connect/models/payment_manager.py b/g2p_payment_g2p_connect/models/payment_manager.py
@@ -263,8 +263,9 @@ def payments_status_check(self, id_):
 
     def stop_status_check_cron(self):
         for rec in self:
-            rec.status_check_cron_id.unlink()
-            rec.status_check_cron_id = None
+            if rec.status_check_cron_id:
+                rec.status_check_cron_id.unlink()
+                rec.status_check_cron_id = None
 
     def _get_payee_fa(self, payment):
         self.ensure_one()

diff --git a/g2p_program_assessment/static/src/js/g2p_assessment.js b/g2p_program_assessment/static/src/js/g2p_assessment.js
@@ -34,8 +34,8 @@ var G2PAssessmentWizardWidget = AbstractField.extend({
         } else if (this.nodeOptions.not_readonly_field) {
             this.readonly = !this.recordData[this.nodeOptions.not_readonly_field];
         }
-        this.showAddCommentsButton = this.nodeOptions.show_add_comments_button != false;
-        this.showAddAssessmentsButton = this.nodeOptions.show_add_assessments_button != false;
+        this.showAddCommentsButton = this.nodeOptions.show_add_comments_button !== false;
+        this.showAddAssessmentsButton = this.nodeOptions.show_add_assessments_button !== false;
         console.log(this);
         this.assessmentAddMode = 0;
         this.assessmentAddModeStarted = 0;

diff --git a/g2p_programs/models/entitlement.py b/g2p_programs/models/entitlement.py
@@ -28,7 +28,7 @@ def _generate_code(self):
 
     ern = fields.Char(
         compute="_compute_generate_ern",
-        string="ERN",   
+        string="ERN",
         readonly=True,
         copy=False,
         store=True,

diff --git a/g2p_programs/models/payment.py b/g2p_programs/models/payment.py
@@ -177,4 +177,4 @@ class G2PPaymentBatchTag(models.Model):
 
     domain = fields.Text(default="[]")
 
-    max_batch_size = fields.Integer(default=500)
+    max_batch_size = fields.Integer(default=500)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -177,4 +177,4 @@ class G2PPaymentBatchTag(models.Model):

		domain = fields.Text(default="[]")

		max_batch_size = fields.Integer(default=500)
		max_batch_size = fields.Integer(default=500)