Laurent Destailleur ca7a7a9038 Merge remote-tracking branch 'origin/3.7' into develop ...

Conflicts:
	htdocs/compta/facture.php
	htdocs/product/stock/product.php

2015-04-08 20:43:51 +02:00

..

bank

Merge pull request #2563 from frederic34/patch-7

2015-04-08 11:51:41 +02:00

charges

Add column to store salary ref when doing payment.

2015-03-10 10:11:51 +01:00

deplacement

QUAL: Traduce terms + remove <center>

2015-03-15 14:04:07 +01:00

facture

Must exclude draft and abandon into default filter.

2015-04-06 19:22:58 +02:00

journal

Invoices: added situation (or interim) invoices support

2015-01-06 17:12:13 +01:00

localtax

QUAL: Traduce terms + remove <center>

2015-03-15 14:04:07 +01:00

paiement

QUAL: Traduce terms + remove <center>

2015-03-15 14:04:07 +01:00

payment_sc

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

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

prelevement

Scrutinizer Auto-Fixes

2015-04-06 10:25:30 +00:00

resultat

Dir "Don"

2015-03-25 22:37:14 +01:00

salaries

Merge remote-tracking branch 'Upstream/develop' into develop-loan

2015-03-22 18:08:12 +01:00

sociales

Uniformize code

2015-04-07 03:00:11 +02:00

stats

Invoices: added situation (or interim) invoices support

2015-01-06 17:12:13 +01:00

tva

QUAL: Traduce terms + remove <center>

2015-03-15 14:04:07 +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.7' into develop

2015-04-08 20:43:51 +02:00

hrm.php

Uniformize status & add price()

2015-03-08 07:21:07 +01:00

index.php

Dir "Don"

2015-03-25 22:37:14 +01:00

paiement_charge.php

Fix: Missing language key

2015-03-27 06:59:21 +01:00

paiement.php

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

2015-02-19 00:01:26 +01:00

recap-compta.php

Implemented constants in Commande, Facture and Propal

2015-03-15 11:48:57 +01:00