Commit Graph
51 Commits
Author SHA1 Message Date
Vikas Mayur 68dc9b9ec1 When items received against a PO are canceled, this also cancels the invoice. Added the ability to re-generate the invoice once canceled items are received again.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@796297 13f79535-47bb-0310-9956-ffa450edef68
2009-07-21 13:46:44 +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
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
Andrew Zeneski 64b3a8bf99 changed package name to match the component; also previous package name was not all lower case creating a new package when viewing in webtools
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763356 13f79535-47bb-0310-9956-ffa450edef68
2009-04-08 19:23:18 +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
Hans Bakker cd93cb31d4 be able to relate a project to an order (order component is not dependant on project manager)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@749560 13f79535-47bb-0310-9956-ffa450edef68
2009-03-03 08:07:35 +00:00
Hans Bakker 73abc819f5 corrected an error in QuoteWorkEffortView definition causing an error message in the startup log
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@726335 13f79535-47bb-0310-9956-ffa450edef68
2008-12-14 02:18:26 +00:00
Jacques Le Roux 4085538f6f Fix 2 erroneous entity view titles found by chance while working on ProtectedView
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@726131 13f79535-47bb-0310-9956-ffa450edef68
2008-12-12 22:04:33 +00:00
Jacques Le Roux 52595e4f48 A slightly modified patch from Bilgin Ibryam "Allow multi-pagination in a page" (https://issues.apache.org/jira/browse/OFBIZ-1935) - OFBIZ-1935
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@725053 13f79535-47bb-0310-9956-ffa450edef68
2008-12-10 10:39:16 +00:00
Hans Bakker caf7e4a2e1 show and enable to add content to customer requests
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@720114 13f79535-47bb-0310-9956-ffa450edef68
2008-11-24 04:44:00 +00:00
Bilgin Ismet Ibryam 9766672b3b A patch from Luke Prentice "OrderHeaderItemAndShipGroup should exclude facilityId from OrderItemShipGroup." - OFBIZ-1960
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@696160 13f79535-47bb-0310-9956-ffa450edef68
2008-09-17 05:46:25 +00:00
Hans Bakker 6111f33a31 allow contacts of the same customer account see each other customer requests
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@690628 13f79535-47bb-0310-9956-ffa450edef68
2008-08-31 03:19:51 +00:00
Ashish Vijaywargiya d7867af0b0 Patch from JIRA issue https://issues.apache.org/jira/browse/OFBIZ-1910 "Add support of fromDate & thruDate in CustRequestRole entity".
Slight change in Entity name in this commit.
In the attached patch the  name of entity was "CustomerRequestRole" but in this commit the name of new entity is "CustRequestParty"(Looked more close to the data model pattern).

Thanks Bilgin for your valuable Input on this.
I have also written the Migration service for providing the Backward compatibility.

Special thanks to Ratnesh & Jacopo in discussing with me on this work.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@686731 13f79535-47bb-0310-9956-ffa450edef68
2008-08-18 11:47:14 +00:00
Hans Bakker 759bf5a7e0 list all customer requests with optional workeffort....correcting link error
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@686168 13f79535-47bb-0310-9956-ffa450edef68
2008-08-15 07:36:16 +00:00
Jacques Le Roux 9df2242f77 More information for the related view
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@685084 13f79535-47bb-0310-9956-ffa450edef68
2008-08-12 08:40:19 +00:00
Hans Bakker cfceea64cb add the communicationEventlist (copied the form: see issue OFBIZ-1914) and related workefforts to the request view, also added a view to be able to do this.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@684392 13f79535-47bb-0310-9956-ffa450edef68
2008-08-10 01:17:03 +00:00
Jacopo Cappellato 6747f82760 Misc small enhancements to the Product Catalog "Inventory" screen.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@682281 13f79535-47bb-0310-9956-ffa450edef68
2008-08-04 07:58:52 +00:00
Hans Bakker a15543b13c some corrections to this view to remove the error messages in the startup log
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@678627 13f79535-47bb-0310-9956-ffa450edef68
2008-07-22 03:36:48 +00:00
Hans Bakker 35ec502a49 added partyId field to customerRequestType, created related view to partyReLationship to be able to list customerRequests by reponsible person and added new service to change customer request status
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@678339 13f79535-47bb-0310-9956-ffa450edef68
2008-07-21 04:08:30 +00:00
Jacques Le Roux 641ff10050 Update Copyright to 2008
A real replace in files feature was one of the reasons I use Eclipse 3.4 for near a year now (I even helped to test, a real must have :o)
Not sure previous commit was sent partially or not at all (I needed to update)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@677685 13f79535-47bb-0310-9956-ffa450edef68
2008-07-17 18:56:25 +00:00
Hans Bakker 9e307a06f2 show related customer requests on a comunication event view
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@677360 13f79535-47bb-0310-9956-ffa450edef68
2008-07-16 17:49:51 +00:00
Hans Bakker dc1773130b show communication events on a customer request overview
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@677306 13f79535-47bb-0310-9956-ffa450edef68
2008-07-16 15:24:18 +00:00
Jacopo Cappellato 7eb08a6233 Misc fixes for the MRP algorithm (including two reported by Daniel Riquelme in the dev list).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@613599 13f79535-47bb-0310-9956-ffa450edef68
2008-01-20 16:31:05 +00:00
Jacques Le Roux e4f26d95f6 Fix a typo
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@581509 13f79535-47bb-0310-9956-ffa450edef68
2007-10-03 06:41:28 +00:00
Jacques Le Roux a7f59bc445 At Chris Howe's demand with no complaints from anybody
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@580876 13f79535-47bb-0310-9956-ffa450edef68
2007-10-01 07:31:45 +00:00
Si Chen fffdfb6430 Add currency of order to order header and payment pref view. This helps us tell what currency maxAmount is in.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@578295 13f79535-47bb-0310-9956-ffa450edef68
2007-09-21 22:31:09 +00:00
Jacopo Cappellato dfd9dbd33c Removed old fields from old Jasper report files; removed an entity from a view definition because it was not linkable to the other ones.
Thanks to Adam Heath for the bug report OFBIZ-1115.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@554887 13f79535-47bb-0310-9956-ffa450edef68
2007-07-10 09:46:08 +00:00
Jacopo Cappellato cb6914ba5f Fixed wrong view entity definition, messed up by one of my last commits today.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@543453 13f79535-47bb-0310-9956-ffa450edef68
2007-06-01 10:08:11 +00:00
Jacopo Cappellato 7d70a84a06 Applied patch from Marco Risaliti (OFBIZ-1036) to add product descriptions for marketing packages components in the packing screen.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@543427 13f79535-47bb-0310-9956-ffa450edef68
2007-06-01 08:33:09 +00:00
Jacopo Cappellato 0cb5e6b248 Refactored code related to the Packing screen to support mkt pkg.
Thanks to Marco Risaliti for the initial patch (OFBIZ-1036) even if I have only partially applied it because I've choosen to follow a different approach for the packing screen.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@541891 13f79535-47bb-0310-9956-ffa450edef68
2007-05-26 13:18:19 +00:00
David E. Jones 7d70c41c12 Did a big search/replace to change all xsd file refs from www.ofbiz.org to ofbiz.apache.org
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@539504 13f79535-47bb-0310-9956-ffa450edef68
2007-05-18 15:47:14 +00:00
Jacopo Cappellato a6cde7466f Fixed some warning at startup.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@523097 13f79535-47bb-0310-9956-ffa450edef68
2007-03-27 21:57:13 +00:00
Jacopo Cappellato 61a7cf5484 Improvements to the MRP algorithm: sales orders ship group dates are now considered, better handling of orders without dates (they are now moved far in the future).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@522494 13f79535-47bb-0310-9956-ffa450edef68
2007-03-26 12:19:49 +00:00
Si Chen 4f9b8dd75f added orderName field to OrderHeaderItemAndRoles
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@518217 13f79535-47bb-0310-9956-ffa450edef68
2007-03-14 16:57:02 +00:00
Si Chen 25215a95b9 Approved requirements list now shows the quantity sold of each product. It reports the last 6 months of sales.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@501970 13f79535-47bb-0310-9956-ffa450edef68
2007-01-31 20:00:42 +00:00
Si Chen 7e11e00c64 OFBIZ-654: Replace the view-entity chain with a single count-distinct view entity.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@500365 13f79535-47bb-0310-9956-ffa450edef68
2007-01-26 21:32:45 +00:00
Si Chen c0c5566262 OFBIZ-654: Approved product requirements by vendor screen. This is an interesting screen as it uses two view entities chained together to perform a two-level query. One view entity is a subquery to group requirements, the next one calls it and counts the results.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@500287 13f79535-47bb-0310-9956-ffa450edef68
2007-01-26 17:37:11 +00:00
Jacques Le Roux dad67935f7 A (large) patch from Scott Gray "Update ASL header" (https://issues.apache.org/jira/browse/OFBIZ-637).
I put also some svn:ignore for shark build and lib diretories and assetmaint/build 

I did some by hand lately, too much to remember. They were files with old header but without copyright. A 1st attempt I suppose, will have to check this after this commit.

I add some problems to commit this patch in one piece because it's so huge (specially with Eclipse I had to turn to Tortoise) !

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@499486 13f79535-47bb-0310-9956-ffa450edef68
2007-01-24 17:15:54 +00:00
Jacopo Cappellato 6734c79135 Based on a recent discussion on the dev mailing list, I've now refactored the entities and code to associate order items:
* OrderItemAssociation has been deprecated and renamed to OldOrderItemAssociation
* two new entities has been added: OrderItemAssoc and OrderItemAssocType
* all the code that was using the OrderItemAssociation entity has been modified to use the new entity
* added seed data for the OrderItemAssocType
Now the new entity can be used not only to store an association between a sales order item and a purchase order item, but also different kinds of relations, such as drop shipments, replacements, new versions of orders etc...

I'm going to commit (in my next commit) a service that can be used to migrate data from the old entity to the new ones.


git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@485144 13f79535-47bb-0310-9956-ffa450edef68
2006-12-10 08:19:40 +00:00
Si Chen 1caee501c1 Moved an entity which should be in accounting/ and whose entitygroup definition is in accounting/ from order to accounting
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@478318 13f79535-47bb-0310-9956-ffa450edef68
2006-11-22 20:49:10 +00:00
Si Chen ee9484af53 Added field to view entity OrderItemQuantityReportGroupByProduct for selecting according to date issued.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@473455 13f79535-47bb-0310-9956-ffa450edef68
2006-11-10 20:23:53 +00:00
Si Chen 7501bd1c26 OFBIZ-337 - Allow returns of partially shipped orders.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@453376 13f79535-47bb-0310-9956-ffa450edef68
2006-10-05 20:44:44 +00:00
Si Chen 9a3e2f4976 Fix issues with open order item report and 'Required for SO' value in orderview. Introduced a new view-entity to report quantities ordered, issued and open gropued by order item. Renamed the view entity grouped by product to be consistent. Simplified the report bsh and InventoryWorker methods. These fixes are dependent on a the <complex-alias> COALESCE issue OFBIZ-336.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@451399 13f79535-47bb-0310-9956-ffa450edef68
2006-09-29 19:37:41 +00:00
Si Chen ac747d7c73 Fix bug where outstanding product quantities does not take issuances into account. This required creating a new view entity to sum up ItemIssuances. Also refactored a bunch of code out of orderview.bsh and created a handy method to get a distinct set of productIds in OrderReadHelper. (Useful for doing where productId IN queries.)
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@450171 13f79535-47bb-0310-9956-ffa450edef68
2006-09-26 20:08:10 +00:00
Si Chen 30a7152bf4 New InventoryWorker class to figure out quantity of product on outstanding POs. Re-factored product inventory page in catalog manager to use it. Added column to show quantity on order for facility inventory
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@448425 13f79535-47bb-0310-9956-ffa450edef68
2006-09-21 01:28:10 +00:00
David E. Jones d3f94c5aef Replaced all old references to [Copyright * The Open For Business Project] which should take care of all of the legal loose ends
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@446798 13f79535-47bb-0310-9956-ffa450edef68
2006-09-16 00:35:48 +00:00
Jacopo Cappellato 3fd69dd536 Implemented searches by unassigned purchase requirements and added supplier id to requirement info.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@441441 13f79535-47bb-0310-9956-ffa450edef68
2006-09-08 08:55:29 +00:00
Jacopo Cappellato 1c336218f1 In the purchase order entry requirements' screen, now by default only the requirements that have a role of SUPPLIER for the given party are shown.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@440330 13f79535-47bb-0310-9956-ffa450edef68
2006-09-05 12:24:39 +00:00
Jacopo Cappellato dc9c759053 License change from MIT to ASL2.0 for the files of the order component.
Thanks to Ashish Vijaywargiya for the patch (Apache OFBIZ-87).


git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@422819 13f79535-47bb-0310-9956-ffa450edef68
2006-07-17 19:47:26 +00:00
Hans Bakker 7bc0010707 extended the list of workefforts for a quote by adding a new view
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@421541 13f79535-47bb-0310-9956-ffa450edef68
2006-07-13 08:32:49 +00:00