details: /erp/devel/main/rev/99818017822d
changeset: 7910:99818017822d
user: Harikrishnan Raja <harikrishnan.raja <at> openbravo.com>
date: Wed Jul 14 16:26:00 2010 +0530
summary: Fixes Issue 13926: Quantity ordered duplicated
details: /erp/devel/main/rev/8b98f543308c
changeset: 7911:8b98f543308c
user: Harikrishnan Raja <harikrishnan.raja <at> openbravo.com>
date: Wed Jul 14 19:09:09 2010 +0530
summary: Fixes Issue 13484: User created on Initial Organization Setup has
Client Admin role
details: /erp/devel/main/rev/161d540df8db
changeset: 7912:161d540df8db
user: Harikrishnan Raja <harikrishnan.raja <at> openbravo.com>
date: Thu Jul 15 08:14:47 2010 +0530
summary: Commit for Database consistency failure.
details: /erp/devel/main/rev/aa0b48d438f1
changeset: 7913:aa0b48d438f1
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Thu Jul 15 08:18:17 2010 +0000
summary: CI: promote changesets from pi to main
details: /erp/devel/main/rev/33fb2a504aa2
changeset: 7914:33fb2a504aa2
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Thu Jul 15 08:18:18 2010 +0000
summary: CI: update AD_MODULE - Core version and label
diffstat:
src-db/database/model/functions/C_ORDER_POST1.xml | 8 +++-
src-db/database/sourcedata/AD_MODULE.xml | 4 +-
src/org/openbravo/erpCommon/ad_forms/InitialOrgSetup.java | 17 +++++++++-
src/org/openbravo/erpCommon/ad_forms/InitialOrgSetup_data.xsql | 2 +-
4 files changed, 25 insertions(+), 6 deletions(-)
diffs (93 lines):
diff -r 3c36c582b319 -r 33fb2a504aa2
src-db/database/model/functions/C_ORDER_POST1.xml
--- a/src-db/database/model/functions/C_ORDER_POST1.xml Wed Jul 14 12:46:20
2010 +0200
+++ b/src-db/database/model/functions/C_ORDER_POST1.xml Thu Jul 15 08:18:18
2010 +0000
@@ -352,7 +352,9 @@
v_QtyPO:=0;
v_QtyOrderPO:=NULL;
END IF;
- M_UPDATE_STORAGE_PENDING(v_Client_ID, v_Org_ID, v_UpdatedBy,
Cur_ResLine.M_Product_ID, Cur_ResLine.M_Warehouse_ID,
Cur_ResLine.M_AttributeSetInstance_ID, Cur_ResLine.C_UOM_ID,
Cur_ResLine.M_PRODUCT_UOM_ID, v_QtySO, v_QtyOrderSO, v_QtyPO, v_QtyOrderPO) ;
+ IF(v_DocStatus<>'IP' OR v_DocAction<>'CO') THEN
+ M_UPDATE_STORAGE_PENDING(v_Client_ID, v_Org_ID, v_UpdatedBy,
Cur_ResLine.M_Product_ID, Cur_ResLine.M_Warehouse_ID,
Cur_ResLine.M_AttributeSetInstance_ID, Cur_ResLine.C_UOM_ID,
Cur_ResLine.M_PRODUCT_UOM_ID, v_QtySO, v_QtyOrderSO, v_QtyPO, v_QtyOrderPO) ;
+ END IF;
END LOOP;
-- Set reserved quantity to 0
UPDATE C_ORDERLINE
@@ -984,8 +986,10 @@
v_QtyOrderPO := C_Uom_Convert(v_QtyPO, Cur_ResLine.C_UOM_ID,
Cur_ResLine.M_Product_UOM_ID, 'Y');
END IF;
END IF;
- M_UPDATE_STORAGE_PENDING(v_Client_ID, v_Org_ID, v_UpdatedBy,
Cur_ResLine.M_Product_ID, Cur_ResLine.M_Warehouse_ID,
Cur_ResLine.M_AttributeSetInstance_ID,
+ IF(v_DocStatus<>'IP' OR v_DocAction<>'CO') THEN
+ M_UPDATE_STORAGE_PENDING(v_Client_ID, v_Org_ID, v_UpdatedBy,
Cur_ResLine.M_Product_ID, Cur_ResLine.M_Warehouse_ID,
Cur_ResLine.M_AttributeSetInstance_ID,
Cur_ResLine.C_UOM_ID, Cur_ResLine.M_PRODUCT_UOM_ID, v_QtySO,
v_QtyOrderSO, v_QtyPO, v_QtyOrderPO);
+ END IF;
DBMS_OUTPUT.PUT_LINE('Reserved Warehouse=' || Cur_ResLine.M_Warehouse_ID ||
', Product=' || Cur_ResLine.M_Product_ID || ', Attrib=' ||
Cur_ResLine.M_AttributeSetInstance_ID || ', Qty=' || v_QtySO || '/' || v_QtyPO);
-- Update Order Line
diff -r 3c36c582b319 -r 33fb2a504aa2 src-db/database/sourcedata/AD_MODULE.xml
--- a/src-db/database/sourcedata/AD_MODULE.xml Wed Jul 14 12:46:20 2010 +0200
+++ b/src-db/database/sourcedata/AD_MODULE.xml Thu Jul 15 08:18:18 2010 +0000
@@ -6,7 +6,7 @@
<!--0--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--0--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--0--> <NAME><![CDATA[core]]></NAME>
-<!--0--> <VERSION><![CDATA[2.50.17732]]></VERSION>
+<!--0--> <VERSION><![CDATA[2.50.17913]]></VERSION>
<!--0--> <DESCRIPTION><![CDATA[Core module is the base one]]></DESCRIPTION>
<!--0--> <HELP><![CDATA[Core module is the base one, all developments in core
are included as part of the standard Openbravo ERP.]]></HELP>
<!--0--> <URL><![CDATA[www.openbravo.com]]></URL>
@@ -22,7 +22,7 @@
<!--0--> <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
<!--0--> <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
<!--0--> <REFERENCEDATAINFO><![CDATA[Standard document types for orders,
invoices, etc. and settings]]></REFERENCEDATAINFO>
-<!--0--> <VERSION_LABEL><![CDATA[dev]]></VERSION_LABEL>
+<!--0--> <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
<!--0--> <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
<!--0--></AD_MODULE>
diff -r 3c36c582b319 -r 33fb2a504aa2
src/org/openbravo/erpCommon/ad_forms/InitialOrgSetup.java
--- a/src/org/openbravo/erpCommon/ad_forms/InitialOrgSetup.java Wed Jul 14
12:46:20 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/InitialOrgSetup.java Thu Jul 15
08:18:18 2010 +0000
@@ -494,6 +494,21 @@
releaseRollbackConnection(conn);
return false;
}
+ String ad_role_id= SequenceIdData.getUUID();
+ if (InitialOrgSetupData.insertRole(conn, this, AD_Client_ID, ad_role_id,
name,AD_Org_ID) != 1) {
+ final String err = "InitialOrgSetup - CreateRole - Role NOT
inserted";
+ log4j.warn(err);
+ m_info.append(err).append(SALTO_LINEA);
+ releaseRollbackConnection(conn);
+ return false;
+ }
+ if (InitialOrgSetupData.insertRoleOrgAccess(conn, this, AD_Client_ID,
AD_Org_ID, ad_role_id) != 1) {
+ final String err = "InitialOrgSetup - CreateRole - Role Organization
NOT inserted";
+ log4j.warn(err);
+ m_info.append(err).append(SALTO_LINEA);
+ releaseRollbackConnection(conn);
+ return false;
+ }
if (log4j.isDebugEnabled())
log4j.debug("InitialOrgSetup - createOrg - USER INSERTED " + name);
// Info
@@ -515,7 +530,7 @@
// * Create User-Role
// OrgUser - User
- if (InitialOrgSetupData.insertUserRoles(conn, this, AD_Client_ID,
AD_User_U_ID, stradRoleId) != 1)
+ if (InitialOrgSetupData.insertUserRoles(conn, this, AD_Client_ID,
AD_User_U_ID, ad_role_id) != 1)
log4j.warn("InitialOrgSetup - createOrg - UserRole OrgUser+Org NOT
inserted");
releaseCommitConnection(conn);
} catch (final Exception e) {
diff -r 3c36c582b319 -r 33fb2a504aa2
src/org/openbravo/erpCommon/ad_forms/InitialOrgSetup_data.xsql
--- a/src/org/openbravo/erpCommon/ad_forms/InitialOrgSetup_data.xsql Wed Jul
14 12:46:20 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/InitialOrgSetup_data.xsql Thu Jul
15 08:18:18 2010 +0000
@@ -67,7 +67,7 @@
<![CDATA[
INSERT INTO AD_Role
(AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Role_ID,Name,
Description,UserLevel,ClientList,OrgList)
- VALUES (?,'0','Y',now(),'0',now(),'0',?,?,?,' CO',?,?)
+ VALUES (?,'0','Y',now(),'0',now(),'0',?,?,?,' O',?,?)
]]>
</Sql>
<Parameter name="AD_Client_ID"/>
------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
