Laurent Destailleur 0c9bc2ac5f Merge branch 'develop' of https://github.com/frederic34/dolibarr into ...

frederic34-develop

Conflicts:
	htdocs/commande/fiche.php
	htdocs/compta/facture.php

2013-06-12 10:47:56 +02:00

..

action

Upgrade tcpdf to 6.0

2013-06-08 16:29:59 +02:00

barcode

Translation of barcode internal engine string

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

cheque/pdf

Upgrade tcpdf to 6.0

2013-06-08 16:29:59 +02:00

commande

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

2013-06-09 16:49:47 +02:00

contract

…

dons

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

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

expedition

Upgrade tcpdf to 6.0

2013-06-08 16:29:59 +02:00

export

Fix: EOF

2013-06-05 16:24:32 +02:00

facture

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

2013-06-09 16:49:47 +02:00

fichinter

Upgrade tcpdf to 6.0

2013-06-08 16:29:59 +02:00

import

Fix: EOF

2013-06-05 16:24:32 +02:00

livraison

Upgrade tcpdf to 6.0

2013-06-08 16:29:59 +02:00

mailings

Fix: not defined default value

2013-05-23 10:04:35 +02:00

member

…

printsheet

…

product

…

project

Upgrade tcpdf to 6.0

2013-06-08 16:29:59 +02:00

propale

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

2013-06-09 16:49:47 +02:00

rapport

Upgrade tcpdf to 6.0

2013-06-08 16:29:59 +02:00

security/generate

…

societe

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

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

supplier_invoice

Upgrade tcpdf to 6.0

2013-06-08 16:29:59 +02:00

supplier_order

Upgrade tcpdf to 6.0

2013-06-08 16:29:59 +02:00

syslog

Fix: log file permission during install

2013-05-03 11:51:26 +02:00

DolibarrModules.class.php

Fix: EOF

2013-06-05 16:24:32 +02:00

index.php

…

modAccounting.class.php

…

modAdherent.class.php

Fix: syntax error

2013-05-31 16:39:34 +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

…

modBoutique.class.php

…

modCashDesk.class.php

…

modCategorie.class.php

…

modClickToDial.class.php

…

modCommande.class.php

…

modComptabilite.class.php

…

modContrat.class.php

…

modCron.class.php

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

2013-04-17 16:26:14 +02:00

modDeplacement.class.php

…

modDocument.class.php

…

modDon.class.php

…

modECM.class.php

…

modExpedition.class.php

…

modExport.class.php

…

modExternalRss.class.php

Fix: syntax error

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

modExternalSite.class.php

…

modFacture.class.php

Qual: Clean code of box management

2013-04-23 16:18:26 +02:00

modFckeditor.class.php

…

modFicheinter.class.php

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

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

modFournisseur.class.php

Update modFournisseur.class.php

2013-05-24 16:17:36 +02:00

modFTP.class.php

…

modGeoIPMaxmind.class.php

…

modGravatar.class.php

Qual: Clean code.

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

modHoliday.class.php

Qual: Clean code.

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

modImport.class.php

…

modLabel.class.php

…

modLdap.class.php

…

modMailing.class.php

…

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: Clean code.

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

modNotification.class.php

…

modOpenSurvey.class.php

Fix: EOF

2013-06-05 16:24:32 +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

…

modPrintIPP.class.php

Merge remote-tracking branch 'upstream/develop' into develop

2013-04-08 11:33:45 +02:00

modProduct.class.php

Fix: [ bug #916 ] Products complementary attributes, imports and

2013-05-29 18:18:24 +02:00

modProjet.class.php

Change duration _planned by planned_workload

2013-05-14 20:22:33 +02:00

modPropale.class.php

…

modService.class.php

…

modSociete.class.php

Fix: [ bug #916 ] Same for Thirds and Members

2013-05-30 18:00:08 +02:00

modStock.class.php

…

modSyslog.class.php

…

modTax.class.php

…

modUser.class.php

…

modWebServices.class.php

…

modWorkflow.class.php

Qual: Clean code.

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