Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
54,329 Commits 36 Branches 189 Tags
9b1caefbf9c68ba433333efbeb125cb15d4b10dd
Commit Graph

6584 Commits

Author SHA1 Message Date
Laurent Destailleur
162ccf68b6 Merge pull request #841 from FHenry/develop 
fix [ bug #825 ] User first name not visible into users->perms
 2013-04-19 17:21:16 -07:00
Marcos García
95ca8db9eb Improved es_ES translations 2013-04-20 00:34:03 +02:00
Marcos García
d90a0acbec Missing externalsite module translations 2013-04-20 00:18:57 +02:00
fhenry
e2d0d0d414 Fix fix as Eldy wish it 2013-04-20 00:10:20 +02:00
Marcos García
40a9ab9772 Added missing translations 2013-04-20 00:08:09 +02:00
Marcos García
458b1cdf60 Improved dictionary translations + minor bug fix 2013-04-19 23:33:54 +02:00
Laurent Destailleur
8eedf3db96 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-19 09:11:09 +02:00
Laurent Destailleur
d5a4f73501 Add fill/reset 2013-04-19 09:10:56 +02:00
Laurent Destailleur
ac8868e2d2 Fix: Use correct format for js 2013-04-18 19:56:14 +02:00
Laurent Destailleur
a880a8c51e Qual: Work to prepare usage of jquery data plugins. 2013-04-18 19:37:50 +02:00
fhenry
ce60e503bc Fix trans for [ task #826 ] Increasing stock when deleting an invoice 2013-04-18 18:10:56 +02:00
fhenry
c0c1de7992 [ task #826 ] Increasing stock when deleting an invoice 2013-04-18 08:40:29 +02:00
Laurent Destailleur
31ce3d67a3 Merge remote-tracking branch 'origin/3.3' into develop 2013-04-17 23:18:15 +02:00
Laurent Destailleur
52a0df3424 Fix: Bad translation 2013-04-17 20:13:42 +02:00
simnandez
c9074231b5 Fix: Spelling es_ES boxes lang 
Trad: Add ca_ES missing translations
 2013-04-17 17:06:19 +02:00
fhenry
4927aae891 [ task #741 ] Gestion des interventions/Add intervention box 2013-04-17 16:20:01 +02:00
Marcos García
0ac7696bc0 Improved holidays module translations 
Conflicts:
	htdocs/holiday/fiche.php
	htdocs/langs/fr_FR/holiday.lang
 2013-04-15 09:29:26 +02:00
Marcos García
421dc07077 Improved es_ES holidays translations 2013-04-15 09:25:41 +02:00
Juanjo Menent
fb41ed68c4 Merge pull request #833 from marcosgdf/translations 
Improved and added missing es_ES translations
 2013-04-15 00:21:41 -07:00
simnandez
ae09d2fa3f Improved margins ca_ES translation 2013-04-15 09:11:58 +02:00
Marcos García
150c862705 Improved margins es_ES translation 2013-04-15 09:11:20 +02:00
Marcos García
6d896a8558 Improved holidays module translations 2013-04-15 00:53:06 +02:00
Marcos García
deaa63960e Improved es_ES holidays translations 2013-04-15 00:18:08 +02:00
Marcos García
16afa18e95 Improved and added missing es_ES translations 2013-04-15 00:09:29 +02:00
Laurent Destailleur
de9f100968 Fix: check read feature 2013-04-14 20:34:31 +02:00
Laurent Destailleur
a5d996de4c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-14 14:45:43 +02:00
Laurent Destailleur
22402c38f8 Still working on new menu management. 2013-04-14 14:32:38 +02:00
simnandez
e27e5e9c44 Improved margins ca_ES translation 2013-04-14 13:53:48 +02:00
Marcos García
6b031616fa Improved margins es_ES translation 2013-04-14 12:34:10 +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
Laurent Destailleur
e5a945ba5b Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	ChangeLog
	htdocs/admin/propal.php
	htdocs/compta/journal/purchasesjournal.php
	htdocs/compta/journal/sellsjournal.php
	htdocs/core/class/conf.class.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/lib/files.lib.php
	htdocs/core/modules/mailings/contacts2.modules.php
	htdocs/langs/ca_ES/admin.lang
	htdocs/langs/en_US/admin.lang
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/public/demo/index.php
 2013-04-14 01:46:33 +02:00
Laurent Destailleur
bda39f25bf New: Default aprrover for holidays i sby default hierchical parent. 2013-04-14 01:04:11 +02:00
Laurent Destailleur
7e48e341ad Merge pull request #829 from marcosgdf/translations 
Added missing translation
 2013-04-13 14:23:07 -07:00
Marcos García
7c4b901b0a Improved es_ES translations and replaced missing translation 2013-04-13 17:45:41 +02:00
Marcos García
418921f360 Revert "Revert "Added missing translation"" 
This reverts commit 85866ff9a6.
 2013-04-13 17:14:06 +02:00
Marcos García
85866ff9a6 Revert "Added missing translation" 
This reverts commit 404ad18425.
 2013-04-13 17:10:07 +02:00
Marcos García
404ad18425 Added missing translation 2013-04-13 16:04:51 +02:00
Marcos García
d6b42ac879 [ bug #816 ] Sales journal does not reflect localtaxes 2013-04-13 14:44:56 +02:00
Laurent Destailleur
2b94188414 Fix: Languages files permissions and loading 2013-04-13 14:09:50 +02:00
Laurent Destailleur
3683f3cc82 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-13 13:56:26 +02:00
Laurent Destailleur
4bb815937a Module opensurvey become a standard feature. 2013-04-13 13:56:13 +02:00
Marcos García
b6f765ef3c Improved es_ES translations 2013-04-12 23:51:52 +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
8e3f0172fc Fix: Fix tons of pb with num ref system of supplier invoices. 2013-04-12 00:00:31 +02:00
Laurent Destailleur
72f0ca194c Fix: Solve conflict of translation 2013-04-10 19:28:54 +02:00
Laurent Destailleur
d7c0cf3d50 Fix: More complete fix for emailing contact selectors. 2013-04-10 16:29:53 +02:00
Laurent Destailleur
72aec6aa60 Better translation 2013-04-10 13:30:54 +02:00
Grand Philippe
f4e58d71ed add supplier invoice extrafields and some fixes 2013-04-09 09:38:25 +02:00
Laurent Destailleur
328801f455 Hide upload on smartphones 2013-04-09 01:27:41 +02:00