Skip to content
Snippets Groups Projects
Commit 141258f5 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

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
parents 2e3aad28 51dd5cf2
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 204 additions and 149 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment