details:   https://code.openbravo.com/erp/devel/main/rev/a03c5bee8e36
changeset: 16105:a03c5bee8e36
user:      Augusto Mauch <augusto.mauch <at> openbravo.com>
date:      Mon Apr 16 16:08:05 2012 +0200
summary:   Fixes issue 18692: HTML widgets can be embeded in a form

Prior to this fix, when an HTML widget whose html code had to be evaluated was 
embeded in a form, the contents of the widget were not shown.

It has been changed the way the contents are included in the window, and now 
the HTML widget is working properly.

details:   https://code.openbravo.com/erp/devel/main/rev/6017d223d423
changeset: 16106:6017d223d423
user:      Miguel de Juana <miguel.dejuana <at> openbravo.com>
date:      Mon Apr 16 16:08:20 2012 +0200
summary:   Fixed issue 15195: New module validation when packaging for 'has 
reference data'
This validation has been done when packaging the module. It warn in case the 
module has reference data and it is not marked as so or in case it is marked 
and it doesn't contain reference data.

details:   https://code.openbravo.com/erp/devel/main/rev/61bfbed9ea6e
changeset: 16107:61bfbed9ea6e
user:      Miguel de Juana <miguel.dejuana <at> openbravo.com>
date:      Mon Apr 16 16:46:16 2012 +0200
summary:   Related to 15195: Fixed typo.

details:   https://code.openbravo.com/erp/devel/main/rev/c511f956550d
changeset: 16108:c511f956550d
user:      David Baz Fayos <david.baz <at> openbravo.com>
date:      Mon Apr 16 18:12:52 2012 +0200
summary:   Fixed issue 20281: In 'Form'/'Edit' column can not be executed 
'Unfreeze' command anymore

details:   https://code.openbravo.com/erp/devel/main/rev/e8864542ee21
changeset: 16109:e8864542ee21
user:      David Baz Fayos <david.baz <at> openbravo.com>
date:      Mon Apr 16 18:17:00 2012 +0200
summary:   Reverted incorrect file push related to issue 20281

details:   https://code.openbravo.com/erp/devel/main/rev/a0b892322cd4
changeset: 16110:a0b892322cd4
user:      David Baz Fayos <david.baz <at> openbravo.com>
date:      Mon Apr 16 18:31:59 2012 +0200
summary:   Fixed permissions

details:   https://code.openbravo.com/erp/devel/main/rev/5ac4bd2d23c0
changeset: 16111:5ac4bd2d23c0
user:      Antonio Moreno <antonio.moreno <at> openbravo.com>
date:      Mon Apr 16 19:23:25 2012 +0200
summary:   Fixed issue 20279. Set default role correctly

details:   https://code.openbravo.com/erp/devel/main/rev/1c4fc60c255e
changeset: 16112:1c4fc60c255e
user:      RM packaging bot <staff.rm <at> openbravo.com>
date:      Tue Apr 17 05:30:01 2012 +0200
summary:   CI: merge back from main

details:   https://code.openbravo.com/erp/devel/main/rev/c360569dd93b
changeset: 16113:c360569dd93b
user:      Pablo Sarobe <pablo.sarobe <at> openbravo.com>
date:      Tue Apr 17 10:49:34 2012 +0200
summary:   Fixes issue 20267: Inactive 8 users

details:   https://code.openbravo.com/erp/devel/main/rev/4f30ff8dc2af
changeset: 16114:4f30ff8dc2af
user:      Pablo Sarobe <pablo.sarobe <at> openbravo.com>
date:      Tue Apr 17 11:37:56 2012 +0200
summary:   Fixes issue 20284: Remove payment monitor at F&B level since exists 
at system level

details:   https://code.openbravo.com/erp/devel/main/rev/faf444cb823d
changeset: 16115:faf444cb823d
user:      Pablo Sarobe <pablo.sarobe <at> openbravo.com>
date:      Tue Apr 17 11:44:13 2012 +0200
summary:   Fixes issue 20285:Add preference showAcct for finance roles

details:   https://code.openbravo.com/erp/devel/main/rev/ac6225e96e99
changeset: 16116:ac6225e96e99
user:      Guillermo Álvarez de Eulate <guillermo.alvarez <at> openbravo.com>
date:      Tue Apr 17 11:20:47 2012 +0200
summary:   Fixed issue 19362: Opened tab fter POST/UNPOST action has been 
corrected.

Because the POST/UNPOST actions always opens a new tab with the general ledger 
journal, the tab name after the fix will be the identifier of this report 
(800000 in AD_PROCESS). Traductions are supported. Also, when General Ledeger 
Journal is opened after POST/UNPOST actions, it will not be added to the recent 
views list.

details:   https://code.openbravo.com/erp/devel/main/rev/3d0c875831e5
changeset: 16117:3d0c875831e5
user:      Guillermo Álvarez de Eulate <guillermo.alvarez <at> openbravo.com>
date:      Tue Apr 17 13:25:36 2012 +0200
summary:   Related to issue 19362: Avoiding possible errors with and undefined 
parameter

details:   https://code.openbravo.com/erp/devel/main/rev/bc914387cb25
changeset: 16118:bc914387cb25
user:      Miguel de Juana <miguel.dejuana <at> openbravo.com>
date:      Tue Apr 17 13:34:24 2012 +0200
summary:   Fixed issue 20266: install.source clean src-core,src-trl & src-wad 
build folder
New small target have been added to call src-core,src-trl and src-wad clean 
target. This new target have been added to the depends line of 'install.source' 
& 'eclipse.install.source' after init before calling 'create.database'.

details:   https://code.openbravo.com/erp/devel/main/rev/8f43187f575a
changeset: 16119:8f43187f575a
user:      Miguel de Juana <miguel.dejuana <at> openbravo.com>
date:      Tue Apr 17 14:40:31 2012 +0200
summary:   related to 20266: Backout, error install.source

details:   https://code.openbravo.com/erp/devel/main/rev/bd743df21d23
changeset: 16120:bd743df21d23
user:      Rok Lenardic <rok.lenardic <at> openbravo.com>
date:      Wed Apr 04 14:19:24 2012 -0400
summary:   fixed issue 20232: Add ProcessRequestId information to the scheduler 
bundle

details:   https://code.openbravo.com/erp/devel/main/rev/9f69a26123c3
changeset: 16121:9f69a26123c3
user:      Miguel de Juana <miguel.dejuana <at> openbravo.com>
date:      Tue Apr 17 18:00:02 2012 +0200
summary:   Fixed issue 20266: install.source clean src-core,src-trl & src-wad 
build folder
New small target have been added to call src-core,src-trl and src-wad clean 
target. This new target have been added to the depends line of 'install.source' 
& 'eclipse.install.source' after init before calling 'create.database'.

details:   https://code.openbravo.com/erp/devel/main/rev/98819a044ef6
changeset: 16122:98819a044ef6
user:      Guillermo Álvarez de Eulate <guillermo.alvarez <at> openbravo.com>
date:      Tue Apr 17 18:01:26 2012 +0200
summary:   Fixed issue 15537: records of undeleatable tables cant be deleted 
using supr shortcut.

details:   https://code.openbravo.com/erp/devel/main/rev/db029aa42c3e
changeset: 16123:db029aa42c3e
user:      Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date:      Tue Apr 17 19:30:58 2012 +0200
summary:   Fixes bug 20291

details:   https://code.openbravo.com/erp/devel/main/rev/a673138d34c7
changeset: 16124:a673138d34c7
user:      Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date:      Tue Apr 17 19:34:56 2012 +0200
summary:   Fixes bug 20275

details:   https://code.openbravo.com/erp/devel/main/rev/5806c7df07af
changeset: 16125:5806c7df07af
user:      Pablo Sarobe <pablo.sarobe <at> openbravo.com>
date:      Tue Apr 17 19:50:17 2012 +0200
summary:   Fixes issue 20292: Deny edit rights to roles when acceding to some 
windows

details:   https://code.openbravo.com/erp/devel/main/rev/564fb957650e
changeset: 16126:564fb957650e
user:      Eduardo Argal <eduardo.argal <at> openbravo.com>
date:      Thu Apr 12 17:05:03 2012 +0200
summary:   Fixes bug 20254: Multi accounting schema is not working properly in 
some circunstances

details:   https://code.openbravo.com/erp/devel/main/rev/b0dec74a9b39
changeset: 16127:b0dec74a9b39
user:      Mikel Irurita <mikel.irurita <at> openbravo.com>
date:      Wed Apr 18 13:06:17 2012 +0200
summary:   Related to issue 20275: license text year updated to 2012

details:   https://code.openbravo.com/erp/devel/main/rev/f51f246210be
changeset: 16128:f51f246210be
user:      Sandra Huguet <sandra.huguet <at> openbravo.com>
date:      Mon Apr 16 09:53:45 2012 +0200
summary:   Fixed issue 20258 Correct description for some elements
Correct description form several elements with
'x not implemented' as description

details:   https://code.openbravo.com/erp/devel/main/rev/3dd42669b0a0
changeset: 16129:3dd42669b0a0
user:      Sandra Huguet <sandra.huguet <at> openbravo.com>
date:      Thu Apr 12 13:39:58 2012 +0200
summary:   Fixed bug 20215 Modify sl_invoice_glitem callout
Modify sl_invoice_glitem callout for not to deletes the unit price and the
list price when chage the account

details:   https://code.openbravo.com/erp/devel/main/rev/2aa6395e5450
changeset: 16130:2aa6395e5450
user:      Víctor Martínez Romanos <victor.martinez <at> openbravo.com>
date:      Wed Apr 18 13:55:08 2012 +0200
summary:   Issue 20215: updated copyright year

details:   https://code.openbravo.com/erp/devel/main/rev/4c34b4aeb047
changeset: 16131:4c34b4aeb047
user:      Mikel Irurita <mikel.irurita <at> openbravo.com>
date:      Wed Apr 18 13:59:46 2012 +0200
summary:   Fixes issue 15836: function c_location_description does not return 
correct data

details:   https://code.openbravo.com/erp/devel/main/rev/1899cc7a420b
changeset: 16132:1899cc7a420b
user:      Sandra Huguet <sandra.huguet <at> openbravo.com>
date:      Thu Apr 12 17:32:18 2012 +0200
summary:   Fixed issue 20188 Paymentrule not mandatory in c_invoice
Paymentrule not mandatory in c_invoice table because this
field is deprecated now.

details:   https://code.openbravo.com/erp/devel/main/rev/da8077df51fc
changeset: 16133:da8077df51fc
user:      Miguel de Juana <miguel.dejuana <at> openbravo.com>
date:      Wed Apr 18 17:44:50 2012 +0200
summary:   Fixed issue 14498: Installed modules before rebuild, identifier 
fixed.
The identifier of a Module Installed(before rebuild) was wrong. It showed the 
language key instead of the name. The reference ad_language of the 
Ad_Module_Install table has been fixed.

details:   https://code.openbravo.com/erp/devel/main/rev/857b4617b567
changeset: 16134:857b4617b567
user:      Guillermo Álvarez de Eulate <guillermo.alvarez <at> openbravo.com>
date:      Wed Apr 18 18:13:37 2012 +0200
summary:   Fixed issue 20287: Wrong instantiation of OBPropertiesProvider have 
been corrected.

The error may be causing problems in some environments when properties file is 
readed

details:   https://code.openbravo.com/erp/devel/main/rev/39b4cef629e4
changeset: 16135:39b4cef629e4
user:      David Miguelez <david.miguelez <at> openbravo.com>
date:      Mon Apr 16 16:26:50 2012 +0200
summary:   Fixes issue 0020274: Now a list of all possible Payment Status
is retrieved instead.

details:   https://code.openbravo.com/erp/devel/main/rev/319114556c32
changeset: 16136:319114556c32
user:      David Miguelez <david.miguelez <at> openbravo.com>
date:      Mon Apr 16 16:26:23 2012 +0200
summary:   Fixes issue 0020273: Added methods for retrieving a list of
Payment status where Payments are confirmed or not.

details:   https://code.openbravo.com/erp/devel/main/rev/c5c63261ef70
changeset: 16137:c5c63261ef70
user:      Mikel Irurita <mikel.irurita <at> openbravo.com>
date:      Thu Apr 19 09:44:22 2012 +0200
summary:   Related to issue 20273: code review

details:   https://code.openbravo.com/erp/devel/main/rev/f6cabb227b41
changeset: 16138:f6cabb227b41
user:      Augusto Mauch <augusto.mauch <at> openbravo.com>
date:      Thu Apr 19 11:39:59 2012 +0200
summary:   Fixes issue 20310: typo corrected in Widget window

The title of the Author Message field had a typo, it has been fixed.

details:   https://code.openbravo.com/erp/devel/main/rev/d3fd7094b162
changeset: 16139:d3fd7094b162
user:      Augusto Mauch <augusto.mauch <at> openbravo.com>
date:      Thu Apr 19 11:52:23 2012 +0200
summary:   Fixes issue 20286: Quick launch combo shows all options

In the getPickListFilterCriteria function of ob-quick-launch.js, the function 
getValue() was beign used as the criteria. If no option has been previously 
selected in the combo, getValue() stores the text entered in the combo, 
otherwise it stores the title of the last window opened using the combo.
Now, the function getDisplayValue() is used for the criteria. This function 
retrieves the text entered in the combo, and is reset each time the combo is 
opened.

details:   https://code.openbravo.com/erp/devel/main/rev/e54f824b9750
changeset: 16140:e54f824b9750
user:      David Miguelez <david.miguelez <at> openbravo.com>
date:      Thu Apr 19 12:34:32 2012 +0200
summary:   Fixes issue 0020304: Prevents Null Pointer Exception and also
prevents division by zero.

details:   https://code.openbravo.com/erp/devel/main/rev/47fa8b561029
changeset: 16141:47fa8b561029
user:      Naiara Martinez <naiara.martinez <at> openbravo.com>
date:      Fri Apr 13 10:41:36 2012 +0200
summary:   fixed bug 12612 Add display logic to Generate Invoice from Receip 
button
show the button when receipt is completed.

details:   https://code.openbravo.com/erp/devel/main/rev/417b0f7dc617
changeset: 16142:417b0f7dc617
user:      Naiara Martinez <naiara.martinez <at> openbravo.com>
date:      Fri Apr 13 09:57:15 2012 +0200
summary:   fixed bug 19962 Financial account for organizations with allowed 
transactions
In the organization field combo are shown only organizations with allowed
transactions.

details:   https://code.openbravo.com/erp/devel/main/rev/774c9cf2c253
changeset: 16143:774c9cf2c253
user:      Rafa de Miguel <rafael.demiguel <at> openbravo.com>
date:      Thu Apr 19 13:56:19 2012 +0200
summary:   Fixed issue 0020198: Generate ship and inv with qty higher to order 
qty

details:   https://code.openbravo.com/erp/devel/main/rev/db1bb0c25f8c
changeset: 16144:db1bb0c25f8c
user:      Naiara Martinez <naiara.martinez <at> openbravo.com>
date:      Fri Apr 13 14:09:55 2012 +0200
summary:   fixed bug 20265 Added an auxiliary input in order to work the 
display logic
of the attribute set value field in Purchase order window (lines tab).

details:   https://code.openbravo.com/erp/devel/main/rev/0edebda30c97
changeset: 16145:0edebda30c97
user:      Augusto Mauch <augusto.mauch <at> openbravo.com>
date:      Thu Apr 19 15:29:51 2012 +0200
summary:   Related to issue 20310: Inconsistency fixed

In the fix of this issue, the name property of a field was changed. This should 
not have been done directly, but by changing the correponding element and 
running the Synchronize Terminology process.

details:   https://code.openbravo.com/erp/devel/main/rev/01ef6149bc24
changeset: 16146:01ef6149bc24
user:      Víctor Martínez Romanos <victor.martinez <at> openbravo.com>
date:      Fri Apr 13 14:31:44 2012 +0200
summary:   Fixed bug 11178: Amortization process, wrong message

Error message in Amortization process has been improved to provide
better information for the user

details:   https://code.openbravo.com/erp/devel/main/rev/ee911eeb0d53
changeset: 16147:ee911eeb0d53
user:      Víctor Martínez Romanos <victor.martinez <at> openbravo.com>
date:      Thu Apr 19 18:49:53 2012 +0200
summary:   Fixed bug 20316: Create amortization process error message when 
currency is not selected

The error message in case currency is not defined has been improved

details:   https://code.openbravo.com/erp/devel/main/rev/4cda1ec9b931
changeset: 16148:4cda1ec9b931
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Fri Apr 20 09:11:01 2012 +0200
summary:   fixed bug 20311: NPE when printing multiple documents

  Hidden tags in this case was inccorectly set.

details:   https://code.openbravo.com/erp/devel/main/rev/c89690f42989
changeset: 16149:c89690f42989
user:      Naiara Martinez <naiara.martinez <at> openbravo.com>
date:      Wed Apr 18 18:20:42 2012 +0200
summary:   fixed bug 12189 Add a rule to show products that have isverified='Y'
In BOM production window, production plan tab.

details:   https://code.openbravo.com/erp/devel/main/rev/7e96bd54d7b0
changeset: 16150:7e96bd54d7b0
user:      Miguel de Juana <miguel.dejuana <at> openbravo.com>
date:      Fri Apr 20 11:17:28 2012 +0200
summary:   Fixed issue 19696: Multiple & Divide Rate in ConversionRate csv use 
6 decimals
Exporting to Spreadsheet in Currency - Conversion Rates, the Multiple Rate by 
an Divide Rate by columns show the value only with 2 digits precision. It has 
been updated and now it shows 6 digits precision as same as the grid/form.

details:   https://code.openbravo.com/erp/devel/main/rev/819c15be77d9
changeset: 16151:819c15be77d9
user:      Víctor Martínez Romanos <victor.martinez <at> openbravo.com>
date:      Fri Mar 23 11:12:07 2012 +0100
summary:   Fixed bug 11114: Incorrect on-screen layout for Enterprise Module 
Management
- The Cancel button is not shown anymore
- The Update available message is not displayed as a link anymore, but as a 
plain text
(Previous onclick t sevent launched non-existent gt_submitUpdateData() JS 
function
- When clicking on any module line, the Description field is updated

details:   https://code.openbravo.com/erp/devel/main/rev/818c28db518e
changeset: 16152:818c28db518e
user:      Sandra Huguet <sandra.huguet <at> openbravo.com>
date:      Tue Apr 17 18:06:07 2012 +0200
summary:   Fixed issue 5231 Select a correct project after selecting a business 
partner
Select a correct project, project phase, project task
after selecting a business partner

details:   https://code.openbravo.com/erp/devel/main/rev/f179cd5a8223
changeset: 16153:f179cd5a8223
user:      Sandra Huguet <sandra.huguet <at> openbravo.com>
date:      Fri Apr 20 12:16:11 2012 +0200
summary:   Fixed issue 15539 Delete not necessary lines in C_INVOICE_POST

details:   https://code.openbravo.com/erp/devel/main/rev/3af549246975
changeset: 16154:3af549246975
user:      Sandra Huguet <sandra.huguet <at> openbravo.com>
date:      Tue Apr 17 14:03:55 2012 +0200
summary:   Fixed issue 20025 Change the default value in C_BPartner_Discount

details:   https://code.openbravo.com/erp/devel/main/rev/a5e16ddab191
changeset: 16155:a5e16ddab191
user:      Sandra Huguet <sandra.huguet <at> openbravo.com>
date:      Wed Apr 18 13:59:31 2012 +0200
summary:   Fixed issue 20298 Change display logic in Project Phase and Project 
Task
Change display logic in Project Phase and Project Task in Expense Sheet
lines, because now this combos have a wrong behaviour.

details:   https://code.openbravo.com/erp/devel/main/rev/7a22ad895103
changeset: 16156:7a22ad895103
user:      Mikel Irurita <mikel.irurita <at> openbravo.com>
date:      Fri Apr 20 14:30:02 2012 +0200
summary:   Related to issue 5231: code review

details:   https://code.openbravo.com/erp/devel/main/rev/33a11a6caf22
changeset: 16157:33a11a6caf22
user:      Mikel Irurita <mikel.irurita <at> openbravo.com>
date:      Fri Apr 20 14:33:11 2012 +0200
summary:   Related to issue 15836: code review.

details:   https://code.openbravo.com/erp/devel/main/rev/5982a9759592
changeset: 16158:5982a9759592
user:      Mikel Irurita <mikel.irurita <at> openbravo.com>
date:      Fri Apr 20 15:32:46 2012 +0200
summary:   Fix OrganizationCombo_data.xsql file license text

details:   https://code.openbravo.com/erp/devel/main/rev/2dac3df84bf0
changeset: 16159:2dac3df84bf0
user:      Gorka Gil <gorka.gil <at> openbravo.com>
date:      Fri Apr 20 17:01:23 2012 +0200
summary:   Merge back from main

details:   https://code.openbravo.com/erp/devel/main/rev/2eb57286c1fc
changeset: 16160:2eb57286c1fc
user:      RM packaging bot <staff.rm <at> openbravo.com>
date:      Sat Apr 21 14:13:53 2012 +0200
summary:   CI: update AD_MODULE to version 16159

diffstat:

 .hgsigs                                                                        
                               |     1 +
 .hgtags                                                                        
                               |     1 +
 build.xml                                                                      
                               |    13 +-
 
modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml
              |     4 +-
 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.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java
              |     5 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentMonitorProcess.java
  |    16 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java
                |    52 +-
 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_COLUMN.xml
                             |     2 +-
 
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.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/grid/ob-view-grid.js
         |     3 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js
     |     2 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-quick-launch.js
    |     2 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-action-button.js
  |    11 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-view-manager.js
 |    13 +-
 
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.htmlwidget/web/org.openbravo.client.htmlwidget/js/ob-html-widget.js
              |     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.kernel/src-db/database/sourcedata/OBCLKER_UIDEFINITION.xml
                       |     2 +-
 
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/NumberUIDefinition.java
         |    10 +
 modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_ELEMENT.xml    
                               |     4 +-
 modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_FIELD.xml      
                               |     2 +-
 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/build/classes/org/openbravo/v3/datasets/SetDefaultRole.class
                |     0 
 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.datasets/src-util/modulescript/src/org/openbravo/v3/datasets/SetDefaultRole.java
     |     2 +-
 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 +-
 modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml              
                               |     2 +-
 modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml   
                               |    18 +-
 referencedata/sampledata/F_B_International_Group.xml                           
                               |  3227 ++++-----
 src-db/database/model/functions/A_ASSET_POST.xml                               
                               |     6 +-
 src-db/database/model/functions/C_INVOICE_POST.xml                             
                               |    16 +-
 src-db/database/model/functions/C_LOCATION_DESCRIPTION.xml                     
                               |    25 +-
 src-db/database/model/tables/C_INVOICE.xml                                     
                               |     2 +-
 src-db/database/model/tables/M_PRODUCT.xml                                     
                               |     5 +
 src-db/database/model/triggers/C_ORDLINE_CHK_RESTRICTIONS_TRG.xml              
                               |    12 +-
 src-db/database/model/triggers/M_INOUTLINE_TRG.xml                             
                               |    11 +-
 src-db/database/sourcedata/AD_AUXILIARINPUT.xml                                
                               |    22 +
 src-db/database/sourcedata/AD_COLUMN.xml                                       
                               |   156 +-
 src-db/database/sourcedata/AD_ELEMENT.xml                                      
                               |    54 +-
 src-db/database/sourcedata/AD_FIELD.xml                                        
                               |   195 +-
 src-db/database/sourcedata/AD_MESSAGE.xml                                      
                               |    22 +
 src-db/database/sourcedata/AD_MODULE.xml                                       
                               |     4 +-
 src-db/database/sourcedata/AD_VAL_RULE.xml                                     
                               |    12 +
 
src-util/modulescript/build/classes/org/openbravo/modulescript/PaymentZeroAmount.class
                        |     0 
 
src-util/modulescript/build/classes/org/openbravo/modulescript/PaymentZeroAmountData.class
                    |     0 
 src-util/modulescript/src/org/openbravo/modulescript/PaymentZeroAmount.java    
                               |    36 +
 
src-util/modulescript/src/org/openbravo/modulescript/PaymentZeroAmount_data.xsql
                              |    40 +
 src/org/openbravo/base/secureApp/HttpSecureAppServlet.java                     
                               |    24 +
 src/org/openbravo/base/secureApp/PopUp_Response.html                           
                               |     4 +-
 src/org/openbravo/base/secureApp/PopUp_Response.xml                            
                               |     1 +
 src/org/openbravo/erpCommon/ad_actionButton/Posted.java                        
                               |    17 +-
 src/org/openbravo/erpCommon/ad_callouts/SE_Expense_BP_Project.java             
                               |     8 +-
 src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Glitem.java                 
                               |     4 +-
 src/org/openbravo/erpCommon/ad_combos/OrganizationCombo_data.xsql              
                               |     4 +-
 src/org/openbravo/erpCommon/ad_forms/AcctServer.java                           
                               |     4 +-
 src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java                        
                               |    16 +-
 src/org/openbravo/erpCommon/ad_forms/UpdateReferenceData.html                  
                               |    30 +-
 src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports_data.xsql      
                               |     8 +-
 src/org/openbravo/erpCommon/modules/ModuleReferenceDataOrgTree.java            
                               |    11 +-
 src/org/openbravo/erpCommon/modules/ModuleReferenceDataOrgTree_data.xsql       
                               |     3 +-
 src/org/openbravo/erpCommon/utility/GenericTree.srpt                           
                               |     3 +-
 src/org/openbravo/erpCommon/utility/GenericTree.xml                            
                               |     4 +-
 src/org/openbravo/erpCommon/utility/reporting/printing/PrintController.java    
                               |     6 +-
 src/org/openbravo/scheduling/ProcessBundle.java                                
                               |    37 +-
 src/org/openbravo/service/system/ModuleValidator.java                          
                               |    23 +-
 98 files changed, 2246 insertions(+), 2115 deletions(-)

diffs (truncated from 11399 to 300 lines):

diff -r f96fec27dd9a -r 2eb57286c1fc .hgsigs
--- a/.hgsigs   Mon Apr 16 12:23:34 2012 +0200
+++ b/.hgsigs   Sat Apr 21 14:13:53 2012 +0200
@@ -61,6 +61,7 @@
 f4d0cceea00d21e244c7d6e5ddf3aa78e8610660 0 
iEYEABECAAYFAk952D8ACgkQCX/oGf+2qkPmMACgo6qZwLG5GJcVYFhZqD2ASYXiEcAAn3Sis7yogN+qwyb1BokA+KSnEmjZ
 4f5fd4acb98e5fb7ef587debb5ffd20487e2bb32 0 
iEYEABECAAYFAk9CRa4ACgkQCX/oGf+2qkPC4ACeJ5HQ20QAW0ULMU/+SUGJvz9YNEYAoJwLMrqwWkt3GuJFyp7TwpULPeKu
 cab708e2de98b574cc10f344845b7dff184080b6 0 
iEYEABECAAYFAk9Pi+oACgkQCX/oGf+2qkP4kwCfT5nGx/E4gn7sZh+d7L5/9JpcplwAoJ5C4WwVNpNaO+tNEx8oMlqdu8mc
+3565692a3ec1a33a8cb71014aa7fa0e4488a47b3 0 
iEYEABECAAYFAk+OsrsACgkQCX/oGf+2qkM/yQCfUNjwjTN32jfek9UBwpNfxq1IqigAnA2Aq5NLUsUtDCw9DmJ5kjx6U26t
 1856e02fc5e0e515a31c939ebc0372303e692a0f 0 
iEYEABECAAYFAk90jY0ACgkQCX/oGf+2qkOxtwCg6Cng1h29qYq7oA8b4mj3KPVMKgkAoLZP6fhub1DNQGEn8zjCEXIRt1Mi
 17bc2224a41a30d10472bd14581378201c1ca44b 0 
iEYEABECAAYFAk+IHlMACgkQCX/oGf+2qkM3MACgoR2lLVuhzaAg2v0PAHTOsvCgEIoAoP5uBTyNv/CqYuf+XIwD6F9nxa+y
 ec66c54fad7f8821269266cd7de52b09a423cdae 0 
iEYEABECAAYFAk99aVgACgkQCX/oGf+2qkOiDwCg+Ne5Dp5L0X34APNzA7rBeCmZVsQAoJ5AU9K9+Dhn7iuBHVyTisbUJ/oC
diff -r f96fec27dd9a -r 2eb57286c1fc .hgtags
--- a/.hgtags   Mon Apr 16 12:23:34 2012 +0200
+++ b/.hgtags   Sat Apr 21 14:13:53 2012 +0200
@@ -72,6 +72,7 @@
 b434a0f497ee8394ca6eb6952939bf26c20566ae 3.0MP8
 482fdc3919a19e72bfa675ddfbeb5aee83144698 3.0MP8.1
 b625648e103ef1d0ae41eff56c9a1e33877e53f9 3.0MP8.2
+2b3682085de417caee2ba0c2bb3f049e452cbc64 3.0MP8.3
 952c381e3ada4a4e3511782945d3aa66e09a697e 3.0MP9
 00280ab1ed3ab01d41ed048ccd01694af1223341 3.0MP10
 4a4cc349c6babb0d72149613cc3e4988427ee0ff 3.0MP10.1
diff -r f96fec27dd9a -r 2eb57286c1fc build.xml
--- a/build.xml Mon Apr 16 12:23:34 2012 +0200
+++ b/build.xml Sat Apr 21 14:13:53 2012 +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-2011 Openbravo SLU
+* All portions are Copyright (C) 2001-2012 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************
@@ -674,7 +674,7 @@
     <ant dir="${base.src}" target="uninstallWebService" inheritAll="true" 
inheritRefs="true" />
   </target>
 
-  <target name="install.source" depends="init, create.database, wad.lib, 
trl.lib, compile.complete.deploy">
+  <target name="install.source" depends="init, cleanSubfolders, 
create.database, wad.lib, trl.lib, compile.complete.deploy">
     <echo message="applying modules" />    
     <antcall inheritall="true" inheritrefs="true" target="apply.module" />
 
@@ -689,7 +689,7 @@
                -->
   </target>
 
-  <target name="eclipse.install.source" depends="init, create.database">
+  <target name="eclipse.install.source" depends="init, cleanSubfolders, 
create.database">
     <fail unless="eclipse.running" message="eclipse.* tasks must be executed 
inside Eclipse" />
     <echo message="Building OpenbravoCore project..." level="info" />
     <eclipse.incrementalBuild project="OpenbravoCore" kind="full"/>
@@ -1136,4 +1136,11 @@
     </taskdef>
     <showclassicwindows userId="0" adminMode="true" 
propertiesFile="${base.config}/Openbravo.properties"/>
   </target>
+  
+  <target name="cleanSubfolders" depends="init">
+      <ant dir="${base.src.core}" target="clean" inheritAll="true" 
inheritRefs="true" />
+      <ant dir="${base.src.trl}" target="clean" inheritAll="true" 
inheritRefs="true" />
+      <ant dir="${base.src.wad}" target="clean" inheritAll="true" 
inheritRefs="true" />
+    </target>
+  
 </project>
diff -r f96fec27dd9a -r 2eb57286c1fc 
modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml
--- 
a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml
  Mon Apr 16 12:23:34 2012 +0200
+++ 
b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml
  Sat Apr 21 14:13:53 2012 +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) 2011 Openbravo SLU
+* All portions are Copyright (C) 2011-2012 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -62,7 +62,7 @@
       ORDER BY name)
     LOOP
       BEGIN
-        v_Sql := 'SELECT ' || Cur_Dbprefix.dbprefix || '_ispaymentconfirmed' 
|| '(''' || status || ''', ''' || fin_payment_scheduledetail_id || ''') FROM 
DUAL';
+        v_Sql := 'SELECT ' || Cur_Dbprefix.dbprefix || '_ispaymentconfirmed' 
|| '(''' || coalesce(status, '') || ''', ''' || 
coalesce(fin_payment_scheduledetail_id, '') || ''') FROM DUAL';
 
         EXECUTE IMMEDIATE v_Sql INTO v_isPaymentConfirmed;
         IF (v_ispaymentconfirmed = 'Y') THEN
diff -r f96fec27dd9a -r 2eb57286c1fc 
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
--- 
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml 
    Mon Apr 16 12:23:34 2012 +0200
+++ 
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml 
    Sat Apr 21 14:13:53 2012 +0200
@@ -6,7 +6,7 @@
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <NAME><![CDATA[Advanced Payables and 
Receivables Mngmt]]></NAME>
-<!--A918E3331C404B889D69AA9BFAFB23AC-->  
<VERSION><![CDATA[3.0.16003]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  
<VERSION><![CDATA[3.0.16159]]></VERSION>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <DESCRIPTION><![CDATA[Managing your 
finances with an ERP does not have to be difficult. Enjoy a radically improved 
user experience that combines the power of an enterprise grade financial 
application with the simplicity and ease of a web 2.0 personal accounting 
service.]]></DESCRIPTION>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <HELP><![CDATA[Advanced Payables and 
Receivables Management simplifies and automates the business processes around 
the management of financial accounts, from the receipt and issue of payment, to 
the reconciliation of those events with bank statements.
 If you would like to help shape this module you are welcome to take part in 
the forum discussions or register feature requests or issues in the 
corresponding (Forum and Bug Tracking) sections in the Advanced Payables and 
Receivable project in the OB Forge.]]></HELP>
diff -r f96fec27dd9a -r 2eb57286c1fc 
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
--- 
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
  Mon Apr 16 12:23:34 2012 +0200
+++ 
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
  Sat Apr 21 14:13:53 2012 +0200
@@ -7,7 +7,7 @@
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  
<AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID>
-<!--89326AE95DAD449D85DFAB2C5B1C6683-->  
<STARTVERSION><![CDATA[2.1.16003]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->  
<STARTVERSION><![CDATA[2.1.16159]]></STARTVERSION>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <DEPENDANT_MODULE_NAME><![CDATA[User 
Interface Selector]]></DEPENDANT_MODULE_NAME>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--B97FC854C6DD41E692161585645A900F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--B97FC854C6DD41E692161585645A900F-->  
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--B97FC854C6DD41E692161585645A900F-->  
<AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--B97FC854C6DD41E692161585645A900F-->  
<STARTVERSION><![CDATA[3.0.16003]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->  
<STARTVERSION><![CDATA[3.0.16159]]></STARTVERSION>
 <!--B97FC854C6DD41E692161585645A900F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--B97FC854C6DD41E692161585645A900F-->  
<DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--B97FC854C6DD41E692161585645A900F-->  
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r f96fec27dd9a -r 2eb57286c1fc 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java
--- 
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java
  Mon Apr 16 12:23:34 2012 +0200
+++ 
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java
  Sat Apr 21 14:13:53 2012 +0200
@@ -1577,14 +1577,15 @@
    */
   public List<FIN_Payment> getCustomerPaymentsWithCredit(Organization org, 
BusinessPartner bp,
       boolean isReceipt) {
+
+    List<String> confirmedStatus = FIN_Utility.getListPaymentConfirmed();
     try {
       OBContext.setAdminMode(true);
       OBCriteria<FIN_Payment> obcPayment = 
OBDal.getInstance().createCriteria(FIN_Payment.class);
       obcPayment.add(Restrictions.eq(FIN_Payment.PROPERTY_BUSINESSPARTNER, 
bp));
       obcPayment.add(Restrictions.eq(FIN_Payment.PROPERTY_RECEIPT, isReceipt));
       obcPayment.add(Restrictions.ne(FIN_Payment.PROPERTY_GENERATEDCREDIT, 
BigDecimal.ZERO));
-      obcPayment.add(Restrictions.ne(FIN_Payment.PROPERTY_STATUS, "RPAP"));
-      obcPayment.add(Restrictions.ne(FIN_Payment.PROPERTY_STATUS, "RPVOID"));
+      obcPayment.add(Restrictions.in(FIN_Payment.PROPERTY_STATUS, 
confirmedStatus));
       
obcPayment.add(Restrictions.neProperty(FIN_Payment.PROPERTY_GENERATEDCREDIT,
           FIN_Payment.PROPERTY_USEDCREDIT));
       final Organization legalEntity = FIN_Utility.getLegalEntityOrg(org);
diff -r f96fec27dd9a -r 2eb57286c1fc 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentMonitorProcess.java
--- 
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentMonitorProcess.java
      Mon Apr 16 12:23:34 2012 +0200
+++ 
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentMonitorProcess.java
      Sat Apr 21 14:13:53 2012 +0200
@@ -147,12 +147,20 @@
       invoice.setDaysTillDue(getDaysTillDue(invoice));
       if (invoice.getOutstandingAmount().compareTo(BigDecimal.ZERO) == 0) {
         Date finalSettlementDate = getFinalSettlementDate(invoice);
-        invoice.setFinalSettlementDate(finalSettlementDate);
-        
invoice.setDaysSalesOutstanding(FIN_Utility.getDaysBetween(invoice.getInvoiceDate(),
-            finalSettlementDate));
+        // If date is null invoice amount = 0 then nothing to set
+        if (finalSettlementDate != null) {
+          invoice.setFinalSettlementDate(finalSettlementDate);
+          
invoice.setDaysSalesOutstanding(FIN_Utility.getDaysBetween(invoice.getInvoiceDate(),
+              finalSettlementDate));
+        }
+      }
+      BigDecimal grandTotalAmount = invoice.getGrandTotalAmount();
+      // This prevents division by ZERO
+      if (grandTotalAmount.compareTo(BigDecimal.ZERO) == 0) {
+        grandTotalAmount = BigDecimal.ONE;
       }
       invoice.setPercentageOverdue(amounts.get("overdueOriginal").multiply(new 
BigDecimal(100))
-          .divide(invoice.getGrandTotalAmount(), 
BigDecimal.ROUND_HALF_UP).longValue());
+          .divide(grandTotalAmount, BigDecimal.ROUND_HALF_UP).longValue());
       invoice.setLastCalculatedOnDate(new Date());
 
       OBDal.getInstance().save(invoice);
diff -r f96fec27dd9a -r 2eb57286c1fc 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java
--- 
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java
    Mon Apr 16 12:23:34 2012 +0200
+++ 
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java
    Sat Apr 21 14:13:53 2012 +0200
@@ -228,13 +228,14 @@
   }
 
   /**
-   * Creates a comma separated string with the Id's of the Set of Strings.
-   * This method is deprecated as it has been added to Utility (core)
+   * Creates a comma separated string with the Id's of the Set of Strings. 
This method is deprecated
+   * as it has been added to Utility (core)
+   * 
    * @param set
    *          Set of Strings
    * @return Comma separated string of Id's
    */
-  @Deprecated 
+  @Deprecated
   public static String getInStrSet(Set<String> set) {
     return Utility.getInStrSet(set);
   }
@@ -956,6 +957,51 @@
   }
 
   /**
+   * Returns a list of Payment Status. If isConfirmed equals true, then the 
status returned are
+   * confirmed payments. Else they are pending of execution
+   * 
+   */
+  private static List<String> getListPaymentConfirmedOrNot(Boolean 
isConfirmed) {
+
+    List<String> listPaymentConfirmedOrNot = new ArrayList<String>();
+    OBContext.setAdminMode(true);
+    try {
+      final OBCriteria<org.openbravo.model.ad.domain.List> obCriteria = 
OBDal.getInstance()
+          .createCriteria(org.openbravo.model.ad.domain.List.class);
+      
obCriteria.add(Restrictions.eq(org.openbravo.model.ad.domain.List.PROPERTY_REFERENCE
 + ".id",
+          "575BCB88A4694C27BC013DE9C73E6FE7"));
+      List<org.openbravo.model.ad.domain.List> adRefList = obCriteria.list();
+      for (org.openbravo.model.ad.domain.List adRef : adRefList) {
+        if (isConfirmed.equals(isPaymentConfirmed(adRef.getSearchKey(), 
null))) {
+          listPaymentConfirmedOrNot.add(adRef.getSearchKey());
+        }
+      }
+      return listPaymentConfirmedOrNot;
+    } catch (Exception e) {
+      log4j.error(e);
+      return null;
+    } finally {
+      OBContext.restorePreviousMode();
+    }
+  }
+
+  /**
+   * Returns a list confirmed Payment Status
+   * 
+   */
+  public static List<String> getListPaymentConfirmed() {
+    return getListPaymentConfirmedOrNot(true);
+  }
+
+  /**
+   * Returns a list not confirmed Payment Status
+   * 
+   */
+  public static List<String> getListPaymentNotConfirmed() {
+    return getListPaymentConfirmedOrNot(false);
+  }
+
+  /**
    * Returns the legal entity of the given organization
    * 
    * @param org
diff -r f96fec27dd9a -r 2eb57286c1fc 
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
--- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml  
Mon Apr 16 12:23:34 2012 +0200
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml  
Sat Apr 21 14:13:53 2012 +0200
@@ -6,7 +6,7 @@
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <NAME><![CDATA[JBoss Weld]]></NAME>
-<!--C70732EA90A14EC0916078B85CC33D2D-->  
<VERSION><![CDATA[1.1.16003]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->  
<VERSION><![CDATA[1.1.16159]]></VERSION>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <DESCRIPTION><![CDATA[JBoss 
Weld]]></DESCRIPTION>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <HELP><![CDATA[Provides the JBoss 
Weld framework: Java Contexts and Dependency Injection for the Java EE platform 
(CDI). For more information see http://seamframework.org/Weld]]></HELP>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  
<URL><![CDATA[http://forge.openbravo.com/projects/weld]]></URL>
diff -r f96fec27dd9a -r 2eb57286c1fc 
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
--- 
a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
       Mon Apr 16 12:23:34 2012 +0200
+++ 
b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
       Sat Apr 21 14:13:53 2012 +0200
@@ -7,7 +7,7 @@
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  
<AD_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_MODULE_ID>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  
<AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  
<STARTVERSION><![CDATA[3.0.16003]]></STARTVERSION>
+<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  
<STARTVERSION><![CDATA[3.0.16159]]></STARTVERSION>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  
<DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r f96fec27dd9a -r 2eb57286c1fc 
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml
--- 
a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml
 Mon Apr 16 12:23:34 2012 +0200
+++ 
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml
 Sat Apr 21 14:13:53 2012 +0200
@@ -6559,7 +6559,7 @@
 <!--EFB04F185A9045FC98A38657EA8109AB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--EFB04F185A9045FC98A38657EA8109AB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--EFB04F185A9045FC98A38657EA8109AB-->  <NAME><![CDATA[Java Class 
Name]]></NAME>
-<!--EFB04F185A9045FC98A38657EA8109AB-->  <DESCRIPTION><![CDATA[x not 
implemented]]></DESCRIPTION>
+<!--EFB04F185A9045FC98A38657EA8109AB-->  <DESCRIPTION><![CDATA[The classname 
is used when generating a representation of the table in java (the entity or 
business object). The classname is the simplename of the class (so without the 
package name). Often the AD_Table.name can be used here.]]></DESCRIPTION>
 <!--EFB04F185A9045FC98A38657EA8109AB-->  <HELP><![CDATA[The classname is used 
when generating a representation of the table in java (the entity or business 
object). The classname is the simplename of the class (so without the package 
name). Often the AD_Table.name can be used here. The combination of classname 
and package needs to be unique.]]></HELP>
 <!--EFB04F185A9045FC98A38657EA8109AB-->  
<COLUMNNAME><![CDATA[Classname]]></COLUMNNAME>
 <!--EFB04F185A9045FC98A38657EA8109AB-->  
<AD_TABLE_ID><![CDATA[FF80818132D7FB620132D8129D1A0028]]></AD_TABLE_ID>
diff -r f96fec27dd9a -r 2eb57286c1fc 
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml
--- 
a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml
  Mon Apr 16 12:23:34 2012 +0200
+++ 
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml
  Sat Apr 21 14:13:53 2012 +0200
@@ -371,7 +371,7 @@
 <!--0D7D1CCBA5E54A66A433D37759D2C074-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--0D7D1CCBA5E54A66A433D37759D2C074-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0D7D1CCBA5E54A66A433D37759D2C074-->  <NAME><![CDATA[Java Class 
Name]]></NAME>
-<!--0D7D1CCBA5E54A66A433D37759D2C074-->  <DESCRIPTION><![CDATA[x not 
implemented]]></DESCRIPTION>
+<!--0D7D1CCBA5E54A66A433D37759D2C074-->  <DESCRIPTION><![CDATA[The classname 
is used when generating a representation of the table in java (the entity or 
business object). The classname is the simplename of the class (so without the 
package name). Often the AD_Table.name can be used here.]]></DESCRIPTION>
 <!--0D7D1CCBA5E54A66A433D37759D2C074-->  <HELP><![CDATA[The classname is used 
when generating a representation of the table in java (the entity or business 
object). The classname is the simplename of the class (so without the package 
name). Often the AD_Table.name can be used here. The combination of classname 
and package needs to be unique.]]></HELP>
 <!--0D7D1CCBA5E54A66A433D37759D2C074-->  
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--0D7D1CCBA5E54A66A433D37759D2C074-->  
<AD_TAB_ID><![CDATA[FF80818132D7FB620132D819C1720046]]></AD_TAB_ID>
diff -r f96fec27dd9a -r 2eb57286c1fc 
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
--- 
a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
 Mon Apr 16 12:23:34 2012 +0200
+++ 
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
 Sat Apr 21 14:13:53 2012 +0200
@@ -6,7 +6,7 @@
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <NAME><![CDATA[User Interface 
Application]]></NAME>
-<!--9BA0836A3CD74EE4AB48753A47211BCC-->  
<VERSION><![CDATA[2.1.16003]]></VERSION>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->  
<VERSION><![CDATA[2.1.16159]]></VERSION>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <DESCRIPTION><![CDATA[Provides the 
main application components for the openbravo user interface]]></DESCRIPTION>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <HELP><![CDATA[Provides the main 
application components for the openbravo user interface. The main layout 
incorporates a navigation bar and a main view area.]]></HELP>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  
<URL><![CDATA[http://forge.openbravo.com/projects/clientapplication]]></URL>

------------------------------------------------------------------------------
For Developers, A Lot Can Happen In A Second.
Boundary is the first to Know...and Tell You.
Monitor Your Applications in Ultra-Fine Resolution. Try it FREE!
http://p.sf.net/sfu/Boundary-d2dvs2
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits

Reply via email to