[Production-Development] FR 0002191: Move Division Group Quantity to product tabs
authorrafaeldemiguel <rdm@openbravo.com>
Mon, 10 Oct 2011 18:57:12 +0200
changeset 14998 906079cadffc
parent 14997 b6a33609d723
child 14999 17ea537485c8
[Production-Development] FR 0002191: Move Division Group Quantity to product tabs
src-db/database/model/functions/MA_COPY_VERSION.xml
src-db/database/model/functions/MA_PRODUCTIONRUN_STANDARD.xml
src-db/database/model/tables/MA_SEQUENCE.xml
src-db/database/model/tables/MA_SEQUENCEPRODUCT.xml
src-db/database/model/tables/M_PRODUCTIONLINE.xml
src-db/database/model/tables/M_PRODUCTIONPLAN.xml
src-db/database/sourcedata/AD_COLUMN.xml
src-db/database/sourcedata/AD_FIELD.xml
src/org/openbravo/erpCommon/ad_actionButton/CreateWorkEffort.java
src/org/openbravo/erpCommon/ad_callouts/SL_ProductionPlan_WRPhase.java
src/org/openbravo/erpCommon/ad_callouts/SL_ProductionPlan_WRPhase_data.xsql
--- a/src-db/database/model/functions/MA_COPY_VERSION.xml	Fri Oct 07 17:21:03 2011 +0200
+++ b/src-db/database/model/functions/MA_COPY_VERSION.xml	Mon Oct 10 18:57:12 2011 +0200
@@ -130,7 +130,7 @@
           MA_Processplan_Version_ID, MA_Process_ID, Value, Name,
           Description, CostCenterUse, Preptime, Multiplier,
           Seqno, Noqty, Groupuse, Calculated, Estimatedtime, 
-          Divisiongroupqty, Usedmaterial
+          Usedmaterial
         )
         VALUES
         (
@@ -139,7 +139,7 @@
           v_ProcessPlanVersion_ID, Cur_Sequence.MA_Process_ID, Cur_Sequence.Value, Cur_Sequence.Name,
           Cur_Sequence.Description, Cur_Sequence.CostCenterUse, Cur_Sequence.Preptime, Cur_Sequence.Multiplier,
           Cur_Sequence.Seqno, Cur_Sequence.Noqty, Cur_Sequence.Groupuse, Cur_Sequence.Calculated, Cur_Sequence.Estimatedtime, 
-          Cur_Sequence.Divisiongroupqty, Cur_Sequence.Usedmaterial
+          Cur_Sequence.Usedmaterial
         )
         ;
       FOR Cur_Product IN
@@ -157,7 +157,8 @@
             Created, Createdby, Updated, Updatedby,
             MA_Sequence_ID, M_Product_ID, Quantity, Productiontype,
             C_Uom_ID, Quantityorder, M_Product_Uom_ID, Componentcost,
-            Decrease, Rejected, Uniqueattconsum, Copyproduct
+            Decrease, Rejected, Uniqueattconsum, Copyproduct, 
+            Divisiongroupqty
           )
           VALUES
           (
@@ -165,7 +166,8 @@
             now(), COALESCE(v_User_ID, '0'), now(), COALESCE(v_User_ID, '0'),
             v_Sequence_ID, Cur_Product.M_Product_ID, Cur_Product.Quantity, Cur_Product.Productiontype,
             Cur_Product.C_Uom_ID, Cur_Product.Quantityorder, Cur_Product.M_Product_Uom_ID, Cur_Product.Componentcost,
-            Cur_Product.Decrease, Cur_Product.Rejected, Cur_Product.Uniqueattconsum, Cur_Product.Copyproduct
+            Cur_Product.Decrease, Cur_Product.Rejected, Cur_Product.Uniqueattconsum, Cur_Product.Copyproduct,
+            Cur_Product.Divisiongroupqty
           )
           ;
 	FOR Cur_ProductAtt IN
--- a/src-db/database/model/functions/MA_PRODUCTIONRUN_STANDARD.xml	Fri Oct 07 17:21:03 2011 +0200
+++ b/src-db/database/model/functions/MA_PRODUCTIONRUN_STANDARD.xml	Mon Oct 10 18:57:12 2011 +0200
@@ -58,7 +58,6 @@
     v_allownegativestock CHAR(1);
     v_Calculated CHAR(1);
     v_ByDefault CHAR(1);
-    v_Divisiongroupqty NUMBER; 
     v_PendingQty NUMBER; 
     v_InsertQty NUMBER;
     v_AD_Pinstance_ID VARCHAR2(32);
@@ -118,9 +117,9 @@
       SELECT M_ProductionPlan.AD_Org_ID, M_ProductionPlan.MA_WRPhase_ID,
              M_ProductionPlan.ProductionQty, M_ProductionPlan.Processed,
              COALESCE(MA_CostCenter.CALCULATED, 'N') AS CALCULATED, COALESCE(MA_CostCenter.BYDEFAULT, 'N') AS BYDEFAULT,
-             M_ProductionPlan.line, M_ProductionPlan.M_Production_ID, M_ProductionPlan.Divisiongroupqty
+             M_ProductionPlan.line, M_ProductionPlan.M_Production_ID
       INTO v_PlanOrg_ID, v_WRPhase_ID, v_DoneQuantity, v_Processed,
-           v_Calculated, v_ByDefault, v_PlanLine, v_Production_ID, v_Divisiongroupqty
+           v_Calculated, v_ByDefault, v_PlanLine, v_Production_ID
       FROM M_ProductionPlan LEFT JOIN MA_CostCenter_Version ON M_ProductionPlan.MA_CostCenter_Version_ID = MA_CostCenter_Version.MA_CostCenter_Version_ID
                             LEFT JOIN MA_CostCenter ON MA_CostCenter_version.MA_CostCenter_ID = MA_CostCenter.MA_CostCenter_ID
       WHERE M_ProductionPlan_ID=v_Record_ID;
@@ -175,12 +174,14 @@
         v_Line:=0;
         v_ResultStr:='ProdRunProduct P+ Processing';
         FOR Cur_WRPProduct IN
-          (SELECT wrpp.*, COALESCE(po.M_Locator_ID, p.M_Locator_ID) AS M_Locator_ID, p.name as pname, p.M_AttributeSetInstance_ID, p.AttrSetValueType
+          (SELECT wrpp.*, COALESCE(po.M_Locator_ID, p.M_Locator_ID) AS M_Locator_ID, p.name as pname, p.M_AttributeSetInstance_ID,
+           p.AttrSetValueType, masp.Divisiongroupqty
           FROM M_Product p, MA_WRPhaseProduct wrpp
             left join M_Product_Org po on wrpp.M_Product_ID = po.M_Product_ID
                                     AND po.AD_Org_ID = v_PlanOrg_ID
+	    left join MA_SequenceProduct masp on wrpp.MA_SequenceProduct_ID = masp.MA_SequenceProduct_ID
           WHERE MA_WRPhase_ID=v_WRPhase_ID
-            AND ProductionType='+'
+            AND wrpp.ProductionType='+'
             AND wrpp.M_PRODUCT_ID=p.M_Product_ID
           )
         LOOP
@@ -190,12 +191,12 @@
             RAISE_APPLICATION_ERROR(-20000, v_Message);
           END IF;
           -- Division Group Quantity
-	  IF (v_Divisiongroupqty is not null AND v_Divisiongroupqty <> 0 AND v_NoQty <> 'Y') THEN
+	  IF (Cur_WRPProduct.Divisiongroupqty is not null AND Cur_WRPProduct.Divisiongroupqty <> 0 AND v_NoQty <> 'Y') THEN
 		  v_PendingQty := Cur_WRPProduct.MovementQty*v_DoneQuantity;
 		  WHILE (v_PendingQty>0)
 		  LOOP
-			IF (v_PendingQty > v_Divisiongroupqty) THEN
-			 v_InsertQty:= v_Divisiongroupqty;
+			IF (v_PendingQty > Cur_WRPProduct.Divisiongroupqty) THEN
+			 v_InsertQty:= Cur_WRPProduct.Divisiongroupqty;
 			ELSE
 			 v_InsertQty:= v_PendingQty;
 			END IF;
@@ -210,7 +211,7 @@
 			Productiontype, MovementQty, Updated, Updatedby,
 			C_UOM_ID, M_Locator_ID, 
 			Line, M_AttributeSetInstance_ID, M_Product_UOM_ID, QuantityOrder, 
-			MA_WRPhaseProduct_ID
+			MA_WRPhaseProduct_ID, Divisiongroupqty
 			)
 			VALUES
 			(
@@ -225,7 +226,7 @@
 			v_Line, (CASE WHEN Cur_WRPProduct.AttrSetValueType='D' THEN Cur_WRPProduct.M_AttributeSetInstance_ID ELSE NULL END)
 			,Cur_WRPProduct.M_Product_UOM_ID, 
 			CASE WHEN Cur_WRPProduct.M_Product_UOM_ID IS NULL THEN NULL WHEN v_NoQty = 'Y' THEN 0 ELSE Cur_WRPProduct.QuantityOrder * v_DoneQuantity END,
-			Cur_WRPProduct.MA_WRPhaseProduct_ID
+			Cur_WRPProduct.MA_WRPhaseProduct_ID, Cur_WRPProduct.Divisiongroupqty
 			)
 			;
 		        v_PendingQty:= v_PendingQty-v_InsertQty;
--- a/src-db/database/model/tables/MA_SEQUENCE.xml	Fri Oct 07 17:21:03 2011 +0200
+++ b/src-db/database/model/tables/MA_SEQUENCE.xml	Mon Oct 10 18:57:12 2011 +0200
@@ -101,13 +101,9 @@
         <default><![CDATA[0]]></default>
         <onCreateDefault><![CDATA[0]]></onCreateDefault>
       </column>
-      <column name="DIVISIONGROUPQTY" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false">
-        <default/>
-        <onCreateDefault/>
-      </column>
       <column name="USEDMATERIAL" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
         <default><![CDATA[N]]></default>
-        <onCreateDefault><![CDATA['N']]></onCreateDefault>
+        <onCreateDefault/>
       </column>
       <foreign-key foreignTable="AD_ORG" name="AD_ORG_MASEQUENCE">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
--- a/src-db/database/model/tables/MA_SEQUENCEPRODUCT.xml	Fri Oct 07 17:21:03 2011 +0200
+++ b/src-db/database/model/tables/MA_SEQUENCEPRODUCT.xml	Mon Oct 10 18:57:12 2011 +0200
@@ -85,6 +85,10 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="DIVISIONGROUPQTY" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
       <foreign-key foreignTable="AD_ORG" name="AD_ORG_MASEQUENCEPRODUCT">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
--- a/src-db/database/model/tables/M_PRODUCTIONLINE.xml	Fri Oct 07 17:21:03 2011 +0200
+++ b/src-db/database/model/tables/M_PRODUCTIONLINE.xml	Mon Oct 10 18:57:12 2011 +0200
@@ -97,6 +97,10 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="DIVISIONGROUPQTY" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
       <foreign-key foreignTable="AD_CLIENT" name="M_PRODUCTIONLINE_AD_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
--- a/src-db/database/model/tables/M_PRODUCTIONPLAN.xml	Fri Oct 07 17:21:03 2011 +0200
+++ b/src-db/database/model/tables/M_PRODUCTIONPLAN.xml	Mon Oct 10 18:57:12 2011 +0200
@@ -105,10 +105,6 @@
         <default/>
         <onCreateDefault/>
       </column>
-      <column name="DIVISIONGROUPQTY" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false">
-        <default/>
-        <onCreateDefault/>
-      </column>
       <column name="STARTTIME" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false">
         <default/>
         <onCreateDefault/>
@@ -119,7 +115,7 @@
       </column>
       <column name="ESTIMATEDTIME" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false">
         <default><![CDATA[0]]></default>
-        <onCreateDefault><![CDATA[0]]></onCreateDefault>
+        <onCreateDefault/>
       </column>
       <column name="RUNTIME" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false">
         <default><![CDATA[0]]></default>
@@ -127,7 +123,7 @@
       </column>
       <column name="CLOSEPHASE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
         <default><![CDATA[N]]></default>
-        <onCreateDefault/>
+        <onCreateDefault><![CDATA[0]]></onCreateDefault>
       </column>
       <column name="VALIDATING" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false">
         <default/>
--- a/src-db/database/sourcedata/AD_COLUMN.xml	Fri Oct 07 17:21:03 2011 +0200
+++ b/src-db/database/sourcedata/AD_COLUMN.xml	Mon Oct 10 18:57:12 2011 +0200
@@ -215194,6 +215194,39 @@
 <!--539C4E45B3FB477BAD74E46CD96F6B33-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
 <!--539C4E45B3FB477BAD74E46CD96F6B33--></AD_COLUMN>
 
+<!--53D24E829E4A46C9A4488DEABF052882--><AD_COLUMN>
+<!--53D24E829E4A46C9A4488DEABF052882-->  <AD_COLUMN_ID><![CDATA[53D24E829E4A46C9A4488DEABF052882]]></AD_COLUMN_ID>
+<!--53D24E829E4A46C9A4488DEABF052882-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--53D24E829E4A46C9A4488DEABF052882-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--53D24E829E4A46C9A4488DEABF052882-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--53D24E829E4A46C9A4488DEABF052882-->  <NAME><![CDATA[Division Group Quantity]]></NAME>
+<!--53D24E829E4A46C9A4488DEABF052882-->  <DESCRIPTION><![CDATA[Indicates the quantity in which P+ products will be grouped ]]></DESCRIPTION>
+<!--53D24E829E4A46C9A4488DEABF052882-->  <HELP><![CDATA[Indicates the quantity in which P+ products will be grouped]]></HELP>
+<!--53D24E829E4A46C9A4488DEABF052882-->  <COLUMNNAME><![CDATA[Divisiongroupqty]]></COLUMNNAME>
+<!--53D24E829E4A46C9A4488DEABF052882-->  <AD_TABLE_ID><![CDATA[326]]></AD_TABLE_ID>
+<!--53D24E829E4A46C9A4488DEABF052882-->  <AD_REFERENCE_ID><![CDATA[11]]></AD_REFERENCE_ID>
+<!--53D24E829E4A46C9A4488DEABF052882-->  <FIELDLENGTH><![CDATA[2]]></FIELDLENGTH>
+<!--53D24E829E4A46C9A4488DEABF052882-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--53D24E829E4A46C9A4488DEABF052882-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--53D24E829E4A46C9A4488DEABF052882-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--53D24E829E4A46C9A4488DEABF052882-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--53D24E829E4A46C9A4488DEABF052882-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--53D24E829E4A46C9A4488DEABF052882-->  <SEQNO><![CDATA[83]]></SEQNO>
+<!--53D24E829E4A46C9A4488DEABF052882-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--53D24E829E4A46C9A4488DEABF052882-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--53D24E829E4A46C9A4488DEABF052882-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--53D24E829E4A46C9A4488DEABF052882-->  <AD_ELEMENT_ID><![CDATA[687290BF756545829E283A6AF2CC2576]]></AD_ELEMENT_ID>
+<!--53D24E829E4A46C9A4488DEABF052882-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--53D24E829E4A46C9A4488DEABF052882-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--53D24E829E4A46C9A4488DEABF052882-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--53D24E829E4A46C9A4488DEABF052882-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--53D24E829E4A46C9A4488DEABF052882-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--53D24E829E4A46C9A4488DEABF052882-->  <POSITION><![CDATA[26]]></POSITION>
+<!--53D24E829E4A46C9A4488DEABF052882-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--53D24E829E4A46C9A4488DEABF052882-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--53D24E829E4A46C9A4488DEABF052882-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--53D24E829E4A46C9A4488DEABF052882--></AD_COLUMN>
+
 <!--540860DC16E345E7BC90EA6D0FEDDEA3--><AD_COLUMN>
 <!--540860DC16E345E7BC90EA6D0FEDDEA3-->  <AD_COLUMN_ID><![CDATA[540860DC16E345E7BC90EA6D0FEDDEA3]]></AD_COLUMN_ID>
 <!--540860DC16E345E7BC90EA6D0FEDDEA3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -238412,39 +238445,6 @@
 <!--7C4AEC0BF04F4588A2D26D46E1EE0E7B-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
 <!--7C4AEC0BF04F4588A2D26D46E1EE0E7B--></AD_COLUMN>
 
-<!--7D9C264F6B3040B89A939CC2E857E149--><AD_COLUMN>
-<!--7D9C264F6B3040B89A939CC2E857E149-->  <AD_COLUMN_ID><![CDATA[7D9C264F6B3040B89A939CC2E857E149]]></AD_COLUMN_ID>
-<!--7D9C264F6B3040B89A939CC2E857E149-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--7D9C264F6B3040B89A939CC2E857E149-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--7D9C264F6B3040B89A939CC2E857E149-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--7D9C264F6B3040B89A939CC2E857E149-->  <NAME><![CDATA[Divisiongroupqty]]></NAME>
-<!--7D9C264F6B3040B89A939CC2E857E149-->  <DESCRIPTION><![CDATA[Indicates the quantity in which P+ products will be grouped ]]></DESCRIPTION>
-<!--7D9C264F6B3040B89A939CC2E857E149-->  <HELP><![CDATA[Indicates the quantity in which P+ products will be grouped]]></HELP>
-<!--7D9C264F6B3040B89A939CC2E857E149-->  <COLUMNNAME><![CDATA[Divisiongroupqty]]></COLUMNNAME>
-<!--7D9C264F6B3040B89A939CC2E857E149-->  <AD_TABLE_ID><![CDATA[800096]]></AD_TABLE_ID>
-<!--7D9C264F6B3040B89A939CC2E857E149-->  <AD_REFERENCE_ID><![CDATA[11]]></AD_REFERENCE_ID>
-<!--7D9C264F6B3040B89A939CC2E857E149-->  <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
-<!--7D9C264F6B3040B89A939CC2E857E149-->  <ISKEY><![CDATA[N]]></ISKEY>
-<!--7D9C264F6B3040B89A939CC2E857E149-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--7D9C264F6B3040B89A939CC2E857E149-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
-<!--7D9C264F6B3040B89A939CC2E857E149-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--7D9C264F6B3040B89A939CC2E857E149-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--7D9C264F6B3040B89A939CC2E857E149-->  <SEQNO><![CDATA[300]]></SEQNO>
-<!--7D9C264F6B3040B89A939CC2E857E149-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--7D9C264F6B3040B89A939CC2E857E149-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--7D9C264F6B3040B89A939CC2E857E149-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--7D9C264F6B3040B89A939CC2E857E149-->  <AD_ELEMENT_ID><![CDATA[687290BF756545829E283A6AF2CC2576]]></AD_ELEMENT_ID>
-<!--7D9C264F6B3040B89A939CC2E857E149-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
-<!--7D9C264F6B3040B89A939CC2E857E149-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--7D9C264F6B3040B89A939CC2E857E149-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--7D9C264F6B3040B89A939CC2E857E149-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--7D9C264F6B3040B89A939CC2E857E149-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--7D9C264F6B3040B89A939CC2E857E149-->  <POSITION><![CDATA[26]]></POSITION>
-<!--7D9C264F6B3040B89A939CC2E857E149-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--7D9C264F6B3040B89A939CC2E857E149-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--7D9C264F6B3040B89A939CC2E857E149-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
-<!--7D9C264F6B3040B89A939CC2E857E149--></AD_COLUMN>
-
 <!--7DBD795B18BA4B6589BAADF480BD0440--><AD_COLUMN>
 <!--7DBD795B18BA4B6589BAADF480BD0440-->  <AD_COLUMN_ID><![CDATA[7DBD795B18BA4B6589BAADF480BD0440]]></AD_COLUMN_ID>
 <!--7DBD795B18BA4B6589BAADF480BD0440-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -240815,39 +240815,6 @@
 <!--7E7444273E934B0EA16208658FD6C52E-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
 <!--7E7444273E934B0EA16208658FD6C52E--></AD_COLUMN>
 
-<!--7E873B8CDCFE4FCF9692D2730479D8A2--><AD_COLUMN>
-<!--7E873B8CDCFE4FCF9692D2730479D8A2-->  <AD_COLUMN_ID><![CDATA[7E873B8CDCFE4FCF9692D2730479D8A2]]></AD_COLUMN_ID>
-<!--7E873B8CDCFE4FCF9692D2730479D8A2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--7E873B8CDCFE4FCF9692D2730479D8A2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--7E873B8CDCFE4FCF9692D2730479D8A2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--7E873B8CDCFE4FCF9692D2730479D8A2-->  <NAME><![CDATA[Division Group Quantity]]></NAME>
-<!--7E873B8CDCFE4FCF9692D2730479D8A2-->  <DESCRIPTION><![CDATA[Indicates the quantity in which P+ products will be grouped ]]></DESCRIPTION>
-<!--7E873B8CDCFE4FCF9692D2730479D8A2-->  <HELP><![CDATA[Indicates the quantity in which P+ products will be grouped]]></HELP>
-<!--7E873B8CDCFE4FCF9692D2730479D8A2-->  <COLUMNNAME><![CDATA[Divisiongroupqty]]></COLUMNNAME>
-<!--7E873B8CDCFE4FCF9692D2730479D8A2-->  <AD_TABLE_ID><![CDATA[385]]></AD_TABLE_ID>
-<!--7E873B8CDCFE4FCF9692D2730479D8A2-->  <AD_REFERENCE_ID><![CDATA[11]]></AD_REFERENCE_ID>
-<!--7E873B8CDCFE4FCF9692D2730479D8A2-->  <FIELDLENGTH><![CDATA[2]]></FIELDLENGTH>
-<!--7E873B8CDCFE4FCF9692D2730479D8A2-->  <ISKEY><![CDATA[N]]></ISKEY>
-<!--7E873B8CDCFE4FCF9692D2730479D8A2-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--7E873B8CDCFE4FCF9692D2730479D8A2-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
-<!--7E873B8CDCFE4FCF9692D2730479D8A2-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--7E873B8CDCFE4FCF9692D2730479D8A2-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--7E873B8CDCFE4FCF9692D2730479D8A2-->  <SEQNO><![CDATA[172]]></SEQNO>
-<!--7E873B8CDCFE4FCF9692D2730479D8A2-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--7E873B8CDCFE4FCF9692D2730479D8A2-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--7E873B8CDCFE4FCF9692D2730479D8A2-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--7E873B8CDCFE4FCF9692D2730479D8A2-->  <AD_ELEMENT_ID><![CDATA[687290BF756545829E283A6AF2CC2576]]></AD_ELEMENT_ID>
-<!--7E873B8CDCFE4FCF9692D2730479D8A2-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
-<!--7E873B8CDCFE4FCF9692D2730479D8A2-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--7E873B8CDCFE4FCF9692D2730479D8A2-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--7E873B8CDCFE4FCF9692D2730479D8A2-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--7E873B8CDCFE4FCF9692D2730479D8A2-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--7E873B8CDCFE4FCF9692D2730479D8A2-->  <POSITION><![CDATA[27]]></POSITION>
-<!--7E873B8CDCFE4FCF9692D2730479D8A2-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--7E873B8CDCFE4FCF9692D2730479D8A2-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--7E873B8CDCFE4FCF9692D2730479D8A2-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
-<!--7E873B8CDCFE4FCF9692D2730479D8A2--></AD_COLUMN>
-
 <!--7E8829EBCFF6143AE040007F010018ED--><AD_COLUMN>
 <!--7E8829EBCFF6143AE040007F010018ED-->  <AD_COLUMN_ID><![CDATA[7E8829EBCFF6143AE040007F010018ED]]></AD_COLUMN_ID>
 <!--7E8829EBCFF6143AE040007F010018ED-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -260560,6 +260527,39 @@
 <!--B77F641D5777417CAEDFF43E2BB18742-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
 <!--B77F641D5777417CAEDFF43E2BB18742--></AD_COLUMN>
 
+<!--B7D39D63B1734983ABB6829E13A6F46F--><AD_COLUMN>
+<!--B7D39D63B1734983ABB6829E13A6F46F-->  <AD_COLUMN_ID><![CDATA[B7D39D63B1734983ABB6829E13A6F46F]]></AD_COLUMN_ID>
+<!--B7D39D63B1734983ABB6829E13A6F46F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B7D39D63B1734983ABB6829E13A6F46F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B7D39D63B1734983ABB6829E13A6F46F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B7D39D63B1734983ABB6829E13A6F46F-->  <NAME><![CDATA[Division Group Quantity]]></NAME>
+<!--B7D39D63B1734983ABB6829E13A6F46F-->  <DESCRIPTION><![CDATA[Indicates the quantity in which P+ products will be grouped ]]></DESCRIPTION>
+<!--B7D39D63B1734983ABB6829E13A6F46F-->  <HELP><![CDATA[Indicates the quantity in which P+ products will be grouped]]></HELP>
+<!--B7D39D63B1734983ABB6829E13A6F46F-->  <COLUMNNAME><![CDATA[Divisiongroupqty]]></COLUMNNAME>
+<!--B7D39D63B1734983ABB6829E13A6F46F-->  <AD_TABLE_ID><![CDATA[800097]]></AD_TABLE_ID>
+<!--B7D39D63B1734983ABB6829E13A6F46F-->  <AD_REFERENCE_ID><![CDATA[11]]></AD_REFERENCE_ID>
+<!--B7D39D63B1734983ABB6829E13A6F46F-->  <FIELDLENGTH><![CDATA[2]]></FIELDLENGTH>
+<!--B7D39D63B1734983ABB6829E13A6F46F-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--B7D39D63B1734983ABB6829E13A6F46F-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--B7D39D63B1734983ABB6829E13A6F46F-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--B7D39D63B1734983ABB6829E13A6F46F-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--B7D39D63B1734983ABB6829E13A6F46F-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--B7D39D63B1734983ABB6829E13A6F46F-->  <SEQNO><![CDATA[340]]></SEQNO>
+<!--B7D39D63B1734983ABB6829E13A6F46F-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--B7D39D63B1734983ABB6829E13A6F46F-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--B7D39D63B1734983ABB6829E13A6F46F-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--B7D39D63B1734983ABB6829E13A6F46F-->  <AD_ELEMENT_ID><![CDATA[687290BF756545829E283A6AF2CC2576]]></AD_ELEMENT_ID>
+<!--B7D39D63B1734983ABB6829E13A6F46F-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--B7D39D63B1734983ABB6829E13A6F46F-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--B7D39D63B1734983ABB6829E13A6F46F-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--B7D39D63B1734983ABB6829E13A6F46F-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--B7D39D63B1734983ABB6829E13A6F46F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--B7D39D63B1734983ABB6829E13A6F46F-->  <POSITION><![CDATA[35]]></POSITION>
+<!--B7D39D63B1734983ABB6829E13A6F46F-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--B7D39D63B1734983ABB6829E13A6F46F-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--B7D39D63B1734983ABB6829E13A6F46F-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--B7D39D63B1734983ABB6829E13A6F46F--></AD_COLUMN>
+
 <!--B7ED22A39C674AA0B00C1E8440C0A980--><AD_COLUMN>
 <!--B7ED22A39C674AA0B00C1E8440C0A980-->  <AD_COLUMN_ID><![CDATA[B7ED22A39C674AA0B00C1E8440C0A980]]></AD_COLUMN_ID>
 <!--B7ED22A39C674AA0B00C1E8440C0A980-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_FIELD.xml	Fri Oct 07 17:21:03 2011 +0200
+++ b/src-db/database/sourcedata/AD_FIELD.xml	Mon Oct 10 18:57:12 2011 +0200
@@ -165218,33 +165218,6 @@
 <!--2DFC15C032E841C9A8261D197A44AA86-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
 <!--2DFC15C032E841C9A8261D197A44AA86--></AD_FIELD>
 
-<!--2E2587D8ADA54D739F1AFAFD9120C602--><AD_FIELD>
-<!--2E2587D8ADA54D739F1AFAFD9120C602-->  <AD_FIELD_ID><![CDATA[2E2587D8ADA54D739F1AFAFD9120C602]]></AD_FIELD_ID>
-<!--2E2587D8ADA54D739F1AFAFD9120C602-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--2E2587D8ADA54D739F1AFAFD9120C602-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--2E2587D8ADA54D739F1AFAFD9120C602-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--2E2587D8ADA54D739F1AFAFD9120C602-->  <NAME><![CDATA[Division Group Quantity]]></NAME>
-<!--2E2587D8ADA54D739F1AFAFD9120C602-->  <DESCRIPTION><![CDATA[Indicates the quantity in which P+ products will be grouped ]]></DESCRIPTION>
-<!--2E2587D8ADA54D739F1AFAFD9120C602-->  <HELP><![CDATA[Indicates the quantity in which P+ products will be grouped]]></HELP>
-<!--2E2587D8ADA54D739F1AFAFD9120C602-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--2E2587D8ADA54D739F1AFAFD9120C602-->  <AD_TAB_ID><![CDATA[800109]]></AD_TAB_ID>
-<!--2E2587D8ADA54D739F1AFAFD9120C602-->  <AD_COLUMN_ID><![CDATA[7D9C264F6B3040B89A939CC2E857E149]]></AD_COLUMN_ID>
-<!--2E2587D8ADA54D739F1AFAFD9120C602-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--2E2587D8ADA54D739F1AFAFD9120C602-->  <DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
-<!--2E2587D8ADA54D739F1AFAFD9120C602-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--2E2587D8ADA54D739F1AFAFD9120C602-->  <SEQNO><![CDATA[85]]></SEQNO>
-<!--2E2587D8ADA54D739F1AFAFD9120C602-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
-<!--2E2587D8ADA54D739F1AFAFD9120C602-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
-<!--2E2587D8ADA54D739F1AFAFD9120C602-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--2E2587D8ADA54D739F1AFAFD9120C602-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
-<!--2E2587D8ADA54D739F1AFAFD9120C602-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
-<!--2E2587D8ADA54D739F1AFAFD9120C602-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--2E2587D8ADA54D739F1AFAFD9120C602-->  <GRID_SEQNO><![CDATA[85]]></GRID_SEQNO>
-<!--2E2587D8ADA54D739F1AFAFD9120C602-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
-<!--2E2587D8ADA54D739F1AFAFD9120C602-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
-<!--2E2587D8ADA54D739F1AFAFD9120C602-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
-<!--2E2587D8ADA54D739F1AFAFD9120C602--></AD_FIELD>
-
 <!--2E3512F5F5CE48EB8AC1547FC921F58F--><AD_FIELD>
 <!--2E3512F5F5CE48EB8AC1547FC921F58F-->  <AD_FIELD_ID><![CDATA[2E3512F5F5CE48EB8AC1547FC921F58F]]></AD_FIELD_ID>
 <!--2E3512F5F5CE48EB8AC1547FC921F58F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -168704,6 +168677,34 @@
 <!--548C02B5BA29459399366C8E16A9BEEC-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
 <!--548C02B5BA29459399366C8E16A9BEEC--></AD_FIELD>
 
+<!--549620B22B8846B3AD0DFA504AC07B84--><AD_FIELD>
+<!--549620B22B8846B3AD0DFA504AC07B84-->  <AD_FIELD_ID><![CDATA[549620B22B8846B3AD0DFA504AC07B84]]></AD_FIELD_ID>
+<!--549620B22B8846B3AD0DFA504AC07B84-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--549620B22B8846B3AD0DFA504AC07B84-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--549620B22B8846B3AD0DFA504AC07B84-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--549620B22B8846B3AD0DFA504AC07B84-->  <NAME><![CDATA[Division Group Quantity]]></NAME>
+<!--549620B22B8846B3AD0DFA504AC07B84-->  <DESCRIPTION><![CDATA[Indicates the quantity in which P+ products will be grouped ]]></DESCRIPTION>
+<!--549620B22B8846B3AD0DFA504AC07B84-->  <HELP><![CDATA[Indicates the quantity in which P+ products will be grouped]]></HELP>
+<!--549620B22B8846B3AD0DFA504AC07B84-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--549620B22B8846B3AD0DFA504AC07B84-->  <AD_TAB_ID><![CDATA[800110]]></AD_TAB_ID>
+<!--549620B22B8846B3AD0DFA504AC07B84-->  <AD_COLUMN_ID><![CDATA[B7D39D63B1734983ABB6829E13A6F46F]]></AD_COLUMN_ID>
+<!--549620B22B8846B3AD0DFA504AC07B84-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--549620B22B8846B3AD0DFA504AC07B84-->  <DISPLAYLOGIC><![CDATA[@Productiontype@='+']]></DISPLAYLOGIC>
+<!--549620B22B8846B3AD0DFA504AC07B84-->  <DISPLAYLENGTH><![CDATA[2]]></DISPLAYLENGTH>
+<!--549620B22B8846B3AD0DFA504AC07B84-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--549620B22B8846B3AD0DFA504AC07B84-->  <SEQNO><![CDATA[120]]></SEQNO>
+<!--549620B22B8846B3AD0DFA504AC07B84-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--549620B22B8846B3AD0DFA504AC07B84-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--549620B22B8846B3AD0DFA504AC07B84-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--549620B22B8846B3AD0DFA504AC07B84-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--549620B22B8846B3AD0DFA504AC07B84-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--549620B22B8846B3AD0DFA504AC07B84-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--549620B22B8846B3AD0DFA504AC07B84-->  <GRID_SEQNO><![CDATA[120]]></GRID_SEQNO>
+<!--549620B22B8846B3AD0DFA504AC07B84-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--549620B22B8846B3AD0DFA504AC07B84-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--549620B22B8846B3AD0DFA504AC07B84-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--549620B22B8846B3AD0DFA504AC07B84--></AD_FIELD>
+
 <!--549FB043F3B24FB9B12519B4F09C19B6--><AD_FIELD>
 <!--549FB043F3B24FB9B12519B4F09C19B6-->  <AD_FIELD_ID><![CDATA[549FB043F3B24FB9B12519B4F09C19B6]]></AD_FIELD_ID>
 <!--549FB043F3B24FB9B12519B4F09C19B6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -177442,7 +177443,7 @@
 <!--639A3B8F69E644DAB62B6D07ACE77DDB-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--639A3B8F69E644DAB62B6D07ACE77DDB-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
 <!--639A3B8F69E644DAB62B6D07ACE77DDB-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--639A3B8F69E644DAB62B6D07ACE77DDB-->  <SEQNO><![CDATA[120]]></SEQNO>
+<!--639A3B8F69E644DAB62B6D07ACE77DDB-->  <SEQNO><![CDATA[130]]></SEQNO>
 <!--639A3B8F69E644DAB62B6D07ACE77DDB-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--639A3B8F69E644DAB62B6D07ACE77DDB-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--639A3B8F69E644DAB62B6D07ACE77DDB-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -190368,33 +190369,6 @@
 <!--9B255A20E9AC41A2AA3028A0D5BCF0B9-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
 <!--9B255A20E9AC41A2AA3028A0D5BCF0B9--></AD_FIELD>
 
-<!--9B404CB7DA9F471C91DEC5014EC993CA--><AD_FIELD>
-<!--9B404CB7DA9F471C91DEC5014EC993CA-->  <AD_FIELD_ID><![CDATA[9B404CB7DA9F471C91DEC5014EC993CA]]></AD_FIELD_ID>
-<!--9B404CB7DA9F471C91DEC5014EC993CA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--9B404CB7DA9F471C91DEC5014EC993CA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--9B404CB7DA9F471C91DEC5014EC993CA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--9B404CB7DA9F471C91DEC5014EC993CA-->  <NAME><![CDATA[Division Group Quantity]]></NAME>
-<!--9B404CB7DA9F471C91DEC5014EC993CA-->  <DESCRIPTION><![CDATA[Indicates the quantity in which P+ products will be grouped ]]></DESCRIPTION>
-<!--9B404CB7DA9F471C91DEC5014EC993CA-->  <HELP><![CDATA[Indicates the quantity in which P+ products will be grouped]]></HELP>
-<!--9B404CB7DA9F471C91DEC5014EC993CA-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--9B404CB7DA9F471C91DEC5014EC993CA-->  <AD_TAB_ID><![CDATA[800117]]></AD_TAB_ID>
-<!--9B404CB7DA9F471C91DEC5014EC993CA-->  <AD_COLUMN_ID><![CDATA[7E873B8CDCFE4FCF9692D2730479D8A2]]></AD_COLUMN_ID>
-<!--9B404CB7DA9F471C91DEC5014EC993CA-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--9B404CB7DA9F471C91DEC5014EC993CA-->  <DISPLAYLENGTH><![CDATA[2]]></DISPLAYLENGTH>
-<!--9B404CB7DA9F471C91DEC5014EC993CA-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--9B404CB7DA9F471C91DEC5014EC993CA-->  <SEQNO><![CDATA[150]]></SEQNO>
-<!--9B404CB7DA9F471C91DEC5014EC993CA-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
-<!--9B404CB7DA9F471C91DEC5014EC993CA-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
-<!--9B404CB7DA9F471C91DEC5014EC993CA-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--9B404CB7DA9F471C91DEC5014EC993CA-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
-<!--9B404CB7DA9F471C91DEC5014EC993CA-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
-<!--9B404CB7DA9F471C91DEC5014EC993CA-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--9B404CB7DA9F471C91DEC5014EC993CA-->  <GRID_SEQNO><![CDATA[150]]></GRID_SEQNO>
-<!--9B404CB7DA9F471C91DEC5014EC993CA-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
-<!--9B404CB7DA9F471C91DEC5014EC993CA-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
-<!--9B404CB7DA9F471C91DEC5014EC993CA-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
-<!--9B404CB7DA9F471C91DEC5014EC993CA--></AD_FIELD>
-
 <!--9B47A5ACA52848FE913E570498056B53--><AD_FIELD>
 <!--9B47A5ACA52848FE913E570498056B53-->  <AD_FIELD_ID><![CDATA[9B47A5ACA52848FE913E570498056B53]]></AD_FIELD_ID>
 <!--9B47A5ACA52848FE913E570498056B53-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -190847,33 +190821,6 @@
 <!--9FD95BB291834B73A35A66057F9A952C-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
 <!--9FD95BB291834B73A35A66057F9A952C--></AD_FIELD>
 
-<!--A04B3BC938BB48268F3EB091EB570319--><AD_FIELD>
-<!--A04B3BC938BB48268F3EB091EB570319-->  <AD_FIELD_ID><![CDATA[A04B3BC938BB48268F3EB091EB570319]]></AD_FIELD_ID>
-<!--A04B3BC938BB48268F3EB091EB570319-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--A04B3BC938BB48268F3EB091EB570319-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--A04B3BC938BB48268F3EB091EB570319-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--A04B3BC938BB48268F3EB091EB570319-->  <NAME><![CDATA[Division Group Quantity]]></NAME>
-<!--A04B3BC938BB48268F3EB091EB570319-->  <DESCRIPTION><![CDATA[Indicates the quantity in which P+ products will be grouped ]]></DESCRIPTION>
-<!--A04B3BC938BB48268F3EB091EB570319-->  <HELP><![CDATA[Indicates the quantity in which P+ products will be grouped]]></HELP>
-<!--A04B3BC938BB48268F3EB091EB570319-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--A04B3BC938BB48268F3EB091EB570319-->  <AD_TAB_ID><![CDATA[C9B5394DBA8C465C9CE26A361696B06E]]></AD_TAB_ID>
-<!--A04B3BC938BB48268F3EB091EB570319-->  <AD_COLUMN_ID><![CDATA[7E873B8CDCFE4FCF9692D2730479D8A2]]></AD_COLUMN_ID>
-<!--A04B3BC938BB48268F3EB091EB570319-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--A04B3BC938BB48268F3EB091EB570319-->  <DISPLAYLENGTH><![CDATA[2]]></DISPLAYLENGTH>
-<!--A04B3BC938BB48268F3EB091EB570319-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--A04B3BC938BB48268F3EB091EB570319-->  <SEQNO><![CDATA[150]]></SEQNO>
-<!--A04B3BC938BB48268F3EB091EB570319-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
-<!--A04B3BC938BB48268F3EB091EB570319-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
-<!--A04B3BC938BB48268F3EB091EB570319-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--A04B3BC938BB48268F3EB091EB570319-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
-<!--A04B3BC938BB48268F3EB091EB570319-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
-<!--A04B3BC938BB48268F3EB091EB570319-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--A04B3BC938BB48268F3EB091EB570319-->  <GRID_SEQNO><![CDATA[150]]></GRID_SEQNO>
-<!--A04B3BC938BB48268F3EB091EB570319-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
-<!--A04B3BC938BB48268F3EB091EB570319-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
-<!--A04B3BC938BB48268F3EB091EB570319-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
-<!--A04B3BC938BB48268F3EB091EB570319--></AD_FIELD>
-
 <!--A18268C7292C4EB7A862476D7E89D80B--><AD_FIELD>
 <!--A18268C7292C4EB7A862476D7E89D80B-->  <AD_FIELD_ID><![CDATA[A18268C7292C4EB7A862476D7E89D80B]]></AD_FIELD_ID>
 <!--A18268C7292C4EB7A862476D7E89D80B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -192510,6 +192457,34 @@
 <!--B8133D89DCFA4FF2824A48E8C5E8950F-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
 <!--B8133D89DCFA4FF2824A48E8C5E8950F--></AD_FIELD>
 
+<!--B84E2B82386C4E72936A609C72E8648D--><AD_FIELD>
+<!--B84E2B82386C4E72936A609C72E8648D-->  <AD_FIELD_ID><![CDATA[B84E2B82386C4E72936A609C72E8648D]]></AD_FIELD_ID>
+<!--B84E2B82386C4E72936A609C72E8648D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B84E2B82386C4E72936A609C72E8648D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B84E2B82386C4E72936A609C72E8648D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B84E2B82386C4E72936A609C72E8648D-->  <NAME><![CDATA[Division Group Quantity]]></NAME>
+<!--B84E2B82386C4E72936A609C72E8648D-->  <DESCRIPTION><![CDATA[Indicates the quantity in which P+ products will be grouped ]]></DESCRIPTION>
+<!--B84E2B82386C4E72936A609C72E8648D-->  <HELP><![CDATA[Indicates the quantity in which P+ products will be grouped]]></HELP>
+<!--B84E2B82386C4E72936A609C72E8648D-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--B84E2B82386C4E72936A609C72E8648D-->  <AD_TAB_ID><![CDATA[3E580F9A9D684ACC99B47E8BAE5E5563]]></AD_TAB_ID>
+<!--B84E2B82386C4E72936A609C72E8648D-->  <AD_COLUMN_ID><![CDATA[53D24E829E4A46C9A4488DEABF052882]]></AD_COLUMN_ID>
+<!--B84E2B82386C4E72936A609C72E8648D-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--B84E2B82386C4E72936A609C72E8648D-->  <DISPLAYLOGIC><![CDATA[@Productiontype@='+']]></DISPLAYLOGIC>
+<!--B84E2B82386C4E72936A609C72E8648D-->  <DISPLAYLENGTH><![CDATA[2]]></DISPLAYLENGTH>
+<!--B84E2B82386C4E72936A609C72E8648D-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--B84E2B82386C4E72936A609C72E8648D-->  <SEQNO><![CDATA[110]]></SEQNO>
+<!--B84E2B82386C4E72936A609C72E8648D-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--B84E2B82386C4E72936A609C72E8648D-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--B84E2B82386C4E72936A609C72E8648D-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--B84E2B82386C4E72936A609C72E8648D-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--B84E2B82386C4E72936A609C72E8648D-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--B84E2B82386C4E72936A609C72E8648D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--B84E2B82386C4E72936A609C72E8648D-->  <GRID_SEQNO><![CDATA[110]]></GRID_SEQNO>
+<!--B84E2B82386C4E72936A609C72E8648D-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--B84E2B82386C4E72936A609C72E8648D-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--B84E2B82386C4E72936A609C72E8648D-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--B84E2B82386C4E72936A609C72E8648D--></AD_FIELD>
+
 <!--B885A9283E044499BFE5DCF12AAD72C5--><AD_FIELD>
 <!--B885A9283E044499BFE5DCF12AAD72C5-->  <AD_FIELD_ID><![CDATA[B885A9283E044499BFE5DCF12AAD72C5]]></AD_FIELD_ID>
 <!--B885A9283E044499BFE5DCF12AAD72C5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -194814,6 +194789,34 @@
 <!--E1E87128D16E4530894218F611C19E69-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
 <!--E1E87128D16E4530894218F611C19E69--></AD_FIELD>
 
+<!--E223465B39964B6887C58F426D48253D--><AD_FIELD>
+<!--E223465B39964B6887C58F426D48253D-->  <AD_FIELD_ID><![CDATA[E223465B39964B6887C58F426D48253D]]></AD_FIELD_ID>
+<!--E223465B39964B6887C58F426D48253D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E223465B39964B6887C58F426D48253D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E223465B39964B6887C58F426D48253D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E223465B39964B6887C58F426D48253D-->  <NAME><![CDATA[Division Group Quantity]]></NAME>
+<!--E223465B39964B6887C58F426D48253D-->  <DESCRIPTION><![CDATA[Indicates the quantity in which P+ products will be grouped ]]></DESCRIPTION>
+<!--E223465B39964B6887C58F426D48253D-->  <HELP><![CDATA[Indicates the quantity in which P+ products will be grouped]]></HELP>
+<!--E223465B39964B6887C58F426D48253D-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--E223465B39964B6887C58F426D48253D-->  <AD_TAB_ID><![CDATA[800119]]></AD_TAB_ID>
+<!--E223465B39964B6887C58F426D48253D-->  <AD_COLUMN_ID><![CDATA[53D24E829E4A46C9A4488DEABF052882]]></AD_COLUMN_ID>
+<!--E223465B39964B6887C58F426D48253D-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--E223465B39964B6887C58F426D48253D-->  <DISPLAYLOGIC><![CDATA[@Productiontype@='+']]></DISPLAYLOGIC>
+<!--E223465B39964B6887C58F426D48253D-->  <DISPLAYLENGTH><![CDATA[2]]></DISPLAYLENGTH>
+<!--E223465B39964B6887C58F426D48253D-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--E223465B39964B6887C58F426D48253D-->  <SEQNO><![CDATA[110]]></SEQNO>
+<!--E223465B39964B6887C58F426D48253D-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--E223465B39964B6887C58F426D48253D-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--E223465B39964B6887C58F426D48253D-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--E223465B39964B6887C58F426D48253D-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--E223465B39964B6887C58F426D48253D-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--E223465B39964B6887C58F426D48253D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--E223465B39964B6887C58F426D48253D-->  <GRID_SEQNO><![CDATA[110]]></GRID_SEQNO>
+<!--E223465B39964B6887C58F426D48253D-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--E223465B39964B6887C58F426D48253D-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--E223465B39964B6887C58F426D48253D-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--E223465B39964B6887C58F426D48253D--></AD_FIELD>
+
 <!--E264C03B4D054535BFFB818C11B7B416--><AD_FIELD>
 <!--E264C03B4D054535BFFB818C11B7B416-->  <AD_FIELD_ID><![CDATA[E264C03B4D054535BFFB818C11B7B416]]></AD_FIELD_ID>
 <!--E264C03B4D054535BFFB818C11B7B416-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src/org/openbravo/erpCommon/ad_actionButton/CreateWorkEffort.java	Fri Oct 07 17:21:03 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateWorkEffort.java	Mon Oct 10 18:57:12 2011 +0200
@@ -173,8 +173,6 @@
           }
 
           productionPlan.setOutsourced((wrOp.isOutsourced() == null) ? false : wrOp.isOutsourced());
-          if (wrOp.getMASequence() != null)
-            productionPlan.setDivisionGroupQuantity(wrOp.getMASequence().getDivisiongroupqty());
 
           OBDal.getInstance().save(productionPlan);
           OBDal.getInstance().flush();
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_ProductionPlan_WRPhase.java	Fri Oct 07 17:21:03 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_ProductionPlan_WRPhase.java	Mon Oct 10 18:57:12 2011 +0200
@@ -97,8 +97,6 @@
     resultado.append("new Array(\"inpmaCostcenterVersionId\", \"" + data[0].maCostcenterVersionId
         + "\"), \n");
     resultado.append("new Array(\"inpoutsourced\", \"" + strOutsourced + "\"),\n");
-    resultado.append("new Array(\"inpdivisiongroupqty\", \""
-        + FormatUtilities.replaceJS(data[0].divisiongroupqty) + "\"),\n");
     resultado.append("new Array(\"inpestimatedtime\", \""
         + FormatUtilities.replaceJS(estimatedTime.toPlainString()) + "\")\n");
     resultado.append(");\n");
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_ProductionPlan_WRPhase_data.xsql	Fri Oct 07 17:21:03 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_ProductionPlan_WRPhase_data.xsql	Mon Oct 10 18:57:12 2011 +0200
@@ -25,7 +25,7 @@
     <SqlMethodComment></SqlMethodComment>
     <Sql>
       <![CDATA[
-      SELECT (wrp.QUANTITY - wrp.DONEQUANTITY) AS neededqty, w.secondaryunit, w.conversionrate, ccv.MA_CostCenter_Version_ID, se.divisiongroupqty, wrp.estimatedtime, wrp.quantity
+      SELECT (wrp.QUANTITY - wrp.DONEQUANTITY) AS neededqty, w.secondaryunit, w.conversionrate, ccv.MA_CostCenter_Version_ID, wrp.estimatedtime, wrp.quantity
       FROM MA_WRPhase wrp
       LEFT JOIN MA_Sequence se ON  wrp.MA_Sequence_ID = se.MA_Sequence_ID, MA_WorkRequirement w, MA_Process p
            LEFT JOIN MA_CostCenter cc ON p.MA_COSTCENTER_ID = cc.MA_CostCenter_Id