[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/17eb51a4c06e changeset: 27564:17eb51a4c06e user: Alvaro Ferraz openbravo.com> date: Thu Sep 10 10:08:39 2015 +0200 summary: Fixes issue 30033: Can't create stock for product with attribute without stock We will not be able to void a receipt with a product with a mandatory attribute set value and without stock, if client does not allow negative stock. We will also not be able to create an inventory to increase the stock of this product because we can not select this attribute set value with a selector, and Create Inventory Count List process does not insert lines with products without stock if product has a mandatory attribute. Now, if we are voiding a Goods Receipt with any line with mandatory attribute set value and without stock, a new popup will allow us to automatically create a Physical Inventory to generate stock for this product and then void the receipt. details: https://code.openbravo.com/erp/devel/pi/rev/9a27b30560fc changeset: 27565:9a27b30560fc user: David Miguelez openbravo.com> date: Fri Sep 11 09:30:57 2015 +0200 summary: Related to Issue 30033: Code Review Changes. Removed global variables and transformed them into local ones. diffstat: src-db/database/sourcedata/AD_MESSAGE.xml | 12 + src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 88 ++ src/org/openbravo/erpCommon/ad_actionButton/PhysicalInventory.html | 314 + src/org/openbravo/erpCommon/ad_actionButton/PhysicalInventory.xml | 49 + src/org/openbravo/erpCommon/ad_actionButton/PhysicalInventoryGrid.srpt | 32 + src/org/openbravo/erpCommon/ad_actionButton/PhysicalInventoryGrid.xml | 37 + src/org/openbravo/erpCommon/ad_actionButton/ProcessGoods.java | 325 +++-- 7 files changed, 791 insertions(+), 66 deletions(-) diffs (truncated from 996 to 300 lines): diff -r 8640bd33c410 -r 9a27b30560fc src-db/database/sourcedata/AD_MESSAGE.xml --- a/src-db/database/sourcedata/AD_MESSAGE.xml Fri Sep 11 04:31:36 2015 + +++ b/src-db/database/sourcedata/AD_MESSAGE.xml Fri Sep 11 09:30:57 2015 +0200 @@ -16499,6 +16499,18 @@ + + + + + + + + + + + + diff -r 8640bd33c410 -r 9a27b30560fc src-db/database/sourcedata/AD_TEXTINTERFACES.xml --- a/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Fri Sep 11 04:31:36 2015 + +++ b/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Fri Sep 11 09:30:57 2015 +0200 @@ -13058,6 +13058,17 @@ + + + + + + + + + + + @@ -15576,6 +15587,17 @@ + + + + + + + + + + + @@ -16346,6 +16368,28 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -18150,6 +18194,17 @@ + + + + + + + + + + + @@ -18249,6 +18304,17 @@ + + + + + + + + + + + @@ -21470,6 +21536,17 @@ + + + + + + + + + + + @@ -21921,6 +21998,17 @@ + + + + + + + + + + + diff -r 8640bd33c410 -r 9a27b30560fc src/org/openbravo/erpCommon/ad_actionButton/PhysicalInventory.html --- /dev/null Thu Jan 01 00:00:00 1970 + +++ b/src/org/openbravo/erpCommon/ad_actionButton/PhysicalInventory.html Fri Sep 11 09:30:57 2015 +0200 @@ -0,0 +1,314 @@ + + + + +Create Physical Inventory + + + + + + + + + + + + +defaultLang = "en_US"; + + + + + + +// window.onunload = reloadOpener; // reloads opener on closing + dojo.hostenv.writeIncludes(); //makes debugging in Venkman possible + + + var baseDirectory="../../../../../web/"; + + + var arrDocAction = null; + + + function submitThisPage(strCommand) { +if (strCommand==="CANCEL_PHYSICALINVENTORY" || strCommand==="SAVE_PHYSICALINVENTORY"){ + setProcessingMode('popup', true); + submitCommandForm(strCommand, false, null, null, '_self'); +} +return true; + } + + + +function onLoadDo(){ +setProcessingMode('popup', false); +this.windowTables = new Array( + new windowTableId('client', 'buttonOK') +); +setWindowTableParentElement(); +enableShortcuts('popup'); +setBrowserAutoComplete(false); + +loadGridList(); +reloadOpener(); +initFIN_Utilities(document.frmMain); +setWindowElementFocus('firstElement'); + +// Refresh the invoice header after completing it +var contextView = getFrame('LayoutMDI').OB.ActionButton.executingProcess.contextView; +var currentView = getFrame('LayoutMDI').OB.ActionButton.executingProcess.view; +// Refresh context view +
[OpenbravoERP-commits] devel/pi: Fixed 30602: Inventory Average Cost module merge decla...
details: https://code.openbravo.com/erp/devel/pi/rev/9f7d0329490b changeset: 27566:9f7d0329490b user: Víctor Martínez Romanos openbravo.com> date: Fri Sep 11 10:58:53 2015 +0200 summary: Fixed 30602: Inventory Average Cost module merge declared to org.openbravo.v3 Butler production has the capability to add new merges in minor versions for: * core module * modules marked as allow changes in minor versions The merge has been declared for the org.openbrao.v3 (Openbravo v3 pack) module, because it already had other merges and has special 'Allow changes in minor verison' flag set in Butler. diffstat: modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_MERGE.xml | 10 ++ 1 files changed, 10 insertions(+), 0 deletions(-) diffs (19 lines): diff -r 9a27b30560fc -r 9f7d0329490b modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_MERGE.xml --- a/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_MERGE.xml Fri Sep 11 09:30:57 2015 +0200 +++ b/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_MERGE.xml Fri Sep 11 10:58:53 2015 +0200 @@ -1,5 +1,15 @@ + + + + + + + + + + -- ___ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/main: 4 new changesets
details: https://code.openbravo.com/erp/devel/main/rev/8640bd33c410 changeset: 27563:8640bd33c410 user: RM packaging bot openbravo.com> date: Fri Sep 11 04:31:36 2015 + summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/17eb51a4c06e changeset: 27564:17eb51a4c06e user: Alvaro Ferraz openbravo.com> date: Thu Sep 10 10:08:39 2015 +0200 summary: Fixes issue 30033: Can't create stock for product with attribute without stock We will not be able to void a receipt with a product with a mandatory attribute set value and without stock, if client does not allow negative stock. We will also not be able to create an inventory to increase the stock of this product because we can not select this attribute set value with a selector, and Create Inventory Count List process does not insert lines with products without stock if product has a mandatory attribute. Now, if we are voiding a Goods Receipt with any line with mandatory attribute set value and without stock, a new popup will allow us to automatically create a Physical Inventory to generate stock for this product and then void the receipt. details: https://code.openbravo.com/erp/devel/main/rev/9a27b30560fc changeset: 27565:9a27b30560fc user: David Miguelez openbravo.com> date: Fri Sep 11 09:30:57 2015 +0200 summary: Related to Issue 30033: Code Review Changes. Removed global variables and transformed them into local ones. details: https://code.openbravo.com/erp/devel/main/rev/2b0a88efd3f9 changeset: 27566:2b0a88efd3f9 user: RM packaging bot openbravo.com> date: Fri Sep 11 13:38:53 2015 + summary: CI: update AD_MODULE to version 27565 diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml |2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml |4 +- modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml |2 +- modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml |2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml |2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml |2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml |2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml |8 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml |2 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml |2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml |2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml |6 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml |2 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml |4 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml |2 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml |2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml |2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml |2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml |2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml |2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml |2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml |2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml |2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 10 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml |2 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml |4 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml |2 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/2b0a88efd3f9 changeset: 27567:2b0a88efd3f9 user: RM packaging bot openbravo.com> date: Fri Sep 11 13:38:53 2015 + summary: CI: update AD_MODULE to version 27565 details: https://code.openbravo.com/erp/devel/pi/rev/7675645657e4 changeset: 27568:7675645657e4 user: RM packaging bot openbravo.com> date: Fri Sep 11 13:55:00 2015 + summary: CI: merge back from main diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 10 ++-- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 12 ++-- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +-