lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
36,267 Commits 43 Branches 150 Tags 886 MiB
9d88ec7141
Commit Graph

36267 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
9d88ec7141 doxygen 2013-04-14 10:48:34 +02:00
Laurent Destailleur
263e9098fa Fix: group name not visible 2013-04-14 02:54:54 +02:00
Laurent Destailleur
51f444fb8c Look: Optimize title lines 2013-04-14 02:09:41 +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
6ebeb53a2c Merge pull request #828 from marcosgdf/bug-817 
[ bug #817 ] Purchases journal does not reflect localtaxes
 2013-04-13 16:29:07 -07:00
Laurent Destailleur
38cb9a530f Doxygen 2013-04-14 01:28:43 +02:00
Laurent Destailleur
2f5709e3cb Fix: Some fix into holiday module 2013-04-14 01:21:54 +02:00
Laurent Destailleur
bda39f25bf New: Default aprrover for holidays i sby default hierchical parent. 2013-04-14 01:04:11 +02:00
Marcos García
486425d258 Merge branch '3.3' into bug-817 
Conflicts:
	ChangeLog
 2013-04-13 23:58:05 +02:00
Laurent Destailleur
7e48e341ad Merge pull request #829 from marcosgdf/translations 
Added missing translation
 2013-04-13 14:23:07 -07:00
Laurent Destailleur
8d4da9df1e Merge pull request #827 from marcosgdf/bug-816 
[ bug #816 ] Sales journal does not reflect localtaxes
 2013-04-13 14:22:40 -07:00
Laurent Destailleur
fc22489104 Fix: Option SOCIETE_DISABLE_CUSTOMERS not complete 2013-04-13 21:18:41 +02:00
Laurent Destailleur
355168527d Look: Optimize for smartphone 2013-04-13 18:41:43 +02:00
Laurent Destailleur
1a1e09a5ed Qual: Clean and mutualize code. 2013-04-13 18:33:23 +02: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
a6ed2551fb Revert "Replaced Rest not translated string with AlreadyPaid" 
This reverts commit 580881c205.
 2013-04-13 17:13:59 +02:00
Marcos García
580881c205 Replaced Rest not translated string with AlreadyPaid 2013-04-13 17:12:16 +02:00
Marcos García
85866ff9a6 Revert "Added missing translation" 
This reverts commit 404ad18425.
 2013-04-13 17:10:07 +02:00
Laurent Destailleur
8a88b130b4 Fix: Bad label shown 2013-04-13 16:31:25 +02:00
Laurent Destailleur
20c9370690 New: Support the mode readonly of ckeditor 2013-04-13 16:23:05 +02:00
Marcos García
404ad18425 Added missing translation 2013-04-13 16:04:51 +02:00
Laurent Destailleur
e24fb9f48a Removed all old code. All orignal code has been rewritten now. 2013-04-13 15:43:31 +02:00
Marcos García
b3a035951f [ bug #817 ] Purchases journal does not reflect localtaxes 2013-04-13 15:22:59 +02:00
Laurent Destailleur
473fbf2c33 Fix: syntax error 2013-04-13 15:09:57 +02:00
Marcos García
3ed4d7bfbf Updated changelog 2013-04-13 14:46:43 +02:00
Marcos García
d6b42ac879 [ bug #816 ] Sales journal does not reflect localtaxes 2013-04-13 14:44:56 +02:00
Laurent Destailleur
6e495bfbe1 Fix: lang loading 2013-04-13 14:38:26 +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
Laurent Destailleur
1409b2b81a Merge pull request #826 from marcosgdf/3.3 
Improved translations
 2013-04-13 04:36:50 -07:00
Marcos García
ac0cd975cd Added missing table head strings into supplier invoices 2013-04-13 13:03:13 +02:00
Marcos García
b6f765ef3c Improved es_ES translations 2013-04-12 23:51:52 +02:00
Laurent Destailleur
90cfa42915 Fix: removed useless   2013-04-12 19:45:09 +02:00
Laurent Destailleur
43fd068d1d Qual: Uniformize way to get graph sizes. 2013-04-12 18:45:19 +02:00
Laurent Destailleur
62893c2ae4 Qual: uniformize code to use function de set with and height for graphs 2013-04-12 17:08:54 +02:00
Laurent Destailleur
26653a42e4 Optimize for terminal with no_mouse_hover 2013-04-12 16:53:06 +02:00
Laurent Destailleur
97b0076c5a Doxygen 2013-04-12 16:31:16 +02:00
Laurent Destailleur
506da3cf21 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-12 16:21:40 +02:00
Laurent Destailleur
ae01285fe9 Look: Replace table with div. 
Look: Optimize for smartphone
 2013-04-12 16:16:39 +02:00
Regis Houssin
faebda20d5 Fix: wrong amounts 2013-04-12 16:09:52 +02:00
Laurent Destailleur
3b939206da Look: Minor optimization 2013-04-12 14:55:40 +02:00
Laurent Destailleur
3238a22afd Fix: Do not show not defined entries 2013-04-12 14:46:48 +02:00
Laurent Destailleur
8f7f0b142d Fix: Change of permission are immediatly effective 2013-04-12 14:27:41 +02:00
Laurent Destailleur
c9b3193c44 Fix: Hooks with version 3.4 must match specification defined here: 
http://wiki.dolibarr.org/index.php/Hooks_system
So i try a better fix that implement correctly this. To have the
moveFileUpload trigger keeping dolibarr code, it must return 0.
 2013-04-12 13:18:24 +02:00
simnandez
2e9a8369a7 Trad: Update ca_ES and es_ES translations 2013-04-12 10:46:33 +02:00
Regis Houssin
9596134e47 Fix: use new method 2013-04-12 10:28:19 +02:00
Regis Houssin
0b2b888584 Fix: use new method 2013-04-12 10:26:52 +02:00
Regis Houssin
85e09a953f Fix: missing return with hook 2013-04-12 10:04:10 +02:00