lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9f795331f5
dolibarr/htdocs/core
History
Laurent Destailleur 9f795331f5 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/perl/virtualmin/dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/compta/paiement_charge.php
	htdocs/compta/sociales/charges.php
	htdocs/core/db/mysql.class.php
	htdocs/filefunc.inc.php
	htdocs/societe/class/societe.class.php
2014-05-06 23:58:17 +02:00
..
ajax Removed closing php tag 2014-05-03 18:18:44 +02:00
boxes Properties "civilite_id" were renamed into "civility_id". 2014-05-05 00:23:09 +02:00
class Merge remote-tracking branch 'origin/3.5' into develop 2014-05-06 23:58:17 +02:00
db Merge remote-tracking branch 'origin/3.5' into develop 2014-05-06 23:58:17 +02:00
filemanagerdol Removed closing php tag 2014-05-03 18:18:44 +02:00
js Removed closing php tag 2014-05-03 18:18:44 +02:00
lib Merge remote-tracking branch 'origin/3.5' into develop 2014-05-06 23:58:17 +02:00
login Removed closing php tag 2014-05-03 18:18:44 +02:00
menus Removed closing php tag 2014-05-03 18:18:44 +02:00
modules Merge remote-tracking branch 'origin/3.5' into develop 2014-05-06 23:58:17 +02:00
tpl Finished task to merge form of free product and predefined product. 2014-05-06 18:31:39 +02:00
triggers Removed closing php tag 2014-05-03 18:18:44 +02:00
actions_extrafields.inc.php Removed closing php tag 2014-05-03 18:18:44 +02:00
actions_sendmails.inc.php Fix: Sending email from thirdparty must add event into agenda if option 2013-09-25 21:36:40 +02:00
actions_setnotes.inc.php Qual: Mutualize code for actions of editing notes 2014-01-11 13:33:30 +01:00
antispamimage.php Removed closing php tag 2014-05-03 18:18:44 +02:00
datepicker.php Removed closing php tag 2014-05-03 18:18:44 +02:00
doxygen.php Removed closing php tag 2014-05-03 18:18:44 +02:00
get_menudiv.php Removed closing php tag 2014-05-03 18:18:44 +02:00
index.php Fix: Avoid errors into rpm packages 2011-07-31 21:24:20 +00:00
photos_resize.php Removed closing php tag 2014-05-03 18:18:44 +02:00
search_page.php Removed closing php tag 2014-05-03 18:18:44 +02:00
tools.php Removed closing php tag 2014-05-03 18:18:44 +02:00