Re: svn commit: r1167015 - in /ofbiz/trunk: applications/accounting/entitydef/ applications/order/config/ applications/order/data/ applications/order/entitydef/ applications/order/script/org/ofbiz/order/order/ applications/order/script/org/ofbiz/order/test...

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r1167015 - in /ofbiz/trunk: applications/accounting/entitydef/ applications/order/config/ applications/order/data/ applications/order/entitydef/ applications/order/script/org/ofbiz/order/order/ applications/order/script/org/ofbiz/order/test...

Deepak Dixit-2
Hi Hans,

inline:

On Sep 9, 2011, at 12:10 PM, [hidden email] wrote:

> Author: hansbak
> Date: Fri Sep  9 06:40:28 2011
> New Revision: 1167015
>
> URL: http://svn.apache.org/viewvc?rev=1167015&view=rev
> Log:
> New product type: Fixed Asset Usage For Rental of an asset which is shipped from and returned to inventory. Including Junit test and demo data. More explanation will follow in a blog on the 'what is new page'
>
> Modified:
>    ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
>    ofbiz/trunk/applications/order/config/OrderUiLabels.xml
>    ofbiz/trunk/applications/order/data/OrderTypeData.xml
>    ofbiz/trunk/applications/order/entitydef/entitymodel_view.xml
>    ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml
>    ofbiz/trunk/applications/order/script/org/ofbiz/order/test/ShoppingCartTests.xml
>    ofbiz/trunk/applications/order/servicedef/secas.xml
>    ofbiz/trunk/applications/order/servicedef/services.xml
>    ofbiz/trunk/applications/order/servicedef/services_return.xml
>    ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
>    ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java
>    ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java
>    ofbiz/trunk/applications/order/testdef/ShoppingCartTests.xml
>    ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/compareproducts.ftl
>    ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl
>    ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl
>    ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItemInc.ftl
>    ofbiz/trunk/applications/product/data/ProductTypeData.xml
>    ofbiz/trunk/applications/product/widget/catalog/CatalogMenus.xml
>    ofbiz/trunk/framework/images/webapp/images/ecommain.css
>    ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml
>    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/EditShoppingList.groovy
>    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl
>    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl
>    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl
>    ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml
>
> Modified: ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml?rev=1167015&r1=1167014&r2=1167015&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml (original)
> +++ ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml Fri Sep  9 06:40:28 2011
> @@ -4069,4 +4069,12 @@ under the License.
>             <key-map field-name="finAccountId"/>
>         </view-link>
>     </view-entity>
> +    
> +    <!-- Extend Entity Inventory Item for relation Fix Asset -->
> +    <extend-entity entity-name="InventoryItem">
> +        <field name="fixedAssetId" type="id"></field>
> +        <relation type="one" fk-name="FIXED_ASSET" title="FixedAsset" rel-entity-name="InventoryItem">
> +            <key-map field-name="fixedAssetId" rel-field-name="inventoryItemId"/>

In this commit fixedAssetId has beed added in InventoryItem entity, due to this changes some of view entity throwing out field alias in view entity.
Here is the list of those view entity that need to fix:
- InventoryItemAndDetail
- ItemIssuanceAndInventoryItem
- ItemIssuanceInventoryItemAndProduct
- ProductInventoryItemAndItemIssuance

Can you please have a look at it?


Thanks & Regards
--
Deepak Dixit


> +        </relation>
> +    </extend-entity>
> </entitymodel>

Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r1167015 - in /ofbiz/trunk: applications/accounting/entitydef/ applications/order/config/ applications/order/data/ applications/order/entitydef/ applications/order/script/org/ofbiz/order/order/ applications/order/script/org/ofbiz/order/test...

hans_bakker
Thank you for the tip, we will have a look at it....

Regards,
Hans

On Thu, 2011-09-22 at 18:18 +0530, Deepak Dixit wrote:

> Hi Hans,
>
> inline:
>
> On Sep 9, 2011, at 12:10 PM, [hidden email] wrote:
>
> > Author: hansbak
> > Date: Fri Sep  9 06:40:28 2011
> > New Revision: 1167015
> >
> > URL: http://svn.apache.org/viewvc?rev=1167015&view=rev
> > Log:
> > New product type: Fixed Asset Usage For Rental of an asset which is shipped from and returned to inventory. Including Junit test and demo data. More explanation will follow in a blog on the 'what is new page'
> >
> > Modified:
> >    ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
> >    ofbiz/trunk/applications/order/config/OrderUiLabels.xml
> >    ofbiz/trunk/applications/order/data/OrderTypeData.xml
> >    ofbiz/trunk/applications/order/entitydef/entitymodel_view.xml
> >    ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml
> >    ofbiz/trunk/applications/order/script/org/ofbiz/order/test/ShoppingCartTests.xml
> >    ofbiz/trunk/applications/order/servicedef/secas.xml
> >    ofbiz/trunk/applications/order/servicedef/services.xml
> >    ofbiz/trunk/applications/order/servicedef/services_return.xml
> >    ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
> >    ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java
> >    ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java
> >    ofbiz/trunk/applications/order/testdef/ShoppingCartTests.xml
> >    ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/compareproducts.ftl
> >    ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl
> >    ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl
> >    ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItemInc.ftl
> >    ofbiz/trunk/applications/product/data/ProductTypeData.xml
> >    ofbiz/trunk/applications/product/widget/catalog/CatalogMenus.xml
> >    ofbiz/trunk/framework/images/webapp/images/ecommain.css
> >    ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml
> >    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/EditShoppingList.groovy
> >    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl
> >    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl
> >    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl
> >    ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml
> >
> > Modified: ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
> > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml?rev=1167015&r1=1167014&r2=1167015&view=diff
> > ==============================================================================
> > --- ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml (original)
> > +++ ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml Fri Sep  9 06:40:28 2011
> > @@ -4069,4 +4069,12 @@ under the License.
> >             <key-map field-name="finAccountId"/>
> >         </view-link>
> >     </view-entity>
> > +    
> > +    <!-- Extend Entity Inventory Item for relation Fix Asset -->
> > +    <extend-entity entity-name="InventoryItem">
> > +        <field name="fixedAssetId" type="id"></field>
> > +        <relation type="one" fk-name="FIXED_ASSET" title="FixedAsset" rel-entity-name="InventoryItem">
> > +            <key-map field-name="fixedAssetId" rel-field-name="inventoryItemId"/>
>
> In this commit fixedAssetId has beed added in InventoryItem entity, due to this changes some of view entity throwing out field alias in view entity.
> Here is the list of those view entity that need to fix:
> - InventoryItemAndDetail
> - ItemIssuanceAndInventoryItem
> - ItemIssuanceInventoryItemAndProduct
> - ProductInventoryItemAndItemIssuance
>
> Can you please have a look at it?
>
>
> Thanks & Regards

--
Ofbiz on twitter: http://twitter.com/apache_ofbiz
Alternative ofbiz website: http://www.ofbiz.info
http://www.antwebsystems.com : Quality services for competitive rates.

Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r1167015 - in /ofbiz/trunk: applications/accounting/entitydef/ applications/order/config/ applications/order/data/ applications/order/entitydef/ applications/order/script/org/ofbiz/order/order/ applications/order/script/org/ofbiz/order/test...

Deepak Dixit-2
Thanks Hans :)

Thanks & Regards
--
Deepak Dixit


On Sep 22, 2011, at 6:37 PM, Hans Bakker wrote:

> Thank you for the tip, we will have a look at it....
>
> Regards,
> Hans
>
> On Thu, 2011-09-22 at 18:18 +0530, Deepak Dixit wrote:
>> Hi Hans,
>>
>> inline:
>>
>> On Sep 9, 2011, at 12:10 PM, [hidden email] wrote:
>>
>>> Author: hansbak
>>> Date: Fri Sep  9 06:40:28 2011
>>> New Revision: 1167015
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1167015&view=rev
>>> Log:
>>> New product type: Fixed Asset Usage For Rental of an asset which is shipped from and returned to inventory. Including Junit test and demo data. More explanation will follow in a blog on the 'what is new page'
>>>
>>> Modified:
>>>   ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
>>>   ofbiz/trunk/applications/order/config/OrderUiLabels.xml
>>>   ofbiz/trunk/applications/order/data/OrderTypeData.xml
>>>   ofbiz/trunk/applications/order/entitydef/entitymodel_view.xml
>>>   ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml
>>>   ofbiz/trunk/applications/order/script/org/ofbiz/order/test/ShoppingCartTests.xml
>>>   ofbiz/trunk/applications/order/servicedef/secas.xml
>>>   ofbiz/trunk/applications/order/servicedef/services.xml
>>>   ofbiz/trunk/applications/order/servicedef/services_return.xml
>>>   ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
>>>   ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java
>>>   ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java
>>>   ofbiz/trunk/applications/order/testdef/ShoppingCartTests.xml
>>>   ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/compareproducts.ftl
>>>   ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl
>>>   ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl
>>>   ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItemInc.ftl
>>>   ofbiz/trunk/applications/product/data/ProductTypeData.xml
>>>   ofbiz/trunk/applications/product/widget/catalog/CatalogMenus.xml
>>>   ofbiz/trunk/framework/images/webapp/images/ecommain.css
>>>   ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml
>>>   ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/EditShoppingList.groovy
>>>   ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl
>>>   ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl
>>>   ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl
>>>   ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml
>>>
>>> Modified: ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml?rev=1167015&r1=1167014&r2=1167015&view=diff
>>> ==============================================================================
>>> --- ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml (original)
>>> +++ ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml Fri Sep  9 06:40:28 2011
>>> @@ -4069,4 +4069,12 @@ under the License.
>>>            <key-map field-name="finAccountId"/>
>>>        </view-link>
>>>    </view-entity>
>>> +    
>>> +    <!-- Extend Entity Inventory Item for relation Fix Asset -->
>>> +    <extend-entity entity-name="InventoryItem">
>>> +        <field name="fixedAssetId" type="id"></field>
>>> +        <relation type="one" fk-name="FIXED_ASSET" title="FixedAsset" rel-entity-name="InventoryItem">
>>> +            <key-map field-name="fixedAssetId" rel-field-name="inventoryItemId"/>
>>
>> In this commit fixedAssetId has beed added in InventoryItem entity, due to this changes some of view entity throwing out field alias in view entity.
>> Here is the list of those view entity that need to fix:
>> - InventoryItemAndDetail
>> - ItemIssuanceAndInventoryItem
>> - ItemIssuanceInventoryItemAndProduct
>> - ProductInventoryItemAndItemIssuance
>>
>> Can you please have a look at it?
>>
>>
>> Thanks & Regards
>
> --
> Ofbiz on twitter: http://twitter.com/apache_ofbiz
> Alternative ofbiz website: http://www.ofbiz.info
> http://www.antwebsystems.com : Quality services for competitive rates.
>

Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r1167015 - in /ofbiz/trunk: applications/accounting/entitydef/ applications/order/config/ applications/order/data/ applications/order/entitydef/ applications/order/script/org/ofbiz/order/order/ applications/order/script/org/ofbiz/order/test...

hans_bakker
In reply to this post by Deepak Dixit-2
Thanks for the comment, fixed in revision 1176145
Regards,
Hans

On Thu, 2011-09-22 at 18:18 +0530, Deepak Dixit wrote:

> Hi Hans,
>
> inline:
>
> On Sep 9, 2011, at 12:10 PM, [hidden email] wrote:
>
> > Author: hansbak
> > Date: Fri Sep  9 06:40:28 2011
> > New Revision: 1167015
> >
> > URL: http://svn.apache.org/viewvc?rev=1167015&view=rev
> > Log:
> > New product type: Fixed Asset Usage For Rental of an asset which is shipped from and returned to inventory. Including Junit test and demo data. More explanation will follow in a blog on the 'what is new page'
> >
> > Modified:
> >    ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
> >    ofbiz/trunk/applications/order/config/OrderUiLabels.xml
> >    ofbiz/trunk/applications/order/data/OrderTypeData.xml
> >    ofbiz/trunk/applications/order/entitydef/entitymodel_view.xml
> >    ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml
> >    ofbiz/trunk/applications/order/script/org/ofbiz/order/test/ShoppingCartTests.xml
> >    ofbiz/trunk/applications/order/servicedef/secas.xml
> >    ofbiz/trunk/applications/order/servicedef/services.xml
> >    ofbiz/trunk/applications/order/servicedef/services_return.xml
> >    ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
> >    ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java
> >    ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java
> >    ofbiz/trunk/applications/order/testdef/ShoppingCartTests.xml
> >    ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/compareproducts.ftl
> >    ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl
> >    ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl
> >    ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItemInc.ftl
> >    ofbiz/trunk/applications/product/data/ProductTypeData.xml
> >    ofbiz/trunk/applications/product/widget/catalog/CatalogMenus.xml
> >    ofbiz/trunk/framework/images/webapp/images/ecommain.css
> >    ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml
> >    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/EditShoppingList.groovy
> >    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl
> >    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl
> >    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl
> >    ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml
> >
> > Modified: ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
> > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml?rev=1167015&r1=1167014&r2=1167015&view=diff
> > ==============================================================================
> > --- ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml (original)
> > +++ ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml Fri Sep  9 06:40:28 2011
> > @@ -4069,4 +4069,12 @@ under the License.
> >             <key-map field-name="finAccountId"/>
> >         </view-link>
> >     </view-entity>
> > +    
> > +    <!-- Extend Entity Inventory Item for relation Fix Asset -->
> > +    <extend-entity entity-name="InventoryItem">
> > +        <field name="fixedAssetId" type="id"></field>
> > +        <relation type="one" fk-name="FIXED_ASSET" title="FixedAsset" rel-entity-name="InventoryItem">
> > +            <key-map field-name="fixedAssetId" rel-field-name="inventoryItemId"/>
>
> In this commit fixedAssetId has beed added in InventoryItem entity, due to this changes some of view entity throwing out field alias in view entity.
> Here is the list of those view entity that need to fix:
> - InventoryItemAndDetail
> - ItemIssuanceAndInventoryItem
> - ItemIssuanceInventoryItemAndProduct
> - ProductInventoryItemAndItemIssuance
>
> Can you please have a look at it?
>
>
> Thanks & Regards

--
Ofbiz on twitter: http://twitter.com/apache_ofbiz
Alternative ofbiz website: http://www.ofbiz.info
http://www.antwebsystems.com : Quality services for competitive rates.