details: /erp/devel/main/rev/71efbe7821e3
changeset: 7141:71efbe7821e3
user: Iván Perdomo <ivan.perdomo <at> openbravo.com>
date: Mon Apr 19 16:44:25 2010 +0200
summary: Fixes issue 13032: Hide UI back button when hideMenu is true
details: /erp/devel/main/rev/a16a91d616c6
changeset: 7142:a16a91d616c6
user: Iván Perdomo <ivan.perdomo <at> openbravo.com>
date: Wed Apr 21 12:50:15 2010 +0200
summary: Merge changes from PI
details: /erp/devel/main/rev/0d1ece383cd8
changeset: 7143:0d1ece383cd8
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Wed Apr 21 13:23:06 2010 +0200
summary: Fixes issue 0012818: Error in Purchase Order Report
details: /erp/devel/main/rev/da5c2f332b5e
changeset: 7144:da5c2f332b5e
user: David Alsasua <david.alsasua <at> openbravo.com>
date: Wed Apr 21 13:43:26 2010 +0200
summary: Fixes issue 12839: It is not possible to cance a remittance
details: /erp/devel/main/rev/9263e11d4930
changeset: 7145:9263e11d4930
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Wed Apr 21 16:56:07 2010 +0200
summary: Fixes issue 0012474: Warehouses and Bins don't appear in Material
Transaction Report
details: /erp/devel/main/rev/18e1d305fcd1
changeset: 7146:18e1d305fcd1
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Wed Apr 21 18:18:55 2010 +0200
summary: Fixed issue 13062.Modified view and add 2 fields in payment windows.
details: /erp/devel/main/rev/8066f233e9a8
changeset: 7147:8066f233e9a8
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Wed Apr 21 18:38:46 2010 +0200
summary: Fixes issue 0012474: Warehouses and Bins don't appear in Material
Transaction Report
details: /erp/devel/main/rev/d7ae71e064f7
changeset: 7148:d7ae71e064f7
user: Iván Perdomo <ivan.perdomo <at> openbravo.com>
date: Wed Apr 21 19:08:29 2010 +0200
summary: Fixes issue 13060: Changed isautosave to be required column
details: /erp/devel/main/rev/7e8895c44dea
changeset: 7149:7e8895c44dea
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Wed Apr 21 22:04:36 2010 +0200
summary: Related to issue 13062.Fix db inconsistency.
details: /erp/devel/main/rev/fe5026297cf9
changeset: 7150:fe5026297cf9
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Wed Apr 21 19:39:17 2010 +0200
summary: Fixes 0013065: Reconciliation Psted button failing
details: /erp/devel/main/rev/9ecddaf2a817
changeset: 7151:9ecddaf2a817
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Thu Apr 22 00:34:17 2010 +0200
summary: Fixes bug 0013066: Accounting process fails
details: /erp/devel/main/rev/ff1c64d7f68b
changeset: 7152:ff1c64d7f68b
user: Harikrishnan Raja <harikrishnan.raja <at> openbravo.com>
date: Thu Apr 22 10:07:14 2010 +0530
summary: Fixes Issue 12225: Error when copying accounting configuration from
BP group.
details: /erp/devel/main/rev/1133b8a877a3
changeset: 7153:1133b8a877a3
user: Sivaraman Rajagopal <sivaraman.rajagopal <at> openbravo.com>
date: Thu Apr 22 10:10:10 2010 +0530
summary: 8530: RFE: 2.50 Popup of copy lines for Goods Receipt should suggest
the Attribute values
details: /erp/devel/main/rev/783d62a77511
changeset: 7154:783d62a77511
user: Sivaraman Rajagopal <sivaraman.rajagopal <at> openbravo.com>
date: Thu Apr 22 11:47:46 2010 +0530
summary: Fixes issue 12879: The Document Type is wrong when we use
Requisition to Order
details: /erp/devel/main/rev/6f131867b08c
changeset: 7155:6f131867b08c
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Thu Apr 22 10:15:36 2010 +0200
summary: Related to issue 13062.Fix incosistency issue.
details: /erp/devel/main/rev/d510eff80937
changeset: 7156:d510eff80937
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Apr 22 10:37:18 2010 +0200
summary: fixed issue 13068: Reached 64k method size limit in
ComboReloadsProcessHelper.printPage
Created a new method per process
details: /erp/devel/main/rev/ac28ad27304e
changeset: 7157:ac28ad27304e
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Apr 22 11:29:07 2010 +0200
summary: fixed issue 13068: Reached 64k method size limit in
ComboReloadsProcessHelper.printPage
Do not generate org callout in case there is not ad_org_id column
details: /erp/devel/main/rev/717afc06700f
changeset: 7158:717afc06700f
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Thu Apr 22 13:11:30 2010 +0200
summary: Fixed issue 13072. ant diagnostic should work again
details: /erp/devel/main/rev/fe3ebc91f201
changeset: 7159:fe3ebc91f201
user: Sathiyan Sivaprakasam <sathiyan.sivaprakasam <at> openbravo.com>
date: Thu Apr 22 18:54:05 2010 +0530
summary: Fixes Issue 12743: Withholding Report in PDF fails
details: /erp/devel/main/rev/ec07533734ac
changeset: 7160:ec07533734ac
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Apr 22 15:27:21 2010 +0200
summary: issue 13068: Make process mehtods private
details: /erp/devel/main/rev/6b7c616d7412
changeset: 7161:6b7c616d7412
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Apr 22 17:04:38 2010 +0200
summary: fixed bug 12967: The hour in a column defined as datetime is not
saved properly
details: /erp/devel/main/rev/dc5494f72eac
changeset: 7162:dc5494f72eac
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Apr 22 17:47:21 2010 +0200
summary: fixed bug 13085: ant diagnostics should check for tomcat >=6
details: /erp/devel/main/rev/e6bc9b3a2f58
changeset: 7163:e6bc9b3a2f58
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Apr 22 18:13:30 2010 +0200
summary: fixed bug 12893: No message when saving in field sequence tab
details: /erp/devel/main/rev/5d4c147f2599
changeset: 7164:5d4c147f2599
user: Harikrishnan Raja <harikrishnan.raja <at> openbravo.com>
date: Fri Apr 23 00:12:21 2010 +0530
summary: Fixes issue 12816: Autosave does not work in Manual Settlement.
details: /erp/devel/main/rev/a14284c69f01
changeset: 7165:a14284c69f01
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri Apr 23 10:00:29 2010 +0200
summary: fixed bug 13076: behavour not correct when modify a element in help
window
details: /erp/devel/main/rev/919cfa2a9e68
changeset: 7166:919cfa2a9e68
user: Harikrishnan Raja <harikrishnan.raja <at> openbravo.com>
date: Fri Apr 23 15:40:23 2010 +0530
summary: Fixes Issue 12842: Currency value not assigned in Requsition header
page.
details: /erp/devel/main/rev/f416696344a6
changeset: 7167:f416696344a6
user: Sivaraman Rajagopal <sivaraman.rajagopal <at> openbravo.com>
date: Fri Apr 23 15:50:49 2010 +0530
summary: Fixes issue 12857: It is possible to generate an invoice with a
Transaction Document disabled
details: /erp/devel/main/rev/aeacb7e398a6
changeset: 7168:aeacb7e398a6
user: Sivaraman Rajagopal <sivaraman.rajagopal <at> openbravo.com>
date: Fri Apr 23 15:53:55 2010 +0530
summary: Fixes issue 12805: Inactive Discount still apples to the sales order
details: /erp/devel/main/rev/c1385e451739
changeset: 7169:c1385e451739
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Fri Apr 23 01:24:27 2010 +0200
summary: Fixes wrong default value for processed and processing
details: /erp/devel/main/rev/8f769fcf0b0a
changeset: 7170:8f769fcf0b0a
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri Apr 23 12:51:39 2010 +0200
summary: fixed bug 12626: Toolbar: Search pop-up is not working well
details: /erp/devel/main/rev/aa6da0c803d4
changeset: 7171:aa6da0c803d4
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri Apr 23 13:10:52 2010 +0200
summary: fixed bug 11423: Print icon in Data package tab is useless
details: /erp/devel/main/rev/15877f7f7451
changeset: 7172:15877f7f7451
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri Apr 23 13:22:53 2010 +0200
summary: fixed bug 13017: Incorrect error message installing commercial
modules in expired instances
details: /erp/devel/main/rev/bb264740f388
changeset: 7173:bb264740f388
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Fri Apr 23 13:23:45 2010 +0200
summary: Fixed issue 12720. Label fixed.
details: /erp/devel/main/rev/2765ecbdd5a2
changeset: 7174:2765ecbdd5a2
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Fri Apr 23 13:24:12 2010 +0200
summary: Fixed issue 13097. Set parent key columns.
details: /erp/devel/main/rev/89f2a74f50fd
changeset: 7175:89f2a74f50fd
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Fri Apr 23 13:40:09 2010 +0200
summary: Fixed issue 13105.Show description fields as read only.
details: /erp/devel/main/rev/174274efc18c
changeset: 7176:174274efc18c
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri Apr 23 13:51:11 2010 +0200
summary: fixed bug 12683: Oracle build takes a lot of time
details: /erp/devel/main/rev/8dc35f2ddcca
changeset: 7177:8dc35f2ddcca
user: Sathiyan Sivaprakasam <sathiyan.sivaprakasam <at> openbravo.com>
date: Fri Apr 23 17:46:46 2010 +0530
summary: Fixes Issue 12743: bracket and format issue has been fixed
details: /erp/devel/main/rev/72a9865d5f18
changeset: 7178:72a9865d5f18
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri Apr 23 15:13:30 2010 +0200
summary: fixed bug 11658: error inserting next step in workflow
details: /erp/devel/main/rev/ecec4ea06a1d
changeset: 7179:ecec4ea06a1d
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Fri Apr 23 16:02:38 2010 +0200
summary: Fixed issue 13106. Modules with tables added to the name exceptions
can now be exported and packaged.
details: /erp/devel/main/rev/cb15f7a33252
changeset: 7180:cb15f7a33252
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Fri Apr 23 16:11:53 2010 +0200
summary: Fixes Issue 12842: Currency value not assigned in Requsition header
page
details: /erp/devel/main/rev/ade5b974f0db
changeset: 7181:ade5b974f0db
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Fri Apr 23 17:32:58 2010 +0200
summary: Fixes issue 0012628: When clicking Linked Items in Business Partner
window, Accounting Transaction Details show database IDs
details: /erp/devel/main/rev/650e5e995461
changeset: 7182:650e5e995461
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Fri Apr 23 17:34:32 2010 +0200
summary: Fixes bug 0013110: Error in code
details: /erp/devel/main/rev/73e50ed2313e
changeset: 7183:73e50ed2313e
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Fri Apr 23 17:35:08 2010 +0200
summary: Fixes bug 0013108. Fixes bug 0013109
details: /erp/devel/main/rev/3cef9d762a0c
changeset: 7184:3cef9d762a0c
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Fri Apr 23 17:55:02 2010 +0200
summary: Fixes issue 0012628: When clicking Linked Items in Business Partner
window, Accounting Transaction Details show database IDs
details: /erp/devel/main/rev/197c00fa1289
changeset: 7185:197c00fa1289
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Sat Apr 24 14:45:20 2010 +0200
summary: Fixes erp_devel_main-full-pgsql #127
details: /erp/devel/main/rev/e027c06aa915
changeset: 7186:e027c06aa915
user: Martin Taal <martin.taal <at> openbravo.com>
date: Mon Apr 26 12:00:43 2010 +0200
summary: fixes issue 9050: Default value in database and application
dictionary differ, they need to be the same
details: /erp/devel/main/rev/19f1bedbb5ca
changeset: 7187:19f1bedbb5ca
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Mon Apr 26 15:10:45 2010 +0200
summary: Fixes issue 0012856: Error in 'Purchase Order Report
details: /erp/devel/main/rev/2ed70bcb603c
changeset: 7188:2ed70bcb603c
user: Mikel Irurita <mikel.irurita <at> openbravo.com>
date: Mon Apr 26 16:29:36 2010 +0200
summary: Fixes issue 0013103: Make consistent Trial Balance report filters
order
details: /erp/devel/main/rev/6045df330155
changeset: 7189:6045df330155
user: David Alsasua <david.alsasua <at> openbravo.com>
date: Tue Apr 27 00:44:50 2010 +0200
summary: Fixes issue 13117: Uncorrect Account in Account Combination
Replaced combobox with textbox, as it is a non-editable field, for
accounting schema in subaccount selector
details: /erp/devel/main/rev/dab53908ec46
changeset: 7190:dab53908ec46
user: Manoharan Iyyadurai <manoharan.iyyadurai <at> openbravo.com>
date: Tue Apr 27 13:34:03 2010 +0530
summary: Created trigger for Payment Proposal and Payment Prop Details
details: /erp/devel/main/rev/03d53536fd30
changeset: 7191:03d53536fd30
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Tue Apr 27 10:24:20 2010 +0200
summary: fixed bug 11402: OBX files packaged on windows contains back slashes
details: /erp/devel/main/rev/f76f4e0aa35c
changeset: 7192:f76f4e0aa35c
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Tue Apr 27 12:21:18 2010 +0200
summary: fixed bug 11402: OBX files packaged on windows contains back slashes
details: /erp/devel/main/rev/61de2f092cde
changeset: 7193:61de2f092cde
user: Anandan Narasimachari Monnin <anandan.monnin <at> openbravo.com>
date: Tue Apr 27 18:28:28 2010 +0530
summary: backout the created trigger
details: /erp/devel/main/rev/a61461ed0794
changeset: 7194:a61461ed0794
user: Anandan Narasimachari Monnin <anandan.monnin <at> openbravo.com>
date: Tue Apr 27 18:29:25 2010 +0530
summary: backout the trigger created in the changeset 7148
details: /erp/devel/main/rev/dfa8f68abdb3
changeset: 7195:dfa8f68abdb3
user: David Alsasua <david.alsasua <at> openbravo.com>
date: Tue Apr 27 18:43:36 2010 +0200
summary: Fixes issue 12365: subreport was compiled, but not translated
details: /erp/devel/main/rev/d61ce2cd2892
changeset: 7196:d61ce2cd2892
user: Martin Taal <martin.taal <at> openbravo.com>
date: Tue Apr 27 22:32:28 2010 +0200
summary: fixes issue 13135: OBContext.getLanguage() returns 'wrong' language,
if user does not have a default language set
fixes issue 13136: OBContext.getLanguage does only use users' default language,
and does not honor language change in the role change popup
details: /erp/devel/main/rev/3b66fefae747
changeset: 7197:3b66fefae747
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Fri May 14 14:25:58 2010 +0200
summary: Merge stable changesets from int to main
details: /erp/devel/main/rev/36f76c8d7193
changeset: 7198:36f76c8d7193
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Fri May 14 14:25:59 2010 +0200
summary: Update AD_MODULE version for obx generation
diffstat:
.hgsigs
| 4 +
.hgtags
| 4 +
build.xml
| 9 +-
config/Openbravo.properties.template
| 4 +
src-db/database/lib/dbsourcemanager.jar
| 0
src-db/database/model/functions/AD_GET_DOCTYPE.xml
| 2 +-
src-db/database/model/functions/C_INVOICE_CREATE.xml
| 16 +-
src-db/database/model/functions/C_ORDER_POST1.xml
| 1 +
src-db/database/model/functions/C_REMITTANCE_POST.xml
| 90 ++++++-
src-db/database/model/tables/AD_ALERTRECIPIENT.xml
| 2 +-
src-db/database/model/tables/AD_COLUMN.xml
| 2 +-
src-db/database/model/tables/AD_LANGUAGE.xml
| 2 +-
src-db/database/model/tables/AD_MODULE.xml
| 2 +-
src-db/database/model/tables/FIN_FINACC_TRANSACTION.xml
| 6 +-
src-db/database/model/triggers/AD_PROPERTY_CONF_MOD_TRG.xml
| 29 +-
src-db/database/model/triggers/AD_WF_NODENEXT_MOD_TRG.xml
| 6 +-
src-db/database/model/triggers/C_BPARTNER_TRG.xml
| 10 +-
src-db/database/model/triggers/C_INVLINE_CHK_RESTRICTIONS_TRG.xml
| 6 +-
src-db/database/model/triggers/C_INVOICELINE_TRG4.xml
| 39 --
src-db/database/model/views/FIN_PAYMENT_DETAIL_V.xml
| 8 +-
src-db/database/sourcedata/AD_COLUMN.xml
| 76 ++++-
src-db/database/sourcedata/AD_ELEMENT.xml
| 11 +
src-db/database/sourcedata/AD_FIELD.xml
| 118 +++++--
src-db/database/sourcedata/AD_MESSAGE.xml
| 22 +
src-db/database/sourcedata/AD_MODEL_OBJECT.xml
| 24 -
src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml
| 40 --
src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
src-db/database/sourcedata/AD_TAB.xml
| 5 +-
src-db/database/sourcedata/AD_TEXTINTERFACES.xml
| 11 +
src-db/database/sourcedata/AD_VAL_RULE.xml
| 14 +-
src-test/org/openbravo/test/dal/IssuesTest.java
| 39 ++
src-util/diagnostic/config/diagnostics.properties
| 4 +-
src-util/diagnostic/src/org/openbravo/task/CheckTomcatAntExecution.java
| 2 +-
src-util/diagnostic/src/org/openbravo/task/CheckTomcatFilePermissions.java
| 2 +-
src-util/diagnostic/src/org/openbravo/task/CheckX.java
| 2 +-
src-util/modulescript/build/classes/org/openbravo/modulescript/CreateDoctypeTemplate.class
| 0
src-util/modulescript/build/classes/org/openbravo/modulescript/CreateDoctypeTemplateData.class
| 0
src-util/modulescript/src/org/openbravo/modulescript/CreateDoctypeTemplate.java
| 58 ++++
src-util/modulescript/src/org/openbravo/modulescript/CreateDoctypeTemplate_Data.xsql
| 68 +++++
src-wad/build.xml
| 4 +-
src-wad/src/org/openbravo/wad/ComboReloadsProcessHelper.javaxml
| 17 +-
src-wad/src/org/openbravo/wad/ComboReloadsProcessHelper.xml
| 7 +-
src-wad/src/org/openbravo/wad/Fields_data.xsql
| 12 +
src-wad/src/org/openbravo/wad/Wad.java
| 22 +-
src-wad/src/org/openbravo/wad/javasource.javaxml
| 6 +-
src-wad/src/org/openbravo/wad/javasourceSortTab.javaxml
| 10 +-
src/build.xml
| 10 +
src/buildAD.xml
| 3 +-
src/org/openbravo/base/secureApp/HttpSecureAppServlet.java
| 6 +-
src/org/openbravo/base/secureApp/LoginUtils.java
| 2 +-
src/org/openbravo/dal/core/OBContext.java
| 53 +++-
src/org/openbravo/erpCommon/ad_actionButton/CopyFromSettlement.java
| 6 +-
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java
| 25 +-
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_ShipmentPO.xml
| 1 +
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Shipment_data.xsql
| 36 ++-
src/org/openbravo/erpCommon/ad_actionButton/InvoicePaymentMonitor.java
| 9 +-
src/org/openbravo/erpCommon/ad_callouts/SE_Supplier_BPartner.java
| 2 +-
src/org/openbravo/erpCommon/ad_callouts/SL_Requisition_BPartner.java
| 5 +-
src/org/openbravo/erpCommon/ad_callouts/SL_Requisition_BPartner_data.xsql
| 7 +-
src/org/openbravo/erpCommon/ad_forms/AcctServer.java
| 1 +
src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java
| 63 ++++-
src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java
| 56 ++--
src/org/openbravo/erpCommon/ad_forms/DocFINPaymentTemplate.java
| 24 +-
src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java
| 103 ++++---
src/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual.java
| 30 +--
src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java
| 59 ++--
src/org/openbravo/erpCommon/ad_forms/ModuleManagement_ErrorCommercial.html
| 2 +-
src/org/openbravo/erpCommon/ad_help/DisplayHelp_Edit_Field_F1.html
| 6 +-
src/org/openbravo/erpCommon/ad_process/PaymentMonitor.java
| 15 +-
src/org/openbravo/erpCommon/ad_process/PaymentMonitorProcess.java
| 24 +-
src/org/openbravo/erpCommon/ad_process/RestartingContext.html
| 17 +-
src/org/openbravo/erpCommon/ad_reports/InoutEdition_data.xsql
| 10 +-
src/org/openbravo/erpCommon/ad_reports/ReportAnnualCertification.html
| 12 +-
src/org/openbravo/erpCommon/ad_reports/ReportAnnualCertification.java
| 71 +++-
src/org/openbravo/erpCommon/ad_reports/ReportAnnualCertification.jrxml
| 24 +-
src/org/openbravo/erpCommon/ad_reports/ReportAnnualCertification_data.xsql
| 9 +-
src/org/openbravo/erpCommon/ad_reports/ReportDebtPayment_data.xsql
| 20 +-
src/org/openbravo/erpCommon/ad_reports/ReportMaterialTransactionEditionJR.jrxml
| 136 +++++++--
src/org/openbravo/erpCommon/ad_reports/ReportPricelist.html
| 2 +-
src/org/openbravo/erpCommon/ad_reports/ReportPurchaseOrder.jrxml
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.html
| 17 +-
src/org/openbravo/erpCommon/info/AccountElementValue.html
| 43 ++-
src/org/openbravo/erpCommon/info/AccountElementValue.java
| 42 +-
src/org/openbravo/erpCommon/info/AccountElementValue.xml
| 8 +-
src/org/openbravo/erpCommon/info/AccountElementValue_data.xsql
| 8 +
src/org/openbravo/erpCommon/modules/ExtractModule.java
| 9 +-
src/org/openbravo/erpCommon/modules/ImportModule.java
| 6 +-
src/org/openbravo/erpCommon/obps/ActivationKey.java
| 3 +
src/org/openbravo/erpCommon/security/Menu.java
| 3 +
src/org/openbravo/erpCommon/utility/PropertyException.java
| 46 +++
src/org/openbravo/erpCommon/utility/Utility.java
| 24 +-
src/org/openbravo/erpReports/RptC_Remittance.java
| 9 +-
src/org/openbravo/reference/ui/UIReference.java
| 9 +-
src/org/openbravo/service/system/SystemValidationTask.java
| 8 +-
94 files changed, 1309 insertions(+), 599 deletions(-)
diffs (truncated from 4211 to 300 lines):
diff -r df1dfe427bc7 -r 36f76c8d7193 .hgsigs
--- a/.hgsigs Mon Apr 19 14:03:58 2010 +0200
+++ b/.hgsigs Fri May 14 14:25:59 2010 +0200
@@ -14,3 +14,7 @@
4a5dd51c34fbbf64e9f933f9b7d54589ef5fb7b9 0
iEYEABECAAYFAkuM+1EACgkQCX/oGf+2qkPHfgCdFKV1PxtXcckQ3R3+kJgXnRFAtgkAoM6eWuR1ZA3nRphHH7sX2SGoufA5
75b887d57378e59138c0362b928a504db568ed9b 0
iEYEABECAAYFAkuSHAsACgkQCX/oGf+2qkOEpwCeM6aKuQ/VK5ywylW5Jiki2L5YX0UAoPtzt8ELfu+2n0hTB2E36NgVq1IU
8df12cedf6a200183c73497ae0cefa3fee0a0427 0
iEYEABECAAYFAkuzHu4ACgkQCX/oGf+2qkNkzwCeJC2mfV4HG3jDDH4B9ovaplpzyWwAoOQY9wuMO2XNnVJ9xw7JS+Qjy52k
+5c7276ed55f2605be4e0163a90820437ae51b35a 0
iEYEABECAAYFAkvoPD0ACgkQCX/oGf+2qkPJwwCgvsSfRbgj8XvBTAe0D98MuzYC9X0AnR61u2gYKK5GgGlgo6B6S7dfDCUr
+a56977f8bc9c70b88f49eccc4e05d4703926df8b 0
iEYEABECAAYFAkvpHhQACgkQCX/oGf+2qkNE2gCfRUvL9gvk0xEg6OjMlTbJbplKpNkAnAz8f8WZ4NY9NFmiefa6afLiiyIG
+8594549ee5becd6e51d6a295a6b473c42bacbbb9 0
iEYEABECAAYFAkvq4o4ACgkQCX/oGf+2qkPvLACfdPEl+S1cRY59u90LiQRmROPIL8cAniZtSjiAg13GifqOFZCZZ+zilCep
+9f343a616b2f998c3867661467de5dd9daeb7112 0
iEYEABECAAYFAkvq7PIACgkQCX/oGf+2qkMcHQCg3eHGql848ExhA5oOgtqfjIE3toUAn0GiWHkItn3YxPFitn8+e0IfOEaj
diff -r df1dfe427bc7 -r 36f76c8d7193 .hgtags
--- a/.hgtags Mon Apr 19 14:03:58 2010 +0200
+++ b/.hgtags Fri May 14 14:25:59 2010 +0200
@@ -24,3 +24,7 @@
1a6428c78a5521471084e7b93a42a03a74543495 2.50MP12
65aa17bbe739f7d3370aba319e68474c2356fdf2 2.50MP13
17a70403b6d39988147a0b8a11bb3a57ed04c373 2.50MP14
+66ff592fb792f3bc13a076db81cd1f5729f1b881 2.50MP15
+30fd49cdc1b1a5d3ff7233f2569e8afb8d0523f3 2.50MP16
+8a6462c8520ce811b77ee562c87387a7f0663d39 2.50MP16
+41915c2f5ec639dadab8e797a1e5f1e0922fa029 2.50MP17
diff -r df1dfe427bc7 -r 36f76c8d7193 build.xml
--- a/build.xml Mon Apr 19 14:03:58 2010 +0200
+++ b/build.xml Fri May 14 14:25:59 2010 +0200
@@ -12,7 +12,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) 2001-2009 Openbravo SLU
+* All portions are Copyright (C) 2001-2010 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -187,6 +187,12 @@
<equals arg1="${bbdd.rdbms}" arg2="POSTGRE" />
</and>
</condition>
+
+ <condition property="java.security.egd" value="">
+ <not>
+ <isset property="${java.security.egd}" />
+ </not>
+ </condition>
<path id="project.class.path">
<pathelement path="${build}" />
@@ -663,6 +669,7 @@
<java classname="org.openbravo.erpCommon.modules.ApplyModuleTask"
fork="true" maxmemory="${build.maxmemory}" failonerror="true">
<arg line="'${base.src}'" />
<classpath refid="project.class.path" />
+ <sysproperty key="java.security.egd" value="${java.security.egd}"/>
</java>
</target>
diff -r df1dfe427bc7 -r 36f76c8d7193 config/Openbravo.properties.template
--- a/config/Openbravo.properties.template Mon Apr 19 14:03:58 2010 +0200
+++ b/config/Openbravo.properties.template Fri May 14 14:25:59 2010 +0200
@@ -66,6 +66,10 @@
# bbdd.password=TAD
# bbdd.sessionConfig=ALTER SESSION SET NLS_DATE_FORMAT='DD-MM-YYYY'
NLS_NUMERIC_CHARACTERS='.,'
+# Oracle instances in linux, can delay on getting DB connection (issue
#12683).
+# In these cases this property can be set to solve the problem
+# java.security.egd=file:///dev/urandom
+
bbdd.rdbms=POSTGRE
bbdd.driver=org.postgresql.Driver
bbdd.url=jdbc:postgresql://localhost:5432
diff -r df1dfe427bc7 -r 36f76c8d7193 src-db/database/lib/dbsourcemanager.jar
Binary file src-db/database/lib/dbsourcemanager.jar has changed
diff -r df1dfe427bc7 -r 36f76c8d7193
src-db/database/model/functions/AD_GET_DOCTYPE.xml
--- a/src-db/database/model/functions/AD_GET_DOCTYPE.xml Mon Apr 19
14:03:58 2010 +0200
+++ b/src-db/database/model/functions/AD_GET_DOCTYPE.xml Fri May 14
14:25:59 2010 +0200
@@ -43,7 +43,7 @@
AND AD_Client_Id=p_ClientId
AND AD_ISORGINCLUDED(p_OrgId, AD_Org_ID, p_ClientId) <> -1
ORDER BY AD_ISORGINCLUDED(p_OrgId, AD_Org_ID, p_ClientId),
- IsDefault,
+ IsDefault DESC,
C_DocType_ID
)
LOOP
diff -r df1dfe427bc7 -r 36f76c8d7193
src-db/database/model/functions/C_INVOICE_CREATE.xml
--- a/src-db/database/model/functions/C_INVOICE_CREATE.xml Mon Apr 19
14:03:58 2010 +0200
+++ b/src-db/database/model/functions/C_INVOICE_CREATE.xml Fri May 14
14:25:59 2010 +0200
@@ -372,6 +372,7 @@
* Create Invoice Header ---------------------------------------
*/
-- Get Order DocType Info - approved from Invoice DocType
+ BEGIN
v_ResultStr:='GetDocTypeInfo - ' || Cur_Order.C_DocType_ID;
SELECT od.C_DocTypeInvoice_ID,
od.DocSubTypeSO
INTO v_DocType_ID,
@@ -379,7 +380,12 @@
FROM C_DOCTYPE od,
C_DOCTYPE ID
WHERE od.C_DocType_ID=Cur_Order.C_DocType_ID
- AND od.C_DocTypeInvoice_ID=ID.C_DocType_ID;
+ AND od.C_DocTypeInvoice_ID=ID.C_DocType_ID
+ AND ID.IsActive='Y';
+ EXCEPTION
+ WHEN OTHERS THEN
+ RAISE_APPLICATION_ERROR(-20000, '@NoDocumentTypeFound@') ;
+ END;
--
Ad_Sequence_Next('C_Invoice', Cur_Order.AD_Client_ID,
p_Invoice_ID) ;
Ad_Sequence_Doctype(v_DocType_ID, Cur_Order.AD_Client_ID, 'Y',
v_DocumentNo) ;
@@ -890,6 +896,7 @@
RAISE_APPLICATION_ERROR(-20000, '@NoDefaultInvoice@') ;
END;
ELSE
+ BEGIN
SELECT od.C_DocTypeInvoice_ID
INTO v_DocType_ID
FROM C_DOCTYPE od,
@@ -897,7 +904,12 @@
C_ORDER o
WHERE od.C_DocType_ID=o.C_DocType_ID
AND od.C_DocTypeInvoice_ID=ID.C_DocType_ID
- AND o.C_Order_ID=Cur_InvoiceSchedule.C_Order_ID;
+ AND o.C_Order_ID=Cur_InvoiceSchedule.C_Order_ID
+ AND ID.IsActive='Y';
+ EXCEPTION
+ WHEN OTHERS THEN
+ RAISE_APPLICATION_ERROR(-20000, '@NoDocumentTypeFound@') ;
+ END;
END IF;
IF(NOT FINISH_PROCESS) THEN
-- Get other defaults
diff -r df1dfe427bc7 -r 36f76c8d7193
src-db/database/model/functions/C_ORDER_POST1.xml
--- a/src-db/database/model/functions/C_ORDER_POST1.xml Mon Apr 19 14:03:58
2010 +0200
+++ b/src-db/database/model/functions/C_ORDER_POST1.xml Fri May 14 14:25:59
2010 +0200
@@ -619,6 +619,7 @@
AND C_DISCOUNT.M_PRODUCT_ID=M_PRODUCT.M_PRODUCT_ID
AND C_ORDER_DISCOUNT.C_ORDER_ID=v_Record_ID
AND C_ORDER_DISCOUNT.ISACTIVE='Y'
+ AND C_DISCOUNT.ISACTIVE='Y'
ORDER BY C_ORDER_DISCOUNT.LINE
)
LOOP
diff -r df1dfe427bc7 -r 36f76c8d7193
src-db/database/model/functions/C_REMITTANCE_POST.xml
--- a/src-db/database/model/functions/C_REMITTANCE_POST.xml Mon Apr 19
14:03:58 2010 +0200
+++ b/src-db/database/model/functions/C_REMITTANCE_POST.xml Fri May 14
14:25:59 2010 +0200
@@ -19,7 +19,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) 2001-2009 Openbravo SLU
+* All portions are Copyright (C) 2001-2010 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************/
@@ -32,7 +32,7 @@
v_AD_Client_ID VARCHAR2(32) ;
v_AD_Org_ID VARCHAR2(32) ;
v_Processed VARCHAR(60) ;
- v_Posted VARCHAR(60) ;
+ v_Posted CHAR(1) ;
v_Processing CHAR(1);
v_Currency VARCHAR2(32);
v_Date DATE;
@@ -60,6 +60,7 @@
TYPE RECORD IS REF CURSOR;
Cur_Parameter RECORD;
Cur_RemittanceLines RECORD;
+ Cur_Settlements RECORD;
-- Parameter
-- Parameter Variables
v_Aux NUMBER;
@@ -68,8 +69,11 @@
v_DueDate DATE;
v_Status_to VARCHAR(60) ;
v_Consolidate VARCHAR(60) ;
+ v_SettlementID_W varchar2(32) :='' ;
+ v_Withholding BOOLEAN := FALSE;
v_SettlementID varchar2(32) ;
v_DocumentNo VARCHAR(40);
+ v_DocumentNo_W VARCHAR(40);
v_DPMId varchar2(32);
v_DPId varchar2(32);
v_DPMLineId varchar2(32);
@@ -179,6 +183,26 @@
WHERE r.C_Remittance_ID=v_Record_ID
AND C_SETTLEMENT_ID IS NOT NULL;
IF v_Aux=1 THEN
+ -- If any payment with no amount, but withholding amount is present
in the settlement, means a new settlement was
+ --created when processing the remittance, and needs to be
unprocessed.
+ FOR Cur_Settlements IN
+ (
+ SELECT DISTINCT C_SETTLEMENT_CANCEL_ID
+ FROM C_DEBT_PAYMENT DP
+ WHERE DP.C_SETTLEMENT_GENERATE_ID = v_vSettlementId
+ AND DP.AMOUNT='0'
+ AND DP.WITHHOLDINGAMOUNT IS NOT NULL
+ AND DP.WITHHOLDINGAMOUNT <> '0'
+ )
+ LOOP
+ SELECT POSTED, DOCUMENTNO INTO v_Posted, v_documentno_Settlement
FROM C_SETTLEMENT WHERE C_SETTLEMENT_ID=Cur_Settlements.C_SETTLEMENT_CANCEL_ID;
+ IF (v_Posted='Y') THEN
+ RAISE_APPLICATION_ERROR(-20000,
'@WITHHOLDING_SETTLEMENT_POSTED@' || v_documentno_Settlement || '.');
+ END IF;
+ C_SETTLEMENT_POST(NULL, Cur_Settlements.C_SETTLEMENT_CANCEL_ID) ;
+ UPDATE C_DEBT_PAYMENT SET C_SETTLEMENT_CANCEL_ID=NULL WHERE
C_SETTLEMENT_CANCEL_ID = Cur_Settlements.C_SETTLEMENT_CANCEL_ID;
+ DELETE FROM C_SETTLEMENT WHERE
C_Settlement_ID=Cur_Settlements.C_SETTLEMENT_CANCEL_ID;
+ END LOOP;
C_SETTLEMENT_POST(NULL, v_vSettlementId) ;
UPDATE C_REMITTANCELINE
SET C_DEBT_PAYMENT_CANCELLED=NULL
@@ -359,6 +383,8 @@
dp.STATUS,
dp.C_BPartner_id,
dp.description,
+ dp.withholdingamount,
+ dp.c_withholding_id,
rl.C_REMITTANCELINE_ID
FROM C_REMITTANCELINE rl,
C_DEBT_PAYMENT dp
@@ -375,7 +401,8 @@
ISRECEIPT, C_CURRENCY_ID, PAYMENTRULE, ISPAID,
AMOUNT, DATEPLANNED, ISMANUAL, STATUS,
C_SETTLEMENT_GENERATE_ID, isValid, c_BPartner_ID,
Generate_Processed,
- Description, C_BANKACCOUNT_ID, status_initial
+ Description, C_BANKACCOUNT_ID, status_initial,
+ withholdingamount, c_withholding_id
)
VALUES
(
@@ -384,9 +411,37 @@
Cur_RemittanceLines.ISRECEIPT,
Cur_RemittanceLines.C_CURRENCY_ID, Cur_RemittanceLines.PAYMENTRULE,
Cur_RemittanceLines.ISPAID,
-Cur_RemittanceLines.AMOUNT, Cur_RemittanceLines.DATEPLANNED,
'N', Cur_RemittanceLines.STATUS,
v_SettlementID, 'Y', v_BankPartner, 'Y',
- '*RT* '||Cur_RemittanceLines.description, v_BankAccountID,
Cur_RemittanceLines.STATUS
+ '*RT* '||Cur_RemittanceLines.description, v_BankAccountID,
Cur_RemittanceLines.STATUS,
+ -Cur_RemittanceLines.withholdingamount,
Cur_RemittanceLines.c_withholding_id
)
;
+ -- If the payment has a withholding associated, then a new payment
is created with no amount, but withholding amount. The BP of these
+ --payments will be the one in the original payment, and not the bank.
+ IF (Cur_RemittanceLines.withholdingamount IS NOT NULL AND NOT
Cur_RemittanceLines.withholdingamount = '0') THEN
+ v_Withholding := TRUE;
+ INSERT
+ INTO C_DEBT_PAYMENT
+ (
+ C_DEBT_PAYMENT_ID, AD_CLIENT_ID, AD_ORG_ID, ISACTIVE,
+ CREATED, CREATEDBY, UPDATED, UPDATEDBY,
+ ISRECEIPT, C_CURRENCY_ID, PAYMENTRULE, ISPAID,
+ AMOUNT, DATEPLANNED, ISMANUAL, STATUS,
+ C_SETTLEMENT_GENERATE_ID, isValid, c_BPartner_ID,
Generate_Processed,
+ Description, C_BANKACCOUNT_ID, status_initial,
+ withholdingamount, c_withholding_id
+ )
+ VALUES
+ (
+ get_uuid(), Cur_RemittanceLines.ad_Client_Id,
Cur_RemittanceLines.AD_Org_Id, 'Y',
+ now(), v_AD_User_ID, now(), v_AD_User_ID,
+ Cur_RemittanceLines.ISRECEIPT,
Cur_RemittanceLines.C_CURRENCY_ID, Cur_RemittanceLines.PAYMENTRULE, 'N',
+ '0', Cur_RemittanceLines.DATEPLANNED, 'N',
Cur_RemittanceLines.STATUS,
+ v_SettlementID, 'Y', Cur_RemittanceLines.C_BPartner_id, 'Y',
+ '*RT*W* '||Cur_RemittanceLines.description, v_BankAccountID,
Cur_RemittanceLines.STATUS,
+ Cur_RemittanceLines.withholdingamount,
Cur_RemittanceLines.c_withholding_id
+ )
+ ;
+ END IF;
UPDATE C_REMITTANCELINE
SET C_DEBT_PAYMENT_CANCELLED=v_DPID
WHERE C_RemittanceLine_ID=Cur_RemittanceLines.c_RemittanceLine_id;
@@ -429,6 +484,7 @@
--Calculate the total amount
--v_GeneratedAmt := v_GeneratedAmt + i.Amount;
END LOOP;
+
SELECT COALESCE(SUM(C_Currency_Round( C_Currency_Convert(Amount,
C_Currency_ID, v_Currency, v_dateTrx, NULL, v_aD_Client_Id, v_AD_Org_Id),
v_Currency, NULL)), 0)
INTO v_GeneratedAmt
FROM C_Debt_Payment_V
@@ -466,6 +522,32 @@
;
--Post Settlement
C_SETTLEMENT_POST(NULL, v_SettlementID) ;
+ -- If any of the payments in the remittance has got withholding, then
some new payments will have been created. Now those payments are included in a
+ --cancelation settlement, that is afterwards processed.
+ IF (v_Withholding) THEN
+ Ad_Sequence_Next('C_Settlement', v_AD_Org_Id, v_SettlementID_W) ;
+ Ad_Sequence_Doctype(v_SettlementDocType_ID, v_SettlementID_W, 'Y',
v_DocumentNo_W) ;
+ INSERT
+ INTO C_SETTLEMENT
+ (
+ C_SETTLEMENT_ID, AD_CLIENT_ID, AD_ORG_ID, ISACTIVE,
+ CREATED, CREATEDBY, UPDATED, UPDATEDBY,
+ DOCUMENTNO, DATETRX, DATEACCT, SETTLEMENTTYPE,
+ C_DOCTYPE_ID, C_Currency_ID, ISGENERATED
+ )
+ VALUES
+ (
+ v_SettlementID_W, v_AD_Client_Id, v_AD_Org_Id, 'Y',
+ now(), v_AD_User_ID, now(), v_AD_User_ID,
+ '*RT*W*'||v_DocumentNo_W, v_dateTrx, v_dateTrx, 'C',
+ v_SettlementDocType_ID, v_Currency, 'Y'
+ )
+ ;
------------------------------------------------------------------------------
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
