Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
40,390 Commits 36 Branches 189 Tags
f34aadef3df57794de74006bc2c2c9fc4da6be12
Commit Graph

34721 Commits

Author SHA1 Message Date
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
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
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
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
simnandez
e27e5e9c44 Improved margins ca_ES translation 2013-04-14 13:53:48 +02:00
Juanjo Menent
e934614fce Merge pull request #830 from marcosgdf/bug-807 
Fixed bug #807: Margins modules with orders2invoice does not respect cost price
 2013-04-14 04:44:58 -07:00
Marcos García
b6ce386513 Converted indentation to tabs 2013-04-14 13:07:05 +02:00
Marcos García
90b9e7c136 Fixed bug #807: Margins modules with orders2invoice does not respect cost price 
Also, removed duplicated requires in orderstoinvoice.php
 2013-04-14 13:06:13 +02:00
Marcos García
6b031616fa Improved margins es_ES translation 2013-04-14 12:34:10 +02: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
3cec5bfc40 doxygen 2013-04-14 11:22:00 +02:00
Laurent Destailleur
b86eba7f34 doxygen 2013-04-14 10:50:33 +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
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
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