You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by er...@apache.org on 2012/06/19 23:36:33 UTC
svn commit: r1351866 [14/48] - in /ofbiz/branches/20120329_portletWidget: ./
applications/accounting/ applications/accounting/config/
applications/accounting/data/ applications/accounting/entitydef/
applications/accounting/script/org/ofbiz/accounting/i...
Modified: ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_EditCalendarWeek.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_EditCalendarWeek.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_EditCalendarWeek.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_EditCalendarWeek.xml Tue Jun 19 21:36:11 2012
@@ -23,8 +23,15 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
xmlns="http://docbook.org/ns/docbook">
- <title>OFBiz:MFG: Find calendars</title>
- <para>
- WIP
- </para>
+ <title>OFBiz: MFG: Aanmaken en wijzigen kalenderweek</title>
+ <para>
+ In dit scherm kun je nieuwe kalenderweken aanmaken en bestaande wijzigen.
+ </para>
+ <section>
+ <title> </title>
+ <para>
+ Geef de nieuwe kalenderweek een naam en een omschrijving.
+ Zet voor iedere dag de starttijd en de capaciteit.
+ </para>
+ </section>
</section>
\ No newline at end of file
Modified: ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_EditProductBom.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_EditProductBom.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_EditProductBom.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_EditProductBom.xml Tue Jun 19 21:36:11 2012
@@ -23,8 +23,8 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
xmlns="http://docbook.org/ns/docbook">
- <title>OFBiz:MFG: Edit BoM</title>
- <para>
- WIP
- </para>
+ <title>OFBiz: MFG: BoM toevoegen/aanpassen</title>
+ <para>
+ In dit scherm kun je een bestaande BoM aanpassen of een nieuwe definieren.
+ </para>
</section>
\ No newline at end of file
Modified: ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_EditProductManufacturingRules.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_EditProductManufacturingRules.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_EditProductManufacturingRules.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_EditProductManufacturingRules.xml Tue Jun 19 21:36:11 2012
@@ -23,8 +23,17 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
xmlns="http://docbook.org/ns/docbook">
- <title>OFBiz:MFG: Edit manufacturing rules</title>
- <para>
- WIP
- </para>
+ <title>OFBiz: MFG: Edit manufacturing rules</title>
+ <para>
+ Dit scherm toont de productie regels die van toepassing zijn op een te produceren product.
+ Een productie regel geeft aan welke componenten vervangen kunnen worden door een ander component.
+ In dit scherm kun je tevens nieuwe productie regels definieren.
+ </para>
+ <section>
+ <title>Nieuwe productie regel definieren</title>
+ <para>
+ Dit formulier stelt je in staat vervangende componenten te definieren voor BoM componenten.
+ In het tweede deel van het scherm worden de vervangingsregels getoond.
+ </para>
+ </section>
</section>
\ No newline at end of file
Modified: ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_EditRouting.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_EditRouting.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_EditRouting.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_EditRouting.xml Tue Jun 19 21:36:11 2012
@@ -23,8 +23,8 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
xmlns="http://docbook.org/ns/docbook">
- <title>OFBiz:MFG: Main</title>
- <para>
- WIP
- </para>
+ <title>OFBiz: MFG: Route aanmaken en wijzigen</title>
+ <para>
+ In dit scherm kun je een nieuwe route aanmaken en een bestaande wijzigen.
+ </para>
</section>
\ No newline at end of file
Modified: ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_EditRoutingProductLink.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_EditRoutingProductLink.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_EditRoutingProductLink.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_EditRoutingProductLink.xml Tue Jun 19 21:36:11 2012
@@ -23,8 +23,14 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
xmlns="http://docbook.org/ns/docbook">
- <title>OFBiz:MFG: Edit route associated product</title>
- <para>
- WIP
- </para>
+ <title>OFBiz: MFG: Koppeling product werkplan wijzigen</title>
+ <para>
+ In dit scherm kun je de koppelingen van een werkplan met producten wijzigen. Tevens toont het scherm de gekoppelde producten.
+ </para>
+ <section>
+ <title>Nieuwe koppeling definieren</title>
+ <para>
+ Selecteer het product, zet de hoeveelheid en de van- en tot-datum. Klik op de button om het op te slaan.
+ </para>
+ </section>
</section>
\ No newline at end of file
Modified: ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_EditRoutingTask.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_EditRoutingTask.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_EditRoutingTask.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_EditRoutingTask.xml Tue Jun 19 21:36:11 2012
@@ -23,8 +23,14 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
xmlns="http://docbook.org/ns/docbook">
- <title>OFBiz:MFG: Edit route task</title>
+ <title>OFBiz: MFG: Werkplan taak aanpassen</title>
<para>
- WIP
+ In dit scherm worden nieuwe werkplan taken gedefinieerd. Ook kun je hiermee bestaande werkplan taken wijzigen.
</para>
+ <section>
+ <title>Invullen formulier</title>
+ <para>
+ Geef de werkplan taak een beschrijvende naam en omschrijving.
+ </para>
+ </section>
</section>
\ No newline at end of file
Modified: ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_EditRoutingTaskAssoc.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_EditRoutingTaskAssoc.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_EditRoutingTaskAssoc.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_EditRoutingTaskAssoc.xml Tue Jun 19 21:36:11 2012
@@ -23,8 +23,21 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
xmlns="http://docbook.org/ns/docbook">
- <title>OFBiz:MFG: Edit route associated task</title>
+ <title>OFBiz: MFG: Koppeling werkplan-taak wijzigen</title>
<para>
- WIP
+ Dit scherm toont gekoppelde werkplan taken en biedt de mogelijkheid werkplan taken te koppelen.
</para>
+ <section>
+ <title>Koppelen</title>
+ <para>
+ Selecteer de werkplan taak, geef het een volgnummer en zet de van- en tot-datum.
+ </para>
+ </section>
+ <section>
+ <title>Overzicht</title>
+ <para>
+ Onder het formulier wordt het overzicht van gekoppelde werkplan taken getoond. Klik op een werkplan taak om deze te openen.
+ Klik op de 'Wis'-knop om de koppeling te verwijderen.
+ </para>
+ </section>
</section>
\ No newline at end of file
Modified: ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_EditRoutingTaskCost.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_EditRoutingTaskCost.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_EditRoutingTaskCost.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_EditRoutingTaskCost.xml Tue Jun 19 21:36:11 2012
@@ -23,8 +23,8 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
xmlns="http://docbook.org/ns/docbook">
- <title>OFBiz:MFG: Edit route task</title>
+ <title>OFBiz: MFG: Aanpassen/toevoegen kosten werkplan taak</title>
<para>
- WIP
+ Met dit scherm kunnen bestaande kosten definities voor een werkplan taak aangepast worden en nieuwe gedefinieerd.
</para>
</section>
\ No newline at end of file
Modified: ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_EditRoutingTaskFixedAsset.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_EditRoutingTaskFixedAsset.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_EditRoutingTaskFixedAsset.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_EditRoutingTaskFixedAsset.xml Tue Jun 19 21:36:11 2012
@@ -23,8 +23,8 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
xmlns="http://docbook.org/ns/docbook">
- <title>OFBiz:MFG: Edit route task</title>
+ <title>OFBiz: MFG: Werkplan taak Productiemiddel koppelen/aanpassen</title>
<para>
- WIP
+ In dit scherm kun je een nieuwe productie middel aan een werkplan taak koppelen en een bestaande koppeling aanpassen.
</para>
</section>
\ No newline at end of file
Modified: ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_EditRoutingTaskProduct.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_EditRoutingTaskProduct.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_EditRoutingTaskProduct.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_EditRoutingTaskProduct.xml Tue Jun 19 21:36:11 2012
@@ -23,8 +23,8 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
xmlns="http://docbook.org/ns/docbook">
- <title>OFBiz:MFG: Edit route task</title>
+ <title>OFBiz: MFG: Product van werkplan taak aanmaken en aanpassen</title>
<para>
- WIP
+ In dit scherm kun je een product aan een werkplan taak koppelen en een bestaande koppeling aanpassen.
</para>
</section>
\ No newline at end of file
Modified: ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_FindInventoryEventPlan.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_FindInventoryEventPlan.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_FindInventoryEventPlan.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_FindInventoryEventPlan.xml Tue Jun 19 21:36:11 2012
@@ -23,8 +23,8 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
xmlns="http://docbook.org/ns/docbook">
- <title>OFBiz:MFG: Find inventory event plan</title>
+ <title>OFBiz: MFG: Materials resource plans</title>
<para>
- WIP
+ Dit scherm toont de uitgevoerde MRP's en de MRP's die nog uitgevoerd moeten worden.
</para>
</section>
\ No newline at end of file
Modified: ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_ListRoutingTaskProducts.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_ListRoutingTaskProducts.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_ListRoutingTaskProducts.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_ListRoutingTaskProducts.xml Tue Jun 19 21:36:11 2012
@@ -23,8 +23,17 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
xmlns="http://docbook.org/ns/docbook">
- <title>OFBiz:MFG: Edit route task</title>
+ <title>OFBiz: MFG: Tonen producten van werkplan taak</title>
<para>
- WIP
+ Dit scherm toont de producten die gekoppeld zijn aan de werkplan taak.
+ Vanaf dit scherm kunnen nieuwe koppeling worden aangemaakt en bestaand gewijzigd worden.
</para>
+ <section>
+ <title>Nieuwe koppelingen aanmaken</title>
+ <para>Klik op de knop om het invulformulier om een nieuwe productkoppeling aan te maken.</para>
+ </section>
+ <section>
+ <title>Overzicht gekoppelde producten</title>
+ <para>Dit overzicht toont de gekoppelede producten. Vanaf hier kan de koppeling aangepast en verwijderd worden.</para>
+ </section>
</section>
\ No newline at end of file
Modified: ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_ManufacturingReports.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_ManufacturingReports.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_ManufacturingReports.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_ManufacturingReports.xml Tue Jun 19 21:36:11 2012
@@ -23,8 +23,8 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
xmlns="http://docbook.org/ns/docbook">
- <title>OFBiz:MFG: Reports</title>
+ <title>OFBiz: MFG: Rapporten</title>
<para>
- WIP
+ Dit scherm toont de fabricage rapporten.
</para>
</section>
\ No newline at end of file
Modified: ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_RunMRP.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_RunMRP.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_RunMRP.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/helpdata/NL/Help_MFG_RunMRP.xml Tue Jun 19 21:36:11 2012
@@ -23,8 +23,14 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
xmlns="http://docbook.org/ns/docbook">
- <title>OFBiz:MFG: Run MRP</title>
+ <title>OFBiz: MFG: MRP uitvoeren</title>
<para>
- WIP
+ Met dit scherm kunnen MRP's opgestart worden.
</para>
+ <section>
+ <title>Nieuwe MRP opstarten</title>
+ <para>
+ Geef de MRP naam op, selecteer de magazijngroep en het warehouse om de MRP te starten.
+ </para>
+ </section>
</section>
\ No newline at end of file
Modified: ofbiz/branches/20120329_portletWidget/applications/manufacturing/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/manufacturing/ofbiz-component.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/manufacturing/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/manufacturing/ofbiz-component.xml Tue Jun 19 21:36:11 2012
@@ -34,7 +34,7 @@ under the License.
<!-- entity resources: model(s), eca(s) and group definitions -->
<entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/ManufacturingData.xml"/>
- <entity-resource type="data" reader-name="seed" loader="main" location="data/ManufacturingSecurityData.xml"/>
+ <entity-resource type="data" reader-name="security" loader="main" location="data/ManufacturingSecurityData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/ManufacturingHelpData_EN.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/ManufacturingHelpData_NL.xml"/>
<!--<entity-resource type="data" reader-name="seed-initial" loader="main" location="data/ManufacturingScheduledServices.xml"/>-->
Modified: ofbiz/branches/20120329_portletWidget/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMHelper.java?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMHelper.java (original)
+++ ofbiz/branches/20120329_portletWidget/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMHelper.java Tue Jun 19 21:36:11 2012
@@ -137,7 +137,7 @@ public class BOMHelper {
try {
List<GenericValue> shipmentPlans = delegator.findByAnd("OrderShipment", UtilMisc.toMap("shipmentId", shipmentId), null, false);
for(GenericValue shipmentPlan : shipmentPlans) {
- GenericValue orderItem = shipmentPlan.getRelatedOne("OrderItem");
+ GenericValue orderItem = shipmentPlan.getRelatedOne("OrderItem", false);
List<GenericValue> productionRuns = delegator.findByAnd("WorkOrderItemFulfillment", UtilMisc.toMap("orderId", shipmentPlan.getString("orderId"), "orderItemSeqId", shipmentPlan.getString("orderItemSeqId"), "shipGroupSeqId", shipmentPlan.getString("shipGroupSeqId")), null, true);
if (UtilValidate.isNotEmpty(productionRuns)) {
Modified: ofbiz/branches/20120329_portletWidget/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMNode.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMNode.java?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMNode.java (original)
+++ ofbiz/branches/20120329_portletWidget/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMNode.java Tue Jun 19 21:36:11 2012
@@ -409,7 +409,7 @@ public class BOMNode {
String serviceName = null;
if (this.productAssoc != null && this.productAssoc.getString("estimateCalcMethod") != null) {
try {
- GenericValue genericService = productAssoc.getRelatedOne("CustomMethod");
+ GenericValue genericService = productAssoc.getRelatedOne("CustomMethod", false);
if (genericService != null && genericService.getString("customMethodName") != null) {
serviceName = genericService.getString("customMethodName");
}
@@ -613,16 +613,16 @@ public class BOMNode {
}
List<GenericValue> pfs = null;
if (UtilValidate.isEmpty(facilityId)) {
- pfs = getProduct().getRelatedCache("ProductFacility");
+ pfs = getProduct().getRelated("ProductFacility", null, null, true);
} else {
- pfs = getProduct().getRelatedCache("ProductFacility", UtilMisc.toMap("facilityId", facilityId), null);
+ pfs = getProduct().getRelated("ProductFacility", UtilMisc.toMap("facilityId", facilityId), null, true);
}
if (UtilValidate.isEmpty(pfs)) {
if (getSubstitutedNode() != null && getSubstitutedNode().getProduct() != null) {
if (UtilValidate.isEmpty(facilityId)) {
- pfs = getSubstitutedNode().getProduct().getRelatedCache("ProductFacility");
+ pfs = getSubstitutedNode().getProduct().getRelated("ProductFacility", null, null, true);
} else {
- pfs = getSubstitutedNode().getProduct().getRelatedCache("ProductFacility", UtilMisc.toMap("facilityId", facilityId), null);
+ pfs = getSubstitutedNode().getProduct().getRelated("ProductFacility", UtilMisc.toMap("facilityId", facilityId), null, true);
}
}
}
@@ -649,7 +649,7 @@ public class BOMNode {
public boolean isManufactured(boolean ignoreSupplierProducts) {
List<GenericValue> supplierProducts = null;
try {
- supplierProducts = product.getRelated("SupplierProduct", UtilMisc.toMap("supplierPrefOrderId", "10_MAIN_SUPPL"), UtilMisc.toList("minimumOrderQuantity"));
+ supplierProducts = product.getRelated("SupplierProduct", UtilMisc.toMap("supplierPrefOrderId", "10_MAIN_SUPPL"), UtilMisc.toList("minimumOrderQuantity"), false);
} catch (GenericEntityException gee) {
Debug.logError("Problem in BOMNode.isManufactured()", module);
}
Modified: ofbiz/branches/20120329_portletWidget/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.java?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.java (original)
+++ ofbiz/branches/20120329_portletWidget/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.java Tue Jun 19 21:36:11 2012
@@ -596,7 +596,7 @@ public class BOMServices {
GenericValue orderItem = orderReadHelper.getOrderItem(orderShipment.getString("orderItemSeqId"));
GenericValue product = null;
try {
- product = orderItem.getRelatedOne("Product");
+ product = orderItem.getRelatedOne("Product", false);
} catch (GenericEntityException e) {
return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ManufacturingPackageConfiguratorError", locale));
}
@@ -650,7 +650,7 @@ public class BOMServices {
// single package
GenericValue orderItem = orderReadHelper.getOrderItem(orderShipment.getString("orderItemSeqId"));
try {
- product = orderItem.getRelatedOne("Product");
+ product = orderItem.getRelatedOne("Product", false);
} catch (GenericEntityException e) {
return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ManufacturingPackageConfiguratorError", locale));
}
Modified: ofbiz/branches/20120329_portletWidget/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMTree.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMTree.java?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMTree.java (original)
+++ ofbiz/branches/20120329_portletWidget/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMTree.java Tue Jun 19 21:36:11 2012
@@ -125,7 +125,7 @@ public class BOMTree {
// the bill of materials of its virtual product (if the current
// product is variant).
if (!hasBom(product, inDate)) {
- List<GenericValue> virtualProducts = product.getRelatedByAnd("AssocProductAssoc", UtilMisc.toMap("productAssocTypeId", "PRODUCT_VARIANT"));
+ List<GenericValue> virtualProducts = product.getRelated("AssocProductAssoc", UtilMisc.toMap("productAssocTypeId", "PRODUCT_VARIANT"), null, false);
virtualProducts = EntityUtil.filterByDate(virtualProducts, inDate);
GenericValue virtualProduct = EntityUtil.getFirst(virtualProducts);
if (virtualProduct != null) {
@@ -174,8 +174,7 @@ public class BOMTree {
}
private boolean hasBom(GenericValue product, Date inDate) throws GenericEntityException {
- List<GenericValue> children = product.getRelatedByAnd("MainProductAssoc",
- UtilMisc.toMap("productAssocTypeId", bomTypeId));
+ List<GenericValue> children = product.getRelated("MainProductAssoc", UtilMisc.toMap("productAssocTypeId", bomTypeId), null, false);
children = EntityUtil.filterByDate(children, inDate);
return UtilValidate.isNotEmpty(children);
}
Modified: ofbiz/branches/20120329_portletWidget/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRun.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRun.java?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRun.java (original)
+++ ofbiz/branches/20120329_portletWidget/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRun.java Tue Jun 19 21:36:11 2012
@@ -165,11 +165,10 @@ public class ProductionRun {
if (exist()) {
if (productProduced == null) {
try {
- List<GenericValue> productionRunProducts = productionRun.getRelated("WorkEffortGoodStandard",
- UtilMisc.toMap("workEffortGoodStdTypeId", "PRUN_PROD_DELIV"), null);
+ List<GenericValue> productionRunProducts = productionRun.getRelated("WorkEffortGoodStandard", UtilMisc.toMap("workEffortGoodStdTypeId", "PRUN_PROD_DELIV"), null, false);
this.productionRunProduct = EntityUtil.getFirst(productionRunProducts);
quantity = productionRunProduct.getBigDecimal("estimatedQuantity");
- productProduced = productionRunProduct.getRelatedOneCache("Product");
+ productProduced = productionRunProduct.getRelatedOne("Product", true);
} catch (GenericEntityException e) {
Debug.logWarning(e.getMessage(), module);
}
@@ -310,7 +309,7 @@ public class ProductionRun {
if (exist()) {
if (currentStatus == null) {
try {
- currentStatus = productionRun.getRelatedOneCache("StatusItem");
+ currentStatus = productionRun.getRelatedOne("StatusItem", true);
} catch (GenericEntityException e) {
Debug.logWarning(e.getMessage(), module);
}
@@ -333,7 +332,7 @@ public class ProductionRun {
GenericValue routingTask;
for (Iterator<GenericValue> iter = productionRunRoutingTasks.iterator(); iter.hasNext();) {
routingTask = iter.next();
- productionRunComponents.addAll(routingTask.getRelated("WorkEffortGoodStandard", UtilMisc.toMap("workEffortGoodStdTypeId", "PRUNT_PROD_NEEDED"),null));
+ productionRunComponents.addAll(routingTask.getRelated("WorkEffortGoodStandard", UtilMisc.toMap("workEffortGoodStdTypeId", "PRUNT_PROD_NEEDED"),null, false));
}
} catch (GenericEntityException e) {
Debug.logWarning(e.getMessage(), module);
@@ -352,7 +351,7 @@ public class ProductionRun {
if (exist()) {
if (productionRunRoutingTasks == null) {
try {
- productionRunRoutingTasks = productionRun.getRelated("ChildWorkEffort",UtilMisc.toMap("workEffortTypeId","PROD_ORDER_TASK"),UtilMisc.toList("priority"));
+ productionRunRoutingTasks = productionRun.getRelated("ChildWorkEffort",UtilMisc.toMap("workEffortTypeId","PROD_ORDER_TASK"),UtilMisc.toList("priority"), false);
} catch (GenericEntityException e) {
Debug.logWarning(e.getMessage(), module);
}
@@ -370,7 +369,7 @@ public class ProductionRun {
if (exist()) {
if (productionRunRoutingTasks == null) {
try {
- productionRunRoutingTasks = productionRun.getRelated("ChildWorkEffort",UtilMisc.toMap("workEffortTypeId","PROD_ORDER_TASK"),UtilMisc.toList("priority"));
+ productionRunRoutingTasks = productionRun.getRelated("ChildWorkEffort",UtilMisc.toMap("workEffortTypeId","PROD_ORDER_TASK"),UtilMisc.toList("priority"), false);
} catch (GenericEntityException e) {
Debug.logWarning(e.getMessage(), module);
}
@@ -414,7 +413,7 @@ public class ProductionRun {
if (task.get("estimateCalcMethod") != null) {
String serviceName = null;
try {
- GenericValue genericService = task.getRelatedOne("CustomMethod");
+ GenericValue genericService = task.getRelatedOne("CustomMethod", false);
if (genericService != null && genericService.getString("customMethodName") != null) {
serviceName = genericService.getString("customMethodName");
// call the service
Modified: ofbiz/branches/20120329_portletWidget/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunHelper.java?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunHelper.java (original)
+++ ofbiz/branches/20120329_portletWidget/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunHelper.java Tue Jun 19 21:36:11 2012
@@ -59,11 +59,11 @@ public class ProductionRunHelper {
if (productionRunId != null) {
GenericValue productionRun = delegator.findOne("WorkEffort", UtilMisc.toMap("workEffortId", productionRunId), false);
if (productionRun != null) {
- List<GenericValue> productionRunProducts = productionRun.getRelated("WorkEffortGoodStandard", UtilMisc.toMap("workEffortGoodStdTypeId", "PRUN_PROD_DELIV"),null);
+ List<GenericValue> productionRunProducts = productionRun.getRelated("WorkEffortGoodStandard", UtilMisc.toMap("workEffortGoodStdTypeId", "PRUN_PROD_DELIV"),null, false);
GenericValue productionRunProduct = EntityUtil.getFirst(productionRunProducts);
- GenericValue productProduced = productionRunProduct.getRelatedOneCache("Product");
- List<GenericValue> productionRunComponents = productionRun.getRelated("WorkEffortGoodStandard", UtilMisc.toMap("workEffortGoodStdTypeId", "PRUNT_PROD_NEEDED"),null);
- List<GenericValue> productionRunRoutingTasks = productionRun.getRelated("FromWorkEffortAssoc",UtilMisc.toMap("workEffortTypeId","PROD_ORDER_TASK"),null);
+ GenericValue productProduced = productionRunProduct.getRelatedOne("Product", true);
+ List<GenericValue> productionRunComponents = productionRun.getRelated("WorkEffortGoodStandard", UtilMisc.toMap("workEffortGoodStdTypeId", "PRUNT_PROD_NEEDED"),null, false);
+ List<GenericValue> productionRunRoutingTasks = productionRun.getRelated("FromWorkEffortAssoc",UtilMisc.toMap("workEffortTypeId","PROD_ORDER_TASK"),null, false);
result.put("productionRunProduct", productionRunProduct);
result.put("productProduced", productProduced);
result.put("productionRunComponents", productionRunComponents);
Modified: ofbiz/branches/20120329_portletWidget/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java (original)
+++ ofbiz/branches/20120329_portletWidget/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java Tue Jun 19 21:36:11 2012
@@ -304,7 +304,7 @@ public class ProductionRunServices {
if (EntityUtil.isValueActive(routingTaskAssoc, startDate)) {
GenericValue routingTask = null;
try {
- routingTask = routingTaskAssoc.getRelatedOne("ToWorkEffort");
+ routingTask = routingTaskAssoc.getRelatedOne("ToWorkEffort", false);
} catch (GenericEntityException e) {
Debug.logError(e.getMessage(), module);
}
@@ -645,7 +645,7 @@ public class ProductionRunServices {
List<GenericValue> mandatoryWorkEfforts = EntityUtil.filterByDate(delegator.findByAnd("WorkEffortAssoc", UtilMisc.toMap("workEffortIdTo", productionRunId, "workEffortAssocTypeId", "WORK_EFF_PRECEDENCY"), null, false));
for (int i = 0; i < mandatoryWorkEfforts.size(); i++) {
GenericValue mandatoryWorkEffortAssoc = mandatoryWorkEfforts.get(i);
- GenericValue mandatoryWorkEffort = mandatoryWorkEffortAssoc.getRelatedOne("FromWorkEffort");
+ GenericValue mandatoryWorkEffort = mandatoryWorkEffortAssoc.getRelatedOne("FromWorkEffort", false);
if (!(mandatoryWorkEffort.getString("currentStatusId").equals("PRUN_COMPLETED") ||
mandatoryWorkEffort.getString("currentStatusId").equals("PRUN_RUNNING") ||
mandatoryWorkEffort.getString("currentStatusId").equals("PRUN_CLOSED"))) {
@@ -904,7 +904,7 @@ public class ProductionRunServices {
// and compute the overhead costs associated to the finished product
try {
// get the currency
- GenericValue facility = productionRun.getGenericValue().getRelatedOne("Facility");
+ GenericValue facility = productionRun.getGenericValue().getRelatedOne("Facility", false);
Map<String, Object> outputMap = dispatcher.runSync("getPartyAccountingPreferences",
UtilMisc.<String, Object>toMap("userLogin", userLogin,
"organizationPartyId", facility.getString("ownerPartyId")));
@@ -924,8 +924,8 @@ public class ProductionRunServices {
UtilMisc.toList("sequenceNum"), false);
for (int i = 0; i < productCostComponentCalcs.size(); i++) {
GenericValue productCostComponentCalc = productCostComponentCalcs.get(i);
- GenericValue costComponentCalc = productCostComponentCalc.getRelatedOne("CostComponentCalc");
- GenericValue customMethod = costComponentCalc.getRelatedOne("CustomMethod");
+ GenericValue costComponentCalc = productCostComponentCalc.getRelatedOne("CostComponentCalc", false);
+ GenericValue customMethod = costComponentCalc.getRelatedOne("CustomMethod", false);
if (customMethod == null) {
// TODO: not supported for CostComponentCalc entries directly associated to a product
Debug.logWarning("Unable to create cost component for cost component calc with id [" + costComponentCalc.getString("costComponentCalcId") + "] because customMethod is not set", module);
@@ -1054,7 +1054,7 @@ public class ProductionRunServices {
"workEffortAssocTypeId", "WORK_EFF_TEMPLATE"), null, false)));
GenericValue routingTask = null;
if (UtilValidate.isNotEmpty(routingTaskAssoc)) {
- routingTask = routingTaskAssoc.getRelatedOne("FromWorkEffort");
+ routingTask = routingTaskAssoc.getRelatedOne("FromWorkEffort", false);
}
// Get all the valid CostComponentCalc entries
@@ -1063,8 +1063,8 @@ public class ProductionRunServices {
workEffortCostCalcs = EntityUtil.filterByDate(workEffortCostCalcs);
for (GenericValue workEffortCostCalc : workEffortCostCalcs) {
- GenericValue costComponentCalc = workEffortCostCalc.getRelatedOne("CostComponentCalc");
- GenericValue customMethod = costComponentCalc.getRelatedOne("CustomMethod");
+ GenericValue costComponentCalc = workEffortCostCalc.getRelatedOne("CostComponentCalc", false);
+ GenericValue customMethod = costComponentCalc.getRelatedOne("CustomMethod", false);
if (UtilValidate.isEmpty(customMethod) || UtilValidate.isEmpty(customMethod.getString("customMethodName"))) {
// compute the total time
double totalTime = actualTotalMilliSeconds;
@@ -1101,16 +1101,15 @@ public class ProductionRunServices {
}
// Now get the cost information associated to the fixed asset and compute the costs
- GenericValue fixedAsset = workEffort.getRelatedOne("FixedAsset");
+ GenericValue fixedAsset = workEffort.getRelatedOne("FixedAsset", false);
if (UtilValidate.isEmpty(fixedAsset) && UtilValidate.isNotEmpty(routingTask)) {
- fixedAsset = routingTask.getRelatedOne("FixedAsset");
+ fixedAsset = routingTask.getRelatedOne("FixedAsset", false);
}
if (UtilValidate.isNotEmpty(fixedAsset)) {
- List<GenericValue> setupCosts = fixedAsset.getRelatedByAnd("FixedAssetStdCost",
- UtilMisc.toMap("fixedAssetStdCostTypeId", "SETUP_COST"));
+ List<GenericValue> setupCosts = fixedAsset.getRelated("FixedAssetStdCost",
+ UtilMisc.toMap("fixedAssetStdCostTypeId", "SETUP_COST"), null, false);
GenericValue setupCost = EntityUtil.getFirst(EntityUtil.filterByDate(setupCosts));
- List<GenericValue> usageCosts = fixedAsset.getRelatedByAnd("FixedAssetStdCost",
- UtilMisc.toMap("fixedAssetStdCostTypeId", "USAGE_COST"));
+ List<GenericValue> usageCosts = fixedAsset.getRelated("FixedAssetStdCost", UtilMisc.toMap("fixedAssetStdCostTypeId", "USAGE_COST"), null, false);
GenericValue usageCost = EntityUtil.getFirst(EntityUtil.filterByDate(usageCosts));
if (UtilValidate.isNotEmpty(setupCost) || UtilValidate.isNotEmpty(usageCost)) {
String currencyUomId = (setupCost != null? setupCost.getString("amountUomId"): usageCost.getString("amountUomId"));
@@ -1625,7 +1624,7 @@ public class ProductionRunServices {
GenericValue orderItem = null;
try {
// Find the related order item (if exists)
- List<GenericValue> orderItems = productionRun.getGenericValue().getRelated("WorkOrderItemFulfillment");
+ List<GenericValue> orderItems = productionRun.getGenericValue().getRelated("WorkOrderItemFulfillment", null, null, false);
orderItem = EntityUtil.getFirst(orderItems);
} catch (GenericEntityException e) {
Debug.logWarning(e.getMessage(), module);
@@ -1635,7 +1634,7 @@ public class ProductionRunServices {
BigDecimal unitCost = ZERO;
try {
// get the currency
- GenericValue facility = productionRun.getGenericValue().getRelatedOne("Facility");
+ GenericValue facility = productionRun.getGenericValue().getRelatedOne("Facility", false);
Map<String, Object> outputMap = dispatcher.runSync("getPartyAccountingPreferences", UtilMisc.<String, Object>toMap("userLogin", userLogin, "organizationPartyId", facility.getString("ownerPartyId")));
GenericValue partyAccountingPreference = (GenericValue)outputMap.get("partyAccountingPreference");
if (partyAccountingPreference == null) {
@@ -2078,7 +2077,7 @@ public class ProductionRunServices {
}
if (quantityToProduce.compareTo(ZERO) > 0) {
try {
- List<GenericValue> components = theTask.getRelated("WorkEffortGoodStandard");
+ List<GenericValue> components = theTask.getRelated("WorkEffortGoodStandard", null, null, false);
for (GenericValue component : components) {
BigDecimal totalRequiredMaterialQuantity = component.getBigDecimal("estimatedQuantity").multiply(totalQuantityProduced).divide(quantityToProduce, rounding);
// now get the units that have been already issued and subtract them
@@ -2432,7 +2431,7 @@ public class ProductionRunServices {
boolean isImmediatelyFulfilled = false;
try {
GenericValue order = delegator.findOne("OrderHeader", UtilMisc.toMap("orderId", orderId), false);
- GenericValue productStore = delegator.getRelatedOne("ProductStore", order);
+ GenericValue productStore = delegator.getRelatedOne("ProductStore", order, false);
isImmediatelyFulfilled = "Y".equals(productStore.getString("isImmediatelyFulfilled"));
} catch (GenericEntityException e) {
return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ManufacturingProductionRunForMarketingPackagesCreationError", UtilMisc.toMap("orderId", orderId, "orderItemSeqId", orderItemSeqId, "errorString", e.getMessage()), locale));
@@ -2590,7 +2589,7 @@ public class ProductionRunServices {
GenericValue orderItem = null;
if ("OrderItemShipGroupAssoc".equals(orderItemOrShipGroupAssoc.getEntityName())) {
try {
- orderItem = orderItemOrShipGroupAssoc.getRelatedOne("OrderItem");
+ orderItem = orderItemOrShipGroupAssoc.getRelatedOne("OrderItem", false);
} catch(GenericEntityException gee) {
Debug.logInfo("Unable to find order item for " + orderItemOrShipGroupAssoc, module);
}
@@ -2942,7 +2941,7 @@ public class ProductionRunServices {
if (inventoryItem.get("availableToPromiseTotal") != null && inventoryItem.getBigDecimal("availableToPromiseTotal").compareTo(ZERO) <= 0) {
return ServiceUtil.returnSuccess();
}
- GenericValue product = inventoryItem.getRelatedOne("Product");
+ GenericValue product = inventoryItem.getRelatedOne("Product", false);
if (product == null) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceProduct, "ProductProductNotFound", locale) + " " + inventoryItem.get("productId"));
}
Modified: ofbiz/branches/20120329_portletWidget/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java (original)
+++ ofbiz/branches/20120329_portletWidget/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java Tue Jun 19 21:36:11 2012
@@ -104,7 +104,7 @@ public class MrpServices {
if (listResult != null) {
try {
for(GenericValue tmpRequirement : listResult) {
- listResultRoles.addAll(tmpRequirement.getRelated("RequirementRole"));
+ listResultRoles.addAll(tmpRequirement.getRelated("RequirementRole", null, null, false));
//int numOfRecordsRemoved = delegator.removeRelated("RequirementRole", tmpRequirement);
}
delegator.removeAll(listResultRoles);
@@ -272,7 +272,7 @@ public class MrpServices {
OrderReadHelper orh = new OrderReadHelper(delegator, orderId);
BigDecimal shippedQuantity = null;
try {
- shippedQuantity = orh.getItemShippedQuantity(genericResult.getRelatedOne("OrderItem"));
+ shippedQuantity = orh.getItemShippedQuantity(genericResult.getRelatedOne("OrderItem", false));
} catch (GenericEntityException e) {
}
if (UtilValidate.isNotEmpty(shippedQuantity)) {
@@ -595,12 +595,12 @@ public class MrpServices {
if (UtilValidate.isEmpty(facilityGroup)) {
return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ManufacturingMrpFacilityGroupIsNotValid", UtilMisc.toMap("facilityGroupId", facilityGroupId), locale));
}
- List<GenericValue> facilities = facilityGroup.getRelated("FacilityGroupMember", UtilMisc.toList("sequenceNum"));
+ List<GenericValue> facilities = facilityGroup.getRelated("FacilityGroupMember", null, UtilMisc.toList("sequenceNum"), false);
if (UtilValidate.isEmpty(facilities)) {
return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ManufacturingMrpFacilityGroupIsNotAssociatedToFacility", UtilMisc.toMap("facilityGroupId", facilityGroupId), locale));
}
for(GenericValue facilityMember : facilities) {
- GenericValue facility = facilityMember.getRelatedOne("Facility");
+ GenericValue facility = facilityMember.getRelatedOne("Facility", false);
if ("WAREHOUSE".equals(facility.getString("facilityTypeId")) && UtilValidate.isEmpty(facilityId)) {
facilityId = facility.getString("facilityId");
}
@@ -680,8 +680,8 @@ public class MrpServices {
BigDecimal positiveEventQuantity = eventQuantity.compareTo(BigDecimal.ZERO) > 0 ? eventQuantity: eventQuantity.negate();
// It's a new product, so it's necessary to read the MrpQoh
try {
- product = inventoryEventForMRP.getRelatedOneCache("Product");
- productFacility = EntityUtil.getFirst(product.getRelatedByAndCache("ProductFacility", UtilMisc.toMap("facilityId", facilityId)));
+ product = inventoryEventForMRP.getRelatedOne("Product", true);
+ productFacility = EntityUtil.getFirst(product.getRelated("ProductFacility", UtilMisc.toMap("facilityId", facilityId), null, true));
} catch (GenericEntityException e) {
return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ManufacturingMrpCannotFindProductForEvent", locale));
}
Modified: ofbiz/branches/20120329_portletWidget/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/ProposedOrder.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/ProposedOrder.java?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/ProposedOrder.java (original)
+++ ofbiz/branches/20120329_portletWidget/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/ProposedOrder.java Tue Jun 19 21:36:11 2012
@@ -155,7 +155,7 @@ public class ProposedOrder {
if (EntityUtil.isValueActive(routingTaskAssoc, endDate)) {
GenericValue routingTask = null;
try {
- routingTask = routingTaskAssoc.getRelatedOneCache("ToWorkEffort");
+ routingTask = routingTaskAssoc.getRelatedOne("ToWorkEffort", true);
} catch (GenericEntityException e) {
Debug.logError(e.getMessage(), module);
}
Modified: ofbiz/branches/20120329_portletWidget/applications/manufacturing/src/org/ofbiz/manufacturing/techdata/TechDataServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/manufacturing/src/org/ofbiz/manufacturing/techdata/TechDataServices.java?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/manufacturing/src/org/ofbiz/manufacturing/techdata/TechDataServices.java (original)
+++ ofbiz/branches/20120329_portletWidget/applications/manufacturing/src/org/ofbiz/manufacturing/techdata/TechDataServices.java Tue Jun 19 21:36:11 2012
@@ -172,23 +172,23 @@ public class TechDataServices {
public static GenericValue getTechDataCalendar(GenericValue routingTask) {
GenericValue machineGroup = null, techDataCalendar = null;
try {
- machineGroup = routingTask.getRelatedOneCache("FixedAsset");
+ machineGroup = routingTask.getRelatedOne("FixedAsset", true);
} catch (GenericEntityException e) {
Debug.logError("Pb reading FixedAsset associated with routingTask"+e.getMessage(), module);
}
if (machineGroup != null) {
if (machineGroup.getString("calendarId") != null) {
try {
- techDataCalendar = machineGroup.getRelatedOneCache("TechDataCalendar");
+ techDataCalendar = machineGroup.getRelatedOne("TechDataCalendar", true);
} catch (GenericEntityException e) {
Debug.logError("Pb reading TechDataCalendar associated with machineGroup"+e.getMessage(), module);
}
} else {
try {
- List<GenericValue> machines = machineGroup.getRelatedCache("ChildFixedAsset");
+ List<GenericValue> machines = machineGroup.getRelated("ChildFixedAsset", null, null, true);
if (machines != null && machines.size()>0) {
GenericValue machine = EntityUtil.getFirst(machines);
- techDataCalendar = machine.getRelatedOneCache("TechDataCalendar");
+ techDataCalendar = machine.getRelatedOne("TechDataCalendar", true);
}
} catch (GenericEntityException e) {
Debug.logError("Pb reading machine child from machineGroup"+e.getMessage(), module);
@@ -270,7 +270,7 @@ public class TechDataServices {
GenericValue techDataCalendarWeek = null;
// TODO read TechDataCalendarExcWeek to manage execption week (maybe it's needed to refactor the entity definition
try {
- techDataCalendarWeek = techDataCalendar.getRelatedOneCache("TechDataCalendarWeek");
+ techDataCalendarWeek = techDataCalendar.getRelatedOne("TechDataCalendarWeek", true);
} catch (GenericEntityException e) {
Debug.logError("Pb reading Calendar Week associated with calendar"+e.getMessage(), module);
return 0;
@@ -302,7 +302,7 @@ public class TechDataServices {
GenericValue techDataCalendarWeek = null;
// TODO read TechDataCalendarExcWeek to manage execption week (maybe it's needed to refactor the entity definition
try {
- techDataCalendarWeek = techDataCalendar.getRelatedOneCache("TechDataCalendarWeek");
+ techDataCalendarWeek = techDataCalendar.getRelatedOne("TechDataCalendarWeek", true);
} catch (GenericEntityException e) {
Debug.logError("Pb reading Calendar Week associated with calendar"+e.getMessage(), module);
return ServiceUtil.returnError("Pb reading Calendar Week associated with calendar");
@@ -424,7 +424,7 @@ public class TechDataServices {
GenericValue techDataCalendarWeek = null;
// TODO read TechDataCalendarExcWeek to manage exception week (maybe it's needed to refactor the entity definition
try {
- techDataCalendarWeek = techDataCalendar.getRelatedOneCache("TechDataCalendarWeek");
+ techDataCalendarWeek = techDataCalendar.getRelatedOne("TechDataCalendarWeek", true);
} catch (GenericEntityException e) {
Debug.logError("Pb reading Calendar Week associated with calendar"+e.getMessage(), module);
return 0;
@@ -456,7 +456,7 @@ public class TechDataServices {
GenericValue techDataCalendarWeek = null;
// TODO read TechDataCalendarExcWeek to manage exception week (maybe it's needed to refactor the entity definition
try {
- techDataCalendarWeek = techDataCalendar.getRelatedOneCache("TechDataCalendarWeek");
+ techDataCalendarWeek = techDataCalendar.getRelatedOne("TechDataCalendarWeek", true);
} catch (GenericEntityException e) {
Debug.logError("Pb reading Calendar Week associated with calendar"+e.getMessage(), module);
return ServiceUtil.returnError("Pb reading Calendar Week associated with calendar");
Modified: ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/bom/EditProductBom.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/bom/EditProductBom.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/bom/EditProductBom.groovy (original)
+++ ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/bom/EditProductBom.groovy Tue Jun 19 21:36:11 2012
@@ -65,10 +65,10 @@ Collection formulae = delegator.findByAn
context.formulae = formulae;
if (product) {
- assocFromProducts = product.getRelated("MainProductAssoc", (productAssocTypeId ? [productAssocTypeId : productAssocTypeId]: [:]), ["sequenceNum","productId"]);
+ assocFromProducts = product.getRelated("MainProductAssoc", (productAssocTypeId ? [productAssocTypeId : productAssocTypeId]: [:]), ["sequenceNum","productId"], false);
if (assocFromProducts) context.assocFromProducts = assocFromProducts;
- assocToProducts = product.getRelated("AssocProductAssoc", (productAssocTypeId ? [productAssocTypeId : productAssocTypeId]: [:]), ["sequenceNum","productId"]);
+ assocToProducts = product.getRelated("AssocProductAssoc", (productAssocTypeId ? [productAssocTypeId : productAssocTypeId]: [:]), ["sequenceNum","productId"], false);
if (assocToProducts) context.assocToProducts = assocToProducts;
}
Modified: ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy (original)
+++ ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy Tue Jun 19 21:36:11 2012
@@ -48,7 +48,7 @@ if (productionRunId) {
context.inventoryItems = inventoryItems;
if (inventoryItems) {
lastWorkEffortInventoryProduced = (GenericValue)inventoryItems.get(inventoryItems.size() - 1);
- lastInventoryItem = lastWorkEffortInventoryProduced.getRelatedOne("InventoryItem");
+ lastInventoryItem = lastWorkEffortInventoryProduced.getRelatedOne("InventoryItem", false);
context.lastLotId = lastInventoryItem.lotId;
}
@@ -107,11 +107,11 @@ if (productionRunId) {
templateTaskAssoc = EntityUtil.getFirst(EntityUtil.filterByDate(delegator.findByAnd("WorkEffortAssoc", [workEffortIdTo : routingTask.workEffortId, workEffortAssocTypeId : "WORK_EFF_TEMPLATE"], null, false)));
templateTask = [:];
if (templateTaskAssoc) {
- templateTask = templateTaskAssoc.getRelatedOne("FromWorkEffort");
+ templateTask = templateTaskAssoc.getRelatedOne("FromWorkEffort", false);
}
delivProducts = [];
if (templateTask) {
- delivProducts = EntityUtil.filterByDate(templateTask.getRelatedByAnd("WorkEffortGoodStandard", [workEffortGoodStdTypeId : "PRUNT_PROD_DELIV"]));
+ delivProducts = EntityUtil.filterByDate(templateTask.getRelated("WorkEffortGoodStandard", [workEffortGoodStdTypeId : "PRUNT_PROD_DELIV"], null, false));
}
context.delivProducts = delivProducts;
// Get the list of delivered products, i.e. inventory items
@@ -161,9 +161,9 @@ if (productionRunId) {
productionRunComponentsAlreadyIssued = FastList.newInstance();
if (productionRunComponents) {
productionRunComponents.each { component ->
- product = component.getRelatedOne("Product");
+ product = component.getRelatedOne("Product", false);
componentName = product.getString("internalName");
- productionRunTask = component.getRelatedOne("WorkEffort");
+ productionRunTask = component.getRelatedOne("WorkEffort", false);
workEffortName = productionRunTask.getString("workEffortName");
Map componentData = component.getAllFields();
componentData.internalName = componentName;
Modified: ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunFixedAssets.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunFixedAssets.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunFixedAssets.groovy (original)
+++ ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunFixedAssets.groovy Tue Jun 19 21:36:11 2012
@@ -24,7 +24,7 @@ productionRunId = parameters.productionR
taskInfos = [];
tasks = delegator.findByAnd("WorkEffort", [workEffortParentId : productionRunId, workEffortTypeId : "PROD_ORDER_TASK"], ["workEffortId"], false);
tasks.each { task ->
- records = task.getRelated("WorkEffortFixedAssetAssign");
+ records = task.getRelated("WorkEffortFixedAssetAssign", null, null, false);
HtmlFormWrapper taskForm = new HtmlFormWrapper("component://manufacturing/widget/manufacturing/ProductionRunForms.xml", "ProductionRunTaskFixedAssets", request, response);
taskForm.putInContext("records", records);
taskInfos.add([task : task, taskForm : taskForm]);
Modified: ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/WorkWithShipmentPlans.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/WorkWithShipmentPlans.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/WorkWithShipmentPlans.groovy (original)
+++ ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/WorkWithShipmentPlans.groovy Tue Jun 19 21:36:11 2012
@@ -31,8 +31,8 @@ if (shipmentPlans) {
workInProgress = "false";
shipmentPlans.each { shipmentPlan ->
oneRow = new HashMap(shipmentPlan);
- // oneRow.putAll(shipmentPlan.getRelatedOne("OrderItemInventoryRes"));
- orderItem = shipmentPlan.getRelatedOne("OrderItem");
+ // oneRow.putAll(shipmentPlan.getRelatedOne("OrderItemInventoryRes", false));
+ orderItem = shipmentPlan.getRelatedOne("OrderItem", false);
oneRow.productId = orderItem.productId;
orderedQuantity = orderItem.quantity;
canceledQuantity = orderItem.cancelQuantity;
@@ -43,7 +43,7 @@ if (shipmentPlans) {
// Total quantity issued
issuedQuantity = 0.0;
qtyIssuedInShipment = [:];
- issuances = orderItem.getRelated("ItemIssuance");
+ issuances = orderItem.getRelated("ItemIssuance", null, null, false);
issuances.each { issuance ->
if (issuance.quantity) {
issuedQuantity += issuance.quantity;
@@ -98,7 +98,7 @@ if (shipmentPlans) {
// Reserved and Not Available quantity
reservedQuantity = 0.0;
reservedNotAvailable = 0.0;
- reservations = orderItem.getRelated("OrderItemShipGrpInvRes");
+ reservations = orderItem.getRelated("OrderItemShipGrpInvRes", null, null, false);
reservations.each { reservation ->
if (reservation.quantity) {
reservedQuantity += reservation.quantity;
@@ -109,7 +109,7 @@ if (shipmentPlans) {
}
oneRow.notAvailableQuantity = reservedNotAvailable;
// Planned Weight and Volume
- product = orderItem.getRelatedOne("Product");
+ product = orderItem.getRelatedOne("Product", false);
weight = 0.0;
quantity = 0.0;
if (shipmentPlan.quantity) {
Modified: ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/productionRunAllFixedAssets.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/productionRunAllFixedAssets.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/productionRunAllFixedAssets.groovy (original)
+++ ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/productionRunAllFixedAssets.groovy Tue Jun 19 21:36:11 2012
@@ -28,7 +28,7 @@ if (productionRunId) {
productionRunFixedAssetsData = FastList.newInstance();
productionRunRoutingTasks = productionRun.getProductionRunRoutingTasks();
productionRunRoutingTasks.each { prodRunTask ->
- taskFixedAssets = prodRunTask.getRelated("WorkEffortFixedAssetAssign");
+ taskFixedAssets = prodRunTask.getRelated("WorkEffortFixedAssetAssign", null, null, false);
productionRunFixedAssetsData.addAll(taskFixedAssets);
}
context.productionRunFixedAssetsData = productionRunFixedAssetsData;
Modified: ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PackageContentsAndOrder.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PackageContentsAndOrder.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PackageContentsAndOrder.groovy (original)
+++ ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PackageContentsAndOrder.groovy Tue Jun 19 21:36:11 2012
@@ -40,7 +40,7 @@ if (packageContents) {
orderShipments = delegator.findByAnd("OrderShipment", [shipmentId : shipmentId, shipmentItemSeqId : packageContent.shipmentItemSeqId], null, false);
orderShipment = EntityUtil.getFirst(orderShipments);
orderItem = delegator.findOne("OrderItem", [orderId : orderShipment.orderId, orderItemSeqId : orderShipment.orderItemSeqId], false);
- product = orderItem.getRelatedOne("Product");
+ product = orderItem.getRelatedOne("Product", false);
// verify if the product is a member of the given category (based on the report's parameter)
if (productCategoryIdPar) {
if (!isProductInCategory(delegator, product.productId, productCategoryIdPar)) {
Modified: ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentLabel.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentLabel.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentLabel.groovy (original)
+++ ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentLabel.groovy Tue Jun 19 21:36:11 2012
@@ -32,8 +32,8 @@ if (shipment) {
shipmentPackages.each { shipmentPackage ->
shipmentPackageComponents = delegator.findByAnd("ShipmentPackageContent", [shipmentId : shipmentId, shipmentPackageSeqId : shipmentPackage.shipmentPackageSeqId], null, false);
shipmentPackageComponents.each { shipmentPackageComponent ->
- shipmentItem = shipmentPackageComponent.getRelatedOne("ShipmentItem");
- orderShipments = shipmentItem.getRelated("OrderShipment");
+ shipmentItem = shipmentPackageComponent.getRelatedOne("ShipmentItem", false);
+ orderShipments = shipmentItem.getRelated("OrderShipment", null, null, false);
orderShipment = EntityUtil.getFirst(orderShipments);
String orderId = null;
Modified: ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentWorkEffortTasks.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentWorkEffortTasks.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentWorkEffortTasks.groovy (original)
+++ ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentWorkEffortTasks.groovy Tue Jun 19 21:36:11 2012
@@ -35,7 +35,7 @@ if (shipment) {
productionRunProduct = [:];
productionRunProducts = delegator.findByAnd("WorkEffortGoodStandard", [workEffortId : productionRun.workEffortId , workEffortGoodStdTypeId : "PRUN_PROD_DELIV", statusId : "WEGS_CREATED"], null, false);
if (productionRunProducts) {
- productionRunProduct = ((GenericValue)productionRunProducts.get(0)).getRelatedOne("Product");
+ productionRunProduct = ((GenericValue)productionRunProducts.get(0)).getRelatedOne("Product", false);
}
tasks = delegator.findByAnd("WorkEffort", [workEffortParentId : productionRun.workEffortId, workEffortTypeId : "PROD_ORDER_TASK"], null, false);
tasks.each { task ->
Modified: ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionDay.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionDay.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionDay.groovy (original)
+++ ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionDay.groovy Tue Jun 19 21:36:11 2012
@@ -36,7 +36,7 @@ if (calendarId) {
techDataCalendar = delegator.findOne("TechDataCalendar", [calendarId : calendarId], false);
}
if (techDataCalendar) {
- calendarExceptionDays = techDataCalendar.getRelated("TechDataCalendarExcDay");
+ calendarExceptionDays = techDataCalendar.getRelated("TechDataCalendarExcDay", null, null, false);
}
HtmlFormWrapper listCalendarExceptionDayWrapper = new HtmlFormWrapper("component://manufacturing/widget/manufacturing/CalendarForms.xml", "ListCalendarExceptionDay", request, response);
listCalendarExceptionDayWrapper.putInContext("calendarExceptionDays", calendarExceptionDays);
Modified: ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionWeek.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionWeek.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionWeek.groovy (original)
+++ ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionWeek.groovy Tue Jun 19 21:36:11 2012
@@ -34,11 +34,11 @@ if (calendarId) {
techDataCalendar = delegator.findOne("TechDataCalendar", [calendarId : calendarId], false);
}
if (techDataCalendar) {
- calendarExceptionWeeks = techDataCalendar.getRelated("TechDataCalendarExcWeek");
+ calendarExceptionWeeks = techDataCalendar.getRelated("TechDataCalendarExcWeek", null, null, false);
}
calendarExceptionWeeksDatas = [];
calendarExceptionWeeks.each { calendarExceptionWeek ->
- calendarWeek = calendarExceptionWeek.getRelatedOne("TechDataCalendarWeek");
+ calendarWeek = calendarExceptionWeek.getRelatedOne("TechDataCalendarWeek", false);
calendarExceptionWeeksDatas.add([calendarExceptionWeek : calendarExceptionWeek , calendarWeek : calendarWeek]);
}
Modified: ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl Tue Jun 19 21:36:11 2012
@@ -126,7 +126,7 @@ function lookupBom() {
</td>
</tr>
<#else>
- <#assign curProductAssocType = productAssoc.getRelatedOneCache("ProductAssocType")>
+ <#assign curProductAssocType = productAssoc.getRelatedOne("ProductAssocType", true)>
<input type="hidden" name="UPDATE_MODE" value="UPDATE"/>
<input type="hidden" name="productId" value="${productId?if_exists}"/>
<input type="hidden" name="productIdTo" value="${productIdTo?if_exists}"/>
@@ -259,8 +259,8 @@ function lookupBom() {
</tr>
<#assign alt_row = false>
<#list assocFromProducts?if_exists as assocFromProduct>
- <#assign listToProduct = assocFromProduct.getRelatedOneCache("AssocProduct")>
- <#assign curProductAssocType = assocFromProduct.getRelatedOneCache("ProductAssocType")>
+ <#assign listToProduct = assocFromProduct.getRelatedOne("AssocProduct", true)>
+ <#assign curProductAssocType = assocFromProduct.getRelatedOne("ProductAssocType", true)>
<tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
<td><a href="<@o...@ofbizUrl>" class="buttontext">${(assocFromProduct.productIdTo)?if_exists}</a></td>
<td><#if listToProduct?exists><a href="<@o...@ofbizUrl>" class="buttontext">${(listToProduct.internalName)?if_exists}</a></#if> </td>
@@ -305,8 +305,8 @@ function lookupBom() {
</tr>
<#assign alt_row = false>
<#list assocToProducts?if_exists as assocToProduct>
- <#assign listToProduct = assocToProduct.getRelatedOneCache("MainProduct")>
- <#assign curProductAssocType = assocToProduct.getRelatedOneCache("ProductAssocType")>
+ <#assign listToProduct = assocToProduct.getRelatedOne("MainProduct", true)>
+ <#assign curProductAssocType = assocToProduct.getRelatedOne("ProductAssocType", true)>
<tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
<td><a href="<@o...@ofbizUrl>" class="buttontext">${(assocToProduct.productId)?if_exists}</a></td>
<!-- <td><#if listToProduct?exists><a href="<@o...@ofbizUrl>" class="buttontext">${(listToProduct.internalName)?if_exists}</a></#if></td> -->
Modified: ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl Tue Jun 19 21:36:11 2012
@@ -148,7 +148,7 @@ document.lookupinventory.productId.focus
<#assign count = lowIndex>
<#assign productTmp = "">
<#list inventoryList[lowIndex..highIndex-1] as inven>
- <#assign product = inven.getRelatedOne("Product")>
+ <#assign product = inven.getRelatedOne("Product", false)>
<#if facilityId?exists && facilityId?has_content>
</#if>
<#if ! product.equals( productTmp )>
@@ -161,7 +161,7 @@ document.lookupinventory.productId.focus
<#if qohEvents?has_content>
<#assign initialQohEvent = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(qohEvents)>
</#if>
- <#if initialQohEvent != null>
+ <#if initialQohEvent??>
<#if initialQohEvent.quantity?has_content>
<#assign quantityAvailableAtDate = initialQohEvent.quantity>
</#if>
@@ -176,7 +176,7 @@ document.lookupinventory.productId.focus
<b>[${inven.productId}]</b> ${product.internalName?if_exists}
</th>
<td>
- <#if productFacility != null && productFacility?has_content>
+ <#if productFacility?has_content>
<div>
<b>${uiLabelMap.ProductFacility}:</b> ${productFacility.facilityId?if_exists}
</div>
@@ -208,7 +208,7 @@ document.lookupinventory.productId.focus
</#if>
<#assign quantityAvailableAtDate = quantityAvailableAtDate?default(0) + inven.getBigDecimal("quantity")>
<#assign productTmp = product>
- <#assign MrpEventType = inven.getRelatedOne("MrpEventType")>
+ <#assign MrpEventType = inven.getRelatedOne("MrpEventType", false)>
<tr class="${rowClass}">
<td>${MrpEventType.get("description",locale)}</td>
<td> </td>
Modified: ofbiz/branches/20120329_portletWidget/applications/marketing/config/MarketingEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/marketing/config/MarketingEntityLabels.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/marketing/config/MarketingEntityLabels.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/marketing/config/MarketingEntityLabels.xml Tue Jun 19 21:36:11 2012
@@ -28,6 +28,7 @@
<value xml:lang="pt_BR">Anúncio</value>
<value xml:lang="ro">Anunturi</value>
<value xml:lang="th">à¸à¸²à¸£à¸à¸£à¸°à¸à¸²à¸¨</value>
+ <value xml:lang="vi">Quảng bá</value>
<value xml:lang="zh">声æ</value>
<value xml:lang="zh_TW">è²æ</value>
</property>
@@ -40,6 +41,7 @@
<value xml:lang="pt_BR">Marketing</value>
<value xml:lang="ro">Vanzari</value>
<value xml:lang="th">à¸à¸²à¸£à¸à¸¥à¸²à¸</value>
+ <value xml:lang="vi">Tiếp thá»</value>
<value xml:lang="zh">å¸åºå®£ä¼ </value>
<value xml:lang="zh_TW">è¡é·</value>
</property>
@@ -52,6 +54,7 @@
<value xml:lang="pt_BR">Mala direta</value>
<value xml:lang="ro">Noutati</value>
<value xml:lang="th">à¸à¸à¸«à¸¡à¸²à¸¢à¸à¹à¸²à¸§</value>
+ <value xml:lang="vi">Nháºn tin má»i</value>
<value xml:lang="zh">æ°é»</value>
<value xml:lang="zh_TW">æ°è</value>
</property>
@@ -64,6 +67,7 @@
<value xml:lang="pt_BR">Segmento de marketing</value>
<value xml:lang="ro">Segment de Piata</value>
<value xml:lang="th">สà¹à¸§à¸à¸à¸à¸à¸à¸²à¸£à¸à¸¥à¸²à¸</value>
+ <value xml:lang="vi">Phân khúc thá» trÆ°á»ng</value>
<value xml:lang="zh">å¸åºååº</value>
<value xml:lang="zh_TW">è¡é·åå</value>
</property>
@@ -76,6 +80,7 @@
<value xml:lang="pt_BR">Segmento de vendas</value>
<value xml:lang="ro">Segment de Vanzare</value>
<value xml:lang="th">สà¹à¸§à¸à¸à¸à¸à¸à¸²à¸£à¸à¸²à¸¢</value>
+ <value xml:lang="vi">Phân khúc kinh doanh</value>
<value xml:lang="zh">éå®ååº</value>
<value xml:lang="zh_TW">é·å®åå</value>
</property>
@@ -83,6 +88,7 @@
<value xml:lang="en">Access Code</value>
<value xml:lang="it">Codice di accesso</value>
<value xml:lang="pt_BR">Código de acesso</value>
+ <value xml:lang="vi">Mã truy nháºp</value>
<value xml:lang="zh">访é®ç </value>
<value xml:lang="zh_TW">åå碼</value>
</property>
@@ -95,6 +101,7 @@
<value xml:lang="pt_BR">Externo</value>
<value xml:lang="ro">Extern</value>
<value xml:lang="th">ภายà¸à¸à¸</value>
+ <value xml:lang="vi">Há» thá»ng ngoà i</value>
<value xml:lang="zh">å¤é¨</value>
<value xml:lang="zh_TW">å¤é¨</value>
</property>
@@ -107,6 +114,7 @@
<value xml:lang="pt_BR">Interno</value>
<value xml:lang="ro">Intern</value>
<value xml:lang="th">ภายà¹à¸</value>
+ <value xml:lang="vi">Ná»i bá»</value>
<value xml:lang="zh">å
é¨</value>
<value xml:lang="zh_TW">å
§é¨</value>
</property>
@@ -119,6 +127,7 @@
<value xml:lang="pt_BR">Parceiro</value>
<value xml:lang="ro">Gestit de un Partener</value>
<value xml:lang="th">หุà¹à¸à¸ªà¹à¸§à¸à¸à¸²à¸£à¸à¸§à¸à¸à¸¸à¸¡</value>
+ <value xml:lang="vi">Äá»i tác</value>
<value xml:lang="zh">已管ççä¼ä¼´</value>
<value xml:lang="zh_TW">夥伴</value>
</property>