lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40,390 Commits 43 Branches 150 Tags 886 MiB
f34aadef3d
Commit Graph

40390 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Juanjo Menent
cb8cbecbde Merge pull request #831 from marcosgdf/translations 
Improved margins module es_ES translation
 2013-04-14 04:44:03 -07:00
Marcos García
0e34df43b1 Updated changelog 2013-04-14 13:09:00 +02: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
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
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