15 Commits
Author SHA1 Message Date
Jacques Le Roux 27c6b8dab5 Actually cleans unitData.xml after r1660412 for OFBIZ-6059
It was already there, I just committed it at r1660392

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1660414 13f79535-47bb-0310-9956-ffa450edef68
2015-02-17 15:30:00 +00:00
Jacques Le Roux 129994acf2 A patch from Ron Wheeler for "UOM missing 2 entries" https://issues.apache.org/jira/browse/OFBIZ-6059
<Uom abbreviation="Pb" description="Petabyte of Data" uomId="DATA_Pb" uomTypeId="DATA_MEASURE"/>
<UomConversion uomId="DATA_Pb" uomIdTo="DATA_Tb" conversionFactor="1024"/>

were left out when PB was added.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1660412 13f79535-47bb-0310-9956-ffa450edef68
2015-02-17 15:23:14 +00:00
Jacques Le Roux 046eb40f2a A patch from Ron on dev ML
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1660392 13f79535-47bb-0310-9956-ffa450edef68
2015-02-17 14:38:30 +00:00
Jacques Le Roux c943b51124 A patch from Pierre Smits for "UnitData.xml is missing some liquid volume measures" https://issues.apache.org/jira/browse/OFBIZ-5277
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1512307 13f79535-47bb-0310-9956-ffa450edef68
2013-08-09 13:58:31 +00:00
Hans Bakker 4a9ea51f54 allow single pieces and boxes with a numkber of pieces share the same inventory location but can however be sold at optionally different prices. More explanation will be given in the new feature list of december 2010. Contribution of tukkata.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1040908 13f79535-47bb-0310-9956-ffa450edef68
2010-12-01 09:26:47 +00:00
David E. Jones 5c5149bf11 Small change to short ton description as it seems more people are familiar with the term US ton than short ton
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@991279 13f79535-47bb-0310-9956-ffa450edef68
2010-08-31 18:14:39 +00:00
Ashish Vijaywargiya e90d83e6af Applied patch from jira issue OFBIZ-3909 - Bug in showing online estimate rate on UPS services.
UPS Online shipping rates are showing wrong values when product weight having different weightUomId. It doesn't support UOM Conversion as it is working in USPS services.
So fixing this bug, following work is done.

1) Calling generic methods "getPackageSplit", "getProductItemInfo" & "calcPackageWeight" methods from ShipmentWorker.java
2) Removed duplicate methods from UpsServices.java

Thanks Amit for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@990751 13f79535-47bb-0310-9956-ffa450edef68
2010-08-30 09:55:02 +00:00
Ashish Vijaywargiya 2c06dd8e5e Added gram into pound support.
Thanks Vivek for the patch. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@960495 13f79535-47bb-0310-9956-ffa450edef68
2010-07-05 09:21:59 +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
David E. Jones 39e6c63453 Added Uoms for special cases; technically the Each uom is assumed if there is no uom, but with this can make explicit, or qualify wi no uom specific, but with this can be explicit or qualified further with something like the per person
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@598575 13f79535-47bb-0310-9956-ffa450edef68
2007-11-27 09:53:04 +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
David E. Jones 4492f49c6a Applied patch from Tim Ruppert with some additional unit conversions; Jira #OFBIZ-417
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@469615 13f79535-47bb-0310-9956-ffa450edef68
2006-10-31 19:27:09 +00:00
Jacopo Cappellato 37a7cb17a8 seed data for in to mm conversion.
Patch from Tim Ruppert (OFBIZ-209).

git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@446864 13f79535-47bb-0310-9956-ffa450edef68
2006-09-16 12:24:29 +00:00
Jacopo Cappellato 6c1d55d4a8 Conversion from MIT to ASL2.0 for the files of the common component.
Many thanks to Ashish Vijaywargiya for the patch (Apache OFBIZ-87).

git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@422421 13f79535-47bb-0310-9956-ffa450edef68
2006-07-16 09:47:46 +00:00
David E. Jones 94fe6d1cda Initial OFBiz import from revision 7923 of the old svn.ofbiz.org SVN repository.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@418498 13f79535-47bb-0310-9956-ffa450edef68
2006-07-01 19:05:20 +00:00