Laurent Destailleur c73fe965d2 Merge remote-tracking branch 'origin/3.6' into 3.7 ...

Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/class/facture.class.php

2015-08-13 03:58:32 +02:00

..

action

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

2014-11-05 16:37:07 +01:00

barcode

Uniformize code: property "nom" for thirdparty is aliased into "name"

2014-10-04 17:20:17 +02:00

cheque

Fix #2695

2015-04-22 19:25:20 +02:00

commande

Fix: Masks works with thirdparty type

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

contract

FIX Ref/label of product on contract line was not visible, nor into

2015-04-29 19:57:01 +02:00

dons

Removed index.php and replaced them with blank index.html as it is more appropriate

2014-07-12 23:18:57 +02:00

expedition

Fix: Not showing delivery date on rouget pdf (expedition)

2015-07-27 13:11:07 +02:00

export

Merge remote-tracking branch 'origin/3.6' into 3.7

2015-07-19 12:04:30 +02:00

facture

Merge remote-tracking branch 'origin/3.6' into 3.7

2014-11-28 02:20:01 +01:00

fichinter

Fix: Masks works with thirdparty type

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

import

Merge pull request #2386 from lrq3000/3.7

2015-02-24 17:16:17 +01:00

livraison

Fix: Masks works with thirdparty type

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

mailings

Uniformize code: property "nom" for thirdparty is aliased into "name"

2014-10-04 17:20:17 +02:00

member

Fix bad operator for and

2015-02-03 13:05:28 +01:00

printsheet

Fix bad operator for and

2015-02-03 13:05:28 +01:00

product

Uniformize code: property "nom" for thirdparty is aliased into "name"

2014-10-04 17:20:17 +02:00

project

Position of field into pdf baleine

2015-03-14 12:35:03 +01:00

propale

Clean code

2015-05-06 23:31:03 +02:00

rapport

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

2014-09-28 02:14:32 +02:00

security

Fix: checkstyle

2014-11-05 16:23:10 +01:00

societe

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

2015-03-14 13:46:18 +01:00

supplier_invoice

Merge remote-tracking branch 'origin/3.6' into 3.7

2015-07-30 15:07:22 +02:00

supplier_order

Merge remote-tracking branch 'origin/3.6' into 3.7

2015-07-30 15:07:22 +02:00

syslog

Fix error when using a log hangler that make output into the http

2015-03-21 01:22:05 +01:00

DolibarrModules.class.php

Merge remote-tracking branch 'origin/3.6' into 3.7

2015-08-13 03:58:32 +02:00

index.html

Removed index.php and replaced them with blank index.html as it is more appropriate

2014-07-12 23:18:57 +02:00

modAccounting.class.php

FIXED Accountancy clean code

2015-02-03 06:39:44 +01:00

modAdherent.class.php

Fixed SQL table reference for members types in export

2015-04-30 17:20:53 +02:00

modAgenda.class.php

Fix pb during export of agenda events

2015-03-26 11:23:21 +01:00

modBanque.class.php

Some fix with export definition. Works now with pgql too.

2014-10-12 01:59:21 +02:00

modBarcode.class.php

Fix #3304

2015-08-07 12:45:27 +02:00

modBookmark.class.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

modCashDesk.class.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

modCategorie.class.php

FIX Export of tags for contact and member

2015-06-01 21:34:21 +02:00

modClickToDial.class.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

modCommande.class.php

Fix error into export filter step

2015-05-05 12:45:38 +02:00

modComptabilite.class.php

Delete elements have a link with old module ventilation - Replace today by module Accounting Expert

2014-09-19 05:55:54 +02:00

modContrat.class.php

FIX We did a test on a permission to export contract when permission did

2015-05-10 23:46:34 +02:00

modCron.class.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

modDeplacement.class.php

Fix: [ bug #1735 ] Rights to delete expense notes no longer there - cannot delete expense notes

2015-01-18 03:12:46 +01:00

modDocument.class.php

Fix: [ bug #1364 ] Duplicate Id on permission

2014-05-06 23:27:44 +02:00

modDon.class.php

Fix: bad indice

2014-06-27 01:34:27 +02:00

modECM.class.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

modExpedition.class.php

Renamed llx_c_pays to llx_c_country & field "libelle" to "label"

2014-08-10 13:37:39 +02:00

modExport.class.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

modExternalRss.class.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

modExternalSite.class.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

modFacture.class.php

Fix error into export filter step

2015-05-05 12:45:38 +02:00

modFckeditor.class.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

modFicheinter.class.php

Renamed llx_c_pays to llx_c_country & field "libelle" to "label"

2014-08-10 13:37:39 +02:00

modFournisseur.class.php

Fix error into export filter step

2015-05-05 12:45:38 +02:00

modFTP.class.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

modGeoIPMaxmind.class.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

modGravatar.class.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

modHoliday.class.php

Qual: Renamed all files & links "fiche.php" into "card.php"

2014-09-18 21:18:25 +02:00

modImport.class.php

Qual: remove PHP closing tag (again)

2014-05-26 13:51:25 +02:00

modLabel.class.php

Divers

2014-06-16 06:17:46 +02:00

modLdap.class.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

modMailing.class.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

modMailmanSpip.class.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

modMargin.class.php

Fix: [ bug #1652 ] Margin tab should not be shown for thirds not clients

2015-02-17 00:04:31 +01:00

modNotification.class.php

Qual: remove PHP closing tag (again)

2014-05-26 13:51:25 +02:00

modOpenSurvey.class.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

modPaybox.class.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

modPaypal.class.php

Qual: remove PHP closing tag (again)

2014-05-26 13:51:25 +02:00

modPrelevement.class.php

Qual: remove PHP closing tag (again)

2014-05-26 13:51:25 +02:00

modPrintIPP.class.php

Fixed a lot of bugs into PrintIPP module. Seems to be stable enough now

2014-12-04 13:20:56 +01:00

modProduct.class.php

Solve fixme.

2014-10-03 02:00:50 +02:00

modProductBatch.class.php

FIXED: #1829 POS not compatible with batch products

2015-02-09 17:19:20 +01:00

modProjet.class.php

Allow exporting projects without a third party

2015-05-01 15:58:36 +02:00

modPropale.class.php

Fix error into export filter step

2015-05-05 12:45:38 +02:00

modResource.class.php

Move module to status development

2014-05-14 12:27:09 +02:00

modSalaries.class.php

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

2014-09-28 02:14:32 +02:00

modService.class.php

Solve fixme.

2014-10-03 02:00:50 +02:00

modSkype.class.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

modSociete.class.php

Merge remote-tracking branch 'origin/3.6' into 3.7

2015-07-19 12:04:30 +02:00

modStock.class.php

Renamed llx_c_pays to llx_c_country & field "libelle" to "label"

2014-08-10 13:37:39 +02:00

modSyncSupplierWebServices.class.php

Fix CRLF

2014-11-30 15:24:39 +01:00

modSyslog.class.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

modTax.class.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

modUser.class.php

FIX Save of filters into export profiles failed.

2015-06-24 18:29:29 +02:00

modWebServices.class.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

modWorkflow.class.php

Removed closing php tag

2014-05-03 18:18:44 +02:00