Related to issue 29496: Code review improvements
authorVíctor Martínez Romanos <victor.martinez@openbravo.com>
Thu, 25 Jun 2015 15:32:39 +0200
changeset 27152 405ac3729ec7
parent 27151 3f6a959095d4
child 27153 431da3d3ec95
Related to issue 29496: Code review improvements

Added the same AD_Element_ID to the new IsStocked column as in the Product table
Updated copyright and fixed typo
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/return-material/ob-return-material.js
src-db/database/sourcedata/AD_COLUMN.xml
src-db/database/sourcedata/AD_FIELD.xml
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/return-material/ob-return-material.js	Thu May 07 16:18:01 2015 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/return-material/ob-return-material.js	Thu Jun 25 15:32:39 2015 +0200
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2011-2014 Openbravo SLU
+ * All portions are Copyright (C) 2011-2015 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -132,10 +132,10 @@
       availableQty = new BigDecimal(String(record.availableQty)),
       storageBin = record.storageBin,
       editedRecord = null,
-      isstocked = record.stockable,
+      isstocked = record.stocked,
       i;
   if (state) {
-    //Cheking available stock
+    // Checking available stock
     if (storageBin === null && isstocked) {
       grid.view.messageBar.setMessage(isc.OBMessageBar.TYPE_ERROR, null, OB.I18N.getLabel('OBUIAPP_RM_NotAvailableStock', [record.rMOrderNo]));
       return false;
--- a/src-db/database/sourcedata/AD_COLUMN.xml	Thu May 07 16:18:01 2015 +0200
+++ b/src-db/database/sourcedata/AD_COLUMN.xml	Thu Jun 25 15:32:39 2015 +0200
@@ -316867,8 +316867,10 @@
 <!--C0D9A7D1D5B043A4B8AE9F6AC683FD50-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--C0D9A7D1D5B043A4B8AE9F6AC683FD50-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--C0D9A7D1D5B043A4B8AE9F6AC683FD50-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--C0D9A7D1D5B043A4B8AE9F6AC683FD50-->  <NAME><![CDATA[Stockable]]></NAME>
-<!--C0D9A7D1D5B043A4B8AE9F6AC683FD50-->  <COLUMNNAME><![CDATA[Isstocked]]></COLUMNNAME>
+<!--C0D9A7D1D5B043A4B8AE9F6AC683FD50-->  <NAME><![CDATA[Stocked]]></NAME>
+<!--C0D9A7D1D5B043A4B8AE9F6AC683FD50-->  <DESCRIPTION><![CDATA[Organization stocks this product]]></DESCRIPTION>
+<!--C0D9A7D1D5B043A4B8AE9F6AC683FD50-->  <HELP><![CDATA[The Stocked check box indicates if this product is stocked by this Organization.]]></HELP>
+<!--C0D9A7D1D5B043A4B8AE9F6AC683FD50-->  <COLUMNNAME><![CDATA[IsStocked]]></COLUMNNAME>
 <!--C0D9A7D1D5B043A4B8AE9F6AC683FD50-->  <AD_TABLE_ID><![CDATA[347B0AA5C3CD4D18910D2FE4990B790E]]></AD_TABLE_ID>
 <!--C0D9A7D1D5B043A4B8AE9F6AC683FD50-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
 <!--C0D9A7D1D5B043A4B8AE9F6AC683FD50-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
@@ -316881,6 +316883,7 @@
 <!--C0D9A7D1D5B043A4B8AE9F6AC683FD50-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
 <!--C0D9A7D1D5B043A4B8AE9F6AC683FD50-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--C0D9A7D1D5B043A4B8AE9F6AC683FD50-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--C0D9A7D1D5B043A4B8AE9F6AC683FD50-->  <AD_ELEMENT_ID><![CDATA[415]]></AD_ELEMENT_ID>
 <!--C0D9A7D1D5B043A4B8AE9F6AC683FD50-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--C0D9A7D1D5B043A4B8AE9F6AC683FD50-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--C0D9A7D1D5B043A4B8AE9F6AC683FD50-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
--- a/src-db/database/sourcedata/AD_FIELD.xml	Thu May 07 16:18:01 2015 +0200
+++ b/src-db/database/sourcedata/AD_FIELD.xml	Thu Jun 25 15:32:39 2015 +0200
@@ -191471,9 +191471,9 @@
 <!--2569A250B0A143B59B7023153426759B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--2569A250B0A143B59B7023153426759B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--2569A250B0A143B59B7023153426759B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--2569A250B0A143B59B7023153426759B-->  <NAME><![CDATA[Stockable]]></NAME>
-<!--2569A250B0A143B59B7023153426759B-->  <DESCRIPTION><![CDATA[Inform if the product is stockable or not]]></DESCRIPTION>
-<!--2569A250B0A143B59B7023153426759B-->  <HELP><![CDATA[Inform if the product is stockable or not]]></HELP>
+<!--2569A250B0A143B59B7023153426759B-->  <NAME><![CDATA[Stocked]]></NAME>
+<!--2569A250B0A143B59B7023153426759B-->  <DESCRIPTION><![CDATA[Organization stocks this product]]></DESCRIPTION>
+<!--2569A250B0A143B59B7023153426759B-->  <HELP><![CDATA[The Stocked check box indicates if this product is stocked by this Organization.]]></HELP>
 <!--2569A250B0A143B59B7023153426759B-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--2569A250B0A143B59B7023153426759B-->  <AD_TAB_ID><![CDATA[9195CC43B5A4419195030A4DB17D8737]]></AD_TAB_ID>
 <!--2569A250B0A143B59B7023153426759B-->  <AD_COLUMN_ID><![CDATA[C0D9A7D1D5B043A4B8AE9F6AC683FD50]]></AD_COLUMN_ID>