dolibarr/htdocs/societe
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
..
admin Merge pull request #1568 from GPCsolutions/closingtagremoval 2014-05-04 18:08:37 +02:00
ajax Removed closing php tag 2014-05-03 18:18:44 +02:00
canvas Properties "civilite_id" were renamed into "civility_id". 2014-05-05 00:23:09 +02:00
checkvat Normalized EOL 2013-07-01 12:00:42 +02:00
class Merge remote-tracking branch 'origin/3.5' into develop 2014-05-06 23:58:17 +02:00
notify Removed closing php tag 2014-05-03 18:18:44 +02:00
tpl Removed closing php tag 2014-05-03 18:18:44 +02:00
agenda.php Removed closing php tag 2014-05-03 18:18:44 +02:00
ajaxcompanies.php Better managent of contact status and fix COMPANY_DONOTSEARCH_ANYWHERE 2013-10-30 12:24:51 +01:00
ajaxcountries.php Clean dead comments 2013-06-01 15:36:37 +02:00
commerciaux.php Removed closing php tag 2014-05-03 18:18:44 +02:00
consumption.php Removed closing php tag 2014-05-03 18:18:44 +02:00
document.php Removed closing php tag 2014-05-03 18:18:44 +02:00
index.php Merge pull request #1539 from defrance69/patch-7 2014-05-04 19:15:21 +02:00
info.php Removed closing php tag 2014-05-03 18:18:44 +02:00
localtaxes.php Removed closing php tag 2014-05-03 18:18:44 +02:00
note.php Removed closing php tag 2014-05-03 18:18:44 +02:00
price.php Removed closing php tag 2014-05-03 18:18:44 +02:00
rib.php Removed closing php tag 2014-05-03 18:18:44 +02:00
soc.php Properties "civilite_id" were renamed into "civility_id". 2014-05-05 00:23:09 +02:00
societe.php Removed closing php tag 2014-05-03 18:18:44 +02:00