Laurent Destailleur 141258f514 Merge remote-tracking branch 'origin/3.4' into develop ...

and fix syntax errors into sql requests.
Group by must ALWAYS contains fields that are not included into SUM or
COUNT

Conflicts:
	htdocs/fourn/product/liste.php
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
	htdocs/margin/productMargins.php
	htdocs/margin/tabs/productMargins.php

2013-10-07 16:17:51 +02:00

..

ajax

Qual: Uniformize fields departement_id into state_id

2013-09-20 14:35:58 +02:00

boxes

Merge remote-tracking branch 'origin/3.4' into develop

2013-09-24 13:17:58 +02:00

class

better margin calculation (especially for credit notes)

2013-10-05 10:29:22 +02:00

db

Fixed tinyint for PostgreSQL in a more generic way

2013-09-11 17:34:35 +02:00

filemanagerdol

CSS fixes

2013-09-05 20:54:19 +02:00

js

Fixed bad copy-paste

2013-09-06 10:22:13 +02:00

lib

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into

2013-09-28 13:26:52 +02:00

login

Work on openif authentication mode

2013-09-18 21:22:24 +02:00

menus

Code comment

2013-09-15 12:17:45 +02:00

modules

Merge remote-tracking branch 'origin/3.4' into develop

2013-10-07 16:17:51 +02:00

tpl

fix bad margin calculation for credit notes

2013-09-24 17:49:56 +02:00

triggers

Fix: Sending email from thirdparty must add event into agenda if option

2013-09-25 21:36:40 +02:00

actions_extrafields.inc.php

Qual: Uniformise name of include files we use to share common code found

2013-09-23 13:22:28 +02:00

actions_sendmails.inc.php

Fix: Sending email from thirdparty must add event into agenda if option

2013-09-25 21:36:40 +02:00

antispamimage.php

Fix: Check consitency of option NOREQUIREXXX

2013-02-24 14:54:08 +01:00

datepicker.php

Qual: Work to prepare usage of jquery data plugins.

2013-04-18 19:37:50 +02:00

doxygen.php

…

get_menudiv.php

Fix: Var not initialized

2013-06-01 23:46:36 +02:00

index.php

…

photos_resize.php

…

search_page.php

Fix: convert line delimiters

2013-06-24 17:34:22 +02:00

tools.php

Fix: Permissions on files

2013-08-06 00:36:21 +02:00