mirror of
				https://github.com/brain-tec/account_ebics.git
				synced 2025-11-04 07:00:35 +00:00 
			
		
		
		
	fix try/except
This commit is contained in:
		@@ -393,28 +393,27 @@ class EbicsFile(models.Model):
 | 
				
			|||||||
            )
 | 
					            )
 | 
				
			||||||
        res = {"statement_ids": [], "notifications": []}
 | 
					        res = {"statement_ids": [], "notifications": []}
 | 
				
			||||||
        st_datas = self._split_camt(res)
 | 
					        st_datas = self._split_camt(res)
 | 
				
			||||||
        msg_hdr = _("{} : Import failed for file %(fn)s:\n", fn=self.name)
 | 
					        if author == "oca":
 | 
				
			||||||
        try:
 | 
					            self._process_camt053_oca(res, st_datas)
 | 
				
			||||||
            if author == "oca":
 | 
					        else:
 | 
				
			||||||
                self._process_camt053_oca(res, st_datas)
 | 
					            self._process_camt053_oe(res, st_datas)
 | 
				
			||||||
            else:
 | 
					 | 
				
			||||||
                self._process_camt053_oe(res, st_datas)
 | 
					 | 
				
			||||||
        except UserError as e:
 | 
					 | 
				
			||||||
            message = msg_hdr.format(_("Error"))
 | 
					 | 
				
			||||||
            message += "".join(e.args)
 | 
					 | 
				
			||||||
            res["notifications"].append({"type": "error", "message": message})
 | 
					 | 
				
			||||||
        except Exception:
 | 
					 | 
				
			||||||
            tb = "".join(format_exception(*exc_info()))
 | 
					 | 
				
			||||||
            message = msg_hdr.format(_("Error"))
 | 
					 | 
				
			||||||
            message += tb
 | 
					 | 
				
			||||||
            res["notifications"].append({"type": "error", "message": message})
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        return self._process_download_result(res)
 | 
					        return self._process_download_result(res)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def _process_camt053_oca(self, res, st_datas):
 | 
					    def _process_camt053_oca(self, res, st_datas):
 | 
				
			||||||
 | 
					        msg_hdr = _("{} : Import failed for file %(fn)s:\n", fn=self.name)
 | 
				
			||||||
        for st_data in st_datas:
 | 
					        for st_data in st_datas:
 | 
				
			||||||
            with self.env.cr.savepoint():
 | 
					            try:
 | 
				
			||||||
                self._create_statement_camt053_oca(res, st_data)
 | 
					                with self.env.cr.savepoint():
 | 
				
			||||||
 | 
					                    self._create_statement_camt053_oca(res, st_data)
 | 
				
			||||||
 | 
					            except UserError as e:
 | 
				
			||||||
 | 
					                message = msg_hdr.format(_("Error"))
 | 
				
			||||||
 | 
					                message += "".join(e.args)
 | 
				
			||||||
 | 
					                res["notifications"].append({"type": "error", "message": message})
 | 
				
			||||||
 | 
					            except Exception:
 | 
				
			||||||
 | 
					                tb = "".join(format_exception(*exc_info()))
 | 
				
			||||||
 | 
					                message = msg_hdr.format(_("Error"))
 | 
				
			||||||
 | 
					                message += tb
 | 
				
			||||||
 | 
					                res["notifications"].append({"type": "error", "message": message})
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def _create_statement_camt053_oca(self, res, st_data):
 | 
					    def _create_statement_camt053_oca(self, res, st_data):
 | 
				
			||||||
        wiz = (
 | 
					        wiz = (
 | 
				
			||||||
@@ -430,9 +429,20 @@ class EbicsFile(models.Model):
 | 
				
			|||||||
        We execute a cr.commit() after every statement import since we get a
 | 
					        We execute a cr.commit() after every statement import since we get a
 | 
				
			||||||
        'savepoint does not exist' error when using 'with self.env.cr.savepoint()'.
 | 
					        'savepoint does not exist' error when using 'with self.env.cr.savepoint()'.
 | 
				
			||||||
        """
 | 
					        """
 | 
				
			||||||
 | 
					        msg_hdr = _("{} : Import failed for file %(fn)s:\n", fn=self.name)
 | 
				
			||||||
        for st_data in st_datas:
 | 
					        for st_data in st_datas:
 | 
				
			||||||
            self._create_statement_camt053_oe(res, st_data)
 | 
					            try:
 | 
				
			||||||
            self.env.cr.commit()  # pylint: disable=E8102
 | 
					                self._create_statement_camt053_oe(res, st_data)
 | 
				
			||||||
 | 
					                self.env.cr.commit()  # pylint: disable=E8102
 | 
				
			||||||
 | 
					            except UserError as e:
 | 
				
			||||||
 | 
					                message = msg_hdr.format(_("Error"))
 | 
				
			||||||
 | 
					                message += "".join(e.args)
 | 
				
			||||||
 | 
					                res["notifications"].append({"type": "error", "message": message})
 | 
				
			||||||
 | 
					            except Exception:
 | 
				
			||||||
 | 
					                tb = "".join(format_exception(*exc_info()))
 | 
				
			||||||
 | 
					                message = msg_hdr.format(_("Error"))
 | 
				
			||||||
 | 
					                message += tb
 | 
				
			||||||
 | 
					                res["notifications"].append({"type": "error", "message": message})
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def _create_statement_camt053_oe(self, res, st_data):
 | 
					    def _create_statement_camt053_oe(self, res, st_data):
 | 
				
			||||||
        attachment = (
 | 
					        attachment = (
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user