lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
f7ab53be8e
dolibarr/htdocs/compta
History
Laurent Destailleur 100fa1067e Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/bank/virement.php
	htdocs/compta/facture/impayees.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/modProjet.class.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/en_GB/admin.lang
	htdocs/langs/es_AR/orders.lang
	htdocs/langs/es_AR/trips.lang
	htdocs/langs/es_CO/admin.lang
	htdocs/langs/es_CO/orders.lang
	htdocs/langs/es_CO/trips.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/pl_PL/interventions.lang
	htdocs/langs/pt_BR/trips.lang
	htdocs/langs/ro_RO/productbatch.lang
	htdocs/langs/ro_RO/trips.lang
	htdocs/main.inc.php
	htdocs/projet/element.php
2015-04-22 17:57:57 +02:00
..
bank Merge remote-tracking branch 'origin/3.7' into develop 2015-04-22 17:57:57 +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-04-22 17:57:57 +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 Change title images for accountancy section 2015-04-18 23:17:47 +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 Dir "Don" 2015-03-25 22:37:14 +01: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 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 First clean of code after devcamp 2015-04-21 15:49:58 +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