Browse Source

add authorized_decimal column to katao_product TG-48

SiM 5 years ago
parent
commit
73d8a697f4

+ 1 - 0
config/schema.yml

@@ -99,6 +99,7 @@ propel:
     katao_supplier_id:        { type: integer, foreignTable: katao_supplier, foreignReference: id, required: true, onDelete: cascade }
     max_sol_amount:           { type: integer }
     unit_price_euro:          { type: float, required: true }
+    authorize_decimal:        { type: boolean, size: 1, default: false }
     margin:                   { type: float }
     tva_rate:                 { type: float, default: 0 }
     min_order_number:         { type: integer, required: true, default: 1 }

+ 1 - 0
data/sql/lib.model.schema.sql

@@ -242,6 +242,7 @@ CREATE TABLE `katao_product`
 	`katao_supplier_id` INTEGER  NOT NULL,
 	`max_sol_amount` INTEGER,
 	`unit_price_euro` FLOAT  NOT NULL,
+	`authorize_decimal` INTEGER(1) default 0,
 	`margin` FLOAT,
 	`tva_rate` FLOAT default 0,
 	`min_order_number` INTEGER default 1 NOT NULL,

+ 6 - 0
data/sql/patch_2018-11-14_gestion-decimales.sql

@@ -0,0 +1,6 @@
+SET AUTOCOMMIT = 0;
+START TRANSACTION;
+
+ALTER TABLE `katao_product` ADD `authorize_decimal` INTEGER(1) default 0 AFTER `unit_price_euro`;
+
+COMMIT;

+ 2 - 0
lib/model/map/KataoProductMapBuilder.php

@@ -79,6 +79,8 @@ class KataoProductMapBuilder {
 
 		$tMap->addColumn('UNIT_PRICE_EURO', 'UnitPriceEuro', 'double', CreoleTypes::FLOAT, true, null);
 
+		$tMap->addColumn('AUTHORIZE_DECIMAL', 'AuthorizeDecimal', 'boolean', CreoleTypes::BOOLEAN, false, 1);
+
 		$tMap->addColumn('MARGIN', 'Margin', 'double', CreoleTypes::FLOAT, false, null);
 
 		$tMap->addColumn('TVA_RATE', 'TvaRate', 'double', CreoleTypes::FLOAT, false, null);

+ 96 - 49
lib/model/om/BaseKataoProduct.php

@@ -82,6 +82,13 @@ abstract class BaseKataoProduct extends BaseObject  implements Persistent {
 	protected $unit_price_euro;
 
 
+	/**
+	 * The value for the authorize_decimal field.
+	 * @var        boolean
+	 */
+	protected $authorize_decimal = false;
+
+
 	/**
 	 * The value for the margin field.
 	 * @var        double
@@ -346,6 +353,17 @@ abstract class BaseKataoProduct extends BaseObject  implements Persistent {
 		return $this->unit_price_euro;
 	}
 
+	/**
+	 * Get the [authorize_decimal] column value.
+	 * 
+	 * @return     boolean
+	 */
+	public function getAuthorizeDecimal()
+	{
+
+		return $this->authorize_decimal;
+	}
+
 	/**
 	 * Get the [margin] column value.
 	 * 
@@ -696,6 +714,22 @@ abstract class BaseKataoProduct extends BaseObject  implements Persistent {
 
 	} // setUnitPriceEuro()
 
+	/**
+	 * Set the value of [authorize_decimal] column.
+	 * 
+	 * @param      boolean $v new value
+	 * @return     void
+	 */
+	public function setAuthorizeDecimal($v)
+	{
+
+		if ($this->authorize_decimal !== $v || $v === false) {
+			$this->authorize_decimal = $v;
+			$this->modifiedColumns[] = KataoProductPeer::AUTHORIZE_DECIMAL;
+		}
+
+	} // setAuthorizeDecimal()
+
 	/**
 	 * Set the value of [margin] column.
 	 * 
@@ -943,32 +977,34 @@ abstract class BaseKataoProduct extends BaseObject  implements Persistent {
 
 			$this->unit_price_euro = $rs->getFloat($startcol + 8);
 
-			$this->margin = $rs->getFloat($startcol + 9);
+			$this->authorize_decimal = $rs->getBoolean($startcol + 9);
+
+			$this->margin = $rs->getFloat($startcol + 10);
 
-			$this->tva_rate = $rs->getFloat($startcol + 10);
+			$this->tva_rate = $rs->getFloat($startcol + 11);
 
-			$this->min_order_number = $rs->getInt($startcol + 11);
+			$this->min_order_number = $rs->getInt($startcol + 12);
 
-			$this->picture = $rs->getString($startcol + 12);
+			$this->picture = $rs->getString($startcol + 13);
 
-			$this->delivery_delay = $rs->getInt($startcol + 13);
+			$this->delivery_delay = $rs->getInt($startcol + 14);
 
-			$this->is_archived = $rs->getInt($startcol + 14);
+			$this->is_archived = $rs->getInt($startcol + 15);
 
-			$this->accounting_code_purchase = $rs->getString($startcol + 15);
+			$this->accounting_code_purchase = $rs->getString($startcol + 16);
 
-			$this->accounting_code_sell = $rs->getString($startcol + 16);
+			$this->accounting_code_sell = $rs->getString($startcol + 17);
 
-			$this->created_at = $rs->getTimestamp($startcol + 17, null);
+			$this->created_at = $rs->getTimestamp($startcol + 18, null);
 
-			$this->updated_at = $rs->getTimestamp($startcol + 18, null);
+			$this->updated_at = $rs->getTimestamp($startcol + 19, null);
 
 			$this->resetModified();
 
 			$this->setNew(false);
 
 			// FIXME - using NUM_COLUMNS may be clearer.
-			return $startcol + 19; // 19 = KataoProductPeer::NUM_COLUMNS - KataoProductPeer::NUM_LAZY_LOAD_COLUMNS).
+			return $startcol + 20; // 20 = KataoProductPeer::NUM_COLUMNS - KataoProductPeer::NUM_LAZY_LOAD_COLUMNS).
 
 		} catch (Exception $e) {
 			throw new PropelException("Error populating KataoProduct object", $e);
@@ -1378,33 +1414,36 @@ abstract class BaseKataoProduct extends BaseObject  implements Persistent {
 				return $this->getUnitPriceEuro();
 				break;
 			case 9:
-				return $this->getMargin();
+				return $this->getAuthorizeDecimal();
 				break;
 			case 10:
-				return $this->getTvaRate();
+				return $this->getMargin();
 				break;
 			case 11:
-				return $this->getMinOrderNumber();
+				return $this->getTvaRate();
 				break;
 			case 12:
-				return $this->getPicture();
+				return $this->getMinOrderNumber();
 				break;
 			case 13:
-				return $this->getDeliveryDelay();
+				return $this->getPicture();
 				break;
 			case 14:
-				return $this->getIsArchived();
+				return $this->getDeliveryDelay();
 				break;
 			case 15:
-				return $this->getAccountingCodePurchase();
+				return $this->getIsArchived();
 				break;
 			case 16:
-				return $this->getAccountingCodeSell();
+				return $this->getAccountingCodePurchase();
 				break;
 			case 17:
-				return $this->getCreatedAt();
+				return $this->getAccountingCodeSell();
 				break;
 			case 18:
+				return $this->getCreatedAt();
+				break;
+			case 19:
 				return $this->getUpdatedAt();
 				break;
 			default:
@@ -1436,16 +1475,17 @@ abstract class BaseKataoProduct extends BaseObject  implements Persistent {
 			$keys[6] => $this->getKataoSupplierId(),
 			$keys[7] => $this->getMaxSolAmount(),
 			$keys[8] => $this->getUnitPriceEuro(),
-			$keys[9] => $this->getMargin(),
-			$keys[10] => $this->getTvaRate(),
-			$keys[11] => $this->getMinOrderNumber(),
-			$keys[12] => $this->getPicture(),
-			$keys[13] => $this->getDeliveryDelay(),
-			$keys[14] => $this->getIsArchived(),
-			$keys[15] => $this->getAccountingCodePurchase(),
-			$keys[16] => $this->getAccountingCodeSell(),
-			$keys[17] => $this->getCreatedAt(),
-			$keys[18] => $this->getUpdatedAt(),
+			$keys[9] => $this->getAuthorizeDecimal(),
+			$keys[10] => $this->getMargin(),
+			$keys[11] => $this->getTvaRate(),
+			$keys[12] => $this->getMinOrderNumber(),
+			$keys[13] => $this->getPicture(),
+			$keys[14] => $this->getDeliveryDelay(),
+			$keys[15] => $this->getIsArchived(),
+			$keys[16] => $this->getAccountingCodePurchase(),
+			$keys[17] => $this->getAccountingCodeSell(),
+			$keys[18] => $this->getCreatedAt(),
+			$keys[19] => $this->getUpdatedAt(),
 		);
 		return $result;
 	}
@@ -1505,33 +1545,36 @@ abstract class BaseKataoProduct extends BaseObject  implements Persistent {
 				$this->setUnitPriceEuro($value);
 				break;
 			case 9:
-				$this->setMargin($value);
+				$this->setAuthorizeDecimal($value);
 				break;
 			case 10:
-				$this->setTvaRate($value);
+				$this->setMargin($value);
 				break;
 			case 11:
-				$this->setMinOrderNumber($value);
+				$this->setTvaRate($value);
 				break;
 			case 12:
-				$this->setPicture($value);
+				$this->setMinOrderNumber($value);
 				break;
 			case 13:
-				$this->setDeliveryDelay($value);
+				$this->setPicture($value);
 				break;
 			case 14:
-				$this->setIsArchived($value);
+				$this->setDeliveryDelay($value);
 				break;
 			case 15:
-				$this->setAccountingCodePurchase($value);
+				$this->setIsArchived($value);
 				break;
 			case 16:
-				$this->setAccountingCodeSell($value);
+				$this->setAccountingCodePurchase($value);
 				break;
 			case 17:
-				$this->setCreatedAt($value);
+				$this->setAccountingCodeSell($value);
 				break;
 			case 18:
+				$this->setCreatedAt($value);
+				break;
+			case 19:
 				$this->setUpdatedAt($value);
 				break;
 		} // switch()
@@ -1566,16 +1609,17 @@ abstract class BaseKataoProduct extends BaseObject  implements Persistent {
 		if (array_key_exists($keys[6], $arr)) $this->setKataoSupplierId($arr[$keys[6]]);
 		if (array_key_exists($keys[7], $arr)) $this->setMaxSolAmount($arr[$keys[7]]);
 		if (array_key_exists($keys[8], $arr)) $this->setUnitPriceEuro($arr[$keys[8]]);
-		if (array_key_exists($keys[9], $arr)) $this->setMargin($arr[$keys[9]]);
-		if (array_key_exists($keys[10], $arr)) $this->setTvaRate($arr[$keys[10]]);
-		if (array_key_exists($keys[11], $arr)) $this->setMinOrderNumber($arr[$keys[11]]);
-		if (array_key_exists($keys[12], $arr)) $this->setPicture($arr[$keys[12]]);
-		if (array_key_exists($keys[13], $arr)) $this->setDeliveryDelay($arr[$keys[13]]);
-		if (array_key_exists($keys[14], $arr)) $this->setIsArchived($arr[$keys[14]]);
-		if (array_key_exists($keys[15], $arr)) $this->setAccountingCodePurchase($arr[$keys[15]]);
-		if (array_key_exists($keys[16], $arr)) $this->setAccountingCodeSell($arr[$keys[16]]);
-		if (array_key_exists($keys[17], $arr)) $this->setCreatedAt($arr[$keys[17]]);
-		if (array_key_exists($keys[18], $arr)) $this->setUpdatedAt($arr[$keys[18]]);
+		if (array_key_exists($keys[9], $arr)) $this->setAuthorizeDecimal($arr[$keys[9]]);
+		if (array_key_exists($keys[10], $arr)) $this->setMargin($arr[$keys[10]]);
+		if (array_key_exists($keys[11], $arr)) $this->setTvaRate($arr[$keys[11]]);
+		if (array_key_exists($keys[12], $arr)) $this->setMinOrderNumber($arr[$keys[12]]);
+		if (array_key_exists($keys[13], $arr)) $this->setPicture($arr[$keys[13]]);
+		if (array_key_exists($keys[14], $arr)) $this->setDeliveryDelay($arr[$keys[14]]);
+		if (array_key_exists($keys[15], $arr)) $this->setIsArchived($arr[$keys[15]]);
+		if (array_key_exists($keys[16], $arr)) $this->setAccountingCodePurchase($arr[$keys[16]]);
+		if (array_key_exists($keys[17], $arr)) $this->setAccountingCodeSell($arr[$keys[17]]);
+		if (array_key_exists($keys[18], $arr)) $this->setCreatedAt($arr[$keys[18]]);
+		if (array_key_exists($keys[19], $arr)) $this->setUpdatedAt($arr[$keys[19]]);
 	}
 
 	/**
@@ -1596,6 +1640,7 @@ abstract class BaseKataoProduct extends BaseObject  implements Persistent {
 		if ($this->isColumnModified(KataoProductPeer::KATAO_SUPPLIER_ID)) $criteria->add(KataoProductPeer::KATAO_SUPPLIER_ID, $this->katao_supplier_id);
 		if ($this->isColumnModified(KataoProductPeer::MAX_SOL_AMOUNT)) $criteria->add(KataoProductPeer::MAX_SOL_AMOUNT, $this->max_sol_amount);
 		if ($this->isColumnModified(KataoProductPeer::UNIT_PRICE_EURO)) $criteria->add(KataoProductPeer::UNIT_PRICE_EURO, $this->unit_price_euro);
+		if ($this->isColumnModified(KataoProductPeer::AUTHORIZE_DECIMAL)) $criteria->add(KataoProductPeer::AUTHORIZE_DECIMAL, $this->authorize_decimal);
 		if ($this->isColumnModified(KataoProductPeer::MARGIN)) $criteria->add(KataoProductPeer::MARGIN, $this->margin);
 		if ($this->isColumnModified(KataoProductPeer::TVA_RATE)) $criteria->add(KataoProductPeer::TVA_RATE, $this->tva_rate);
 		if ($this->isColumnModified(KataoProductPeer::MIN_ORDER_NUMBER)) $criteria->add(KataoProductPeer::MIN_ORDER_NUMBER, $this->min_order_number);
@@ -1676,6 +1721,8 @@ abstract class BaseKataoProduct extends BaseObject  implements Persistent {
 
 		$copyObj->setUnitPriceEuro($this->unit_price_euro);
 
+		$copyObj->setAuthorizeDecimal($this->authorize_decimal);
+
 		$copyObj->setMargin($this->margin);
 
 		$copyObj->setTvaRate($this->tva_rate);

File diff suppressed because it is too large
+ 4 - 2
lib/model/om/BaseKataoProductPeer.php


Some files were not shown because too many files changed in this diff