details: /erp/devel/main/rev/4a38878937ad
changeset: 8034:4a38878937ad
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Fri Aug 06 10:43:25 2010 +0200
summary: Fixed issue 14131.Added missing message text for
VendorWithNoPaymentTerm.
details: /erp/devel/main/rev/a97e0286a716
changeset: 8035:a97e0286a716
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Fri Aug 06 13:23:42 2010 +0200
summary: Fixed issue 14132.The process also sets in the order the
po_paymentmethod_id.
details: /erp/devel/main/rev/065b32c2d2f8
changeset: 8036:065b32c2d2f8
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Fri Aug 06 18:07:18 2010 +0200
summary: CI: promote changesets from pi to main
details: /erp/devel/main/rev/03555adbd6f7
changeset: 8037:03555adbd6f7
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Fri Aug 06 18:07:19 2010 +0200
summary: CI: update AD_MODULE - Core version and label
diffstat:
src-db/database/sourcedata/AD_MESSAGE.xml | 11
++++++++++
src-db/database/sourcedata/AD_MODULE.xml | 4 +-
src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder.java | 2 +-
src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder_data.xsql | 11
++++++---
4 files changed, 21 insertions(+), 7 deletions(-)
diffs (96 lines):
diff -r 719c3bbbf9f5 -r 03555adbd6f7 src-db/database/sourcedata/AD_MESSAGE.xml
--- a/src-db/database/sourcedata/AD_MESSAGE.xml Thu Aug 05 13:44:10 2010 +0530
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml Fri Aug 06 18:07:19 2010 +0200
@@ -32391,6 +32391,17 @@
<!--B879A897808F4D9F947BF1D2EB4F1487-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--B879A897808F4D9F947BF1D2EB4F1487--></AD_MESSAGE>
+<!--B90DAD98BE6B409FA4D10CD01397A735--><AD_MESSAGE>
+<!--B90DAD98BE6B409FA4D10CD01397A735-->
<AD_MESSAGE_ID><![CDATA[B90DAD98BE6B409FA4D10CD01397A735]]></AD_MESSAGE_ID>
+<!--B90DAD98BE6B409FA4D10CD01397A735-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B90DAD98BE6B409FA4D10CD01397A735--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B90DAD98BE6B409FA4D10CD01397A735--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B90DAD98BE6B409FA4D10CD01397A735-->
<VALUE><![CDATA[VendorWithNoPaymentTerm]]></VALUE>
+<!--B90DAD98BE6B409FA4D10CD01397A735--> <MSGTEXT><![CDATA[The vendor does not
have a default Payment Term defined.]]></MSGTEXT>
+<!--B90DAD98BE6B409FA4D10CD01397A735--> <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--B90DAD98BE6B409FA4D10CD01397A735-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--B90DAD98BE6B409FA4D10CD01397A735--></AD_MESSAGE>
+
<!--BB8D6006485A4EE6BA186F10B22F4579--><AD_MESSAGE>
<!--BB8D6006485A4EE6BA186F10B22F4579-->
<AD_MESSAGE_ID><![CDATA[BB8D6006485A4EE6BA186F10B22F4579]]></AD_MESSAGE_ID>
<!--BB8D6006485A4EE6BA186F10B22F4579-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 719c3bbbf9f5 -r 03555adbd6f7 src-db/database/sourcedata/AD_MODULE.xml
--- a/src-db/database/sourcedata/AD_MODULE.xml Thu Aug 05 13:44:10 2010 +0530
+++ b/src-db/database/sourcedata/AD_MODULE.xml Fri Aug 06 18:07:19 2010 +0200
@@ -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.17989]]></VERSION>
+<!--0--> <VERSION><![CDATA[2.50.18036]]></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 719c3bbbf9f5 -r 03555adbd6f7
src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder.java
--- a/src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder.java Thu Aug
05 13:44:10 2010 +0530
+++ b/src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder.java Fri Aug
06 18:07:19 2010 +0200
@@ -472,7 +472,7 @@
data1[0].invoicerule.equals("") ? "I" : data1[0].invoicerule,
data1[0].deliveryrule
.equals("") ? "A" : data1[0].deliveryrule, "I",
data1[0].deliveryviarule.equals("") ? "D" :
data1[0].deliveryviarule, strWarehouse,
- strPriceListId, "", "", "");
+ strPriceListId, "", "", "", data1[0].poPaymentmethodId);
} catch (ServletException ex) {
myMessage = Utility.translateError(this, vars, vars.getLanguage(),
ex.getMessage());
releaseRollbackConnection(conn);
diff -r 719c3bbbf9f5 -r 03555adbd6f7
src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder_data.xsql
--- a/src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder_data.xsql Thu Aug
05 13:44:10 2010 +0530
+++ b/src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder_data.xsql Fri Aug
06 18:07:19 2010 +0200
@@ -32,7 +32,7 @@
'' AS InvoiceRule, '' AS DeliveryRule, '' AS FreightCostRule, '' AS
DeliveryViaRule,
'' AS PaymentRulePO, '' AS PO_PaymentTerm_ID, '' AS DESCRIPTION, ''
AS C_UOM_ID, '' AS QUANTITYORDER, '' AS M_PRODUCT_UOM_ID,
'' AS PRICELIMIT, '' AS PRICEACTUAL, '' AS DISCOUNT, '' AS TAX, ''
AS C_ORDERLINE_ID,
- '' AS PADRE, '' AS ID, '' AS NAME, '' AS PRICESTD, '' AS TO_CLOSE,
'' AS UOMNAME, '' AS SECUOMNAME
+ '' AS PADRE, '' AS ID, '' AS NAME, '' AS PRICESTD, '' AS TO_CLOSE,
'' AS UOMNAME, '' AS SECUOMNAME, '' AS PO_PAYMENTMETHOD_ID
FROM DUAL
]]></Sql>
<Field name="rownum" value="count"/>
@@ -231,7 +231,7 @@
<Sql>
<![CDATA[
SELECT p.InvoiceRule, p.DeliveryRule, DeliveryViaRule,
- p.PaymentRulePO, p.PO_PaymentTerm_ID
+ p.PaymentRulePO, p.PO_PaymentTerm_ID, p.PO_PaymentMethod_ID
FROM C_BPartner p
WHERE p.C_BPartner_ID = ?
]]>
@@ -375,8 +375,10 @@
DATEORDERED, DATEPROMISED, DATEACCT, C_BPARTNER_ID,
C_BPARTNER_LOCATION_ID, BILLTO_ID, C_CURRENCY_ID,
PAYMENTRULE, C_PAYMENTTERM_ID, INVOICERULE, DELIVERYRULE,
FREIGHTCOSTRULE,
DELIVERYVIARULE, M_WAREHOUSE_ID, M_PRICELIST_ID,
- C_PROJECT_ID, C_ACTIVITY_ID, C_CAMPAIGN_ID, PRIORITYRULE, ISSOTRX)
- VALUES
(?,?,?,now(),?,now(),?,?,?,?,?,?,TO_DATE(?),TO_DATE(?),TO_DATE(?),?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,'5',
'N')
+ C_PROJECT_ID, C_ACTIVITY_ID, C_CAMPAIGN_ID, PRIORITYRULE, ISSOTRX,
+ FIN_PAYMENTMETHOD_ID)
+ VALUES
(?,?,?,now(),?,now(),?,?,?,?,?,?,TO_DATE(?),TO_DATE(?),TO_DATE(?),?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,'5',
'N',
+ ?)
]]>
</Sql>
<Parameter name="cOrderId"/>
@@ -407,6 +409,7 @@
<Parameter name="cProjectId"/>
<Parameter name="cActivityId"/>
<Parameter name="cCampaignId"/>
+ <Parameter name="finPaymentMethodId"/>
</SqlMethod>
<SqlMethod name="insertCOrderline" type="preparedStatement"
connection="true" return="rowCount">
<SqlMethodComment></SqlMethodComment>
------------------------------------------------------------------------------
This SF.net email is sponsored by
Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
