Commit Graph

37109 Commits

Author SHA1 Message Date
Laurent Destailleur
2483f044c5 Fix: Trans 2013-06-12 16:28:36 +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
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
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
e85b72e452 Fix: Bad error management 2013-06-09 15:59:51 +02: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
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
Marcos García
532c56002d Entities problem with error message in predefined invoice creation 2013-06-08 19:07:13 +02:00
Laurent Destailleur
bd4ca9f1ed Merge remote-tracking branch 'origin/3.3' into 3.4 2013-06-08 16:55:49 +02:00
Laurent Destailleur
49dcc32374 Fix: Param lang forbidden into price function 2013-06-08 16:53:26 +02:00
Laurent Destailleur
b4abe58237 Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
	htdocs/core/lib/pdf.lib.php
2013-06-08 16:49:02 +02:00
Laurent Destailleur
0ffb01e347 Fix: Remove duplicate key 2013-06-08 16:35:52 +02:00
Laurent Destailleur
e13974b5f3 Fix: tcpdf bug 2013-06-08 15:29:27 +02:00
Laurent Destailleur
2c71c898eb Fix: param lang not provided to price function 2013-06-08 15:21:47 +02:00
Laurent Destailleur
afbe6c1808 Fix: translation 2013-06-08 14:56:40 +02:00
Laurent Destailleur
3c9fef8eea Fix: choice of percentage was lost 2013-06-08 01:33:16 +02:00
Laurent Destailleur
dd43f7a890 Fix: memory not freed 2013-06-07 19:12:38 +02:00
Laurent Destailleur
a88a3bb877 Look: More neutral css to match with other skins 2013-06-07 16:39:29 +02:00
Laurent Destailleur
a27d71f083 Fix: Miscellaneous fixes into cachdesk module:
- Missing footer in cashdesk module
- Wrong field label
- Do not use limit list (Freeze when too many product)
2013-06-07 15:59:47 +02:00
Laurent Destailleur
c78d5aa4a7 Fix: Bad param 'zone' into printCommon 2013-06-07 14:52:25 +02:00
Laurent Destailleur
693f4f3b8b Fix: Pb of offset in numbering. Add also phpunit test to detect and test
fix.

Conflicts:
	test/phpunit/NumberingModulesTest.php
2013-06-06 21:25:10 +02:00
Laurent Destailleur
4bc8cbc993 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-06-06 09:43:02 +02:00
Laurent Destailleur
bf8fd7d34f Fix: CSS 2013-06-06 09:42:39 +02:00
Laurent Destailleur
8bad0fc97d Merge pull request #1024 from csalvador/updateline-bug
fixed bug when editing a supplier order line
2013-06-05 15:41:02 -07:00
Laurent Destailleur
56f9d8f50c Fix: missing style 2013-06-05 22:10:43 +02:00
Laurent Destailleur
0b481f285a Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-06-05 21:56:37 +02:00
Laurent Destailleur
61d5359f23 Fix: Uniformize menu entries 2013-06-05 21:55:51 +02:00
Cédric Salvador
37ef86379f fixed bug when editing a supplier order line 2013-06-05 18:19:50 +02:00
simnandez
097fbaacd0 Fix: Warning missing argument 2 into withdrawals 2013-06-05 15:09:30 +02:00
simnandez
a4841dacda Fix: Warning missing argument 2 into withdrawals 2013-06-05 15:09:13 +02:00
Laurent Destailleur
9a5000dd3d Fix: email format 2013-06-05 14:29:05 +02:00
Laurent Destailleur
e4a3929a5c Fix: Minor fixes into style. 2013-06-05 14:23:49 +02:00
Laurent Destailleur
7aa145ae6a Fix: Previous fix was not complete 2013-06-05 11:09:54 +02:00
Laurent Destailleur
650158dd59 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-06-05 10:51:09 +02:00
Laurent Destailleur
f83ab0de70 Fix: ModelDoc Activation bug 2013-06-05 10:49:12 +02:00
Laurent Destailleur
67758c963b Fix: PHPUnit tests 2013-06-04 22:52:58 +02:00
Laurent Destailleur
94d1f23721 Merge pull request #1019 from GPCsolutions/3.3-societefix
Fixed field name
2013-06-04 10:19:44 -07:00
Raphaël Doursenaud
880a27f827 Fixed field name 2013-06-04 18:40:46 +02:00