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

Conflicts:
	build/debian/changelog
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/fourn/facture/fiche.php
	htdocs/product/stock/mouvement.php
	htdocs/projet/element.php
	htdocs/societe/rib.php
	htdocs/theme/bureau2crea/img/statut4.png

2015-04-12 12:03:59 +02:00

..

bank

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

2015-04-12 12:03:59 +02:00

charges

Fixed: [ bug #1690 ] Sorting on salary table triggers SQL errors

2014-12-23 13:07:16 +01:00

deplacement

PHPDoc and misc fixes for several folders

2015-02-10 13:17:37 +01:00

dons

PHPDoc and misc fixes for several folders

2015-02-10 13:17:37 +01:00

facture

Fix trigger to insert lines where called when inserting line but also

2015-02-26 13:19:19 +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

PHPDoc and misc fixes for several folders

2015-02-10 13:17:37 +01:00

paiement

Merge branch 'misc' of https://github.com/marcosgdf/dolibarr into

2015-02-18 22:54:02 +01:00

payment_sc

Merge branch 'oop-pdf' of github.com:marcosgdf/dolibarr into

2014-09-23 00:02:19 +02:00

prelevement

Fix: [ bug #1836 ] Required parameter missing in Rejetprelevement line

2015-03-14 10:16:50 +01:00

resultat

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

2015-02-18 23:51:41 +01:00

salaries

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

2015-03-11 03:29:52 +01:00

sociales

Fix trigger to insert lines where called when inserting line but also

2015-02-26 13:03:17 +01:00

stats

Fixed: Bad value for % increase for first year.

2014-12-21 14:15:36 +01:00

tva

PHPDoc and misc fixes for several folders

2015-02-10 13:17:37 +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

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

2015-04-12 12:03:59 +02: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

PHPDoc and misc fixes for several folders

2015-02-10 13:17:37 +01:00

recap-compta.php

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

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