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

..

action

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

2013-09-22 19:57:48 +02:00

barcode

Translation of barcode internal engine string

2013-04-27 12:49:19 +02:00

cheque/pdf

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

2013-09-22 19:57:48 +02:00

commande

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

2013-09-22 19:57:48 +02:00

contract

uniformize

2013-09-02 11:53:07 +02:00

dons

I killed <td nowrap>. Hello <td class="nowrap"> !

2013-07-19 14:23:42 +02:00

expedition

Fix: Use correct translation key

2013-09-25 19:07:25 +02:00

export

Revert "Method should be static"

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

facture

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

2013-09-22 19:57:48 +02:00

fichinter

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

2013-09-22 19:57:48 +02:00

import

Fix: convert line delimiters

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

livraison

Doc

2013-09-25 12:37:19 +02:00

mailings

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

2013-09-04 15:13:38 +02:00

member

Qual: Make code more generic

2013-09-02 02:14:16 +02:00

printsheet

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

product

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

project

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

2013-09-22 19:57:48 +02:00

propale

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

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

rapport

Fix: Better management of pdf generation when tcpdf not available.

2013-09-22 19:53:27 +02:00

security/generate

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

societe

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

2013-05-03 00:15:02 +02:00

supplier_invoice

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

2013-09-22 19:57:48 +02:00

supplier_order

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

2013-09-22 20:01:33 +02:00

syslog

More accurate log file

2013-09-09 12:23:15 +02:00

DolibarrModules.class.php

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

2013-06-25 23:22:00 +02:00

index.php

…

modAccounting.class.php

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

modAdherent.class.php

New: Export/import profile include state.

2013-08-31 12:43:41 +02:00

modAgenda.class.php

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

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

modBanque.class.php

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

2013-08-01 17:42:18 +02:00

modBarcode.class.php

Fix: pgsql compatibility

2013-04-20 23:43:02 +02:00

modBookmark.class.php

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

modBoutique.class.php

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

modCashDesk.class.php

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

modCategorie.class.php

Qual: removed a bunch of duplicated array keys

2013-09-05 17:00:18 +02:00

modClickToDial.class.php

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

modCommande.class.php

Fix: Export of country

2013-08-01 15:28:19 +02:00

modComptabilite.class.php

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

modContrat.class.php

some fix for contract model and clean code

2013-08-26 14:29:46 +02:00

modCron.class.php

Qual: Doxygen

2013-08-22 16:49:23 +02:00

modDeplacement.class.php

Fix: Tons of regression after renaming note field into note_private.

2013-08-06 13:22:35 +02:00

modDocument.class.php

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

modDon.class.php

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

modECM.class.php

Taking account remark on pull request da17302

2013-03-04 16:59:39 +01:00

modExpedition.class.php

Fix: Bad dir

2013-08-07 13:35:09 +02:00

modExport.class.php

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

modExternalRss.class.php

Fix: syntax error

2013-05-31 16:39:34 +02:00

modExternalSite.class.php

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

modFacture.class.php

Fix: Tons of regression after renaming note field into note_private.

2013-08-06 13:22:35 +02:00

modFckeditor.class.php

task #768:

2013-03-16 09:23:34 +01:00

modFicheinter.class.php

[ task #741 ] Gestion des interventions/Add intervention box

2013-04-17 16:20:01 +02:00

modFournisseur.class.php

Fix: Tons of regression after renaming note field into note_private.

2013-08-06 13:22:35 +02:00

modFTP.class.php

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

modGeoIPMaxmind.class.php

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

modGravatar.class.php

Qual: Clean code.

2013-06-03 15:18:36 +02:00

modHoliday.class.php

Qual: Doxygen

2013-08-22 16:49:23 +02:00

modImport.class.php

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

modLabel.class.php

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

modLdap.class.php

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

modMailing.class.php

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

modMailmanSpip.class.php

New: Module mailman can subscribe/unsubscribe to ML according to

2013-06-05 15:44:42 +02:00

modMargin.class.php

Qual: Doxygen

2013-08-22 16:49:23 +02:00

modNotification.class.php

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

modOpenSurvey.class.php

Qual: Doxygen

2013-08-22 16:49:23 +02:00

modPaybox.class.php

Qual: Clean code.

2013-06-03 15:18:36 +02:00

modPaypal.class.php

Qual: Clean code.

2013-06-03 15:18:36 +02:00

modPrelevement.class.php

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

modPrintIPP.class.php

Start to debug/fix module IPP

2013-06-12 11:35:30 +02:00

modProduct.class.php

Qual: removed a bunch of duplicated array keys

2013-09-05 17:00:18 +02:00

modProjet.class.php

Update modProjet.class.php

2013-09-14 10:45:41 +02:00

modPropale.class.php

Fix: Pb into export descriptions

2013-08-01 15:30:27 +02:00

modService.class.php

Qual: removed a bunch of duplicated array keys

2013-09-05 17:00:18 +02:00

modSociete.class.php

Merge pull request #1202 from FHenry/develop

2013-09-01 15:01:33 -07:00

modStock.class.php

Qual: removed a bunch of duplicated array keys

2013-09-05 17:00:18 +02:00

modSyslog.class.php

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

modTax.class.php

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

modUser.class.php

english language standardization

2013-02-23 17:40:28 +01:00

modWebServices.class.php

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

modWorkflow.class.php

Qual: Clean code.

2013-06-03 15:18:36 +02:00