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

Conflicts:
	.travis.yml
	htdocs/contrat/class/contrat.class.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/modules/project/pdf/pdf_baleine.modules.php

2015-12-18 21:03:57 +01: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

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

2015-12-18 21:03:57 +01:00

contract

FIX [ bug #3383 ] Company name is overlapped with company direction in PDF models

2015-09-01 11:19:05 +02:00

dons

…

expedition

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

2015-12-18 21:03:57 +01: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

2015-12-18 21:03:57 +01:00

fichinter

FIX [ bug #3383 ] Company name is overlapped with company direction in PDF models

2015-09-01 11:19:05 +02:00

import

syntax error

2015-10-08 09:34:02 +02:00

livraison

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

2015-12-18 21:03:57 +01:00

mailings

FIX : Email selector contact must not include inactive contact

2015-09-30 14:06:45 +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

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

2015-12-18 21:03:57 +01:00

propale

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

2015-12-18 21:03:57 +01:00

rapport

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

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

security

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

2015-12-13 15:53:57 +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-12-18 21:03:57 +01:00

supplier_order

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

2015-12-18 21:03:57 +01:00

syslog

Fix #2863 Sensible defaults for ChromePHP path

2015-08-31 21:08:37 +02:00

DolibarrModules.class.php

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

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

index.html

…

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

…

modCashDesk.class.php

…

modCategorie.class.php

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

2015-11-21 12:23:51 +01:00

modClickToDial.class.php

…

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

missing translation

2015-09-27 11:06:45 +02:00

modCron.class.php

…

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

…

modDon.class.php

…

modECM.class.php

…

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

…

modExternalRss.class.php

…

modExternalSite.class.php

…

modFacture.class.php

FIX Bad condition into invoice export request making reporting too many

2015-09-09 13:26:10 +02:00

modFckeditor.class.php

…

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

…

modGeoIPMaxmind.class.php

…

modGravatar.class.php

…

modHoliday.class.php

fix : Typo

2015-09-03 12:12:10 +02:00

modImport.class.php

…

modLabel.class.php

…

modLdap.class.php

…

modMailing.class.php

…

modMailmanSpip.class.php

…

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

…

modOpenSurvey.class.php

…

modPaybox.class.php

…

modPaypal.class.php

…

modPrelevement.class.php

…

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

…

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

…

modSociete.class.php

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

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

modStock.class.php

FIX : multientity warehouse management

2015-09-08 16:23:00 +02:00

modSyncSupplierWebServices.class.php

Fix CRLF

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

modSyslog.class.php

…

modTax.class.php

…

modUser.class.php

FIX Save of filters into export profiles failed.

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

modWebServices.class.php

…

modWorkflow.class.php

…