[OpenbravoERP-commits] devel/pi: Fixes issue 13370:*\#\ is added to all the serial nu...
details: /erp/devel/pi/rev/7c753fd0d1ca
changeset: 7590:7c753fd0d1ca
user: Harikrishnan Raja harikrishnan.raja at openbravo.com
date: Mon Jun 14 11:33:09 2010 +0530
summary: Fixes issue 13370:*\#\ is added to all the serial number
prefix.Now this is removed.
diffstat:
src/org/openbravo/erpCommon/info/AttributeSetInstance.java | 7 +--
1 files changed, 5 insertions(+), 2 deletions(-)
diffs (26 lines):
diff -r ec2bb4d501a7 -r 7c753fd0d1ca
src/org/openbravo/erpCommon/info/AttributeSetInstance.java
--- a/src/org/openbravo/erpCommon/info/AttributeSetInstance.javaFri Jun
11 16:31:26 2010 +0200
+++ b/src/org/openbravo/erpCommon/info/AttributeSetInstance.javaMon Jun
14 11:33:09 2010 +0530
@@ -220,8 +220,9 @@
lot = AttributeSetInstanceData.selectNextLot(this,
data[0].mLotctlId);
AttributeSetInstanceData.updateLotSequence(conn, this,
vars.getUser(), data[0].mLotctlId);
description_first += (description_first.equals() ? : _) +
lot;// esto
-} else
+} else {
description_first += (description_first.equals() ? : _) + L
+ lot;
+}
}
if (data[0].isserno.equals(Y)) {
serno = vars.getStringParameter(inpserno);
@@ -229,8 +230,10 @@
serno = AttributeSetInstanceData.selectNextSerNo(conn, this,
data[0].mSernoctlId);
AttributeSetInstanceData.updateSerNoSequence(conn, this,
vars.getUser(),
data[0].mSernoctlId);
+ description_first += (description_first.equals() ? : _) +
serno;
+} else {
+ description_first += (description_first.equals() ? : _) + #
+ serno;
}
-description_first += (description_first.equals() ? : _) + # +
serno;
}
if (data[0].isguaranteedate.equals(Y)) {
guaranteedate = vars.getStringParameter(inpDateFrom);
--
ThinkGeek and WIRED's GeekDad team up for the Ultimate
GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the
lucky parental unit. See the prize list and enter to win:
http://p.sf.net/sfu/thinkgeek-promo
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: Fixes issue 13379: Order UOM is not copied from Requis...
details: /erp/devel/pi/rev/c899f464edac changeset: 7591:c899f464edac user: Sivaraman Rajagopal sivaraman.rajagopal at openbravo.com date: Mon Jun 14 11:52:29 2010 +0530 summary: Fixes issue 13379: Order UOM is not copied from Requisition lines to Purchase Order lines The files have been modified in oder to copy 'Order UOM' and 'Order Quantity' from Requisition and also three more new fields have been added in 'Requisition to Order' window grids. Corresponding fields are added in selectSelected, selectLines and insertCOrderline sqlmethods to fetch / insert values. diffstat: src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder.html | 19 +++- src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder.java | 7 +- src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder.xml | 6 ++ src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder_data.xsql | 23 ++--- 4 files changed, 43 insertions(+), 12 deletions(-) diffs (194 lines): diff -r 7c753fd0d1ca -r c899f464edac src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder.html --- a/src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder.html Mon Jun 14 11:33:09 2010 +0530 +++ b/src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder.html Mon Jun 14 11:52:29 2010 +0530 @@ -417,7 +417,10 @@ th class=DataGrid_Header_Cell width=80Need by date/th th class=DataGrid_Header_Cell width=195Product/th th class=DataGrid_Header_Cell width=70Quantity/th - th class=DataGrid_Header_Cell width=170Requester/th + th class=DataGrid_Header_Cell width=70Unit/th + th class=DataGrid_Header_Cell width=71Secondary Quantity/th + th class=DataGrid_Header_Cell width=71Secondary Unit/th + th class=DataGrid_Header_Cell width=120Requester/th th class=DataGrid_Header_Cell width=230Vendor - PriceList/th th class=DataGrid_Header_Cell Price/th /tr @@ -427,6 +430,9 @@ td class=DataGrid_Body_Cell id=fieldNeedByDatexx29-02-2008/td td class=DataGrid_Body_Cellspan id=fieldProductxxBeer/span - span id=fieldAttributexxAttribute/span/td td class=DataGrid_Body_Cell id=fieldQuantityxx100/td +td class=DataGrid_Body_Cell id=fieldUnitxxUnit/td +td class=DataGrid_Body_Cell id=fieldSecQuantityxx101/td +td class=DataGrid_Body_Cell id=fieldSecUnitxxSecUnit/td td class=DataGrid_Body_Cell id=fieldRequesterxxOpenbravo/td td class=DataGrid_Body_Cellspan id=fieldVendorxxGuiness/span - span id=fieldPriceListxxPricelist/span/td td class=DataGrid_Body_Cell id=fieldPricexx3/td @@ -447,6 +453,9 @@ td class=TableEdition_OneCell_width/td td class=TableEdition_OneCell_width/td td class=TableEdition_OneCell_width/td +td class=TableEdition_OneCell_width/td +td class=TableEdition_OneCell_width/td +td class=TableEdition_OneCell_width/td /tr tr td class=TitleCell/td @@ -513,7 +522,7 @@ div id=sectionPriceList table cellspacing=0 cellpadding=0 width=100% class=DataGrid_Header_Table DataGrid_Body_Table style=table-layout: auto; tr class=DataGrid_Body_Row - th class=DataGrid_Header_Cell colspan=8span id=fieldVendorxxVendor/span - span id=fieldPricelistxxPricelistId/span/th + th class=DataGrid_Header_Cell colspan=11span id=fieldVendorxxVendor/span - span id=fieldPricelistxxPricelistId/span/th /tr tr class=DataGrid_Body_Row th class=DataGrid_Header_Cell colspan=2Product/th @@ -521,6 +530,9 @@ th class=DataGrid_Header_Cell width=70Req. Qty/th th class=DataGrid_Header_Cell width=70Matched/th th class=DataGrid_Header_Cell width=100Qty/th + th class=DataGrid_Header_Cell
[OpenbravoERP-commits] devel/pi: Fixed bug 13384: Impossible to translate Report Daily ...
details: /erp/devel/pi/rev/4c076a9459d0 changeset: 7592:4c076a9459d0 user: Víctor Martínez Romanos victor.martinez at openbravo.com date: Mon Jun 14 09:16:43 2010 +0200 summary: Fixed bug 13384: Impossible to translate Report Daily Work Requirements diffstat: src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDailyEdit.jrxml | 1402 + 1 files changed, 715 insertions(+), 687 deletions(-) diffs (truncated from 1422 to 300 lines): diff -r c899f464edac -r 4c076a9459d0 src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDailyEdit.jrxml --- a/src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDailyEdit.jrxml Mon Jun 14 11:52:29 2010 +0530 +++ b/src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDailyEdit.jrxml Mon Jun 14 09:16:43 2010 +0200 @@ -2,122 +2,122 @@ !-- Created with iReport - A designer for JasperReports -- !DOCTYPE jasperReport PUBLIC //JasperReports//DTD Report Design//EN http://jasperreports.sourceforge.net/dtds/jasperreport.dtd; jasperReport - name=ReportWorkRequirementDailyEdit - columnCount=1 - printOrder=Vertical - orientation=Portrait - pageWidth=595 - pageHeight=842 - columnWidth=535 - columnSpacing=0 - leftMargin=30 - rightMargin=30 - topMargin=20 - bottomMargin=20 - whenNoDataType=NoPages - isTitleNewPage=false - isSummaryNewPage=false -property name=ireport.scriptlethandling value=0 / -property name=ireport.encoding value=UTF-8 / -import value=java.util.* / -import value=net.sf.jasperreports.engine.* / -import value=net.sf.jasperreports.engine.data.* / +name=ReportWorkRequirementDailyEdit +columnCount=1 +printOrder=Vertical +orientation=Portrait +pageWidth=595 +pageHeight=842 +columnWidth=535 +columnSpacing=0 +leftMargin=30 +rightMargin=30 +topMargin=20 +bottomMargin=20 +whenNoDataType=NoPages +isTitleNewPage=false +isSummaryNewPage=false + property name=ireport.scriptlethandling value=0 / + property name=ireport.encoding value=UTF-8 / + import value=java.util.* / + import value=net.sf.jasperreports.engine.* / + import value=net.sf.jasperreports.engine.data.* / -style -name=default -isDefault=false -vAlign=Middle -fontName=Bitstream Vera Sans -fontSize=10 -/ -style -name=Report_Title -isDefault=false -fontName=Bitstream Vera Sans -fontSize=18 -/ -style -name=Report_Subtitle -isDefault=false -forecolor=#55 -fontName=Bitstream Vera Sans -fontSize=14 -/ -style -name=Total_Field -isDefault=false -mode=Opaque -forecolor=#00 -backcolor=#CC -vAlign=Middle -/ -style -name=Detail_Header -isDefault=false -mode=Opaque -forecolor=#FF -backcolor=#55 -vAlign=Middle -/ -style -name=GroupHeader_DarkGray -isDefault=false -mode=Opaque -forecolor=#FF -backcolor=#55 -vAlign=Middle -fontName=Bitstream Vera Sans -fontSize=14 -/ -style -name=GroupHeader_Gray -isDefault=false -mode=Opaque -backcolor=#99 -/ -style -name=Detail_Line -isDefault=false - + style + name=default + isDefault=false + vAlign=Middle + fontName=Bitstream Vera Sans + fontSize=10 + / + style + name=Report_Title + isDefault=false + fontName=Bitstream Vera Sans + fontSize=18 + / + style + name=Report_Subtitle + isDefault=false + forecolor=#55 + fontName=Bitstream Vera Sans + fontSize=14 + / + style + name=Total_Field + isDefault=false + mode=Opaque + forecolor=#00 + backcolor=#CC + vAlign=Middle + / + style + name=Detail_Header + isDefault=false + mode=Opaque + forecolor=#FF + backcolor=#55 + vAlign=Middle + / + style + name=GroupHeader_DarkGray + isDefault=false + mode=Opaque + forecolor=#FF + backcolor=#55 + vAlign=Middle + fontName=Bitstream Vera Sans + fontSize=14 +
[OpenbravoERP-commits] devel/pi: Fixes issue 13379: Order UOM is not copied from Requis...
details: /erp/devel/pi/rev/44611cea1f67 changeset: 7593:44611cea1f67 user: Sivaraman Rajagopal sivaraman.rajagopal at openbravo.com date: Mon Jun 14 13:31:44 2010 +0530 summary: Fixes issue 13379: Order UOM is not copied from Requisition lines to Purchase Order lines diffstat: src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 22 ++ 1 files changed, 22 insertions(+), 0 deletions(-) diffs (39 lines): diff -r 4c076a9459d0 -r 44611cea1f67 src-db/database/sourcedata/AD_TEXTINTERFACES.xml --- a/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Mon Jun 14 09:16:43 2010 +0200 +++ b/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Mon Jun 14 13:31:44 2010 +0530 @@ -16154,6 +16154,17 @@ !--00B7AF5613384D16BD23168FF64D24CE-- AD_MODULE_ID![CDATA[0]]/AD_MODULE_ID !--00B7AF5613384D16BD23168FF64D24CE--/AD_TEXTINTERFACES +!--023D343FA6294F3B9B0F8B1CA57712FB--AD_TEXTINTERFACES +!--023D343FA6294F3B9B0F8B1CA57712FB-- AD_TEXTINTERFACES_ID![CDATA[023D343FA6294F3B9B0F8B1CA57712FB]]/AD_TEXTINTERFACES_ID +!--023D343FA6294F3B9B0F8B1CA57712FB-- AD_CLIENT_ID![CDATA[0]]/AD_CLIENT_ID +!--023D343FA6294F3B9B0F8B1CA57712FB-- AD_ORG_ID![CDATA[0]]/AD_ORG_ID +!--023D343FA6294F3B9B0F8B1CA57712FB-- ISACTIVE![CDATA[Y]]/ISACTIVE +!--023D343FA6294F3B9B0F8B1CA57712FB-- TEXT![CDATA[Secondary Quantity]]/TEXT +!--023D343FA6294F3B9B0F8B1CA57712FB-- FILENAME![CDATA[/org/openbravo/erpCommon/ad_forms/RequisitionToOrder.html]]/FILENAME +!--023D343FA6294F3B9B0F8B1CA57712FB-- ISUSED![CDATA[Y]]/ISUSED +!--023D343FA6294F3B9B0F8B1CA57712FB-- AD_MODULE_ID![CDATA[0]]/AD_MODULE_ID +!--023D343FA6294F3B9B0F8B1CA57712FB--/AD_TEXTINTERFACES + !--03581A9E5D284DBD8988172172E4F3E9--AD_TEXTINTERFACES !--03581A9E5D284DBD8988172172E4F3E9-- AD_TEXTINTERFACES_ID![CDATA[03581A9E5D284DBD8988172172E4F3E9]]/AD_TEXTINTERFACES_ID !--03581A9E5D284DBD8988172172E4F3E9-- AD_CLIENT_ID![CDATA[0]]/AD_CLIENT_ID @@ -21321,6 +21332,17 @@ !--C2939B3F7EEE4865A6671F780672553B-- AD_MODULE_ID![CDATA[0]]/AD_MODULE_ID !--C2939B3F7EEE4865A6671F780672553B--/AD_TEXTINTERFACES +!--C68BD2CAFFA6451391940FEEE0928CE7--AD_TEXTINTERFACES +!--C68BD2CAFFA6451391940FEEE0928CE7-- AD_TEXTINTERFACES_ID![CDATA[C68BD2CAFFA6451391940FEEE0928CE7]]/AD_TEXTINTERFACES_ID +!--C68BD2CAFFA6451391940FEEE0928CE7-- AD_CLIENT_ID![CDATA[0]]/AD_CLIENT_ID +!--C68BD2CAFFA6451391940FEEE0928CE7-- AD_ORG_ID![CDATA[0]]/AD_ORG_ID +!--C68BD2CAFFA6451391940FEEE0928CE7-- ISACTIVE![CDATA[Y]]/ISACTIVE +!--C68BD2CAFFA6451391940FEEE0928CE7-- TEXT![CDATA[Secondary Unit]]/TEXT +!--C68BD2CAFFA6451391940FEEE0928CE7-- FILENAME![CDATA[/org/openbravo/erpCommon/ad_forms/RequisitionToOrder.html]]/FILENAME +!--C68BD2CAFFA6451391940FEEE0928CE7-- ISUSED![CDATA[Y]]/ISUSED +!--C68BD2CAFFA6451391940FEEE0928CE7-- AD_MODULE_ID![CDATA[0]]/AD_MODULE_ID +!--C68BD2CAFFA6451391940FEEE0928CE7--/AD_TEXTINTERFACES + !--CAEEEC9A2E9211DE8D72001CC0B8E31F--AD_TEXTINTERFACES !--CAEEEC9A2E9211DE8D72001CC0B8E31F-- AD_TEXTINTERFACES_ID![CDATA[CAEEEC9A2E9211DE8D72001CC0B8E31F]]/AD_TEXTINTERFACES_ID !--CAEEEC9A2E9211DE8D72001CC0B8E31F-- AD_CLIENT_ID![CDATA[0]]/AD_CLIENT_ID -- ThinkGeek and WIRED's GeekDad team up for the Ultimate GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the lucky parental unit. See the prize list and enter to win: http://p.sf.net/sfu/thinkgeek-promo ___ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: Fixed issue 13638. Added oncreatedefault to SELECTED c...
details: /erp/devel/pi/rev/e92cbd6025be changeset: 7598:e92cbd6025be user: Antonio Moreno antonio.moreno at openbravo.com date: Mon Jun 14 12:09:08 2010 +0200 summary: Fixed issue 13638. Added oncreatedefault to SELECTED column in AD_PREFERENCE. As this is a sourcedata mandatory column, it needs an oncreatedefault. diffstat: src-db/database/model/tables/AD_PREFERENCE.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 8eea984425f6 -r e92cbd6025be src-db/database/model/tables/AD_PREFERENCE.xml --- a/src-db/database/model/tables/AD_PREFERENCE.xmlMon Jun 14 11:54:59 2010 +0200 +++ b/src-db/database/model/tables/AD_PREFERENCE.xmlMon Jun 14 12:09:08 2010 +0200 @@ -71,7 +71,7 @@ /column column name=SELECTED primaryKey=false required=true type=CHAR size=1 autoIncrement=false default![CDATA[N]]/default -onCreateDefault/ +onCreateDefault![CDATA['N']]/onCreateDefault /column column name=AD_MODULE_ID primaryKey=false required=false type=VARCHAR size=32 autoIncrement=false default/ -- ThinkGeek and WIRED's GeekDad team up for the Ultimate GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the lucky parental unit. See the prize list and enter to win: http://p.sf.net/sfu/thinkgeek-promo ___ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: Fixes issue 13582: Modified the way of showing/hidding...
details: /erp/devel/pi/rev/ae808d1e7781
changeset: 7599:ae808d1e7781
user: Iván Perdomo ivan.perdomo at openbravo.com
date: Mon Jun 14 12:46:59 2010 +0200
summary: Fixes issue 13582: Modified the way of showing/hidding the email icon
The way to identify if a tab's toolbar has the email functionality is based on
the 'pdf' object member. Is used in the form view, and now is used in grid
view.
diffstat:
src/org/openbravo/erpCommon/utility/ToolBar.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diffs (13 lines):
diff -r e92cbd6025be -r ae808d1e7781
src/org/openbravo/erpCommon/utility/ToolBar.java
--- a/src/org/openbravo/erpCommon/utility/ToolBar.java Mon Jun 14 12:09:08
2010 +0200
+++ b/src/org/openbravo/erpCommon/utility/ToolBar.java Mon Jun 14 12:46:59
2010 +0200
@@ -582,7 +582,8 @@
removeAllTests();
if (isReadOnly)
removeReadOnly();
-if (!email) {
+
+if (pdf != null !pdf.contains(orders) !pdf.contains(invoices)) {
removeElement(EMAIL);
}
--
ThinkGeek and WIRED's GeekDad team up for the Ultimate
GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the
lucky parental unit. See the prize list and enter to win:
http://p.sf.net/sfu/thinkgeek-promo
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: Fixes Issue 13374: The names 'Debit' and 'Credit' are ...
details: /erp/devel/pi/rev/caf34f8c71eb changeset: 7600:caf34f8c71eb user: Balamurugan Ramadoss balamurugan.ramadoss at openbravo.com date: Mon Jun 14 18:23:54 2010 +0530 summary: Fixes Issue 13374: The names 'Debit' and 'Credit' are not correct. diffstat: src-db/database/sourcedata/AD_ELEMENT.xml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r ae808d1e7781 -r caf34f8c71eb src-db/database/sourcedata/AD_ELEMENT.xml --- a/src-db/database/sourcedata/AD_ELEMENT.xml Mon Jun 14 12:46:59 2010 +0200 +++ b/src-db/database/sourcedata/AD_ELEMENT.xml Mon Jun 14 18:23:54 2010 +0530 @@ -673,7 +673,7 @@ !--161-- AD_ORG_ID![CDATA[0]]/AD_ORG_ID !--161-- ISACTIVE![CDATA[Y]]/ISACTIVE !--161-- COLUMNNAME![CDATA[AmtAcctCr]]/COLUMNNAME -!--161-- NAME![CDATA[Credit]]/NAME +!--161-- NAME![CDATA[Accounting Schema Currency Credit]]/NAME !--161-- PRINTNAME![CDATA[Acct Credit]]/PRINTNAME !--161-- DESCRIPTION![CDATA[The amount credited to an account, converted to the organization default currency.]]/DESCRIPTION !--161-- HELP![CDATA[The Account Credit Amount indicates the transaction amount converted to this organization's accounting currency]]/HELP @@ -686,7 +686,7 @@ !--162-- AD_ORG_ID![CDATA[0]]/AD_ORG_ID !--162-- ISACTIVE![CDATA[Y]]/ISACTIVE !--162-- COLUMNNAME![CDATA[AmtAcctDr]]/COLUMNNAME -!--162-- NAME![CDATA[Debit]]/NAME +!--162-- NAME![CDATA[Accounting Schema Currency Debit]]/NAME !--162-- PRINTNAME![CDATA[Acct Debit]]/PRINTNAME !--162-- DESCRIPTION![CDATA[The amount debited to an account, converted to the organization default currency.]]/DESCRIPTION !--162-- HELP![CDATA[The Account Debit Amount indicates the transaction amount converted to this organization's accounting currency]]/HELP -- ThinkGeek and WIRED's GeekDad team up for the Ultimate GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the lucky parental unit. See the prize list and enter to win: http://p.sf.net/sfu/thinkgeek-promo ___ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: Fixes issue 0013469: Daily Work Requirements Report do...
details: /erp/devel/pi/rev/bfddab73b8b5
changeset: 7601:bfddab73b8b5
user: Adrián Romero adrianromero at openbravo.com
date: Mon Jun 14 15:59:04 2010 +0200
summary: Fixes issue 0013469: Daily Work Requirements Report does not show
operations without P-
It has been modified the Daily Work Requirements Report to add a subreport to
show P- products no matter there are P- products or not. The previous report
structure did not allow to show phases when there are not P- products to list
diffstat:
src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDaily.java |
27 +-
src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDailyEdit.jrxml |
589 -
src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDaily_data.xsql |
9 +-
src/org/openbravo/erpCommon/ad_reports/SubreportWorkRequirementDaily.jrxml |
244 ++-
src/org/openbravo/erpCommon/ad_reports/SubreportWorkRequirementDaily2.jrxml |
107 +
5 files changed, 518 insertions(+), 458 deletions(-)
diffs (truncated from 1255 to 300 lines):
diff -r caf34f8c71eb -r bfddab73b8b5
src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDaily.java
--- a/src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDaily.java
Mon Jun 14 18:23:54 2010 +0530
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDaily.java
Mon Jun 14 15:59:04 2010 +0200
@@ -89,14 +89,14 @@
vars, #User_Client, ReportWorkRequirementDaily),
Utility.getContext(this, vars,
#AccessibleOrgTree, ReportWorkRequirementDaily), strStartDateFrom,
strStartDateTo,
strmaProcessPlan);
-for (int i = 0; i data.length; i++) {
- String strqty = ReportWorkRequirementDailyData.inprocess(this,
data[i].wrid,
- data[i].productid);
- data[i].inprocess = strqty;
- if (strqty != null strqty.equals()) {
-strqty = 0;
- }
-}
+//for (int i = 0; i data.length; i++) {
+// String strqty = ReportWorkRequirementDailyData.inprocess(this,
data[i].wrid,
+// data[i].productid);
+// data[i].inprocess = strqty;
+// if (strqty != null strqty.equals()) {
+//strqty = 0;
+// }
+//}
String strLanguage = vars.getLanguage();
String strBaseDesign = getBaseDesignPath(strLanguage);
@@ -110,10 +110,21 @@
throw new ServletException(e);
}
+JasperReport jasperReportProducts2;
+try {
+ jasperReportProducts2 = Utility.getTranslatedJasperReport(this,
strBaseDesign
+ +
/org/openbravo/erpCommon/ad_reports/SubreportWorkRequirementDaily2.jrxml, vars
+ .getLanguage(), strBaseDesign);
+} catch (JRException e) {
+ log4j.error(Could not load/compile jrxml-file, e);
+ throw new ServletException(e);
+}
+
String strReportName =
@basedesign@/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDailyEdit.jrxml;
HashMapString, Object parameters = new HashMapString, Object();
parameters.put(PRODUCTS, jasperReportProducts);
+parameters.put(PRODUCTS2, jasperReportProducts2);
renderJR(vars, response, strReportName, strOutput, parameters, data, null);
}
diff -r caf34f8c71eb -r bfddab73b8b5
src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDailyEdit.jrxml
---
a/src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDailyEdit.jrxml
Mon Jun 14 18:23:54 2010 +0530
+++
b/src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDailyEdit.jrxml
Mon Jun 14 15:59:04 2010 +0200
@@ -29,20 +29,23 @@
vAlign=Middle
fontName=Bitstream Vera Sans
fontSize=10
- /
+
+ /style
style
name=Report_Title
isDefault=false
fontName=Bitstream Vera Sans
fontSize=18
- /
+
+ /style
style
name=Report_Subtitle
isDefault=false
forecolor=#55
fontName=Bitstream Vera Sans
fontSize=14
- /
+
+ /style
style
name=Total_Field
isDefault=false
@@ -50,7 +53,8 @@
forecolor=#00
backcolor=#CC
vAlign=Middle
- /
+
+ /style
style
name=Detail_Header
isDefault=false
@@ -58,7 +62,8 @@
forecolor=#FF
backcolor=#55
vAlign=Middle
- /
+
+ /style
style
name=GroupHeader_DarkGray
isDefault=false
@@ -68,13 +73,15 @@
vAlign=Middle
fontName=Bitstream Vera Sans
fontSize=14
- /
+
+ /style
style
name=GroupHeader_Gray
isDefault=false
mode=Opaque
backcolor=#99
- /
+
+ /style
style
[OpenbravoERP-commits] devel/pi: Fixes Issue 13374: The names 'Debit' and 'Credit' are ...
details: /erp/devel/pi/rev/49f7f621447b changeset: 7602:49f7f621447b user: Balamurugan Ramadoss balamurugan.ramadoss at openbravo.com date: Mon Jun 14 19:39:06 2010 +0530 summary: Fixes Issue 13374: The names 'Debit' and 'Credit' are not correct. diffstat: src-db/database/sourcedata/AD_COLUMN.xml | 4 ++-- src-db/database/sourcedata/AD_ELEMENT.xml | 30 -- src-db/database/sourcedata/AD_FIELD.xml | 4 ++-- 3 files changed, 32 insertions(+), 6 deletions(-) diffs (103 lines): diff -r bfddab73b8b5 -r 49f7f621447b src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml Mon Jun 14 15:59:04 2010 +0200 +++ b/src-db/database/sourcedata/AD_COLUMN.xml Mon Jun 14 19:39:06 2010 +0530 @@ -26604,7 +26604,7 @@ !--1681-- ISTRANSLATED![CDATA[N]]/ISTRANSLATED !--1681-- ISENCRYPTED![CDATA[N]]/ISENCRYPTED !--1681-- ISSELECTIONCOLUMN![CDATA[N]]/ISSELECTIONCOLUMN -!--1681-- AD_ELEMENT_ID![CDATA[162]]/AD_ELEMENT_ID +!--1681-- AD_ELEMENT_ID![CDATA[2EB6010EAA174169880C588220EFE7B8]]/AD_ELEMENT_ID !--1681-- ISSESSIONATTR![CDATA[N]]/ISSESSIONATTR !--1681-- ISSECONDARYKEY![CDATA[N]]/ISSECONDARYKEY !--1681-- ISDESENCRYPTABLE![CDATA[N]]/ISDESENCRYPTABLE @@ -26636,7 +26636,7 @@ !--1682-- ISTRANSLATED![CDATA[N]]/ISTRANSLATED !--1682-- ISENCRYPTED![CDATA[N]]/ISENCRYPTED !--1682-- ISSELECTIONCOLUMN![CDATA[N]]/ISSELECTIONCOLUMN -!--1682-- AD_ELEMENT_ID![CDATA[161]]/AD_ELEMENT_ID +!--1682-- AD_ELEMENT_ID![CDATA[0131585AC1F246DBAF6B84E53534F5FA]]/AD_ELEMENT_ID !--1682-- ISSESSIONATTR![CDATA[N]]/ISSESSIONATTR !--1682-- ISSECONDARYKEY![CDATA[N]]/ISSECONDARYKEY !--1682-- ISDESENCRYPTABLE![CDATA[N]]/ISDESENCRYPTABLE diff -r bfddab73b8b5 -r 49f7f621447b src-db/database/sourcedata/AD_ELEMENT.xml --- a/src-db/database/sourcedata/AD_ELEMENT.xml Mon Jun 14 15:59:04 2010 +0200 +++ b/src-db/database/sourcedata/AD_ELEMENT.xml Mon Jun 14 19:39:06 2010 +0530 @@ -673,7 +673,7 @@ !--161-- AD_ORG_ID![CDATA[0]]/AD_ORG_ID !--161-- ISACTIVE![CDATA[Y]]/ISACTIVE !--161-- COLUMNNAME![CDATA[AmtAcctCr]]/COLUMNNAME -!--161-- NAME![CDATA[Accounting Schema Currency Credit]]/NAME +!--161-- NAME![CDATA[Credit]]/NAME !--161-- PRINTNAME![CDATA[Acct Credit]]/PRINTNAME !--161-- DESCRIPTION![CDATA[The amount credited to an account, converted to the organization default currency.]]/DESCRIPTION !--161-- HELP![CDATA[The Account Credit Amount indicates the transaction amount converted to this organization's accounting currency]]/HELP @@ -686,7 +686,7 @@ !--162-- AD_ORG_ID![CDATA[0]]/AD_ORG_ID !--162-- ISACTIVE![CDATA[Y]]/ISACTIVE !--162-- COLUMNNAME![CDATA[AmtAcctDr]]/COLUMNNAME -!--162-- NAME![CDATA[Accounting Schema Currency Debit]]/NAME +!--162-- NAME![CDATA[Debit]]/NAME !--162-- PRINTNAME![CDATA[Acct Debit]]/PRINTNAME !--162-- DESCRIPTION![CDATA[The amount debited to an account, converted to the organization default currency.]]/DESCRIPTION !--162-- HELP![CDATA[The Account Debit Amount indicates the transaction amount converted to this organization's accounting currency]]/HELP @@ -21916,6 +21916,19 @@ !--101111-- AD_MODULE_ID![CDATA[0]]/AD_MODULE_ID !--101111--/AD_ELEMENT +!--0131585AC1F246DBAF6B84E53534F5FA--AD_ELEMENT +!--0131585AC1F246DBAF6B84E53534F5FA-- AD_ELEMENT_ID![CDATA[0131585AC1F246DBAF6B84E53534F5FA]]/AD_ELEMENT_ID +!--0131585AC1F246DBAF6B84E53534F5FA-- AD_CLIENT_ID![CDATA[0]]/AD_CLIENT_ID +!--0131585AC1F246DBAF6B84E53534F5FA-- AD_ORG_ID![CDATA[0]]/AD_ORG_ID +!--0131585AC1F246DBAF6B84E53534F5FA-- ISACTIVE![CDATA[Y]]/ISACTIVE +!--0131585AC1F246DBAF6B84E53534F5FA-- COLUMNNAME![CDATA[AmtAcctCr]]/COLUMNNAME +!--0131585AC1F246DBAF6B84E53534F5FA-- NAME![CDATA[Accounting Schema Currency Credit]]/NAME +!--0131585AC1F246DBAF6B84E53534F5FA-- PRINTNAME![CDATA[Accounting Schema Currency Credit]]/PRINTNAME +!--0131585AC1F246DBAF6B84E53534F5FA-- DESCRIPTION![CDATA[The amount credited to an account, converted to the organization default currency.]]/DESCRIPTION +!--0131585AC1F246DBAF6B84E53534F5FA-- HELP![CDATA[The Account Credit Amount indicates the transaction amount converted to this organization's accounting currency]]/HELP +!--0131585AC1F246DBAF6B84E53534F5FA-- AD_MODULE_ID![CDATA[0]]/AD_MODULE_ID +!--0131585AC1F246DBAF6B84E53534F5FA--/AD_ELEMENT + !--01A2AC68F3C411DD8A04001D09C4A2FE--AD_ELEMENT !--01A2AC68F3C411DD8A04001D09C4A2FE-- AD_ELEMENT_ID![CDATA[01A2AC68F3C411DD8A04001D09C4A2FE]]/AD_ELEMENT_ID !--01A2AC68F3C411DD8A04001D09C4A2FE-- AD_CLIENT_ID![CDATA[0]]/AD_CLIENT_ID @@ -22001,6 +22014,19 @@ !--2E25DF9EA05D415B851BDB301BA12D0A-- AD_MODULE_ID![CDATA[0]]/AD_MODULE_ID !--2E25DF9EA05D415B851BDB301BA12D0A--/AD_ELEMENT +!--2EB6010EAA174169880C588220EFE7B8--AD_ELEMENT +!--2EB6010EAA174169880C588220EFE7B8-- AD_ELEMENT_ID![CDATA[2EB6010EAA174169880C588220EFE7B8]]/AD_ELEMENT_ID +!--2EB6010EAA174169880C588220EFE7B8-- AD_CLIENT_ID![CDATA[0]]/AD_CLIENT_ID
[OpenbravoERP-commits] devel/pi: Fixes issue 0013636: If the same accounting schema is ...
details: /erp/devel/pi/rev/37271534c60d
changeset: 7603:37271534c60d
user: Adrián Romero adrianromero at openbravo.com
date: Mon Jun 14 16:18:28 2010 +0200
summary: Fixes issue 0013636: If the same accounting schema is assigned for
more than one org, a vendor is created with many entries on the accounting tab
Making the condition that checks whether new accounts must be added or not
based on the status field more precise. One case was missing when status is NULL
diffstat:
src-db/database/model/triggers/C_BPARTNER_TRG.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (12 lines):
diff -r 49f7f621447b -r 37271534c60d
src-db/database/model/triggers/C_BPARTNER_TRG.xml
--- a/src-db/database/model/triggers/C_BPARTNER_TRG.xml Mon Jun 14 19:39:06
2010 +0530
+++ b/src-db/database/model/triggers/C_BPARTNER_TRG.xml Mon Jun 14 16:18:28
2010 +0200
@@ -77,7 +77,7 @@
Creating new sub account
*/
-- Customer
-select count(*) into v_count from C_BP_Vendor_Acct where
c_acctschema_id = Cur_Defaults.C_AcctSchema_ID AND c_bpartner_id =
:new.C_BPartner_ID AND status = Cur_Defaults.status;
+select count(*) into v_count from C_BP_Vendor_Acct where
c_acctschema_id = Cur_Defaults.C_AcctSchema_ID AND c_bpartner_id =
:new.C_BPartner_ID AND ((status IS NULL AND Cur_Defaults.status IS NULL) OR
status = Cur_Defaults.status);
IF (v_count=0) THEN
Ad_Sequence_Next('C_BP_Customer_Acct', Cur_Defaults.C_AcctSchema_ID,
v_BP_Acct_ID);
IF (Cur_Defaults.IsBPNewAccount='Y') THEN
--
ThinkGeek and WIRED's GeekDad team up for the Ultimate
GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the
lucky parental unit. See the prize list and enter to win:
http://p.sf.net/sfu/thinkgeek-promo
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/main: 6 new changesets
details: /erp/devel/main/rev/7c753fd0d1ca changeset: 7604:7c753fd0d1ca user: Harikrishnan Raja harikrishnan.raja at openbravo.com date: Mon Jun 14 11:33:09 2010 +0530 summary: Fixes issue 13370:*\#\ is added to all the serial number prefix.Now this is removed. details: /erp/devel/main/rev/c899f464edac changeset: 7605:c899f464edac user: Sivaraman Rajagopal sivaraman.rajagopal at openbravo.com date: Mon Jun 14 11:52:29 2010 +0530 summary: Fixes issue 13379: Order UOM is not copied from Requisition lines to Purchase Order lines The files have been modified in oder to copy 'Order UOM' and 'Order Quantity' from Requisition and also three more new fields have been added in 'Requisition to Order' window grids. Corresponding fields are added in selectSelected, selectLines and insertCOrderline sqlmethods to fetch / insert values. details: /erp/devel/main/rev/4c076a9459d0 changeset: 7606:4c076a9459d0 user: Víctor Martínez Romanos victor.martinez at openbravo.com date: Mon Jun 14 09:16:43 2010 +0200 summary: Fixed bug 13384: Impossible to translate Report Daily Work Requirements details: /erp/devel/main/rev/44611cea1f67 changeset: 7607:44611cea1f67 user: Sivaraman Rajagopal sivaraman.rajagopal at openbravo.com date: Mon Jun 14 13:31:44 2010 +0530 summary: Fixes issue 13379: Order UOM is not copied from Requisition lines to Purchase Order lines details: /erp/devel/main/rev/d53347719f9e changeset: 7608:d53347719f9e user: RM packaging bot staff.rm at openbravo.com date: Mon Jun 14 15:40:47 2010 + summary: CI: promote changesets from pi to main details: /erp/devel/main/rev/90ec7bc3a271 changeset: 7609:90ec7bc3a271 user: RM packaging bot staff.rm at openbravo.com date: Mon Jun 14 15:40:48 2010 + summary: CI: update AD_MODULE - Core version and label diffstat: src-db/database/sourcedata/AD_MODULE.xml| 4 +- src-db/database/sourcedata/AD_TEXTINTERFACES.xml| 22 + src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder.html| 19 +- src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder.java| 7 +- src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder.xml | 6 + src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder_data.xsql | 23 +- src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDailyEdit.jrxml | 1402 + src/org/openbravo/erpCommon/info/AttributeSetInstance.java | 7 +- 8 files changed, 787 insertions(+), 703 deletions(-) diffs (truncated from 1702 to 300 lines): diff -r ec2bb4d501a7 -r 90ec7bc3a271 src-db/database/sourcedata/AD_MODULE.xml --- a/src-db/database/sourcedata/AD_MODULE.xml Fri Jun 11 16:31:26 2010 +0200 +++ b/src-db/database/sourcedata/AD_MODULE.xml Mon Jun 14 15:40:48 2010 + @@ -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.17411]]/VERSION +!--0-- VERSION![CDATA[2.50.17608]]/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 @@ -21,7 +21,7 @@ !--0-- HASCHARTOFACCOUNTS![CDATA[N]]/HASCHARTOFACCOUNTS !--0-- ISTRANSLATIONMODULE![CDATA[N]]/ISTRANSLATIONMODULE !--0-- HASREFERENCEDATA![CDATA[Y]]/HASREFERENCEDATA -!--0-- VERSION_LABEL![CDATA[dev]]/VERSION_LABEL +!--0-- VERSION_LABEL![CDATA[CI]]/VERSION_LABEL !--0-- ISCOMMERCIAL![CDATA[N]]/ISCOMMERCIAL !--0--/AD_MODULE diff -r ec2bb4d501a7 -r 90ec7bc3a271 src-db/database/sourcedata/AD_TEXTINTERFACES.xml --- a/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Fri Jun 11 16:31:26 2010 +0200 +++ b/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Mon Jun 14 15:40:48 2010 + @@ -16154,6 +16154,17 @@ !--00B7AF5613384D16BD23168FF64D24CE-- AD_MODULE_ID![CDATA[0]]/AD_MODULE_ID !--00B7AF5613384D16BD23168FF64D24CE--/AD_TEXTINTERFACES +!--023D343FA6294F3B9B0F8B1CA57712FB--AD_TEXTINTERFACES +!--023D343FA6294F3B9B0F8B1CA57712FB-- AD_TEXTINTERFACES_ID![CDATA[023D343FA6294F3B9B0F8B1CA57712FB]]/AD_TEXTINTERFACES_ID +!--023D343FA6294F3B9B0F8B1CA57712FB-- AD_CLIENT_ID![CDATA[0]]/AD_CLIENT_ID +!--023D343FA6294F3B9B0F8B1CA57712FB-- AD_ORG_ID![CDATA[0]]/AD_ORG_ID +!--023D343FA6294F3B9B0F8B1CA57712FB-- ISACTIVE![CDATA[Y]]/ISACTIVE +!--023D343FA6294F3B9B0F8B1CA57712FB-- TEXT![CDATA[Secondary Quantity]]/TEXT +!--023D343FA6294F3B9B0F8B1CA57712FB-- FILENAME![CDATA[/org/openbravo/erpCommon/ad_forms/RequisitionToOrder.html]]/FILENAME +!--023D343FA6294F3B9B0F8B1CA57712FB-- ISUSED![CDATA[Y]]/ISUSED +!--023D343FA6294F3B9B0F8B1CA57712FB-- AD_MODULE_ID![CDATA[0]]/AD_MODULE_ID +!--023D343FA6294F3B9B0F8B1CA57712FB--/AD_TEXTINTERFACES +
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: /erp/devel/pi/rev/8a6fc6fe95f8
changeset: 7604:8a6fc6fe95f8
user: Stefan Hühner stefan.huehner at openbravo.com
date: Mon Jun 14 18:42:55 2010 +0200
summary: Issue 12981: Fix formatting
details: /erp/devel/pi/rev/713673c0d94d
changeset: 7605:713673c0d94d
user: Stefan Hühner stefan.huehner at openbravo.com
date: Mon Jun 14 18:46:15 2010 +0200
summary: Fixed 12981: Fix selecting multiple records with special characters
in data
Code change to add xml-cdata to the id#rowkey output of the getIdsInRange
request as the rowkey part of this reponse can contain special characters
like ''.
diffstat:
src/org/openbravo/erpCommon/info/BusinessPartnerMultiple.java | 36 +++--
src/org/openbravo/erpCommon/info/ProductMultiple.java | 35 +++--
src/org/openbravo/erpCommon/info/ProjectMultiple.java | 68 ++
3 files changed, 76 insertions(+), 63 deletions(-)
diffs (truncated from 317 to 300 lines):
diff -r 37271534c60d -r 713673c0d94d
src/org/openbravo/erpCommon/info/BusinessPartnerMultiple.java
--- a/src/org/openbravo/erpCommon/info/BusinessPartnerMultiple.java Mon Jun
14 16:18:28 2010 +0200
+++ b/src/org/openbravo/erpCommon/info/BusinessPartnerMultiple.java Mon Jun
14 18:46:15 2010 +0200
@@ -215,27 +215,27 @@
String strOrderBy = SelectorUtility.buildOrderByClause(strOrderCols,
strOrderDirs);
page = TableSQLData.calcAndGetBackendPage(vars,
BusinessPartnerData.currentPage);
if (vars.getStringParameter(movePage, ).length() 0) {
- // on movePage action force executing countRows again
- strNewFilter = ;
+ // on movePage action force executing countRows again
+ strNewFilter = ;
}
int oldOffset = offset;
offset = (page * TableSQLData.maxRowsPerGridPage) + offset;
log4j.debug(relativeOffset: + oldOffset + absoluteOffset: +
offset);
// New filter or first load
if (strNewFilter.equals(1) || strNewFilter.equals()) {
-String rownum = 0, oraLimit1 = null, oraLimit2 = null,
pgLimit = null;
-if (this.myPool.getRDBMS().equalsIgnoreCase(ORACLE)) {
-oraLimit1 = String.valueOf(offset +
TableSQLData.maxRowsPerGridPage);
-oraLimit2 = (offset + 1) + AND + oraLimit1;
-rownum = ROWNUM;
-} else {
-pgLimit = TableSQLData.maxRowsPerGridPage + OFFSET
+ offset;
-}
- strNumRows = BusinessPartnerMultipleData.countRows(this,rownum,
Utility.getContext(this, vars,
- #User_Client, BusinessPartner), Utility.getContext(this,
vars,
+ String rownum = 0, oraLimit1 = null, oraLimit2 = null, pgLimit =
null;
+ if (this.myPool.getRDBMS().equalsIgnoreCase(ORACLE)) {
+oraLimit1 = String.valueOf(offset +
TableSQLData.maxRowsPerGridPage);
+oraLimit2 = (offset + 1) + AND + oraLimit1;
+rownum = ROWNUM;
+ } else {
+pgLimit = TableSQLData.maxRowsPerGridPage + OFFSET + offset;
+ }
+ strNumRows = BusinessPartnerMultipleData.countRows(this, rownum,
Utility.getContext(this,
+ vars, #User_Client, BusinessPartner),
Utility.getContext(this, vars,
#AccessibleOrgTree, BusinessPartner), strKey, strName,
strContact, strZIP,
strProvincia, (strBpartners.equals(costumer) ? clients :
), (strBpartners
- .equals(vendor) ? vendors : ), strCity,pgLimit,
oraLimit1, oraLimit2);
+ .equals(vendor) ? vendors : ), strCity, pgLimit,
oraLimit1, oraLimit2);
vars.setSessionValue(BusinessPartnerMultipleInfo.numrows,
strNumRows);
} else {
strNumRows =
vars.getSessionValue(BusinessPartnerMultipleInfo.numrows);
@@ -302,7 +302,8 @@
strRowsData.append(title).append(title).append(/title\n);
strRowsData.append(
description).append(description).append(/description\n);
strRowsData.append( /status\n);
-strRowsData.append( rows numRows=\).append(strNumRows).append(\
backendPage=\ + page + \\n);
+strRowsData.append( rows numRows=\).append(strNumRows).append(
+\ backendPage=\ + page + \\n);
if (data != null data.length 0) {
for (int j = 0; j data.length; j++) {
strRowsData.append(tr\n);
@@ -369,13 +370,13 @@
String strOrderBy = SelectorUtility.buildOrderByClause(strOrderCols,
strOrderDirs);
String strPage = vars.getSessionValue(ProductMultiple|currentPage,
0);
int page = Integer.valueOf(strPage);
-
+
int oldMinOffset = minOffset;
int oldMaxOffset = maxOffset;
minOffset = (page * TableSQLData.maxRowsPerGridPage) + minOffset;
maxOffset = (page * TableSQLData.maxRowsPerGridPage) + maxOffset;
log4j.debug(relativeMinOffset: + oldMinOffset + absoluteMinOffset:
+ minOffset);
-
[OpenbravoERP-commits] devel/pi: Fixes issue 13421: GL Posting by DB Tables
details: /erp/devel/pi/rev/0893b1840f69
changeset: 7606:0893b1840f69
user: David Alsasua david.alsasua at openbravo.com
date: Mon Jun 14 22:23:50 2010 +0200
summary: Fixes issue 13421: GL Posting by DB Tables
does not update columns ‘updated’ and ‘updatedBy’
diffstat:
src/org/openbravo/erpCommon/ad_forms/AcctServer.java | 14 +++---
src/org/openbravo/erpCommon/ad_forms/AcctServer_data.xsql | 3 ++-
2 files changed, 9 insertions(+), 8 deletions(-)
diffs (64 lines):
diff -r 713673c0d94d -r 0893b1840f69
src/org/openbravo/erpCommon/ad_forms/AcctServer.java
--- a/src/org/openbravo/erpCommon/ad_forms/AcctServer.java Mon Jun 14
18:46:15 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/AcctServer.java Mon Jun 14
22:23:50 2010 +0200
@@ -570,12 +570,12 @@
errors++;
if (messageResult == null)
setMessageResult(conn, vars, getStatus(), );
- save(conn);
+ save(conn, vars.getUser());
}
} catch (Exception e) {
errors++;
Status = AcctServer.STATUS_Error;
-save(conn);
+save(conn, vars.getUser());
log4j.warn(e);
}
} catch (ServletException e) {
@@ -682,7 +682,7 @@
}
}
// Commit Doc
- if (!save(conn)) { // contains unlock
+ if (!save(conn, vars.getUser())) { // contains unlock
// conn.releaseRollbackConnection(con);
unlock(conn);
// Status = AcctServer.STATUS_Error;
@@ -703,14 +703,14 @@
*
* @param con
* connection
+ * @param strUser
+ * AD_User_ID
* @return true if saved
*/
- private final boolean save(ConnectionProvider conn) {
-// if (log4j.isDebugEnabled()) log4j.debug (AcctServer - save - - +
-// Status);
+ private final boolean save(ConnectionProvider conn, String strUser) {
int no = 0;
try {
- no = AcctServerData.updateSave(conn, tableName, Status, Record_ID);
+ no = AcctServerData.updateSave(conn, tableName, Status, strUser,
Record_ID);
} catch (ServletException e) {
log4j.warn(e);
}
diff -r 713673c0d94d -r 0893b1840f69
src/org/openbravo/erpCommon/ad_forms/AcctServer_data.xsql
--- a/src/org/openbravo/erpCommon/ad_forms/AcctServer_data.xsql Mon Jun 14
18:46:15 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/AcctServer_data.xsql Mon Jun 14
22:23:50 2010 +0200
@@ -183,12 +183,13 @@
SqlMethodComment/SqlMethodComment
Sql
![CDATA[
-UPDATE DUAL SET Posted= ? ,Processing='N'
+UPDATE DUAL SET Posted= ? ,Processing='N', updated=now(), updatedby=?
WHERE CLAVE_ID = ?
]]
/Sql
Parameter name=tableName type=replace optional=true after=UPDATE
text=DUAL/
Parameter name=status/
+ Parameter name=adUserID/
Parameter name=tableName type=replace optional=true after=WHERE
text=CLAVE/
Parameter name=Record_ID/
/SqlMethod
--
ThinkGeek and WIRED's GeekDad team up for the Ultimate
GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the
lucky parental unit. See the prize list and enter to win:
http://p.sf.net/sfu/thinkgeek-promo
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/main: 15 new changesets
details: /erp/devel/main/rev/86b0e6bd04aa changeset: 7610:86b0e6bd04aa user: Antonio Moreno antonio.moreno at openbravo.com date: Mon Jun 14 11:19:40 2010 +0200 summary: Fixed issue 13327. AD_WINDOW_COPY procedure will now work when the language of the source module and the target one are different. Basically, a coalesce-using structure has been added to get the translated version of the name, description, and help, both for the main tables (ad_tab, ad_field) and also for the _trl tables, and if it doesn't exist, then use the name, description, and help of the original row. details: /erp/devel/main/rev/44c5b03fcca1 changeset: 7611:44c5b03fcca1 user: Adrián Romero adrianromero at openbravo.com date: Mon Jun 14 11:30:02 2010 +0200 summary: Fixes issue 0011948: C_GETTAX doesn't order properly when there are more than one tax rates defined for one tax category Reverting last change it was incorrect details: /erp/devel/main/rev/b85f2815bdcc changeset: 7612:b85f2815bdcc user: Iván Perdomo ivan.perdomo at openbravo.com date: Mon Jun 14 11:50:40 2010 +0200 summary: Reformatted code and updated license. Related to issue 13593 details: /erp/devel/main/rev/8eea984425f6 changeset: 7613:8eea984425f6 user: Iván Perdomo ivan.perdomo at openbravo.com date: Mon Jun 14 11:54:59 2010 +0200 summary: Fixes issue 13593: Added bolOneFormSubmission flag to true The bolOneFormSubmission flag disables multiple form submition by enabling/disabling a gSubmitted flag. If this flag is 1 the form.submit() is not made. details: /erp/devel/main/rev/e92cbd6025be changeset: 7614:e92cbd6025be user: Antonio Moreno antonio.moreno at openbravo.com date: Mon Jun 14 12:09:08 2010 +0200 summary: Fixed issue 13638. Added oncreatedefault to SELECTED column in AD_PREFERENCE. As this is a sourcedata mandatory column, it needs an oncreatedefault. details: /erp/devel/main/rev/ae808d1e7781 changeset: 7615:ae808d1e7781 user: Iván Perdomo ivan.perdomo at openbravo.com date: Mon Jun 14 12:46:59 2010 +0200 summary: Fixes issue 13582: Modified the way of showing/hidding the email icon The way to identify if a tab's toolbar has the email functionality is based on the 'pdf' object member. Is used in the form view, and now is used in grid view. details: /erp/devel/main/rev/caf34f8c71eb changeset: 7616:caf34f8c71eb user: Balamurugan Ramadoss balamurugan.ramadoss at openbravo.com date: Mon Jun 14 18:23:54 2010 +0530 summary: Fixes Issue 13374: The names 'Debit' and 'Credit' are not correct. details: /erp/devel/main/rev/bfddab73b8b5 changeset: 7617:bfddab73b8b5 user: Adrián Romero adrianromero at openbravo.com date: Mon Jun 14 15:59:04 2010 +0200 summary: Fixes issue 0013469: Daily Work Requirements Report does not show operations without P- It has been modified the Daily Work Requirements Report to add a subreport to show P- products no matter there are P- products or not. The previous report structure did not allow to show phases when there are not P- products to list details: /erp/devel/main/rev/49f7f621447b changeset: 7618:49f7f621447b user: Balamurugan Ramadoss balamurugan.ramadoss at openbravo.com date: Mon Jun 14 19:39:06 2010 +0530 summary: Fixes Issue 13374: The names 'Debit' and 'Credit' are not correct. details: /erp/devel/main/rev/37271534c60d changeset: 7619:37271534c60d user: Adrián Romero adrianromero at openbravo.com date: Mon Jun 14 16:18:28 2010 +0200 summary: Fixes issue 0013636: If the same accounting schema is assigned for more than one org, a vendor is created with many entries on the accounting tab Making the condition that checks whether new accounts must be added or not based on the status field more precise. One case was missing when status is NULL details: /erp/devel/main/rev/8a6fc6fe95f8 changeset: 7620:8a6fc6fe95f8 user: Stefan Hühner stefan.huehner at openbravo.com date: Mon Jun 14 18:42:55 2010 +0200 summary: Issue 12981: Fix formatting details: /erp/devel/main/rev/713673c0d94d changeset: 7621:713673c0d94d user: Stefan Hühner stefan.huehner at openbravo.com date: Mon Jun 14 18:46:15 2010 +0200 summary: Fixed 12981: Fix selecting multiple records with special characters in data Code change to add xml-cdata to the id#rowkey output of the getIdsInRange request as the rowkey part of this reponse can contain special characters like ''. details: /erp/devel/main/rev/0893b1840f69 changeset: 7622:0893b1840f69 user: David Alsasua david.alsasua at openbravo.com date: Mon Jun 14 22:23:50 2010 +0200 summary: Fixes issue 13421: GL Posting by DB Tables does not update columns ‘updated’ and ‘updatedBy’ details: /erp/devel/main/rev/346269cd379e changeset: 7623:346269cd379e user: RM packaging bot staff.rm at openbravo.com date: Tue Jun 15 03:43:29 2010 + summary: CI: promote changesets from pi to main details:
