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

37465 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Regis Houssin
d9f2ad4ff4 Revert "Fix: hookmanager code" 
This reverts commit 89c3cfec3a.
 2013-06-11 09:36:39 +02:00
Laurent Destailleur
1c8edb9cb5 Use currency symbol instead of text 2013-06-11 02:06:34 +02:00
Regis Houssin
89c3cfec3a Fix: hookmanager code 2013-06-10 19:46:37 +02:00
Laurent Destailleur
482a771e7c Fix: Some quality fixes 2013-06-10 19:04:04 +02:00
Laurent Destailleur
83cf8a8e73 Merge pull request #1039 from grandoc/develop 
fix : language error
 2013-06-10 09:08:07 -07:00
Laurent Destailleur
9ae32c418f Merge pull request #1037 from defrance69/patch-21 
Update fiche.php
 2013-06-10 09:06:56 -07:00
Laurent Destailleur
48b33a7678 Merge pull request #1036 from defrance69/patch-20 
Create html.formcontract.class.php
 2013-06-10 09:06:41 -07:00
Laurent Destailleur
a925d8d535 Merge remote-tracking branch 'origin/3.4' into develop 2013-06-10 17:01:24 +02:00
Laurent Destailleur
56d8807e92 Fix logo after renaming menu 2013-06-10 16:32:44 +02:00
Grand Philippe
43cb1e6a4b fix : language error 2013-06-10 14:51:52 +02:00
Laurent Destailleur
53f512b7dc Update doc 2013-06-10 09:54:23 +02:00
BENKE Charles
b42a3a716d Update fiche.php 
change the call of select_contract function
 2013-06-09 22:15:37 +03:00
BENKE Charles
6167fedff8 Create html.formcontract.class.php 
Add select_contract function who create à lisbox of contract
 2013-06-09 22:08:05 +03:00
Laurent Destailleur
b8f721092f Removed useless comments 2013-06-09 18:36:47 +02:00
Laurent Destailleur
0aab0cca75 Fix doxygen 2013-06-09 18:29:06 +02:00
Laurent Destailleur
88291e423f Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-06-09 18:24:52 +02:00
Laurent Destailleur
f78240c067 Doxygen 2013-06-09 18:24:30 +02:00
Laurent Destailleur
5b23e821e6 Merge pull request #1033 from FHenry/3.4 
Fix bug on extrafeild type price and double
 2013-06-09 07:59:10 -07:00
Laurent Destailleur
11ffe3b7b9 Merge pull request #1032 from marcosgdf/develop 
CR Fix
 2013-06-09 07:57:37 -07:00
Florian Henry
4f438224d7 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-06-09 16:56:47 +02:00
Florian Henry
646be9b984 Fix bug on extrafeild type price and double 2013-06-09 16:56:29 +02:00
Laurent Destailleur
51d11ff190 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/compta/facture/stats/index.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/includes/tcpdf/tcpdf.php
	htdocs/langs/el_GR/other.lang
	htdocs/langs/en_US/cashdesk.lang
	htdocs/langs/en_US/main.lang
	htdocs/langs/es_ES/products.lang
	htdocs/main.inc.php
	test/phpunit/NumberingModulesTest.php
 2013-06-09 16:49:47 +02:00
Laurent Destailleur
1e0cb64bce Fix: Bad error management 2013-06-09 16:15:49 +02:00
Laurent Destailleur
050819ce0b Fix: dead code 2013-06-09 16:15:12 +02:00
Laurent Destailleur
9bb539843f Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-06-09 16:14:19 +02:00
Laurent Destailleur
a5f401f913 Fix: phpunit file 2013-06-09 16:13:59 +02:00
Laurent Destailleur
1eb2fc9fbd Fix: phpunit file 2013-06-09 16:13:24 +02:00
Laurent Destailleur
e85b72e452 Fix: Bad error management 2013-06-09 15:59:51 +02:00
Marcos García
0abcea745e CR Fix 
Git required me to commit these changes
 2013-06-09 15:47:03 +02:00
Marcos García
a12276f22c Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-06-09 15:45:55 +02:00
Marcos García
3e0815c759 CR Fix 
Git required me to commit these changes
 2013-06-09 15:37:25 +02:00
Laurent Destailleur
89ee79f5cf New: Implement same rule for return value of all command line scripts (0 
when success, <>0 if error).
 2013-06-09 14:40:33 +02:00
Laurent Destailleur
e6155ebfd8 Fix: missing class 2013-06-09 12:56:20 +02:00
Laurent Destailleur
e1f922b37b Update changelog 2013-06-09 12:49:05 +02:00
Laurent Destailleur
7d2f904174 Fix: Option MEMBER_PAYONLINE_SENDEMAIL was not working 2013-06-09 12:47:44 +02:00
Laurent Destailleur
49d65e5ebe Fix: criteria of select 2013-06-09 03:10:31 +02:00
Laurent Destailleur
96286571e7 Merge pull request #1031 from marcosgdf/bug-933 
Fix bug #933: Ajax error
 2013-06-08 17:48:28 -07:00
Laurent Destailleur
d416a7397c Merge pull request #1030 from marcosgdf/translations 
Fixed wrong translation key and and improved translations
 2013-06-08 17:46:37 -07:00
Marcos García
f0454926c2 Fix bug #933: Ajax error 
Caused by commit 7e53f98
 2013-06-08 22:29:18 +02:00
Marcos García
3b28de0a07 Fixed some translation problems 2013-06-08 21:57:57 +02:00
Marcos García
cf6bfcc9c4 Missing translations 2013-06-08 20:31:39 +02:00
Marcos García
a06de736c2 Merge branch '3.4' into translations 2013-06-08 20:29:07 +02:00
Marcos García
17efbd41c7 Improved es_ES translation 2013-06-08 20:18:09 +02:00
Marcos García
000de9530d Fixed wrong translation key and and improved es_ES translations 2013-06-08 20:15:48 +02:00
Laurent Destailleur
7e8df8df72 Merge pull request #1029 from marcosgdf/minor 
Removed debug message and wrong translation key
 2013-06-08 11:03:41 -07:00
Marcos García
3cff899b44 Removed debug message and wrong translation key 2013-06-08 20:01:51 +02:00
Laurent Destailleur
5eac7a0bcc Merge pull request #1028 from marcosgdf/minor 
Entities problem with error message in predefined invoice creation
 2013-06-08 11:01:34 -07:00
Laurent Destailleur
c8a634fa08 Merge pull request #1027 from marcosgdf/develop 
CR fix
 2013-06-08 11:01:07 -07:00
Laurent Destailleur
2c14496d3c Fi: translation 2013-06-08 19:56:56 +02:00
Laurent Destailleur
9f0107a6b8 Fxi language 2013-06-08 19:21:24 +02:00