Commit Graph
98 Commits
Author SHA1 Message Date
Hans Bakker 14c0c8dcda help general index cleanedup, started first features list but need 'orderedlist' docbook tag for that
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834369 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 07:17:17 +00:00
Ashish Vijaywargiya 0664a96244 Applied improved patch from jira issue OFBIZ-3165 - Add additional screen for gift card certificate buying functionality by CSR in Order manager application in add item page.
Following points are covered in this patch:

1) Removed hard-coded product ids for Gift certificates products from GiftCertificates.ftl and added new category type called "GIFT_CARD_CATEGORY" and related demo data, also added groovy script for fetching logic to address this issue.

2) Also handled hard-coded surveyId in AddGiftCertificates.groovy

3) Added user friendly messages if required data is not available .

4) Added missing license header in GiftCertificates.ftl

Thanks Divesh for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834042 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 12:53:03 +00:00
Ashish Vijaywargiya fc45518ad6 Applied patch from jira issue OFBIZ-3149 - Improve Category association in eBay.
Recently multi store support for Ebay has been implemented. For the multi store support we need ProductStore > ProdCatalog > ProductCategory association. For EBay we define specific categories of type EBAY_CATEGORY, only those products that are associated to an EBay category are eligible for eBay export. In the current implementation there is no proper prodCatalogCategoryTypeId which can be used to associate eBay category to ProdCatalog, one way to associate an eBay category to ProdCatalog is as a PCCT_BROWSE_ROOT category, thus we have two categories associated to the catalog as BROWSE_ROOT, the other one is for online store. Technically, this is wrong, a catalog should be associated with only one browse root category. Due to this wrong association the eBay category doesn't show up on the advance search page of EBAY webapp, instead online store's browse root category is shown which may also contain those products which are not meant to be exported to eBay. So this category associations need to be fixed, and following is how this can be resolved:

   1. Create a new ProdCatalogCatagoryType PCCT_EBAY_ROOT
   2. Define a worker method in CatalogWorker to derive the top level (root) ebay category
   3. Now in the advance search form, first look for top level ebay category associated to the selected catalog
          * If found, derive sub category list of the top level ebay category and display, else display the top level ebay category itself
          * If not found, derive the top level browse root category (PCCT_BROWSE_ROOT) and display the sub category list for it

Thanks Parimal Gain for the contribution.
Special thanks to Mridul Pathak (Zone of Sharp Mind :-)) for discussing implementation plans & providing wonderful notes.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832713 13f79535-47bb-0310-9956-ffa450edef68
2009-11-04 12:05:09 +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
Hans Bakker ea76601e6c added example product demo attributes and adapted the form
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@830846 13f79535-47bb-0310-9956-ffa450edef68
2009-10-29 05:15:10 +00:00
Jacques Le Roux d24631d047 Podomètre in French is not Podometer in English, thanks to Scott
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829710 13f79535-47bb-0310-9956-ffa450edef68
2009-10-26 07:14:11 +00:00
Jacques Le Roux 1fbb17a252 One more meter type (actually more because I left some empty lines there, though podometer might be useful too, who knowns ?)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829676 13f79535-47bb-0310-9956-ffa450edef68
2009-10-25 23:02:30 +00:00
Jacques Le Roux 6a81be6e9e Some more meter types
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829674 13f79535-47bb-0310-9956-ffa450edef68
2009-10-25 22:47:23 +00:00
Jacopo Cappellato a38f8202aa New util method to find out if a "type" record has a given ancestor.
The method is also used to clean the code related to the two existing marketing package types (that have now in common the same parent).
This will make the framework more flexible because you will be able to create a new product subtype and the system will treat them as its parent type; then you can add custom code to treat it in the special way (if needed). This pattern can be extended in other areas of the system, starting from product types (right now it is also applied to marketing packages).
Thanks to Mridul Pathak for the patch - OFBIZ-2902

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813413 13f79535-47bb-0310-9956-ffa450edef68
2009-09-10 13:02:33 +00:00
Hans Bakker 073906c5df help system now using the mapKey in ContentAssoc so its size is now limited to 100 instead of 20. Suggestion made by Scott: thanks
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813311 13f79535-47bb-0310-9956-ffa450edef68
2009-09-10 08:49:30 +00:00
Adam Heath eab8daf4c0 Typo fixing the typo fix.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813156 13f79535-47bb-0310-9956-ffa450edef68
2009-09-09 22:56:18 +00:00
Adam Heath 57c002d86b Typoe fix.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813150 13f79535-47bb-0310-9956-ffa450edef68
2009-09-09 22:45:27 +00:00
Adam Heath b1c68ae44e Add Library of Congress identification.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@812303 13f79535-47bb-0310-9956-ffa450edef68
2009-09-07 23:20:20 +00:00
Scott Gray 87e0d19d96 Add EAN GoodIdentificationType
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@812047 13f79535-47bb-0310-9956-ffa450edef68
2009-09-07 09:14:57 +00:00
Hans Bakker d6a65c264a helpscreens placeholders now converted to the docbook V5 format inclusive of namespace support, updated the apache ofbiz document to explain how to create helpscreens, created an ftl template to display the docbook help screens, docbook pdf generation now almost working: it can create a local pdf file, but streaming to the browser does not work..if anybody interested to help me check modelscreenwidget.java line 1206
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@811787 13f79535-47bb-0310-9956-ffa450edef68
2009-09-06 09:39:20 +00:00
Ashish Vijaywargiya 6dc9720309 Another update on Google Base.
Following things are done in this commit:

1) Added new entity GoogleBaseConfig and reading the values from there. Also kept option to read configuration values from property file.
2) Added new ProductCategoryType record for Google Base - Thanks Jacopo for your suggestion on this.
3) Prepared data for demo purpose in DemoProduct.xml file - This demo contains the association of few product with Google Category.
4) Also prepared demo data for GoogleBaseConfig entity.
5) Provided option to have default value of webSiteUrl on the GoogleExport form - for this refer productsExportToGoogle.groovy file.

Thanks Pranay for discussing few things with me in b/w this phase of development.

In next Commit I will provide UI for GoogleBaseConfig entity(CRUD operations) so it will be easy for end user to update values in this entity easily instead of moving to webtools and do the needful.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@809552 13f79535-47bb-0310-9956-ffa450edef68
2009-08-31 12:06:14 +00:00
Hans Bakker d34ad96ab6 extended the help template, moved help xmlfiles for easy editing into the file system, started to look at docbook for ofbiz documents
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@805338 13f79535-47bb-0310-9956-ffa450edef68
2009-08-18 10:01:45 +00:00
Hans Bakker c76137a4c7 several adjustments to the help system, now using contentId to select and use underscore in contentId
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@804881 13f79535-47bb-0310-9956-ffa450edef68
2009-08-17 07:15:41 +00:00
Hans Bakker 966b32d5af The 'new' help system
A new help system is implemented which is compatible with the current system which uses the ofboz.docs.org site to store the data.

The new help system has a number of advantages over the old version:
1. complete multilanguage without config xml files, using the locale.
2. Having an automatic multilevel index of all help pages using the ContentAssoc entity
3. Using the content manager for retrieval.
4. Template driven, aware of the different visual themes.
5. A first step towards the storage of OFBiz documentation within the OFBiz system itself.
6. Easy update via normal svn in seed data.
7. Aware of portlets on (userdefined) Portal pages.
8. Create awareness of the capabilities of the content component

The reason of this development was the requirement to provide user documents to the customers of Antwebsystems Co.Ltd

Some of the possible extensions could be:
1. a search function
2. print all or specific help files in PDF format
3. make the help screens work better with the business theme
4. Explain how help can be extended
5. In the help screen be able to send a message to the local support team
6. But most of all, create more help content!


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@804546 13f79535-47bb-0310-9956-ffa450edef68
2009-08-16 02:04:17 +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
Vikas Mayur a97c5ec812 Added the ability to cancel received items against a purchase order if the user make a mistake and receive something incorrectly.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@796272 13f79535-47bb-0310-9956-ffa450edef68
2009-07-21 12:28:52 +00:00
Ashish Vijaywargiya 170aa8100a Adding more data to test role based permissions on catalog manager.
For testing this you can login by user ltdadmin & ltdadmin1.
And then can update records in consecutive tabs present in the EditProduct screen.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@795728 13f79535-47bb-0310-9956-ffa450edef68
2009-07-20 09:40:55 +00:00
Ashish Vijaywargiya 91acdad4ca Applied patch from jira issue OFBIZ-2664 (Portlet to show best selling products of the day).
Thanks Chirag for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@788976 13f79535-47bb-0310-9956-ffa450edef68
2009-06-27 14:15:15 +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 1b5f2d0c8c Fix: Enumeration Data missing for Inventory Item Detail Reason. Applied patch from Mridul Pathak, part of OFBIZ-2501 (https://issues.apache.org/jira/browse/OFBIZ-2501)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@777012 13f79535-47bb-0310-9956-ffa450edef68
2009-05-21 08:43:19 +00:00
Vikas Mayur b4a42dc537 Now Shipping Total adjustments can be applied using promotion. User can specify percentage discount on a specific shipping method.
Applied patch from Arun Patidar, part of OFBIZ-2488 (https://issues.apache.org/jira/browse/OFBIZ-2488)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@776581 13f79535-47bb-0310-9956-ffa450edef68
2009-05-20 06:25:23 +00:00
David E. Jones 8a7c6083b9 Added some comments about feature application types to clear up some confusion and misconceptions
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763515 13f79535-47bb-0310-9956-ffa450edef68
2009-04-09 04:41:23 +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
Hans Bakker cbbe02a1d8 many cleanups, moved customer requests back into order, fixed the edit contactmech in portal as reported in the mailing list
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@761186 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 06:57:09 +00:00
Bruno Busco 32e70a513b Added seed data to have a WebSite entity for every webapp.
The new WebSite entity sets a relation to a VisualThemeSet so that when selecting a VisualTheme, only applicable VisualThemes are available in the VisualTheme Lookup screen.
More work is needed (i.e. move the OrderEntry WebSite from demo to seed) but I need to be sure this is a good direction.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@744518 13f79535-47bb-0310-9956-ffa450edef68
2009-02-14 16:42:49 +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 aad8bae98a Removed obsolete permissions
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@726717 13f79535-47bb-0310-9956-ffa450edef68
2008-12-15 15:43:44 +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
Jacques Le Roux aa65c1ab6e 2 new promotions rules conditions derived from "Order sub-total X in last Y Months"
respectively 
    "Order sub-total X since beginning of current year" 
and  
    "Order sub-total X last year"
+ some French translation amendments

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@712167 13f79535-47bb-0310-9956-ffa450edef68
2008-11-07 15:43:24 +00:00
Adrian Crum 50724da6b9 More temporal expression work - additional JavaDocs, code fixups, converted all job sandbox jobs to temporal expressions.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@695995 13f79535-47bb-0310-9956-ffa450edef68
2008-09-16 18:19:55 +00:00
Jacques Le Roux 1baa53d5b9 A patch from Mridul Pathak "Added support for uploading additional Product Views (images)" (https://issues.apache.org/jira/browse/OFBIZ-1930) - OFBIZ-1930
I fixed an, unrelated to patch, problem in EditProductContentContent.groovy. This is not the 1st time I cross this type of issue. I checked it does not appear on demo server and I guess it was not appearing with bsh  before. I'm not sure of its origin but it seems related to my configuration. I use, from my machine default, "Central European Summer Time" and demo server uses "Central Daylight Time". But I can't see why it affects my machine and not the demo server : there is no origin here (maybe GMT, but obviously it's not the case)
The lines I added are (+ import)
} else {
    fromDate = ObjectType.simpleTypeConvert(fromDate, "Timestamp", null, null, false)    
}
(I intentionnaly let the line without semi-colon as it's not mandatory in Groovy) 


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@689772 13f79535-47bb-0310-9956-ffa450edef68
2008-08-28 10:02:47 +00:00
Jacopo Cappellato 795a920fe4 Moved the bi component from specialpurpose to the framework folder; moved artifacts from the bi component to the proper components.
Everything should be in place now, except for a convenience service (in the bi component) that quickly initializes the datawarehouse for demo purposes: this service calls two services from the applications (wrong dependency); I will fix this soon by moving it in some other places... however it is not a big deal for now because the service is really only useful to quickly test the prototype.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@677587 13f79535-47bb-0310-9956-ffa450edef68
2008-07-17 14:12:38 +00:00
Bilgin Ismet Ibryam b9488000af Changed AGGREGATED_CONF product type to physical, needed for inventory reservations.
Another small fix in reserveForInventoryItemInline method.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@675929 13f79535-47bb-0310-9956-ffa450edef68
2008-07-11 12:19:07 +00:00
Jacopo Cappellato 631e4b56cb Added support for non-serialized status to mark items as defective or on-hold and exclude them form the inventory reservation and issuance services; enhanced inventory counting services to consider only non serialized items with an empty status (i.e. exclude on-hold or damaged items) but also added the statusId field so that it is possible to count on-hold or damaged items.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@664069 13f79535-47bb-0310-9956-ffa450edef68
2008-06-06 18:24:20 +00:00
Ashish Vijaywargiya 36bf41ae69 Moved the files to product component suggested by David.
Also improved the naming convention of file for easy maintenance and search purpose for 
the developer/user point of view.




git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@663627 13f79535-47bb-0310-9956-ffa450edef68
2008-06-05 14:28:42 +00:00
David E. Jones e4804fe553 Applied patch from Bilgin Ibryam in Jira #OFBIZ-1756 to extend the support for by hours and by days in recurrence info and use them as part of conditions for promotions
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@658108 13f79535-47bb-0310-9956-ffa450edef68
2008-05-20 05:48:51 +00:00
Si Chen 874af06e1b Removing the ability to cancel a packed shipment, which would cause the shipment to be cancelled and yet the inventory has already been issued, etc.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@657925 13f79535-47bb-0310-9956-ffa450edef68
2008-05-19 19:19:24 +00:00
Jacopo Cappellato 5a0938e0f7 Enhanced the service that pulls materials for production runs out of inventory: some bug fixes plus the ability to specify if reservations can be overriden; useful for materials that are also sold.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@644805 13f79535-47bb-0310-9956-ffa450edef68
2008-04-04 18:10:10 +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
Marco Risaliti 5d73342b9e Create a new product store email notification execute on quoteStore event for quote creation status (Part of issue OFBIZ-1658).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@629220 13f79535-47bb-0310-9956-ffa450edef68
2008-02-19 20:40:57 +00:00
Bilgin Ismet Ibryam a16275649e Applied my (modified) patch from JIRA Issue # OFBIZ-1453 "store/load possibility for AGGREGATED product configurations".
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@613216 13f79535-47bb-0310-9956-ffa450edef68
2008-01-18 17:47:01 +00:00
David E. Jones 8678ac8c5b Changed long-varchar back to id for the customPriceCalcService field; also added comments to make it clear that this points to a Custoso added comments to make it more clear that this points to a CustomMethod and isn't the service name itself; also noted that the field name is misleading for this and one more consistent with patterns used elsewhere would be better, but not really into the idea of changing this right now
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@597019 13f79535-47bb-0310-9956-ffa450edef68
2007-11-21 10:15:42 +00:00