Commit Graph
157 Commits
Author SHA1 Message Date
Scott Gray ce66eb6c06 Added fixedAssetId and relationship to CostComponent to so that it is easier to determine the source of the cost (in most cases the source is CostComponentCalc but for fixed asset usage it is FixedAssetStdCost)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881732 13f79535-47bb-0310-9956-ffa450edef68
2009-11-18 11:43:11 +00:00
Jacques Le Roux 5ccbd28e3b Revert r833113 & r833116 and remove title="Geo Point" as initially suggested by Erwan at https://issues.apache.org/jira/browse/OFBIZ-3153
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833264 13f79535-47bb-0310-9956-ffa450edef68
2009-11-06 00:44:33 +00:00
Jacques Le Roux 70a8c703ac Change the type of relation for Facilty to GeoPoint from one to many. Because of the elevation field in GeoPoint.
From Adrian's remarks at https://issues.apache.org/jira/browse/OFBIZ-3153 - OFBIZ-3153

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833136 13f79535-47bb-0310-9956-ffa450edef68
2009-11-05 19:22:16 +00:00
Jacques Le Roux 72331c96ad Change "Geo Point" title to "Point"
Change the type of relation for Postal Address to GeoPoint from one to many. Because of the elevation field in GeoPoint. A bit scifi for now, but maybe useful one day...)
Thanks to a discussion with Erwan "Relation title not needed on Facility entity" at https://issues.apache.org/jira/browse/OFBIZ-3153 - OFBIZ-3153

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833113 13f79535-47bb-0310-9956-ffa450edef68
2009-11-05 18:26:27 +00:00
Scott Gray 42aa98280d Adding memberComments as an alias for ProductCategoryMember.comments in the ProductAndCategoryMember view entity
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831834 13f79535-47bb-0310-9956-ffa450edef68
2009-11-02 09:30:29 +00:00
Jacopo Cappellato 1032ba881d Added the ability to define cost component formulae to a product: new ProductCostComponentCalc entity and crud services, and ui to manage the information. Modified standard costing calculation service to use the new entity. Also implemented a custom method (cost formula) that adds a percentage based adjustment
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831099 13f79535-47bb-0310-9956-ffa450edef68
2009-10-29 21:38:18 +00:00
Adam Heath e566ce1960 Add sequenceNum to ProductCategoryRollupAndChild view.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@830009 13f79535-47bb-0310-9956-ffa450edef68
2009-10-26 22:38:07 +00:00
Scott Gray 98f73bee0a Added three new fields to the Product entity:
productWeight
productDiameter
diameterUomId

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@817605 13f79535-47bb-0310-9956-ffa450edef68
2009-09-22 11:33:11 +00:00
Scott Gray f79b26dd69 increased the ProductFeature.idCode field from id to id-long (20 -> 60) as discussed on the dev list to better handle external identifiers
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813726 13f79535-47bb-0310-9956-ffa450edef68
2009-09-11 08:55:17 +00:00
Jacques Le Roux 7befd1d25e no tabs but 4 spaces in code files (*.ftl, *.gro*, *.java, *.xml)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@804935 13f79535-47bb-0310-9956-ffa450edef68
2009-08-17 11:01:25 +00:00
Marco Risaliti 5a85c095a6 New Shipment Gateway Config entities (OFBIZ-2589)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@796874 13f79535-47bb-0310-9956-ffa450edef68
2009-07-22 20:39:35 +00:00
David E. Jones 237d5f5104 Small reorganization of ProductStore fields to move the deprecated ones to the bottom
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@794912 13f79535-47bb-0310-9956-ffa450edef68
2009-07-16 23:57:41 +00:00
Jacopo Cappellato 33c0f74f50 Implemented simple "sell-through" (http://en.wikipedia.org/wiki/Sell-through) information to the find inventory screen.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@782662 13f79535-47bb-0310-9956-ffa450edef68
2009-06-08 15:06:41 +00:00
Vikas Mayur 0f1ffdf0f8 Added a field to ProductStore to specify Store Credit Account type (FIN_ACCOUNT or BILLING_ACCOUNT) for refund return. For Demo ProductStore it is default to Financial Account.
The work flow is based on following steps:
1) If for a return both finAccountId and billingAccountId are supplied, then preference goes to the setting on Product Store. A warning message is shown so that the 
   user know which account is used.
2) If a finAcccountId is supplied then first billing account with -ve amount are searched and if it is found then amount is credit to the billing account else it goes to 
   financial account.
3) If a billingAccountId is supplied then it is used to credit the refund amount.
4) If none of them is supplied, then preference again goes to the setting on Product Store.

Patch applied from Mridul Pathak, part of OFBIZ-2502 (https://issues.apache.org/jira/browse/OFBIZ-2502)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@781804 13f79535-47bb-0310-9956-ffa450edef68
2009-06-04 17:32:02 +00:00
Scott Gray 3689bf9f9b Moved the view entities ProductConfigAndProduct and ProductFacilityAndPostalAddress to packages more appropriate than org.ofbiz.product.product
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@780543 13f79535-47bb-0310-9956-ffa450edef68
2009-06-01 01:14:41 +00:00
Vikas Mayur eebe04dc4c Done following fixes:
1) Moved the view entity to correct package.
2) Changed the view name as well as the entities used. Now the records are coming as expected.
3) Corresponding changes in the findOrdersToPickMove service.

The main purpose of this view entity is to find out the location (areaId) of the inventory item that is reserved/picked for a particular order. For example if an order has two 
order items X and Y and items X is picked from area A and item Y is picked from area B of a facility (where obviously area A and B are associated to a pick/primary location), 
then while grouping this order in facility > picking screen by "Group by Warehouse Area" method will show order under Multi Locations group. To clarify more on this grouping
method, grouping is done only with the areaId and the locationSeqId (which is a combination of areaId, aisleId, sectionId, levelId, positionId).  


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@779041 13f79535-47bb-0310-9956-ffa450edef68
2009-05-27 07:44:17 +00:00
Vikas Mayur 79fae570d0 Adding back the feature to show/hide out of stock products on site. This new implementation is configurable through a new field showOutOfStockProducts (by default equal to Y) on
ProductStore. A new field lastInventoryCount on ProductFacility is also added and it is a mirror of availableToPromiseTotal of a product at a certain point of time and is 
being updated every hour by a schedule service to reflect the current value of inventory count in the system.
If showOutOfStockProducts is equals to N and for a particular product lastInventoryCount is <= zero, then this particular product will not be shown on the site. If the inventory
count becomes +ve again then the product will be again available on the site, in minimum one hour time but could possibly take long depending on the inventory levels.

Patch from Ratnesh Upadhyay, part of OFBIZ-2480 (https://issues.apache.org/jira/browse/OFBIZ-2480).



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@778451 13f79535-47bb-0310-9956-ffa450edef68
2009-05-25 16:37:23 +00:00
Vikas Mayur b6ccc85943 Reverted my last commit in rev. 777498. This need to support configuration so that this feature can be turned on/off.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@777651 13f79535-47bb-0310-9956-ffa450edef68
2009-05-22 18:36:19 +00:00
Vikas Mayur f1ef43b20e Now onwards out of stock items will not show up in the ecommerce site. Added a scheduled service that will run hourly and will update the new attribute isOutOfStock on
Product entity to Y/N where Y means item is out of stock and N means item is in stock. This process will be efficient in a way that the database interaction to check
whether item is out of stock will not take place everytime products are loaded on the ecommerce site.
Applied my patch (initially contributed by Amit Sharma, I have done some improvements over this patch), part of OFBIZ-2480 (https://issues.apache.org/jira/browse/OFBIZ-2480)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@777498 13f79535-47bb-0310-9956-ffa450edef68
2009-05-22 12:42:12 +00:00
Vikas Mayur 444cf326ff Functionality for "Weight Packages Only" option on pack order screen.
Applied patch from Akash Jain, part of OFBIZ-2407 (https://issues.apache.org/jira/browse/OFBIZ-2407).
Note: Excluding only framework/common/config/CommonUiLabels.xml, as this need framework rights.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@775128 13f79535-47bb-0310-9956-ffa450edef68
2009-05-15 13:20:56 +00:00
Jacques Le Roux 058d6aed57 A patch from Ashish Vijaywargiya "Change Copyright Year" (https://issues.apache.org/jira/browse/OFBIZ-2346) - OFBIZ-2346
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@772936 13f79535-47bb-0310-9956-ffa450edef68
2009-05-08 10:56:14 +00:00
Marco Risaliti a657adadf8 Move payment.properties to PaymentGatewayConfig entities (OFBIZ-2269)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763782 13f79535-47bb-0310-9956-ffa450edef68
2009-04-09 19:45:31 +00:00
Jacques Le Roux b9c3ddef08 2d part and end of an effort to remove trailing spaces
[ \t]+$ => "" (empty)
Should be easier to review when committing changes with trailing spaces removed automatically by anyedit or such tool (please refer to http://docs.ofbiz.org/x/mg)

Of course this effort to remove trailing spaces has no functional implications.

Actually, I was doing a 1st commit and as it's long to upload, I got conflicts with r763135
In the meantime I did some refactoring also in *.java and *.groovy files :
){ => ) {
if( => if (
while( => while (
}else => } else
else{ => else {
switch( => switch (
try{ => try {
}catch => } catch
catch( => catch (
}finally{ => } finally {

So these changes are also in this commit, should not be a problem anyway.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763175 13f79535-47bb-0310-9956-ffa450edef68
2009-04-08 10:54:51 +00:00
Jacques Le Roux a5042291f7 1st part of an effort to remove trailing spaces
" +/> => "/>
Should be easier when dealing with Eclipse S/R regexp

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762648 13f79535-47bb-0310-9956-ffa450edef68
2009-04-07 08:27:15 +00:00
Vikas Mayur 43266bac3e For creating picklist, grouping can be done with two new methods Warehouse Area and Number of order items
in addition to the default option i.e. Shipping Method.

Patch from Arun Patidar, reviewed by Pranay Pandey and applied from OFBIZ-2223 (https://issues.apache.org/jira/browse/OFBIZ-2223)




git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762399 13f79535-47bb-0310-9956-ffa450edef68
2009-04-06 15:49:17 +00:00
Hans Bakker 05288d52f1 remove the cause of some warning messages
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@748419 13f79535-47bb-0310-9956-ffa450edef68
2009-02-27 07:51:41 +00:00
Hans Bakker 0cf21cecd4 added a find option to product configuration items, and added the possibility to see in which product a configuration item is used.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@747025 13f79535-47bb-0310-9956-ffa450edef68
2009-02-23 14:11:53 +00:00
Bruno Busco efadece8f4 VisualThemes for Ecommerce (https://issues.apache.org/jira/browse/OFBIZ-2106)
The ProductStore entity has now a visualThemeId that selects the VisualTheme to be used in the Ecommerce.
This can be set in the EditProductStore form selecting a theme between the themes that belong to the "ECOMMERCE" VisualThemeSet

To the following ProductStore fields has been applied the entity deprecation pattern:
<field name="oldStyleSheet" col-name="STYLE_SHEET" type="url"></field>
<field name="oldHeaderLogo" col-name="HEADER_LOGO" type="url"></field>
<field name="oldHeaderMiddleBackground" col-name="HEADER_MIDDLE_BACKGROUND" type="url"></field>
<field name="oldHeaderRightBackground" col-name="HEADER_RIGHT_BACKGROUND" type="url"></field>

The first part of the ecommerce header.ftl (the part defining the <HEAD> tag content) has been moved to a new headerHead.ftl file. This allows all the theme defined header.ftl to include this common part that is mainly inclusion of theme defined resources and should never change (code reuse).

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@746544 13f79535-47bb-0310-9956-ffa450edef68
2009-02-21 17:18:25 +00:00
Hans Bakker 0402a21952 added supplier lookup, modified the sales/purchase input start screen to look better....should actually be converted to forms...do that next time
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@746158 13f79535-47bb-0310-9956-ffa450edef68
2009-02-20 05:59:03 +00:00
Jacques Le Roux 7467abd9da A modified patch from Eric De Maulde "Product image auto scale" '(https://issues.apache.org/jira/browse/OFBIZ-2128) - OFBIZ-2128
I simply added a dynamic directories creation. This patch works but maybe we could use and API for better result (see Jira issue)




git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739042 13f79535-47bb-0310-9956-ffa450edef68
2009-01-29 22:06:32 +00:00
Jacques Le Roux 0500d6baef A 1st commit for "Add geolocation to data model" (https://issues.apache.org/jira/browse/OFBIZ-1923) OFBIZ-1923
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@735404 13f79535-47bb-0310-9956-ffa450edef68
2009-01-18 09:09:32 +00:00
David E. Jones 3f2afba154 Changed to honor the WebSite.allowProductStoreChange field again
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@735396 13f79535-47bb-0310-9956-ffa450edef68
2009-01-18 07:44:05 +00:00
David E. Jones dced19567a Moved product store specific field from framework/webapp component to product component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@734897 13f79535-47bb-0310-9956-ffa450edef68
2009-01-16 02:57:19 +00:00
David E. Jones 874f02e9da Manual merge of typecheckcleanup200810 branch as of rev 731346 in that branch, resolved all conflicts; with this BigDecimal is not the native type for many entity fields and is used for many calculations; some work is still needed in certain areas of the project but this covers the most critical ones; thanks especially to Scott for his work on this
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@731851 13f79535-47bb-0310-9956-ffa450edef68
2009-01-06 07:13:36 +00:00
Hans Bakker c928d9261d improove the bomlist find screen
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@731841 13f79535-47bb-0310-9956-ffa450edef68
2009-01-06 06:07:46 +00:00
David E. Jones 3269e7602c Various cleanups dones while reviewing functionality including formatting, refactoring, better descriptions and consistent defaults. In general no functionality change, though did add a default of N for the require return receive setting on the ProductStore
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@725022 13f79535-47bb-0310-9956-ffa450edef68
2008-12-10 07:31:39 +00:00
Adrian Crum 061b733f5e BalanceInventoryItems performance improvement. Inventory receipts or returns in an installation that has thousands of backorders was running unacceptably slow. This commit fixes that.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@723764 13f79535-47bb-0310-9956-ffa450edef68
2008-12-05 15:35:12 +00:00
Hans Bakker c9fde2784c added view ProductFacilityAndPostalAddress, to be able to list products by geographic location
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@699193 13f79535-47bb-0310-9956-ffa450edef68
2008-09-26 06:40:35 +00:00
Ashish Vijaywargiya 2308a8c95a Applied patch from Surya Kusumakar from Jira Issue # OFBIZ-1963.
Added support for migrating FacilityRole to FacilityParty.

Thanks Surya Kusumakar for your contribution.
Special thanks to Mr. Pranay Pandey for his support :-).

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@698159 13f79535-47bb-0310-9956-ffa450edef68
2008-09-23 12:37:06 +00:00
Bilgin Ismet Ibryam e315ee9310 Product feature i18n fix from Rashko Rejmer.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@690930 13f79535-47bb-0310-9956-ffa450edef68
2008-09-01 09:52:49 +00:00
Jacques Le Roux 92dacb9091 Remove
taxCategory
    taxVatCode
    taxDutyCode
fields from Product entity and all things related. 


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@690360 13f79535-47bb-0310-9956-ffa450edef68
2008-08-29 18:29:57 +00:00
Jacques Le Roux 94591ccc4d Following description added for the workEffortParentId field in rev. 677193 by Jacopo, I added some descriptions here.
But I quickly realized, as David explained, that "We can't document every little thing". 

The best in such case is simply to use he relations view in entity maintenance feature in Webtools to see which fields relate with which entities


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@686636 13f79535-47bb-0310-9956-ffa450edef68
2008-08-17 19:49:23 +00:00
Bilgin Ismet Ibryam 4bd91223f8 Applied the patch from JIRA Issue # OFBIZ-1912 "Configurable products with Virtual product options".
Added a new entity ConfigOptionProductOption to store selected variant products per configuration.
Moved a code snippet about products with VV_FEATURETREE from ShoppingCartEvents to ProductWorker.
Added a demo product PIZZA to test demonstrate Configurable products with Virtual product options. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@685807 13f79535-47bb-0310-9956-ffa450edef68
2008-08-14 08:30:07 +00:00
Adrian Crum cd6b23e3fd Added parentFacilityId to the Facility entity.
I added a CommonEntityChildren UI label to CommonUiLabels.xml because a number of components implement parent->child relationships and they all have their own "Children" UI label. This will help reduce UI label redundancy. I'll make the change in the other components in another commit.

Internationalization note: this commit contains new UI labels.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@680016 13f79535-47bb-0310-9956-ffa450edef68
2008-07-26 17:15:12 +00:00
Hans Bakker 74ff3e83ac created a automatic subscription extension, improved the (product) subscription screens, and added 3 fields in the subscription and subscription resource to enable this function
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@661283 13f79535-47bb-0310-9956-ffa450edef68
2008-05-29 10:31:14 +00:00
Vikas Mayur e00f43ee08 Adding attributes defaultShipmentBoxTypeId to Product entity (for choosing default box type for a product) and boxWeight, weightUomId to ShipmentBoxType entity resp. (for information about weight)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@650820 13f79535-47bb-0310-9956-ffa450edef68
2008-04-23 10:36:58 +00:00
Hans Bakker 28b1b97e78 removed duplicate, found by Bilgin, thanks!
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@645447 13f79535-47bb-0310-9956-ffa450edef68
2008-04-07 10:34:17 +00:00
Hans Bakker 4b0df8671a next version of the alternative variant selection method
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@645387 13f79535-47bb-0310-9956-ffa450edef68
2008-04-07 06:00:59 +00:00
Jacopo Cappellato e4519bd538 Added field (and logic) to product store to enable/disable the recalculation of reservations for new backorders.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@644956 13f79535-47bb-0310-9956-ffa450edef68
2008-04-04 22:10:47 +00:00
Hans Bakker 034175a4f4 partial implementation of the new Variant selection method. Renamed the selection on the product using the enumeration entity, added some productworker methods. As long as not selected on the product, the current functions of the system are not changed.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@644221 13f79535-47bb-0310-9956-ffa450edef68
2008-04-03 08:33:50 +00:00