[OpenbravoERP-commits] devel/main: 6 new changesets
details: https://code.openbravo.com/erp/devel/main/rev/ddc62f35155d changeset: 22799:ddc62f35155d user: David Baz Fayos david.baz at openbravo.com date: Mon Mar 31 16:12:12 2014 +0200 summary: [scupgrade] Fixed issue 26068: Removed lines that prevented 'tab' key proper behavior in Firefox (Win/Linux) and Chrome (Linux) details: https://code.openbravo.com/erp/devel/main/rev/66366aabc392 changeset: 22800:66366aabc392 user: Gorka Gil gorka.gil at openbravo.com date: Mon Mar 31 11:43:26 2014 +0200 summary: fixed issue 26116: run.webservice.tests new features - generate a src/resultws.xml file - don't stop on errors details: https://code.openbravo.com/erp/devel/main/rev/e8bb193ae79c changeset: 22801:e8bb193ae79c user: Sandra Huguet sandra.huguet at openbravo.com date: Mon Mar 31 18:19:34 2014 +0200 summary: Related to issue 26065 close 2013 details: https://code.openbravo.com/erp/devel/main/rev/8ad2e7cf88e3 changeset: 22802:8ad2e7cf88e3 user: RM packaging bot staff.rm at openbravo.com date: Mon Mar 31 19:02:41 2014 + summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/a0ffafde2f77 changeset: 22803:a0ffafde2f77 user: David Baz Fayos david.baz at openbravo.com date: Mon Mar 31 22:33:47 2014 +0200 summary: Related to issue 26092: avoid input icons be cropped details: https://code.openbravo.com/erp/devel/main/rev/648c4d0c52f8 changeset: 22804:648c4d0c52f8 user: RM packaging bot staff.rm at openbravo.com date: Tue Apr 01 06:51:31 2014 + summary: CI: update AD_MODULE to version 22803 diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js | 6 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 10 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/648c4d0c52f8 changeset: 22804:648c4d0c52f8 user: RM packaging bot staff.rm at openbravo.com date: Tue Apr 01 06:51:31 2014 + summary: CI: update AD_MODULE to version 22803 details: https://code.openbravo.com/erp/devel/pi/rev/bc8ef0db5377 changeset: 22805:bc8ef0db5377 user: RM packaging bot staff.rm at openbravo.com date: Tue Apr 01 07:16:02 2014 + summary: CI: merge back from main diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 10 ++-- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 12 ++-- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 24 +-
[OpenbravoERP-commits] devel/pi: Fixed issue 26012: Rich Text Fields are always placed ...
details: https://code.openbravo.com/erp/devel/pi/rev/9a75b3707537
changeset: 22806:9a75b3707537
user: Guillermo Gil guillermo.gil at openbravo.com
date: Tue Apr 01 12:52:18 2014 +0200
summary: Fixed issue 26012: Rich Text Fields are always placed in a new line
Smartclient sets this property by default to true, this would not allow to
place this component in a column other than the first one
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-richtext.js
| 5 -
1 files changed, 4 insertions(+), 1 deletions(-)
diffs (22 lines):
diff -r bc8ef0db5377 -r 9a75b3707537
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-richtext.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-richtext.js
Tue Apr 01 07:16:02 2014 +
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-richtext.js
Tue Apr 01 12:52:18 2014 +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) 2013 Openbravo SLU
+ * All portions are Copyright (C) 2013-2014 Openbravo SLU
* All Rights Reserved.
* Contributor(s): __.
@@ -125,6 +125,9 @@
showFocused: true,
showTitle: true,
rowSpan: 2,
+ // smartclient sets this property by default to true
+ // this would not allow to place this component in a column other than the
first one
+ startRow: false,
init: function () {
if (this.initStyle) {
this.initStyle();
--
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: Fixes Issue 25989, Fixes Issue 25733
details: https://code.openbravo.com/erp/devel/pi/rev/6bed909ec4be
changeset: 22807:6bed909ec4be
user: Pandeeswari Ramakrishnan pandeeswari.ramakrishnan at
openbravo.com
date: Tue Apr 01 17:31:00 2014 +0530
summary: Fixes Issue 25989, Fixes Issue 25733
25989: Lot information not populated in Sales Invoices using Generate Invoices
process regarding Sales Orders
25733: Not homogeneous behaviour in Sales management flow
diffstat:
src-db/database/model/functions/C_INVOICE_CREATE.xml | 4
++--
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql | 4
++--
2 files changed, 4 insertions(+), 4 deletions(-)
diffs (42 lines):
diff -r 9a75b3707537 -r 6bed909ec4be
src-db/database/model/functions/C_INVOICE_CREATE.xml
--- a/src-db/database/model/functions/C_INVOICE_CREATE.xml Tue Apr 01
12:52:18 2014 +0200
+++ b/src-db/database/model/functions/C_INVOICE_CREATE.xml Tue Apr 01
17:31:00 2014 +0530
@@ -127,7 +127,7 @@
ol.Line,
ol.DirectShip,
ol.PriceStd,
- COALESCE(ol.m_attributesetinstance_id, sl.m_attributesetinstance_id)
AS m_attributesetinstance_id,
+ sl.m_attributesetinstance_id,
ol.taxbaseamt,
ol.gross_unit_price,
ol.grosspricestd,
@@ -900,7 +900,7 @@
sh.movementDate,
ol.PriceStd,
ol.gross_unit_price,
-COALESCE(ol.m_attributesetinstance_id,
sl.m_attributesetinstance_id) AS m_attributesetinstance_id,
+sl.m_attributesetinstance_id,
ol.taxbaseamt, o.fin_paymentmethod_id,
pl.istaxincluded,
ol.grosspricestd,
diff -r 9a75b3707537 -r 6bed909ec4be
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql
--- a/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql
Tue Apr 01 12:52:18 2014 +0200
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql
Tue Apr 01 17:31:00 2014 +0530
@@ -301,7 +301,7 @@
l.C_UOM_ID,uom.UOMSymbol,
l.M_Product_ID,Ad_Column_Identifier(to_char('M_Product'),
to_char(l.m_product_id), to_char(?)) AS NAME,
l.C_OrderLine_ID,l.Line, max(uom.stdprecision) AS stdprecision,
cur.priceprecision, il.M_InOutLine_ID as M_InOutLine_ID, l.Description,
(CASE WHEN il.M_INOUTLINE_ID IS NULL THEN
l.quantityOrder*C_DIVIDE((l.QtyOrdered-COALESCE(l.QTYINVOICED
,0)),(l.QtyOrdered)) ELSE il.quantityOrder END) AS quantityOrder,
-(CASE WHEN il.M_INOUTLINE_ID IS NULL THEN l.M_Product_UOM_ID ELSE
il.M_Product_UOM_ID END) AS M_Product_UOM_ID,
COALESCE(l.M_ATTRIBUTESETINSTANCE_ID, il.M_ATTRIBUTESETINSTANCE_ID) AS
M_ATTRIBUTESETINSTANCE_ID, l.ad_org_id,
+(CASE WHEN il.M_INOUTLINE_ID IS NULL THEN l.M_Product_UOM_ID ELSE
il.M_Product_UOM_ID END) AS M_Product_UOM_ID, il.M_ATTRIBUTESETINSTANCE_ID,
l.ad_org_id,
l.taxbaseamt, COALESCE(l.A_Asset_ID, o.A_Asset_ID) as A_Asset_ID,
COALESCE(l.C_Project_ID, o.C_Project_ID) as C_Project_ID,
COALESCE(l.C_Costcenter_ID, o.C_Costcenter_ID) as C_Costcenter_ID,
COALESCE(l.User1_ID, o.User1_ID) as User1_ID, COALESCE(l.User2_ID, o.User2_ID)
as User2_ID, l.explode, 'Y' as isOrder
FROM C_ORDERLINE l left join (SELECT M_InOutLine.* FROM M_InOutLine,
M_InOut
@@ -314,7 +314,7 @@
AND l.M_Product_ID=p.M_Product_ID
GROUP BY
l.QtyOrdered,l.qtydelivered,l.C_UOM_ID,uom.UOMSymbol,l.M_Product_ID,p.NAME,l.Line,l.C_OrderLine_ID,
l.QTYINVOICED, il.M_InOutLine_ID, il.MovementQty, l.Description,
l.quantityOrder, il.quantityOrder,
-l.M_Product_UOM_ID, il.M_Product_UOM_ID,
COALESCE(l.M_ATTRIBUTESETINSTANCE_ID,
il.M_ATTRIBUTESETINSTANCE_ID),l.ad_org_id, cur.priceprecision,
+l.M_Product_UOM_ID, il.M_Product_UOM_ID, il.M_ATTRIBUTESETINSTANCE_ID,
l.ad_org_id, cur.priceprecision,
l.taxbaseamt, COALESCE(l.A_Asset_ID, o.A_Asset_ID),
COALESCE(l.C_Project_ID, o.C_Project_ID), COALESCE(l.C_Costcenter_ID,
o.C_Costcenter_ID),
COALESCE(l.User1_ID, o.User1_ID), COALESCE(l.User2_ID, o.User2_ID),
l.explode
HAVING ( (l.explode='Y') OR ((l.QtyOrdered-COALESCE(l.QTYINVOICED ,0))
0))
--
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: Fixes Issue 25886 When posting a payment using credit ...
details: https://code.openbravo.com/erp/devel/pi/rev/5494e746e052
changeset: 22808:5494e746e052
user: Atul Gaware atul.gaware at openbravo.com
date: Tue Apr 01 18:06:18 2014 +0530
summary: Fixes Issue 25886 When posting a payment using credit and
multi-currency,
Bank Revaluation Gain and Loss Accounts are used at the same time
diffstat:
src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java | 15
+++-
src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java | 15
+++-
src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java| 18
-
3 files changed, 44 insertions(+), 4 deletions(-)
diffs (120 lines):
diff -r 6bed909ec4be -r 5494e746e052
src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java
--- a/src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java Tue Apr
01 17:31:00 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java Tue Apr
01 18:06:18 2014 +0530
@@ -640,18 +640,31 @@
transaction.getFinPayment().getGeneratedCredit().compareTo(ZERO)
== 0) {
ListFIN_Payment_Credit creditPayments = transaction.getFinPayment()
.getFINPaymentCreditList();
+BigDecimal amtDiff = BigDecimal.ZERO;
for (FIN_Payment_Credit creditPayment : creditPayments) {
boolean isReceiptPayment =
creditPayment.getCreditPaymentUsed().isReceipt();
String creditAmountConverted =
convertAmount(creditPayment.getAmount(), isReceiptPayment,
DateAcct, TABLEID_Payment,
creditPayment.getCreditPaymentUsed().getId(),
creditPayment.getCreditPaymentUsed().getCurrency().getId(),
as.m_C_Currency_ID, null,
- as, fact, Fact_Acct_Group_ID, nextSeqNo(SeqNo), conn).toString();
+ as, fact, Fact_Acct_Group_ID, nextSeqNo(SeqNo), conn,
false).toString();
fact.createLine(null,
getAccountBPartner(C_BPartner_ID, as, isReceiptPayment, true,
conn), creditPayment
.getCreditPaymentUsed().getCurrency().getId(),
(isReceiptPayment ? creditAmountConverted : ),
(isReceiptPayment ?
: creditAmountConverted), Fact_Acct_Group_ID,
nextSeqNo(SeqNo), DocumentType,
conn);
+ amtDiff = amtDiff.add(creditPayment.getAmount()).subtract(
+ new BigDecimal(creditAmountConverted));
+}
+if (!transaction.getFinPayment().isReceipt()
amtDiff.compareTo(BigDecimal.ZERO) == 1
+|| transaction.getFinPayment().isReceipt()
amtDiff.compareTo(BigDecimal.ZERO) == -1) {
+ fact.createLine(null,
getAccount(AcctServer.ACCTTYPE_ConvertGainDefaultAmt, as, conn),
+ transaction.getCurrency().getId(), , amtDiff.abs().toString(),
Fact_Acct_Group_ID,
+ nextSeqNo(SeqNo), DocumentType, conn);
+} else {
+ fact.createLine(null,
getAccount(AcctServer.ACCTTYPE_ConvertChargeDefaultAmt, as, conn),
+ transaction.getCurrency().getId(), amtDiff.abs().toString(), ,
Fact_Acct_Group_ID,
+ nextSeqNo(SeqNo), DocumentType, conn);
}
if (creditPayments.isEmpty()) {
fact.createLine(
diff -r 6bed909ec4be -r 5494e746e052
src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java
--- a/src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java Tue Apr 01
17:31:00 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java Tue Apr 01
18:06:18 2014 +0530
@@ -489,12 +489,13 @@
if (new BigDecimal(usedAmount).compareTo(ZERO) != 0
new BigDecimal(generatedAmount).compareTo(ZERO) == 0) {
ListFIN_Payment_Credit creditPayments =
payment.getFINPaymentCreditList();
+BigDecimal amtDiff = BigDecimal.ZERO;
for (FIN_Payment_Credit creditPayment : creditPayments) {
String creditAmountConverted =
convertAmount(creditPayment.getAmount(),
creditPayment.getCreditPaymentUsed().isReceipt(), DateAcct,
TABLEID_Payment,
creditPayment.getCreditPaymentUsed().getId(),
creditPayment.getCreditPaymentUsed().getCurrency().getId(),
as.m_C_Currency_ID, null,
- as, fact, Fact_Acct_Group_ID, nextSeqNo(SeqNo), conn).toString();
+ as, fact, Fact_Acct_Group_ID, nextSeqNo(SeqNo), conn,
false).toString();
fact.createLine(
null,
getAccountBPartner(C_BPartner_ID, as,
creditPayment.getCreditPaymentUsed()
@@ -503,6 +504,18 @@
(creditPayment.getCreditPaymentUsed().isReceipt() ?
creditAmountConverted : ),
(creditPayment.getCreditPaymentUsed().isReceipt() ? :
creditAmountConverted),
Fact_Acct_Group_ID, nextSeqNo(SeqNo), DocumentType, conn);
+ amtDiff = amtDiff.add(creditPayment.getAmount()).subtract(
+ new BigDecimal(creditAmountConverted));
+}
+if (!payment.isReceipt() amtDiff.compareTo(BigDecimal.ZERO)
[OpenbravoERP-commits] devel/pi: Fixes Issue 25673 Posting opening journal (thousand li...
details: https://code.openbravo.com/erp/devel/pi/rev/9e49204adcd4
changeset: 22809:9e49204adcd4
user: Atul Gaware atul.gaware at openbravo.com
date: Mon Mar 17 17:58:11 2014 +0530
summary: Fixes Issue 25673 Posting opening journal (thousand lines) takes
long time
diffstat:
src/org/openbravo/erpCommon/ad_forms/FactLine.java | 8
src/org/openbravo/erpCommon/ad_forms/FactLine_data.xsql | 7 ---
2 files changed, 8 insertions(+), 7 deletions(-)
diffs (65 lines):
diff -r 5494e746e052 -r 9e49204adcd4
src/org/openbravo/erpCommon/ad_forms/FactLine.java
--- a/src/org/openbravo/erpCommon/ad_forms/FactLine.javaTue Apr 01
18:06:18 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_forms/FactLine.javaMon Mar 17
17:58:11 2014 +0530
@@ -11,7 +11,7 @@
* Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke, parts
* created by ComPiere are Copyright (C) ComPiere, Inc.; All Rights Reserved.
* Contributor(s): Openbravo SLU
- * Contributions are Copyright (C) 2001-2013 Openbravo S.L.U.
+ * Contributions are Copyright (C) 2001-2014 Openbravo S.L.U.
**
*/
package org.openbravo.erpCommon.ad_forms;
@@ -821,11 +821,11 @@
m_Fact_Acct_Group_ID, m_SeqNo, m_DocBaseType, Record_ID2,
(m_docLine != null) ? m_docLine.m_A_Asset_ID : ,
(m_docLine != null) ? m_docLine.m_C_WithHolding_ID : ,
m_docVO.C_DocType_ID,
-C_Costcenter_ID);
+C_Costcenter_ID, (m_docVO.m_IsOpening.equals(Y)) ? O : N);
log4jFactLine.debug(FactLine - After insertFactAct);
}
- if (m_docVO.m_IsOpening.equals(Y))
-FactLineData.updateFactAcct(con, conn, m_AD_Table_ID, m_Record_ID);
+ // if (m_docVO.m_IsOpening.equals(Y))
+ // FactLineData.updateFactAcct(con, conn, m_AD_Table_ID, m_Record_ID);
} catch (ServletException e) {
log4jFactLine.warn(e);
}
diff -r 5494e746e052 -r 9e49204adcd4
src/org/openbravo/erpCommon/ad_forms/FactLine_data.xsql
--- a/src/org/openbravo/erpCommon/ad_forms/FactLine_data.xsql Tue Apr 01
18:06:18 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_forms/FactLine_data.xsql Mon Mar 17
17:58:11 2014 +0530
@@ -12,7 +12,7 @@
* Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke, parts
* created by ComPiere are Copyright (C) ComPiere, Inc.; All Rights Reserved.
* Contributor(s): Openbravo SLU
- * Contributions are Copyright (C) 2001-2010 Openbravo S.L.U.
+ * Contributions are Copyright (C) 2001-2014 Openbravo S.L.U.
**
--
@@ -73,7 +73,7 @@
AmtSourceDR,AmtSourceCR,AmtAcctDR,AmtAcctCR,
C_UOM_ID,Qty,M_Locator_ID,M_Product_ID,C_BPartner_ID,AD_OrgTrx_ID,C_LocFrom_ID,C_LocTo_ID,C_SalesRegion_ID,
C_Project_ID,C_Campaign_ID,C_Activity_ID,User1_ID,User2_ID,Description,
Fact_Acct_Group_ID, SeqNo, DocBaseType,
-Record_ID2, A_ASSET_ID, C_WithHolding_ID, C_DocType_ID,
C_Costcenter_ID)
+Record_ID2, A_ASSET_ID, C_WithHolding_ID, C_DocType_ID,
C_Costcenter_ID, FACTACCTTYPE)
VALUES
(?, ?, ?,'Y',now(),?,now(),?,
?, ?, ?, ?, TO_DATE(?), TO_DATE(?),
@@ -81,7 +81,7 @@
?, ?, ?, ?,
TO_NUMBER(?), TO_NUMBER(?), TO_NUMBER(?), TO_NUMBER(?),
?, TO_NUMBER(?), ?,?, ?, ?,?, ?, ?,?, ?, ?,?, ?, ?, ?,
TO_NUMBER(?), ?,
- ?, ?, ?, ?, ?)
+ ?, ?, ?, ?, ?, ?)
]]
/Sql
Parameter name=m_Fact_Acct_ID/
@@ -130,6 +130,7 @@
Parameter name=cWithholdingId/
Parameter name=cDocTypeId/
Parameter name=cCostcenterId/
+ Parameter name=FactAcctType/
/SqlMethod
SqlMethod name=updateFactAcct type=preparedStatement connection=true
return=rowCount
SqlMethodComment/SqlMethodComment
--
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/003cc8c257f7
changeset: 22810:003cc8c257f7
user: David Baz Fayos david.baz at openbravo.com
date: Tue Apr 01 21:11:15 2014 +0200
summary: Related to issue 26092: Checkboxes are now always left-aligned in
grid view
even after column resizing
details: https://code.openbravo.com/erp/devel/pi/rev/c0811054ce65
changeset: 22811:c0811054ce65
user: David Baz Fayos david.baz at openbravo.com
date: Tue Apr 01 21:13:44 2014 +0200
summary: Related to issue 26092: inputs are now always centered while editing
records in the grid
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
| 8 +---
1 files changed, 5 insertions(+), 3 deletions(-)
diffs (25 lines):
diff -r 9e49204adcd4 -r c0811054ce65
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
Mon Mar 17 17:58:11 2014 +0530
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
Tue Apr 01 21:13:44 2014 +0200
@@ -886,7 +886,11 @@
func = this.getGridSummaryFunction(fld),
isSummary = record (record[this.groupSummaryRecordProperty] ||
record[this.gridSummaryRecordProperty]);
if (!fld.clientClass rowNum === this.getEditRow()) {
- return 'center';
+ if (fld.editorType === 'OBCheckboxItem') {
+return isRTL ? isc.Canvas.RIGHT : isc.Canvas.LEFT;
+ } else {
+return isc.Canvas.CENTER;
+ }
}
if (isSummary func === 'count') {
@@ -3317,8 +3321,6 @@
this.view.isEditingGrid = true;
-record[this.recordBaseStyleProperty] = this.baseStyleEdit;
-
// also called in case of new
var form = this.getEditForm();
--
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
