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

36309 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
4fab5fbeeb Fix: bad language file 2013-04-15 23:11:48 +02:00
Laurent Destailleur
3887b904ab Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-15 22:26:33 +02:00
Laurent Destailleur
51fe0d9e09 Removed duplicate function 2013-04-15 22:26:03 +02:00
Regis Houssin
5682e0ae25 Fix: missing quote 2013-04-15 21:40:49 +02:00
Regis Houssin
c9dba00f3f Fix: missing current entity record 2013-04-15 21:29:49 +02:00
Laurent Destailleur
b7edb3f472 Fix: Correct css 2013-04-15 18:04:22 +02:00
Laurent Destailleur
37e54b3d80 Qual: Update copyright files. 
Qual: Removed not used library.
Look: Uniformize css.
 2013-04-15 18:00:20 +02:00
Laurent Destailleur
8e1c06f617 Qual: Cleaner menu sources 2013-04-15 15:56:50 +02:00
Laurent Destailleur
a4073dddd4 Doxygen llxHeader and llxFooter. 2013-04-15 15:43:25 +02:00
Laurent Destailleur
de2ddc02e4 Qual: Another clean of menu management system. Removed all files 
pre.inc.php
 2013-04-15 13:11:29 +02:00
Laurent Destailleur
8a0e111417 Fix: Bad array type 2013-04-15 12:39:34 +02:00
Laurent Destailleur
2db3bcc72e Fix: migration 3.3.0 to 3.4.0 2013-04-15 10:00:09 +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
Marcos García
462719331e Updated changelog 2013-04-15 09:13:00 +02:00
simnandez
ae09d2fa3f Improved margins ca_ES translation 2013-04-15 09:11:58 +02:00
Marcos García
9163a0a9d0 Converted indentation to tabs 2013-04-15 09:11:40 +02:00
Marcos García
60cd3d1e41 Fixed bug #807: Margins modules with orders2invoice does not respect cost price 
Also, removed duplicated requires in orderstoinvoice.php
 2013-04-15 09:11:30 +02:00
Marcos García
150c862705 Improved margins es_ES translation 2013-04-15 09:11:20 +02:00
Marcos García
16afa18e95 Improved and added missing es_ES translations 2013-04-15 00:09:29 +02:00
Laurent Destailleur
36c55971b5 Fix: PHPUnit Regression 2013-04-14 23:57:07 +02:00
Laurent Destailleur
67052933ca Fix: PHPUnit 2013-04-14 23:42:24 +02:00
Laurent Destailleur
eead2977d9 Fix: pgsql upgrade 2013-04-14 23:15:55 +02:00
Laurent Destailleur
0e073038ad Fix: Check on correct security key 2013-04-14 20:59:16 +02:00
Laurent Destailleur
f028cce39d Qual: More log 2013-04-14 20:43:38 +02:00
Laurent Destailleur
de9f100968 Fix: check read feature 2013-04-14 20:34:31 +02:00
Laurent Destailleur
22731788c5 Qual: Remove duplicate script. Enhance old one. 2013-04-14 20:15:55 +02:00
Laurent Destailleur
67a4431529 Fix into emailing 2013-04-14 20:05:23 +02:00
Laurent Destailleur
a0851ba99f More complete log. 2013-04-14 18:10:02 +02:00
Laurent Destailleur
e4c4cced70 Look: Optimize for small screen 2013-04-14 16:11:55 +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
f8c3396fa7 Fix: "Now" button was not working when using combo calendar selector. 2013-04-14 14:45:23 +02:00
Laurent Destailleur
22402c38f8 Still working on new menu management. 2013-04-14 14:32:38 +02:00
Juanjo Menent
de19af9e9f Merge pull request #825 from FHenry/develop 
[ task #814 ] Add extrafield feature into Project/project tasks module
 2013-04-14 05:15:17 -07:00
Laurent Destailleur
baad1ffc56 New: Add link to autofill/reset with quantity to ship when creating 
a delivery receipt.
 2013-04-14 12:19:21 +02:00
Laurent Destailleur
83f88af269 doxygen 2013-04-14 11:42:39 +02:00
Laurent Destailleur
3cec5bfc40 doxygen 2013-04-14 11:22:00 +02:00
Laurent Destailleur
d7d30f8fc9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-14 11:07:38 +02:00
Laurent Destailleur
b86eba7f34 doxygen 2013-04-14 10:50:33 +02:00
Laurent Destailleur
9d88ec7141 doxygen 2013-04-14 10:48:34 +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
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