Laurent Destailleur fc0d5abd14 Merge remote-tracking branch 'origin/3.3' into develop ...

Conflicts:
	ChangeLog
	htdocs/compta/prelevement/bons.php
	htdocs/compta/prelevement/fiche-stat.php
	htdocs/contact/class/contact.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/modSociete.class.php
	htdocs/projet/fiche.php
	test/phpunit/FilesLibTest.php

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

..

action

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

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

barcode

Translation of barcode internal engine string

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

cheque/pdf

english language standardization

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

commande

Implement MAIN_DOC_USE_TIMING into project and order ODT

2013-04-26 08:48:44 +02:00

contract

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

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

dons

Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap

2013-04-25 01:13:13 +02:00

expedition

Change carrier config into dict instead of dedicated conf page

2013-04-19 20:20:10 +02:00

export

New: enhance tool fixdosfiles.sh

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

facture

Use MAIN_DOC_USE_TIMING on invoices (odt)

2013-04-26 08:48:44 +02:00

fichinter

Fix: $hookmanager is a global object

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

import

Fix: Remove separator files.

2013-04-30 23:08:07 +02:00

livraison

Fix: Uniformize pdf code for typhon. This should also solve problem

2013-04-19 09:52:25 +02: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

Implement MAIN_DOC_USE_TIMING into project and order ODT

2013-04-26 08:48:44 +02:00

propale

Use MAIN_DOC_USE_TIMING on proposals (ODT)

2013-04-26 08:48:44 +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

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 develop

2013-04-14 01:46:33 +02:00

supplier_order

Add paiement mode et delay on PDF muscadet

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

syslog

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

2013-04-28 01:24:58 +02:00

DolibarrModules.class.php

Fix: Avoid empty arrays

2013-05-01 16:00:06 +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

Fix: Better error message during import of csv with records split onto

2013-04-25 23:49:24 +02:00

modAgenda.class.php

Fix: Removed warnings

2013-04-26 19:13:39 +02:00

modBanque.class.php

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

2013-04-23 14:04:56 +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

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

Qual: No need to use two menu entries for this.

2013-04-17 16:26:14 +02: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

Qual: Clean code of box management

2013-04-23 16:18:26 +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

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

Qual: Another clean of menu management system. Removed all files

2013-04-15 13:11:29 +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

Pgsql compatibility

2013-04-19 15:02:53 +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

[ task #814 ] Add extrafield feature into Project/project tasks module

2013-04-12 11:09:53 +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: Import of contact/address not complete and not working with pgsql

2013-04-30 22:56:52 +02: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