* Variables contenant les valeurs nécessaires à ce contrôle
*/
private String ligneNodeId, operationNodeId = "", fonctionNodeId = "", natureNodeId = "";
- private String exercice, idBordereau, typeBordereau, idPce, nomencl = "", typnomencl = "", operation = "";
+ private String exercice, idBordereau, typeBordereau, idPce, typePce ="", nomencl = "", typnomencl = "", operation = "";
private boolean isDepense, isNaturePresent, isFonctionPresent, isOperationPresent, votop = false;
private Document tableRef;
private Nodes nodesListeCodeOp;
this.votop = (Boolean) this.hParams.get("votop");
logger.debug("Vote par opérations = " + this.votop);
}
+
/*
* if (servTVA == null || servADM == null) { logger.info("Le contrôle " + CTRL_ID +
* " ne peut pas s'exécuter car les paramètres listes de service ne sont pas valorisées"); }
if (xpath.endsWith(CHEMIN_BLOCBORDEREAU_TYPBORD)) {
this.typeBordereau = atts.getValue("V");
}
+
+ if (xpath.endsWith(CHEMIN_PIECE_DEPENSE_TYPPCE) || xpath.endsWith(CHEMIN_PIECE_RECETTE_TYPPCE)) {
+ this.typePce = atts.getValue("V");
+ }
if (xpath.endsWith(CHEMIN_PIECE_DEPENSE_IDPIECE) || xpath.endsWith(CHEMIN_PIECE_RECETTE_IDPIECE)) {
this.idPce = atts.getValue("V");
}
}
this.anos.add(ano);
}
- if (!this.nomencl.equals("M21") && !this.nomencl.equals("M22")) {
+ if (!this.nomencl.equals("M21") && !this.nomencl.equals("M22") && !"15".equals(this.typePce)) {
if (this.typnomencl.equals("Fonction") && (!this.isFonctionPresent || this.isOperationPresent)) {
final Anomalie ano = this.addPesAnomalieWithTag(this, this.getDocumentModel(), this.messageAnomalie, this.isDepense, this.exercice, this.typeBordereau, this.idBordereau, "MCOM39", null, "", PIECE_ELEMENT_ID, this.idPce);
if (!this.isFonctionPresent) {
this.anos.add(ano);
}
}
- if (!this.listeCodeOp.contains(this.operation) && this.isNaturePresent && this.isFonctionPresent && this.isOperationPresent) {
+ if (!this.listeCodeOp.contains(this.operation) && this.isNaturePresent && this.isFonctionPresent && this.isOperationPresent && !"15".equals(this.typePce)) {
if ((this.nomencl.equals("M21") || this.nomencl.equals("M22")) || !this.typnomencl.equals("Nature-ref-fonct") || !this.votop) {
final Anomalie ano = this.addPesAnomalie(this, this.getDocumentModel(), this.messageAnomalie, this.isDepense, this.exercice, this.typeBordereau, this.idBordereau, "MCOM40", null, PIECE_ELEMENT_ID, this.idPce);
ano.addNode(this.natureNodeId);