From f468f975f0467ec5a04ae83b7b37f34a45e7ecd6 Mon Sep 17 00:00:00 2001
From: bonazzi <bonazzi@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Tue, 18 Apr 2017 17:32:16 +0000
Subject: [PATCH] Patch level         : 12.0 380 Files correlati     :

Patch 380

git-svn-id: svn://10.65.10.50/branches/R_10_00@23744 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 src/mr/mr2100.cpp | 5 ++---
 src/mr/mrplib.cpp | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/mr/mr2100.cpp b/src/mr/mr2100.cpp
index dcc8a4ad5..944fb5007 100755
--- a/src/mr/mr2100.cpp
+++ b/src/mr/mr2100.cpp
@@ -1188,7 +1188,6 @@ bool TMatResMask::on_field_event(TOperable_field& o, TField_event e, long jolly)
       switch(e)
       {
         case fe_modify:
-        case fe_init:
         {
           real qta, price;
           TString codart;
@@ -2769,9 +2768,9 @@ bool TMatResPlanning::build_orders()
     sf.check_row(n);
 
     if (tipoord=="P")
-      tipoord=" ";
+      tipoord = " ";
     else
-      tipoord=m.get(F_TIPOCF_CONDV);
+      tipoord = "F";
     find_price(m.get(F_TIPOCV),m.get(F_CODCONDV),m.get(F_CATVEN_CV),
         tipoord, codforn, codart, qta,  price);
     row->add(price.string(), F_PREZZO - FIRST_FIELD);
diff --git a/src/mr/mrplib.cpp b/src/mr/mrplib.cpp
index a4236cfad..a63e98b1a 100755
--- a/src/mr/mrplib.cpp
+++ b/src/mr/mrplib.cpp
@@ -1452,7 +1452,7 @@ void find_price(const TString &tipocv, const TString &codcv, const TString &codc
       if (_condv->ricerca(codice, qta))
       {
         price = _condv->get_prezzo();
-        retry=FALSE;
+        retry = false;
       }
     }
     break;