Commit Graph
50 Commits
Author SHA1 Message Date
Jacques Le Roux 06d24f1277 Better French translation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829605 13f79535-47bb-0310-9956-ffa450edef68
2009-10-25 15:25:24 +00:00
Jacques Le Roux afbb983bff I18n of some promotion code errors and French labels
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823694 13f79535-47bb-0310-9956-ffa450edef68
2009-10-09 21:20:42 +00:00
Jacques Le Roux 00ea03a370 Better French translation (in relation with http://docs.ofbiz.org/display/~mattboll/Dictionary+for+French+translations)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813733 13f79535-47bb-0310-9956-ffa450edef68
2009-09-11 09:17:15 +00:00
Jacques Le Roux 89ddce4f54 A slightly modified patch (see comment in Jira) from Nicolas Malin "Add PartyIdentification feature" (https://issues.apache.org/jira/browse/OFBIZ-2848) - OFBIZ-2848
I also changed some "numéro" to n°, but I kepts numéros as n°s is bad (French language is really weird, full of exceptions ;o)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@812532 13f79535-47bb-0310-9956-ffa450edef68
2009-09-08 14:38:30 +00:00
Hans Bakker fd4d514dff do not allow changes to the customer request when cancelled or completed
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@799192 13f79535-47bb-0310-9956-ffa450edef68
2009-07-30 07:29:05 +00:00
Adrian Crum c87e4f5d4a Chinese translation for the applications folder, provided by Shi Yusen - https://issues.apache.org/jira/browse/OFBIZ-2767.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@798955 13f79535-47bb-0310-9956-ffa450edef68
2009-07-29 15:39:59 +00:00
Vikas Mayur 4133eb8982 Minor correction to the label names and the script.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@795884 13f79535-47bb-0310-9956-ffa450edef68
2009-07-20 15:54:40 +00:00
Vikas Mayur c09d083e0e User cannot verify order items (Facility > Verify Pick) if there is insufficient inventory in the system. Patch from Akash Jain.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@788290 13f79535-47bb-0310-9956-ffa450edef68
2009-06-25 08:21:18 +00:00
Ashish Vijaywargiya 7410dc0426 Applied patch from jira issue OFBIZ-2407 (Functionality for "Weight Packages Only" option on pack order screen)
-- Worked on "Warning Form". Now when newEstimatedShippingCharges is greater/less than 10% of estimatedShippingCharges then shown warning form.

Thanks Akash Jain for your contribution.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@782931 13f79535-47bb-0310-9956-ffa450edef68
2009-06-09 09:46:03 +00:00
Ashish Vijaywargiya b4f5dace64 Applied patch from jira issue OFBIZ-2407 (Functionality for "Weight Packages Only" option on pack order screen).
I have cursory reviewed the code and did the functional testing. And found functionality working fine.

Thanks Akash Jain for your contribution.
Specially thanks to other members involved in this work are Divesh, Pranay & Vikas.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@782258 13f79535-47bb-0310-9956-ffa450edef68
2009-06-06 13:15:14 +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
Vikas Mayur e0b2d06490 Facilitate packing screen to use verified orders from Verify Pick screen by using existing shipment and invoice.
Patch from Akash Jain (reviewed and tested by Pranay Pandey), Part of OFBIZ-2329 (https://issues.apache.org/jira/browse/OFBIZ-2329).

Note: I have done little modifications to the new labels part of this patch.

This issue completes the functionality of the Verify Pick feature added recently. I would like to port these changes to release09.04 later today
if I do not see any objections.

 


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@767394 13f79535-47bb-0310-9956-ffa450edef68
2009-04-22 06:50:16 +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 ad33f3e58a Better French translations
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@758032 13f79535-47bb-0310-9956-ffa450edef68
2009-03-24 21:18:48 +00:00
Vikas Mayur 9e7732ea1a Functionality to add bulk products to purchase order through order detail page.
Patch applied from OFBIZ-2221 (https://issues.apache.org/jira/browse/OFBIZ-2221) with slight modification to
1) Label
2) Used view-size in form instead of screen definition.

Thanks to Akash Jain, Pranay Pandey (review and test).

i18n note: This commit has new label.




git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@755627 13f79535-47bb-0310-9956-ffa450edef68
2009-03-18 16:10:44 +00:00
Marco Risaliti 1823bccdf9 A lot of hardcoded labels cleaning and changes some wrong references
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@755366 13f79535-47bb-0310-9956-ffa450edef68
2009-03-17 19:44:17 +00:00
Jacques Le Roux 73e2cca8cf A patch from Bharat Soni "Buyer should be able to specify PO# otherwise it should be generated automatically while placing a purchase order." (https://issues.apache.org/jira/browse/OFBIZ-2218) - OFBIZ-2218
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@752866 13f79535-47bb-0310-9956-ffa450edef68
2009-03-12 13:51:35 +00:00
Marco Risaliti ff720d540e A lot of hardcoded labels cleaning and changes some wrong references
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@746049 13f79535-47bb-0310-9956-ffa450edef68
2009-02-19 23:08:30 +00:00
Marco Risaliti c7be03b41b A lot of hardcoded labels cleaning and changes some wrong references
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@745689 13f79535-47bb-0310-9956-ffa450edef68
2009-02-18 23:15:06 +00:00
Jacques Le Roux 619487614d Better label
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742166 13f79535-47bb-0310-9956-ffa450edef68
2009-02-08 21:10:02 +00:00
Jacques Le Roux d33460b61d Typo
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742165 13f79535-47bb-0310-9956-ffa450edef68
2009-02-08 21:07:42 +00:00
Jacques Le Roux 9819d35d61 To close "Providing Functionality of ProductFeatureIactn Entity" https://issues.apache.org/jira/browse/OFBIZ-2170 - OFBIZ-2170
It would have been better if we had prevented to show incompatible options as soon we know it (when we select other features). This means building js functions embedded in groovy and I don't have time for that...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742163 13f79535-47bb-0310-9956-ffa450edef68
2009-02-08 20:58:12 +00:00
Jacques Le Roux 8b80224434 Some French labels which were missing
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@740302 13f79535-47bb-0310-9956-ffa450edef68
2009-02-03 13:31:53 +00:00
Jacques Le Roux 7a259f221f Fixes done automatically by the Label Manager. I changed the wrong ones by hand, see https://issues.apache.org/jira/browse/OFBIZ-2070 - OFBIZ-2070
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@737585 13f79535-47bb-0310-9956-ffa450edef68
2009-01-25 21:41:15 +00:00
Jacques Le Roux bcb4424888 Last French translations done "by hand" before (hopefully) using Labels Manager
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@737390 13f79535-47bb-0310-9956-ffa450edef68
2009-01-24 16:33:13 +00:00
Marco Risaliti c07be78e21 Some more cleaning on labels before using the new Label Manager
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@737217 13f79535-47bb-0310-9956-ffa450edef68
2009-01-23 22:48:32 +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
Jacques Le Roux b680c6cd4a Some French labels fixes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@735829 13f79535-47bb-0310-9956-ffa450edef68
2009-01-19 21:25:25 +00:00
Marco Risaliti d4a976cf2e Some missing italian translations and some missing i18n in order and content component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@732423 13f79535-47bb-0310-9956-ffa450edef68
2009-01-07 18:40:27 +00:00
Marco Risaliti 0e4d71f273 A lot of Marketing/Manufacturing/Workeffort labels cleaning (Part of OFBIZ-1780)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@731303 13f79535-47bb-0310-9956-ffa450edef68
2009-01-04 17:58:06 +00:00
Jacques Le Roux 303e014f8e Better French translation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@729680 13f79535-47bb-0310-9956-ffa450edef68
2008-12-27 21:45:48 +00:00
Jacques Le Roux ba41fe5a91 Typo
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@728898 13f79535-47bb-0310-9956-ffa450edef68
2008-12-23 07:59:59 +00:00
Jacques Le Roux 83b8887f28 French translation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@728736 13f79535-47bb-0310-9956-ffa450edef68
2008-12-22 18:11:51 +00:00
Jacques Le Roux d5f99b443a A modified patch from Erik Wegner "Patch for all language files (*Labels.xml) to correct language order, find duplicates or invalid entries" (https://issues.apache.org/jira/browse/OFBIZ-2073) - OFBIZ-2073
I removed some hunks, see https://issues.apache.org/jira/browse/OFBIZ-2073?focusedCommentId=12656651#action_12656651



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@726808 13f79535-47bb-0310-9956-ffa450edef68
2008-12-15 21:28:06 +00:00
Marco Risaliti 2daba0581c Removed some duplicated labels.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@725809 13f79535-47bb-0310-9956-ffa450edef68
2008-12-11 21:00:35 +00:00
Jacques Le Roux 3457f0f750 A patch from Karim Rahimpur "more and improved spanish translations" (https://issues.apache.org/jira/browse/OFBIZ-2046) - OFBIZ-2046
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@718580 13f79535-47bb-0310-9956-ffa450edef68
2008-11-18 13:28:33 +00:00
Jacques Le Roux 4c7ca711ac French translation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@707895 13f79535-47bb-0310-9956-ffa450edef68
2008-10-25 19:43:41 +00:00
Jacques Le Roux 1842a5e863 More consistent French translation for User Login and misc.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@705926 13f79535-47bb-0310-9956-ffa450edef68
2008-10-18 21:29:17 +00:00
Jacques Le Roux 838012b290 Better French translation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@700907 13f79535-47bb-0310-9956-ffa450edef68
2008-10-01 20:39:39 +00:00
Jacques Le Roux a869532522 French translation and misc. l10n
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@698116 13f79535-47bb-0310-9956-ffa450edef68
2008-09-23 10:01:44 +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
Hans Bakker efe3927216 add missing label and only show option if has access
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@686592 13f79535-47bb-0310-9956-ffa450edef68
2008-08-17 08:49:18 +00:00
Jacques Le Roux 29ed71e933 Better French translation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@685476 13f79535-47bb-0310-9956-ffa450edef68
2008-08-13 08:20:14 +00:00
Jacques Le Roux 6c9bdbb127 A patch from Bruno Busco "New and improved Italian labels" (https://issues.apache.org/jira/browse/OFBIZ-1864) - OFBIZ-1864
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@674749 13f79535-47bb-0310-9956-ffa450edef68
2008-07-08 09:32:18 +00:00
Jacques Le Roux 5706eb2cbb French translation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@674651 13f79535-47bb-0310-9956-ffa450edef68
2008-07-07 21:38:25 +00:00
Jacopo Cappellato a6846143a0 Fixes for Italian labels.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@674005 13f79535-47bb-0310-9956-ffa450edef68
2008-07-04 11:05:16 +00:00
Jacques Le Roux c26d4a4e8e Some sparse French labels fix, more to come...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@659043 13f79535-47bb-0310-9956-ffa450edef68
2008-05-22 08:45:08 +00:00
Jacques Le Roux 9bfd2ef27f # has not the meaning of number in French (nb is sometimes used instead)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@658826 13f79535-47bb-0310-9956-ffa450edef68
2008-05-21 19:44:02 +00:00
Jacopo Cappellato 3fabe825fe Applied patch from Sumit Porwal, with some changes I did, (OFBIZ-1632 "Refactor the getGlAccountFromAccountType minilang method so that all the entity-one calls are replaced by calls to minilang (inline) methods.") and patch from Rashko Rejmer (OFBIZ-1631, "Replace all the code that directly retrieves from the db a PartyAcctgPreference for an organizationPartyId with a call to the service implemented in OFBIZ-1630"); misc cleanups to gl forms and screens; implemented new service to manually run the mappings for acctg trans entries (useful also to test the gl setup for automatic transactions).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@646697 13f79535-47bb-0310-9956-ffa450edef68
2008-04-10 08:58:40 +00:00
Hans Bakker 53b1f3763f replace the order error labels with an xml file and add the Thai language
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@628617 13f79535-47bb-0310-9956-ffa450edef68
2008-02-18 04:50:11 +00:00