jfefe ba8525bd6a Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into extrafields ... Conflicts: htdocs/install/doctemplates/invoices/template_invoice.odt htdocs/install/doctemplates/proposals/template_proposal.odt htdocs/install/mysql/migration/3.3.0-3.4.0.sql		2013-03-11 05:21:35 +01:00
..
action	Fix: Fix ton of regression due to field name change	2013-03-09 20:34:38 +01:00
admin	New : add extrafield support on propal object	2013-03-04 18:22:25 +01:00
mailing	Merge remote-tracking branch 'origin/3.3' into develop	2013-02-26 20:05:23 +01:00
propal	Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into extrafields	2013-03-11 05:21:35 +01:00
prospect	Fix: sql error	2013-03-04 00:01:38 +01:00
address.php	english language standardization	2013-02-25 17:56:41 +01:00
bookmark.php	Fix: Fix ton of regression due to field name change	2013-03-09 20:34:38 +01:00
contact.php	english language standardization	2013-02-23 15:26:39 +01:00
fiche.php	Fix: Merge customer and prospect tab	2013-02-15 17:28:07 +01:00
index.php	Task 350 in Doliforge	2013-02-12 19:16:48 +01:00
list.php	english language standardization	2013-02-24 17:08:52 +01:00
multiprix.php	Prepare move to other licence. For the moment all answers for licence	2013-01-16 15:36:08 +01:00
propal.php	Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into extrafields	2013-03-11 05:21:35 +01:00
recap-client.php	Prepare move to other licence. For the moment all answers for licence	2013-01-16 15:36:08 +01:00
remise.php	Prepare move to other licence. For the moment all answers for licence	2013-01-16 15:36:08 +01:00
remx.php	Prepare move to other licence. For the moment all answers for licence	2013-01-16 15:36:08 +01:00