2
0
forked from Wavyzz/dolibarr
Commit Graph

1037 Commits

Author SHA1 Message Date
simnandez
ba6b5d27a5 New: TODO il faut incrementer le stock si on supprime une expedition
validee
2013-06-20 18:37:23 +02:00
Laurent Destailleur
a50cd7b698 Fix bug into script that fix CRLF into LF 2013-06-12 11:59:55 +02:00
simnandez
0219242484 Fix: Trad categories more accurate 2013-05-28 15:20:14 +02:00
simnandez
485c7bc477 Fix: Trad categories more accurate 2013-05-28 15:19:24 +02:00
Laurent Destailleur
4c3dcec7b8 Sync with transifex: After this commit, all langs files use same order
of keys than source file (en_US).
Note: Please continue to prefer commiting your change into language
files into git. For the moment transifex does not support conflict
management, diff, versionning, ...
2013-05-27 23:53:06 +02:00
Laurent Destailleur
dee7ac2823 Add missing lang files 2013-05-27 12:02:31 +02:00
Marcos García
0a5bb491d3 Corrected translation key BuyingPrice from lang files 2013-05-19 12:24:19 +02:00
Marcos García
08b234ed01 Corrected translation key BuyingPrice from lang files 2013-05-19 12:08:18 +02:00
Laurent Destailleur
ee890a87a3 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	htdocs/compta/prelevement/class/rejetprelevement.class.php
	htdocs/compta/prelevement/ligne.php
	htdocs/langs/en_US/admin.lang
2013-05-14 01:15:05 +02:00
Laurent Destailleur
dc28335ed5 Merge pull request #948 from marcosgdf/translations
Improved translations
2013-05-13 16:07:22 -07:00
simnandez
0c853b3ebd Fix: Some bugs on withdrawal rejects 2013-05-13 17:35:30 +02:00
simnandez
5fe70e0bee Fix: Some bugs on withdrawal rejects 2013-05-13 17:15:23 +02:00
simnandez
050ca946e9 Fix: Debug of withdrawals rejects 2013-05-13 16:30:52 +02:00
Marcos García
a37392e34e Removed conflict with margins module name and description (already set in admin.lang) 2013-05-12 12:19:26 +02:00
simnandez
7358faeb96 New: [ task #812 ] Add more Scripts. expire contract services ordered by
date end
2013-05-09 09:41:32 +02:00
simnandez
191fc8eb45 Trad: Added missing translations 2013-05-08 18:04:22 +02:00
simnandez
bbb4fcad28 Trad: Added missing translations 2013-05-08 18:00:15 +02:00
simnandez
5e059fb15d Trad: Added missing translations 2013-05-08 17:59:16 +02:00
simnandez
b9583d389e Trad: Add products missing translations 2013-05-08 12:24:50 +02:00
simnandez
46c1b87b32 New: [ task #812 ] Add more Scripts. expire contract services to
representatives and customers
2013-05-07 17:43:54 +02:00
simnandez
ca9a2b281a New: [ task #812 ] Add more Scripts. expire contract services to
representatives
2013-05-07 12:52:14 +02:00
Marcos García
9f537cedd1 Replaced "Jours" with DurationDays translation key 2013-05-06 17:48:20 +02:00
Marcos García
b830c1dd8c Removed "event" word from event description and changed ActionTypeCP to Description 2013-05-06 17:04:04 +02:00
Marcos García
d7a7f316d3 Replaced "Jours" with DurationDays translation key 2013-05-06 16:51:08 +02:00
simnandez
15ede98fe7 New: [ task #877 ] Reorganize menus. Init works
Add migration script 3.4 to 3.5
2013-05-04 01:22:09 +02:00
Marcos García
bf36376215 Corrected ca_ES translations
Translations made by Juanjo Menent (simnandez)
2013-04-29 18:05:11 +02:00
simnandez
00adb1b9ab Fix: [ bug #855 ] Holiday approval email in French 2013-04-29 12:46:07 +02:00
Laurent Destailleur
4c9a728799 Merge pull request #890 from marcosgdf/translations
Improved translations
2013-04-27 12:53:15 -07:00
simnandez
823b716042 Trad: Add ca_ES holiday translations 2013-04-27 17:52:14 +02:00
Marcos García
5784cb120a Moved GenbarcodeLocation from products.lang to admin.lang 2013-04-27 12:32:20 +02:00
fhenry
d9551abb70 Fix trad for Extrafield from table 2013-04-24 17:32:08 +02:00
fhenry
d6514e1cd6 Add extrafield select from table 2013-04-21 17:36:23 +02:00
Laurent Destailleur
a880a8c51e Qual: Work to prepare usage of jquery data plugins. 2013-04-18 19:37:50 +02:00
simnandez
c9074231b5 Fix: Spelling es_ES boxes lang
Trad: Add ca_ES missing translations
2013-04-17 17:06:19 +02:00
simnandez
ae09d2fa3f Improved margins ca_ES translation 2013-04-15 09:11:58 +02:00
simnandez
e27e5e9c44 Improved margins ca_ES translation 2013-04-14 13:53:48 +02:00
fhenry
00fb40e073 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/langs/ca_ES/admin.lang
	htdocs/langs/es_ES/admin.lang

Change-Id: I3c2c0789a92fb3d5506c717986ce0127dec75b9b
2013-04-14 09:40:01 +02:00
fhenry
cc497490eb [ task #814 ] Add extrafield feature into Project/project tasks module 2013-04-12 11:09:53 +02:00
simnandez
2e9a8369a7 Trad: Update ca_ES and es_ES translations 2013-04-12 10:46:33 +02:00
Laurent Destailleur
72f0ca194c Fix: Solve conflict of translation 2013-04-10 19:28:54 +02:00
simnandez
50548601ce Resolve conflicts 2013-04-06 08:20:57 +02:00
fhenry
893fed9284 [ task #783 ] Add checkbox and radio into extrafield feature 2013-04-02 11:56:53 +02:00
Grand Philippe
ee7490a30a fix : language error 2013-03-30 14:31:10 +01:00
Grand Philippe
c5e742278e fix : trad error 2013-03-24 07:11:44 +01:00
fhenry
8971e6fe15 [ task #710 ] Envoi de mail 2013-03-23 14:39:23 +01:00
simnandez
e9cbf94e06 Trad: Add es_ES and ca_ES missing translations 2013-03-22 17:31:43 +01:00
Laurent Destailleur
a3435ab889 Merge remote-tracking branch 'origin/3.3' into develop 2013-03-20 15:32:32 +01:00
Christophe Battarel
e2f28b6c51 remove experimental commissions module 2013-03-18 15:40:56 +01:00
simnandez
54f963f8ae Trad: Fix: A better fix for status/list of orders.
There was a confusion because of bad translation key StatusOrderToBill
that in fact mean "StatusOrderDelivered".
2013-03-16 22:32:03 +01:00
Laurent Destailleur
33a7692fbc Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/exports/class/export.class.php
2013-03-16 17:07:35 +01:00