Laurent Destailleur ddb95e5765 Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: htdocs/comm/mailing/fiche.php htdocs/compta/paiement/liste.php htdocs/contact/class/contact.class.php htdocs/core/lib/tax.lib.php htdocs/core/modules/expedition/doc/pdf_merou.modules.php htdocs/core/modules/expedition/doc/pdf_rouget.modules.php htdocs/langs/en_US/agenda.lang htdocs/webservices/server_contact.php		2015-02-10 21:33:43 +01:00
..
bank	Correct link	2015-01-22 07:15:14 +01:00
charges	Fixed: [ bug #1690 ] Sorting on salary table triggers SQL errors	2014-12-23 13:07:16 +01:00
deplacement	Update /compta/deplacement/list.php	2014-11-23 17:44:13 +01:00
dons	Merge pull request #2083 from frederic34/patch-2	2014-11-23 17:47:43 +01:00
facture	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-01-18 17:13:42 +01:00
journal	Renamed all constants COMPTA_* into ACCOUNTING_* and migration of module ACCOUNTINGEX 3.6	2014-09-21 20:30:55 +02:00
localtax	Fix: Pb of object with wrong type.	2014-11-15 18:24:38 +01:00
paiement	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-02-10 21:33:43 +01:00
payment_sc	Merge branch 'oop-pdf' of github.com:marcosgdf/dolibarr into	2014-09-23 00:02:19 +02:00
prelevement	Fix: PostgreSQL compatibilty	2015-01-16 17:59:58 +01:00
resultat	Center title column & modify language key	2015-02-07 14:55:56 +01:00
salaries	Update /compta/salaries/index.php	2014-11-23 17:44:37 +01:00
sociales	Fixed bug which didn't show documents in auto GED when an object had '/' in its ref	2014-12-25 21:47:39 +01:00
stats	Fixed: Bad value for % increase for first year.	2014-12-21 14:15:36 +01:00
tva	Same problem	2015-02-07 14:34:04 +01:00
ventilation	Merge branch 'develop-accounting' of github.com:aspangaro/dolibarr into	2014-09-29 16:31:35 +02:00
ajaxpayment.php	Replaced usage of dol_json_encode and dol_json_decode with json_encode and json_decode. If json module is not installed, it will refer to dol_json_encode/decode	2014-07-30 15:47:19 +02:00
clients.php	Lowecased booleans to fit with PSR-2 specification.	2014-10-12 00:23:19 +02:00
facture.php	FIX empty discount where created if amount is null for a line with a different tva	2015-02-07 23:42:35 +01:00
hrm.php	Fix: Use correct permission on correct field.	2014-10-30 12:19:38 +01:00
index.php	Fix remove </a> not needed	2014-11-25 18:54:56 +01:00
paiement_charge.php	Lowecased booleans to fit with PSR-2 specification.	2014-10-12 00:23:19 +02:00
paiement.php	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-01-18 17:13:42 +01:00
recap-compta.php	Uniformize code: property "nom" for thirdparty is aliased into "name"	2014-10-04 17:20:17 +02:00