lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7075ac74c4
dolibarr/htdocs/compta
History
Marcos García de La Fuente 7075ac74c4 Merge branch 'develop' into units 
Conflicts:
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/card.php
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/card.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/commonobjectline.class.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
	htdocs/product/class/product.class.php
2015-04-03 15:45:54 +02:00
..
bank Merge pull request #2514 from frederic34/patch-10 2015-04-02 11:40:55 +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-03 15:45:54 +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 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2015-03-22 18:08:12 +01: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 QUAL: Traduce terms + remove <center> 2015-03-15 14:04:07 +01: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 branch 'develop' into units 2015-04-03 15:45:54 +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