dolibarr/htdocs/compta
Laurent Destailleur a93ba86ce0 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/modules/expedition/modules_expedition.php
	htdocs/core/modules/modContrat.class.php
	htdocs/expedition/class/expedition.class.php
2015-05-07 13:35:09 +02:00
..
bank Merge pull request #2673 from aternatik/fix_getentity 2015-05-07 00:48:19 +02:00
charges Change title images for accountancy section 2015-04-18 23:17:47 +02:00
deplacement Merge remote-tracking branch 'origin/3.7' into develop 2015-04-22 17:57:57 +02:00
facture Merge remote-tracking branch 'origin/3.7' into develop 2015-05-07 13:35:09 +02:00
journal Invoices: added situation (or interim) invoices support 2015-01-06 17:12:13 +01:00
localtax FIXME that are not bug are replaced with TODO 2015-04-12 04:01:28 +02:00
paiement Fix: missing getEntity function 2015-04-19 03:05:37 +02:00
payment_sc Merge branch 'oop-pdf' of github.com:marcosgdf/dolibarr into 2014-09-23 00:02:19 +02:00
prelevement Merge remote-tracking branch 'origin/3.7' into develop 2015-04-22 17:57:57 +02:00
resultat Fix: missing getEntity function 2015-04-19 03:05:37 +02:00
salaries Merge remote-tracking branch 'Upstream/develop' into develop-Devcamp 2015-04-22 07:18:52 +02:00
sociales Uniformize feature between invoice and merging tool 2015-04-19 23:15:24 +02:00
stats Fix: missing getEntity function 2015-04-19 03:05:37 +02:00
tva New: Add search field for value date in vat payment list 2015-04-23 07:26:09 +02: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-05-07 13:35:09 +02:00
hrm.php Uniformize status & add price() 2015-03-08 07:21:07 +01:00
index.php Add title image for bank section 2015-04-18 23:17:47 +02: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