Laurent Destailleur b675b9b610 Merge remote-tracking branch 'origin/3.5' into develop ...

Conflicts:
	htdocs/comm/action/fiche.php
	htdocs/core/class/conf.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/company.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/fourn/facture/fiche.php
	htdocs/langs/en_US/admin.lang
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
	htdocs/margin/productMargins.php
	htdocs/projet/tasks/task.php

2014-03-31 00:44:45 +02:00

..

action

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

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

barcode

anglicized

2014-02-27 10:06:11 +01: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.5' into develop

2014-03-31 00:44:45 +02:00

contract

fix : display specimen

2014-03-14 18:23:37 +01:00

dons

Removed some TODO

2014-02-06 20:45:50 +01:00

expedition

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

2014-03-31 00:44:45 +02:00

export

Revert "Method should be static"

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

facture

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

2014-03-31 00:44:45 +02:00

fichinter

debug the Soleil model

2013-11-22 09:51:48 +01:00

import

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

2014-03-21 15:03:37 +01:00

livraison

Fix: Option MAIN_PDF_DASH_BETWEEN_LINES was not working when tcpdf was

2014-03-19 16:36:12 +01:00

mailings

Fix: Several bugs.

2013-11-16 13:00:21 +01:00

member

Fix: A lot of fix into sticker sheet dimension management.

2014-01-08 15:16:56 +01:00

printsheet

Fix: A lot of fix into sticker sheet dimension management.

2014-01-08 15:16:56 +01:00

product

…

project

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

2014-03-24 00:16:47 +01:00

propale

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

2014-03-31 00:44:45 +02:00

rapport

Sec: Missing permission tests

2014-01-30 11:48:14 +01:00

security/generate

…

societe

Fix: Solve pb of too many embedded tables

2014-03-23 20:18:07 +01:00

supplier_invoice

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

2014-03-19 22:29:18 +01:00

supplier_order

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

2014-03-19 22:29:18 +01:00

syslog

New: Add hidden option to disable log handlers.

2013-10-30 19:08:41 +01:00

DolibarrModules.class.php

Fix: error

2014-03-16 20:05:07 +01:00

index.php

…

modAccounting.class.php

…

modAdherent.class.php

New: Export/import profile include state.

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

modAgenda.class.php

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

2014-01-20 02:42:37 +01: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: When cloning product, autogenerating barcode must not use same

2014-03-16 17:37:54 +01:00

modBookmark.class.php

…

modBoutique.class.php

…

modCashDesk.class.php

…

modCategorie.class.php

Fix: Some debugs of module categories

2014-03-18 00:20:39 +01:00

modClickToDial.class.php

…

modCommande.class.php

Fix: Migration must load new boxes

2013-10-26 16:18:28 +02:00

modComptabilite.class.php

…

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

Qual: Feature to make payment of salaries has been moved into a module

2014-03-17 14:30:55 +01:00

modDocument.class.php

…

modDon.class.php

…

modECM.class.php

…

modExpedition.class.php

Fix: Bad dir

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

modExport.class.php

…

modExternalRss.class.php

Fix: syntax error

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

modExternalSite.class.php

…

modFacture.class.php

Update modFacture.class.php

2014-01-12 14:59:23 +01:00

modFckeditor.class.php

Fix: Bad description

2014-03-02 16:44:31 +01:00

modFicheinter.class.php

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

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

modFournisseur.class.php

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

2013-12-24 16:28:27 +01: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: Doxygen

2013-08-22 16:49:23 +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: Doxygen

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

modNotification.class.php

…

modOpenSurvey.class.php

Fix: ajax_combobox function must be included before called.

2014-03-26 16:02:22 +01: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

Start to debug/fix module IPP

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

modProduct.class.php

New: Add a public url as a property for products/services.

2014-03-14 13:51:46 +01:00

modProductBatch.class.php

Use better module id number

2014-03-05 12:25:31 +01:00

modProjet.class.php

Update modProjet.class.php

2014-02-27 11:29:08 +01:00

modPropale.class.php

Fix: Pb into export descriptions

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

modSalaries.class.php

Qual: Feature to make payment of salaries has been moved into a module

2014-03-17 14:30:55 +01:00

modService.class.php

Fix: Translation of menu entries must not be into admin lang file (We

2014-02-19 02:27:13 +01:00

modSkype.class.php

Move skype module from experimental to stable.

2014-03-14 15:26:26 +01:00

modSociete.class.php

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

2014-03-21 15:03:37 +01:00

modStock.class.php

- Add table modification for product (forget in step 1)

2014-03-04 18:55:55 +01:00

modSyslog.class.php

…

modTax.class.php

…

modUser.class.php

Updated user export labels

2014-02-25 04:39:41 +01:00

modWebServices.class.php

…

modWorkflow.class.php

Qual: Clean code.

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