Commit Graph
114 Commits
Author SHA1 Message Date
Jacopo Cappellato 1cc8ea400a Fixed entity definition for new olap entities in the order component.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883645 13f79535-47bb-0310-9956-ffa450edef68
2009-11-24 10:23:33 +00:00
Hans Bakker f8e9df50f0 A first proposal open for comments of the order OLAP entities. secas and initial load are on the way and implemeted following the same pattern as Jacopo's accounting entities
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883034 13f79535-47bb-0310-9956-ffa450edef68
2009-11-22 04:37:27 +00:00
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
David E. Jones 7e6f0209d5 Added finAccountTransId to ReturnItemResponse entity to keep track of when store credit is used there; This is a tough decision. Right now we have ReturnItemResponse that is used for all ReturnItems as they are processed, and we also have the FinAccountTrans that refers to whatever triggered the transaction. However, I don't like circular references... If there was a natural one-to-many relationship in a certain direction it would help break the tie, but realistically these should be a one-to-one relationship. Unfortunately this means for the FinAccount we have to do a lookup on the ReturnItemResponse entity to see if it came from a return. For now I guess that's the best option.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@779867 13f79535-47bb-0310-9956-ffa450edef68
2009-05-29 06:47:32 +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 705e336ded Fix log warnings as things were not set properly. Thanks Hans for reporting
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@778570 13f79535-47bb-0310-9956-ffa450edef68
2009-05-26 06:33:03 +00:00
Anil Patel 1d26ae9f32 Add screenlet to show list of opportunity for an account.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@778544 13f79535-47bb-0310-9956-ffa450edef68
2009-05-26 01:22:10 +00:00
Vikas Mayur d16e9e2c68 Enable audit for few fields on ReturnItem entity namely returnTypeId, returnReasonId, returnQuantity, receivedQuantity and returnPrice. The history of changes on these fields
can be viewed through new tab Return History. Also added a new service for creating return status and removed the inline code that was used earlier to create Return Status.
Patch applied from Awdesh Singh Parihar, part of OFBIZ-2483 (https://issues.apache.org/jira/browse/OFBIZ-2483)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@778463 13f79535-47bb-0310-9956-ffa450edef68
2009-05-25 18:02:47 +00:00
Vikas Mayur d124ccbbf2 Enabled audit on few fields on OrderItem to archive changes in OrderItem price and quantities as well as on OrderItemShipGroup to archive changes in shipment method for an
order. This can be viewed through "Order History" link under Actions screelet on Order Detail Page. 
Slightly modified patch from Amit Sharma, part of OFBIZ-2499 (https://issues.apache.org/jira/browse/OFBIZ-2499)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@778406 13f79535-47bb-0310-9956-ffa450edef68
2009-05-25 12:35:33 +00:00
David E. Jones eb137da458 Added new OrderProductPromoCode entity to keep track of promo codes enetered so that can be used again when promotions are calculated when an order is changed; also moved OrderContent and OrderContentType entities to be in alpha order
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@778273 13f79535-47bb-0310-9956-ffa450edef68
2009-05-25 04:01:58 +00:00
Vikas Mayur f4f58034ca New feature to mark order as viewed.
Patch from Anurag Singh Senger, part of OFBIZ-2446 (https://issues.apache.org/jira/browse/OFBIZ-2446) 


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@773854 13f79535-47bb-0310-9956-ffa450edef68
2009-05-12 11:08:24 +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
Vikas Mayur 257f8d5341 User can print pick sheets for each order in a group which will show detailed information of each order like shipping method, and number of order items
in each order, Product ID and supplier Product ID.

Patch from Arun Patidar (reviewed and tested by Pranay Pandey), part of OFBIZ-2225 (https://issues.apache.org/jira/browse/OFBIZ-2225)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@767482 13f79535-47bb-0310-9956-ffa450edef68
2009-04-22 12:19:39 +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
Vikas Mayur a131758b9e Another new feature from Pranay and Co.
Now Order reservation can be changed manually by setting priority (new field priority on OrderHeader and OrderItemShipGrpInvRes) for the order. This way few orders can be
fulfilled while waiting for sufficient inventory to fulfill large orders.

Applied patch from OFBIZ-2224 (https://issues.apache.org/jira/browse/OFBIZ-2224).
Thanks Pratik Khera and Pranay Pandey.

i18n Note: This commit has three new labels (IMO, they can be moved to common component with names something like CommonHigh, CommonLow etc.)

Pratik, I have done minor changes in the service and they are
1) Used <if-empty field=""> instead of <if> <condition> <if-empty> as this makes the logic more clearer.
2) Removed <condition-list> because their is only one expression in the <entity-condition>
3) Added <clear-field> in the iteration, to make sure that always a new value will be set in the map that is passed to a service and <store-value>  



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@756001 13f79535-47bb-0310-9956-ffa450edef68
2009-03-19 13:58:08 +00:00
Vikas Mayur 7bc9f320d3 Cancel back orders from supplier if the cancelBackOrderDate (new field on OrderItem) has passed. This is achieved using a schedule job.
Patch applied from OFBIZ-2220 (https://issues.apache.org/jira/browse/OFBIZ-2220). 

Thanks Deepesh Kapoor and Pranay Pandey for testing.

On a side note, I have changed the field description on the entity to use <description> element instead of <!-- -->. Also changed this for adjacent field.
Changed the description of the service a bit. 



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@755596 13f79535-47bb-0310-9956-ffa450edef68
2009-03-18 13:54:53 +00:00
Jacques Le Roux 219f600813 A patch from Divesh Dutta " Functionality for putting in estimatedShipDate and estimatedDeliveryDate for order items." (https://issues.apache.org/jira/browse/OFBIZ-2239) - OFBIZ-2239
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@755011 13f79535-47bb-0310-9956-ffa450edef68
2009-03-16 21:34:50 +00:00
Marco Risaliti 2d8f185142 A lot of hardcoded labels cleaning and changes some wrong references
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@753028 13f79535-47bb-0310-9956-ffa450edef68
2009-03-12 21:50:12 +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
Marco Risaliti b9601cfffb Some missing default-resource-name for entity labels.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@748683 13f79535-47bb-0310-9956-ffa450edef68
2009-02-27 20:26:54 +00:00
Jacques Le Roux 572b7683e0 All tabs to 4 spaces in *.groovy, *.java, *.xml : less problems in future with that aspect...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@737003 13f79535-47bb-0310-9956-ffa450edef68
2009-01-23 11:08:47 +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 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
Hans Bakker 5cea27a539 implementation of OFBIZ-2024: add content attachments to a customer request
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@709427 13f79535-47bb-0310-9956-ffa450edef68
2008-10-31 14:09:43 +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
Bilgin Ismet Ibryam 93745e20ac Applied (with few modifications) patch from Len Shein, OFBIZ-1928: "Allow the Shopping Cart to accept a facility per ship group to specify where inventory should be reserved from".
Also added a dropdown button to choose a facility in order manager shipping screen.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@688993 13f79535-47bb-0310-9956-ffa450edef68
2008-08-26 08:30:05 +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 dd838e22a6 Better descriptions
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@685087 13f79535-47bb-0310-9956-ffa450edef68
2008-08-12 08:46:23 +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
Jacques Le Roux 5584b0c222 From David's comments on dev ML
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@685082 13f79535-47bb-0310-9956-ffa450edef68
2008-08-12 08:34:15 +00:00
Jacques Le Roux cb5be4be47 Some fields descriptions from BJ comments on user ML
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@684812 13f79535-47bb-0310-9956-ffa450edef68
2008-08-11 16:54:39 +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
David E. Jones 01ec60e1cd Removed entitygroup.xml files now that they are not needed, and I'm sure they won't be missed
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@672822 13f79535-47bb-0310-9956-ffa450edef68
2008-06-30 17:09:02 +00:00
Jacopo Cappellato e8a991abba Several fixes and enhancements to the return process: now a return shipment is automatically created when the return is approved, and when the return is completed an invoice is also created. Added new entity to associate a return item with a shipment.
Several small enhancements to the ui to link returns with shipments and inventory receipts.
Still, a lot of works needs to be done in this area (e.g. manual creation of return shipments, improve the ui, verify the code that creates the invoice for the return, verify the code that apply payments to invoices etc...)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@669188 13f79535-47bb-0310-9956-ffa450edef68
2008-06-18 14:29:16 +00:00
Vikas Mayur fbffaacc97 New entity SalesForcastDetail - part of jira issue OFBIZ-194
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@661700 13f79535-47bb-0310-9956-ffa450edef68
2008-05-30 13:03:55 +00:00
Bilgin Ismet Ibryam 2727a93034 "Store Order Item changes" from Jira Issue OFBIZ-1773
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@655452 13f79535-47bb-0310-9956-ffa450edef68
2008-05-12 09:36:04 +00:00
Scott Gray 4a2d42bd3d Fix for OFBIZ-1765 reported by Jacopo Cappellato - Replacement returns were creating duplicated replacement orders.
The problem was that updateReturnHeader was being called and committed a 2nd time before the 1st call had been committed, and somehow that was causing a SECA condition to evaluate to true for both commits instead of just one.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@654072 13f79535-47bb-0310-9956-ffa450edef68
2008-05-07 11:24:41 +00:00
David E. Jones b6174f540a Some data model cleanups/fixes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@641640 13f79535-47bb-0310-9956-ffa450edef68
2008-03-26 23:27:48 +00:00