fhenry 2440513007 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ...

develop

Conflicts:
	htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/opensurvey/fonctions.php
	htdocs/opensurvey/public/choix_date.php
	htdocs/opensurvey/public/create_survey.php
	htdocs/opensurvey/public/exportcsv.php
	htdocs/public/paybox/paymentko.php

Change-Id: I57468f3a0f6bb1115bd48b84517060432102c2ea

2013-04-11 10:04:27 +02:00

..

action

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

2013-01-16 15:45:17 +01:00

barcode

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

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

cheque/pdf

english language standardization

2013-02-25 09:52:24 +01:00

commande

Add: ODTSubstitution and ODTSubstitutionLine hooks with $odfHandler for extended ODT substitution

2013-04-03 00:57:40 +02:00

contract

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

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

dons

english language standardization

2013-02-24 17:08:52 +01:00

expedition

[ task #811 ] Uniformanize note field

2013-04-09 17:18:07 +02:00

export

New: enhance tool fixdosfiles.sh

2013-03-30 14:27:13 +01:00

facture

Add: ODTSubstitution and ODTSubstitutionLine hooks with $odfHandler for extended ODT substitution

2013-04-03 00:57:40 +02:00

fichinter

Fix: $hookmanager is a global object

2013-01-26 10:35:30 +01:00

import

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

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

livraison

english language standardization

2013-02-25 09:52:24 +01:00

mailings

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

2013-04-11 07:39:16 +02:00

member

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

2013-01-16 15:36:08 +01: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

Qual : PHP Code_Sniffer

2013-04-10 19:55:21 +02:00

propale

Add: ODTSubstitution and ODTSubstitutionLine hooks with $odfHandler for extended ODT substitution

2013-04-03 00:57:40 +02:00

rapport

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

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

security/generate

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

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

societe

Add: ODTSubstitution and ODTSubstitutionLine hooks with $odfHandler for extended ODT substitution

2013-04-03 00:57:40 +02:00

supplier_invoice

Fix: Some bug into supplier pdf invoice setup.

2013-03-19 15:19:31 +01:00

supplier_order

Add paiement mode et delay on PDF muscadet

2013-04-06 13:38:32 +02:00

syslog

New: dol_syslog method accept a suffix to use different log files for

2013-02-28 16:19:16 +01:00

DolibarrModules.class.php

Qual: More robust error management for menu description

2013-03-30 19:11:52 +01: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

change birth instead of naiss

2013-03-13 22:17:03 +01:00

modAgenda.class.php

Update modAgenda.class.php

2013-03-25 18:26:35 +01:00

modBanque.class.php

Merge

2013-03-22 17:10:17 +01:00

modBarcode.class.php

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

2013-01-16 15:36:08 +01: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

Fix: Ton of bugs into renaming fields

2013-03-09 16:19:15 +01: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: Ton of bugs into renaming fields

2013-03-09 16:19:15 +01: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

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

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

modCron.class.php

New: enhance tool fixdosfiles.sh

2013-03-30 14:27:13 +01:00

modDeplacement.class.php

english language standardization

2013-02-23 17:40:28 +01: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

normalize and simplify code

2013-03-17 12:56:54 +01: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

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

2013-01-16 15:36:08 +01: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: Ton of bugs into renaming fields

2013-03-09 16:19:15 +01:00

modFckeditor.class.php

task #768:

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

modFicheinter.class.php

Fix: Ton of bugs into renaming fields

2013-03-09 16:19:15 +01:00

modFournisseur.class.php

try to fix: supplier invoice numbering

2013-03-17 15:27:52 +01: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

Fix: Ton of bugs into renaming fields

2013-03-09 16:19:15 +01:00

modHoliday.class.php

Fix: Ton of bugs into renaming fields

2013-03-09 16:19:15 +01: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

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

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

modMargin.class.php

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

2013-01-16 15:36:08 +01: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

New: Add module opensurvey. Final. Test are welcome.

2013-04-09 23:05:50 +02:00

modPaybox.class.php

Fix: Ton of bugs into renaming fields

2013-03-09 16:19:15 +01:00

modPaypal.class.php

Fix: Ton of bugs into renaming fields

2013-03-09 16:19:15 +01: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

Qual : Review code after intalling PHPUnit, CodeSniffer on Eclipse...

2013-04-04 13:58:33 +02:00

modProduct.class.php

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

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

modProjet.class.php

Fix bug on ODT template path for order and projects

2013-04-08 18:02:12 +02:00

modPropale.class.php

Fix: Ton of bugs into renaming fields

2013-03-09 16:19:15 +01:00

modService.class.php

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

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

modSociete.class.php

Fix: Force format text of excel text fields

2013-03-09 16:58:55 +01:00

modStock.class.php

english language standardization

2013-02-24 17:08:52 +01: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

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

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