lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
e41dcd173e
dolibarr/htdocs/adherents
History
Laurent Destailleur 7f85d73001 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/contrat/card.php
	htdocs/expensereport/card.php
	htdocs/fichinter/list.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/commande/list.php
	htdocs/fourn/facture/card.php
	htdocs/fourn/paiement/card.php
	htdocs/livraison/card.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/societe/rib.php
	htdocs/supplier_proposal/list.php
	htdocs/user/card.php
2017-10-18 19:51:29 +02:00
..
admin Fix: uniformize substitution tags 2017-10-09 16:33:22 +02:00
canvas Start remove $GLOBALS 2017-09-12 19:49:07 +02:00
cartes Fix: uniformize substitution tags 2017-10-09 16:33:22 +02:00
class Move function colorIsLight into functions.lib.php 2017-10-16 09:29:10 +02:00
stats Look and feel v6 2017-07-04 13:05:02 +02:00
subscription Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-18 19:51:29 +02:00
tpl Replace usage of $bc[$var] with class="oddeven" 2017-04-14 11:22:48 +02:00
agenda.php Standardize code for events 2017-10-04 12:58:13 +02:00
card.php Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-18 19:51:29 +02:00
document.php NEW Search filters in lists are restored when using "back to list" 2017-10-03 16:00:52 +02:00
htpasswd.php Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 2016-09-26 01:32:50 +02:00
index.php New: big refactorization and uniformize code 2017-09-16 10:54:20 +02:00
ldap.php Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap 2017-10-04 08:43:07 +02:00
list.php Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-17 11:14:58 +02:00
note.php NEW Search filters in lists are restored when using "back to list" 2017-10-03 16:00:52 +02:00
subscription.php Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-13 22:01:56 +02:00
type_ldap.php NEW Search filters in lists are restored when using "back to list" 2017-10-03 16:00:52 +02:00
type.php Move function colorIsLight into functions.lib.php 2017-10-16 09:29:10 +02:00