dolibarr/htdocs/compta
Marcos García de La Fuente 87f97ed545 Merge branch 'develop' into units
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
	htdocs/product/admin/product.php
	htdocs/product/card.php
2015-04-18 23:38:14 +02:00
..
bank fix syntax errors 2015-04-18 18:07: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 Merge branch 'develop' into units 2015-04-18 23:38:14 +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 Update paiement.class.php 2015-04-15 11:40:12 +02:00
payment_sc Merge branch 'oop-pdf' of github.com:marcosgdf/dolibarr into 2014-09-23 00:02:19 +02:00
prelevement Copyright 2015-04-18 20:50:03 +02:00
resultat Dir "Don" 2015-03-25 22:37:14 +01:00
salaries NEW: Feature request: A page to merge two thirdparties into one #2613 2015-04-18 20:41:09 +02:00
sociales Uniformize code 2015-04-07 03:00:11 +02:00
stats Merge branch 'develop' into fr-2613 2015-04-18 20:42:57 +02:00
tva FIXME that are not bug are replaced with TODO 2015-04-12 04:01:28 +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 branch 'develop' into units 2015-04-18 23:38:14 +02:00
hrm.php Uniformize status & add price() 2015-03-08 07:21:07 +01:00
index.php Fix: Issues if strict mode option ONLY_FULL_GROUP_BY is activated 2015-04-18 14:17:00 +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