Ion Agorria
6c37d03f13
Added language entries for dinamic prices
2014-11-29 06:32:33 +01:00
Laurent Destailleur
7f0a01936e
Fix a very old bug of conflicth into decrease stock when using point of
...
sale, not compatible with option defined into stock module.
2014-11-28 20:41:52 +01:00
Laurent Destailleur
d3b32ce22f
Fixed: Bad function/picto for information messages (not a star)
2014-11-28 19:49:42 +01:00
Raphaël Doursenaud
10456f90d9
Language files should not be executable
2014-11-28 16:06:45 +01:00
Raphaël Doursenaud
92b54fd496
Removed deprecated oscommerce language files
...
Note to transifex sync personnel: you may have to manually remove the file
from Transifex to prevent it from coming back!
2014-11-28 16:03:45 +01:00
Laurent Destailleur
a724c3aa70
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/main.inc.php
2014-11-28 02:26:40 +01:00
Marcos García de La Fuente
0a0e0e068c
Fixed [ bug #1691 ] Don't think the ID should be displayed in holiday module
2014-11-28 01:02:44 +01:00
Laurent Destailleur
dc1c98734e
Fixed: Option specific to a module should start with module name
2014-11-28 00:21:52 +01:00
Frédéric FRANCE
5dbba380d2
Fix 1721 Missing translation on proposal creation
2014-11-24 20:54:38 +01:00
Marcos García de La Fuente
d9958efcd7
Fixed [ bug #1691 ] Don't think the ID should be displayed in holiday module
2014-11-24 12:45:46 +01:00
Laurent Destailleur
245a06d433
Merge remote-tracking branch 'origin/3.7' into develop
2014-11-23 16:52:15 +01:00
Laurent Destailleur
97a6bd842d
Minor fixes.
2014-11-23 12:39:53 +01:00
Laurent Destailleur
02e18bc03d
Merge remote-tracking branch 'origin/3.7' into develop
2014-11-22 16:29:06 +01:00
Laurent Destailleur
b9cf6ddd65
Merge branch '1698' of github.com:aspangaro/dolibarr into aspangaro-1698
...
Conflicts:
htdocs/langs/en_US/donations.lang
2014-11-22 15:44:59 +01:00
Laurent Destailleur
135e58871e
Merge pull request #2061 from aspangaro/1704
...
#1704 Untranslatable token in externalsite module admin
2014-11-22 15:33:18 +01:00
Laurent Destailleur
06b663b92c
Merge remote-tracking branch 'origin/3.7' into develop
2014-11-22 00:45:45 +01:00
Laurent Destailleur
a2d4046f50
Fixed: Untranslatable tokens
2014-11-22 00:45:04 +01:00
Laurent Destailleur
1246c20355
More complete translation
2014-11-22 00:12:09 +01:00
Laurent Destailleur
9f6a6d1300
Fix: Missing translation
2014-11-20 10:55:38 +01:00
aspangaro
01a5f22f4a
#1704 Untranslatable token in externalsite module admin
2014-11-20 06:34:50 +01:00
Laurent Destailleur
84729a6aa3
Fix: Bad vars
2014-11-18 23:18:59 +01:00
aspangaro
1b077950cd
#1698 Untranslatable strings in donation module admin
2014-11-18 19:54:48 +01:00
aspangaro
31b90cf383
Add 1st version of calculator but need work
2014-11-17 06:38:06 +01:00
aspangaro
c256243bf7
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2014-11-16 08:41:39 +01:00
Laurent Destailleur
d0fb732cce
Fix: Bad value for ThousandSeparator.
2014-11-15 14:24:10 +01:00
Laurent Destailleur
4df754f36f
Merge pull request #2015 from aspangaro/develop-patch
...
Update accounting language
2014-11-15 12:19:23 +01:00
Laurent Destailleur
58c06264e4
Merge branch 'develop' of github.com:BadPixxel/dolibarr into
...
BadPixxel-develop
Conflicts:
htdocs/langs/en_US/categories.lang
htdocs/langs/fr_FR/categories.lang
2014-11-15 12:17:46 +01:00
aspangaro
d15ef855da
Correct travis
2014-11-12 07:37:59 +01:00
aspangaro
a55afd4f50
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2014-11-12 07:32:32 +01:00
aspangaro
c268b1fb64
Update accounting language
...
Problem with transifex in french, the file is in french language on the website but in github, still in english...
2014-11-11 14:49:26 +01:00
aspangaro
3042bf4dc2
Correct lot of bugs
2014-11-10 06:08:50 +01:00
Laurent Destailleur
50f690787b
Sync transifex
2014-11-09 19:16:41 +01:00
aspangaro
9c3fa5a9eb
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2014-11-09 07:26:14 +01:00
Laurent Destailleur
5094c2c066
Merge pull request #1998 from frederic34/iconstock
...
Try to improve stock display for all stock increase/decrease options
2014-11-07 21:48:04 +01:00
Laurent Destailleur
9e92b469b9
Merge pull request #2005 from altairis-fr/hidemargininfos
...
improve "hide margin infos" button : hide ALL informations relatives to margin AND store the state of the button in a cookie instead of shared config option
2014-11-07 21:47:06 +01:00
aspangaro
840dfd780d
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2014-11-07 21:28:39 +01:00
Juanjo Menent
e421741fc4
Trad: More accurate trad of holidays. Update form transifex
2014-11-06 17:33:05 +01:00
Juanjo Menent
0f22ebb7b5
Trad: More accurate trad es_ES of after order. Update form transifex
2014-11-06 12:26:15 +01:00
Juanjo Menent
c422024cb9
Trad: More accurate trad of notifications. Update form transifex
2014-11-06 11:55:26 +01:00
Laurent Destailleur
0ae1bfab04
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-11-06 00:58:43 +01:00
Juanjo Menent
eadb10e71e
Trad: update es_ES from transifex
2014-11-05 22:31:23 +01:00
Laurent Destailleur
60ca5aa026
Debug of module withdraw.
2014-11-05 17:32:42 +01:00
Christophe Battarel
44882f4035
improve "hide margin infos" button : hide ALL informations relatives to margin AND store the state of the button in a cookie instead of shared config option
2014-11-05 17:03:53 +01:00
Laurent Destailleur
5e0946bdc2
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/adherents/fiche.php
htdocs/core/lib/date.lib.php
htdocs/langs/fr_FR/bills.lang
htdocs/resource/class/resource.class.php
2014-11-05 16:37:07 +01:00
Laurent Destailleur
4f08408065
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
ChangeLog
htdocs/core/class/commonobject.class.php
2014-11-05 16:28:44 +01:00
Laurent Destailleur
90fb05805c
Fix: Missing translation
2014-11-05 16:21:17 +01:00
aspangaro
cbfa90abca
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2014-11-04 20:57:05 +01:00
Laurent Destailleur
606a3f9917
Merge remote-tracking branch 'origin/3.4' into 3.5
2014-11-04 17:54:09 +01:00
Laurent Destailleur
c41e908dba
Merge pull request #2000 from Devensys/Develop-MajPasswordPattern
...
New modGeneratePass with personal conf
2014-11-04 17:37:25 +01:00
Andrelec1
796f2409a1
Add verif and correction lang
2014-11-04 11:38:16 +01:00
