Commit Graph

43078 Commits

Author SHA1 Message Date
Laurent Destailleur
6344360ccb Update images to resolutions 1280x800 2014-04-26 12:41:00 +02:00
Laurent Destailleur
2bd8da4e70 Missing property 2014-04-25 20:36:13 +02:00
Laurent Destailleur
71ca269c71 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/core/menus/standard/auguria.lib.php
	htdocs/core/menus/standard/eldy.lib.php
2014-04-25 20:29:29 +02:00
Laurent Destailleur
9a320cc50f Removed a function we should not have. 2014-04-25 20:18:26 +02:00
Laurent Destailleur
196cf53dbd Fix: Pb of return values 2014-04-25 20:11:38 +02:00
Laurent Destailleur
ae23d78c74 Add field nb_holidays and salary. 2014-04-25 20:06:19 +02:00
Laurent Destailleur
b117ea83be Fix: missing trans
Fix: detection of html content
2014-04-25 16:45:14 +02:00
jfefe
6b1a57d1b7 Update changelog 2014-04-25 16:13:58 +02:00
jfefe
dbaddd1fbd Add translation support into categories arbo 2014-04-25 15:36:37 +02:00
jfefe
098fa7027c Remove unused note into category translation 2014-04-25 15:36:00 +02:00
jfefe
d256799abf Work on adding catgory translation 2014-04-25 15:17:12 +02:00
Laurent Destailleur
3a7a15cff8 Trans: text more clear 2014-04-25 15:00:18 +02:00
Laurent Destailleur
298da30200 New: Extrafields can be used as substitution key %EXTRA_XXX% into emails
texts for members.
2014-04-25 14:39:34 +02:00
jfefe
b2b8fbb227 Fix : bad call of extrafields into categories 2014-04-25 14:28:22 +02:00
jfefe
afaf5698a5 Fix : bad link to categorie admin page 2014-04-25 14:25:49 +02:00
jfefe
f9e08c23d9 Add multilang support into getProductOrService webservice method 2014-04-25 13:32:31 +02:00
jfefe
181a49c18c Add multilang support into getProductsForCategory webservice method 2014-04-25 13:31:38 +02:00
jfefe
e6e45862a1 Work into multilang into product webservice 2014-04-25 13:31:38 +02:00
Laurent Destailleur
0b1bfa56e2 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-04-24 01:26:53 +02:00
Laurent Destailleur
889ed4a49c Fix: div was opened and not close or the oposite. 2014-04-24 01:26:28 +02:00
Laurent Destailleur
03d73bce9c Merge pull request #1550 from GPCsolutions/staticanalysis
Various fixes to defects found using statical analysis tooling
2014-04-23 21:20:39 +02:00
Laurent Destailleur
078a7f4162 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-04-23 21:19:06 +02:00
Laurent Destailleur
693529c40b Merge pull request #1549 from atm-maxime/develop
Fix : proposal validation was converting third as customer
2014-04-23 21:18:34 +02:00
Laurent Destailleur
31d56d6c38 Merge pull request #1548 from atm-alexis/3.5
Add somes dol_escape_htmltag on product cards inputs
2014-04-23 21:14:42 +02:00
Laurent Destailleur
6c56302fd2 Merge pull request #1547 from GPCsolutions/jsinjection
Qual: Prevent potential JS injection
2014-04-23 21:14:22 +02:00
Laurent Destailleur
5e2c360d38 Merge pull request #1546 from GPCsolutions/linkfix
Fix undeclared variable
2014-04-23 21:13:06 +02:00
Laurent Destailleur
8d6e80d016 Merge pull request #1545 from GPCsolutions/dolidb
Dolidb
2014-04-23 21:12:43 +02:00
Laurent Destailleur
82d57c20cc Merge pull request #1542 from FHenry/develop
add filter to effectif select
2014-04-23 21:10:07 +02:00
Laurent Destailleur
1f4e6d69a1 Merge pull request #1541 from defrance69/patch-8
Update propal.class.php
2014-04-23 21:09:34 +02:00
Raphaël Doursenaud
20842a5c45 Qual: Missing variable declaration 2014-04-23 18:24:11 +02:00
Raphaël Doursenaud
7cdabb7d6c Qual: Derived missing variable from a known one 2014-04-23 18:24:11 +02:00
Raphaël Doursenaud
ae11a151d7 Qual: Derived missing variable from a known one 2014-04-23 18:24:11 +02:00
Raphaël Doursenaud
152fbbd7f6 Qual: Wrong type in method documentation 2014-04-23 18:24:11 +02:00
Raphaël Doursenaud
11ef3ef34e Qual: Missing variable declaration 2014-04-23 18:24:11 +02:00
Raphaël Doursenaud
a57b7d4ed2 Qual: Derived missing variable from a known one 2014-04-23 18:24:10 +02:00
Raphaël Doursenaud
7852020b3d Qual: Missing global declaration 2014-04-23 18:24:10 +02:00
Raphaël Doursenaud
490b45ea7e Qual: Wrong type in method documentation 2014-04-23 18:24:10 +02:00
Raphaël Doursenaud
e3fa0332f4 Qual: Missing global declaration 2014-04-23 18:24:10 +02:00
Raphaël Doursenaud
167457562e Qual: Wrong variable name 2014-04-23 18:24:10 +02:00
Raphaël Doursenaud
8f215205fa Qual: Wrong type in method documentation 2014-04-23 18:24:10 +02:00
Raphaël Doursenaud
79e2bf4737 Qual: Missing global declaration 2014-04-23 18:24:10 +02:00
Raphaël Doursenaud
c4569b10d0 Qual: Wrong variable name 2014-04-23 18:24:09 +02:00
Raphaël Doursenaud
10a0994241 Qual: Wrong type in method documentation 2014-04-23 18:24:09 +02:00
Raphaël Doursenaud
370996d5c4 Qual: Wrong type in method documentation 2014-04-23 18:24:09 +02:00
Raphaël Doursenaud
32f5ecfaa3 Qual: Wrong type in method documentation 2014-04-23 18:24:09 +02:00
Raphaël Doursenaud
6366a66efd Qual: Wrong type in method documentation 2014-04-23 18:24:09 +02:00
Raphaël Doursenaud
9bb454b242 Qual: Wrong variable name 2014-04-23 18:24:09 +02:00
Raphaël Doursenaud
953e196a2c Qual: Missing variable declaration 2014-04-23 18:24:09 +02:00
Raphaël Doursenaud
f357d3c5ab Qual: Missing global declaration 2014-04-23 18:24:09 +02:00
Raphaël Doursenaud
aa1ff28158 Qual: Missing global declaration 2014-04-23 18:24:08 +02:00