Merge d64df2bbb169
This commit is contained in:
commit
1da7f8b59f
|
@ -74,7 +74,7 @@ AS
|
||||||
o.amounttendered,
|
o.amounttendered,
|
||||||
o.c_activity_id AS c_order_c_activity_id,
|
o.c_activity_id AS c_order_c_activity_id,
|
||||||
o.c_bpartner_id AS c_order_c_bpartner_id,
|
o.c_bpartner_id AS c_order_c_bpartner_id,
|
||||||
o.c_bpartner_location_id AS c_order_c_bpartner_location_i,
|
o.c_bpartner_location_id AS c_order_c_bpartner_loc_id,
|
||||||
o.c_campaign_id AS c_order_c_compaign_id,
|
o.c_campaign_id AS c_order_c_compaign_id,
|
||||||
o.c_cashline_id,
|
o.c_cashline_id,
|
||||||
o.c_cashplanline_id,
|
o.c_cashplanline_id,
|
||||||
|
|
|
@ -134,7 +134,7 @@ AS
|
||||||
ml.movementqty AS m_movementline_movementqty,
|
ml.movementqty AS m_movementline_movementqty,
|
||||||
ml.m_product_id AS m_movementline_m_product_id,
|
ml.m_product_id AS m_movementline_m_product_id,
|
||||||
ml.processed AS m_movementline_processed,
|
ml.processed AS m_movementline_processed,
|
||||||
ml.reversalline_id AS m_movementline_reversalline_i,
|
ml.reversalline_id AS m_movementline_reversalln_id,
|
||||||
ml.scrappedqty AS m_movementline_scrappedqty,
|
ml.scrappedqty AS m_movementline_scrappedqty,
|
||||||
ml.targetqty AS m_movementline_targetqty,
|
ml.targetqty AS m_movementline_targetqty,
|
||||||
ml.updated AS m_movementline_updated,
|
ml.updated AS m_movementline_updated,
|
||||||
|
|
|
@ -64,7 +64,7 @@ SELECT l.ad_client_id,
|
||||||
o.amounttendered,
|
o.amounttendered,
|
||||||
o.c_activity_id AS c_order_c_activity_id,
|
o.c_activity_id AS c_order_c_activity_id,
|
||||||
o.c_bpartner_id AS c_order_c_bpartner_id,
|
o.c_bpartner_id AS c_order_c_bpartner_id,
|
||||||
o.c_bpartner_location_id AS c_order_c_bpartner_location_i,
|
o.c_bpartner_location_id AS c_order_c_bpartner_loc_id,
|
||||||
o.c_campaign_id AS c_order_c_compaign_id,
|
o.c_campaign_id AS c_order_c_compaign_id,
|
||||||
o.c_cashline_id,
|
o.c_cashline_id,
|
||||||
o.c_cashplanline_id,
|
o.c_cashplanline_id,
|
||||||
|
|
|
@ -133,7 +133,7 @@ SELECT t.m_transaction_id,
|
||||||
ml.movementqty AS m_movementline_movementqty,
|
ml.movementqty AS m_movementline_movementqty,
|
||||||
ml.m_product_id AS m_movementline_m_product_id,
|
ml.m_product_id AS m_movementline_m_product_id,
|
||||||
ml.processed AS m_movementline_processed,
|
ml.processed AS m_movementline_processed,
|
||||||
ml.reversalline_id AS m_movementline_reversalline_i,
|
ml.reversalline_id AS m_movementline_reversalln_id,
|
||||||
ml.scrappedqty AS m_movementline_scrappedqty,
|
ml.scrappedqty AS m_movementline_scrappedqty,
|
||||||
ml.targetqty AS m_movementline_targetqty,
|
ml.targetqty AS m_movementline_targetqty,
|
||||||
ml.updated AS m_movementline_updated,
|
ml.updated AS m_movementline_updated,
|
||||||
|
|
|
@ -1,3 +1,6 @@
|
||||||
|
SET SQLBLANKLINES ON
|
||||||
|
SET DEFINE OFF
|
||||||
|
|
||||||
-- Sep 10, 2012 5:10:21 PM SGT
|
-- Sep 10, 2012 5:10:21 PM SGT
|
||||||
-- IDEMPIERE-375 Implement Forgot my Password
|
-- IDEMPIERE-375 Implement Forgot my Password
|
||||||
INSERT INTO AD_Element (ColumnName,AD_Element_ID,EntityType,Name,PrintName,AD_Element_UU,AD_Client_ID,Created,Updated,AD_Org_ID,CreatedBy,UpdatedBy,IsActive) VALUES ('IsExpired',200126,'D','Expired','Expired','875fbbb0-2513-4a00-9f74-001bceab1f24',0,TO_DATE('2012-09-10 17:10:19','YYYY-MM-DD HH24:MI:SS'),TO_DATE('2012-09-10 17:10:19','YYYY-MM-DD HH24:MI:SS'),0,100,100,'Y')
|
INSERT INTO AD_Element (ColumnName,AD_Element_ID,EntityType,Name,PrintName,AD_Element_UU,AD_Client_ID,Created,Updated,AD_Org_ID,CreatedBy,UpdatedBy,IsActive) VALUES ('IsExpired',200126,'D','Expired','Expired','875fbbb0-2513-4a00-9f74-001bceab1f24',0,TO_DATE('2012-09-10 17:10:19','YYYY-MM-DD HH24:MI:SS'),TO_DATE('2012-09-10 17:10:19','YYYY-MM-DD HH24:MI:SS'),0,100,100,'Y')
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue