Laurent Destailleur 67820774bb Merge remote-tracking branch 'origin/3.4' into develop ... Conflicts: ChangeLog htdocs/commande/fiche.php htdocs/core/class/extrafields.class.php htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php		2013-07-27 14:21:47 +02:00
..
class	Uniformize code and look and file for shipment statistics page. This	2013-07-25 15:02:40 +02:00
stats	Merge remote-tracking branch 'origin/3.4' into develop	2013-07-27 14:21:47 +02:00
tpl	Fix: [ bug #698 ] Bad calculation of totals of associated documents	2013-01-25 11:37:30 +01:00
apercu.php	I killed <td nowrap>. Hello <td class="nowrap"> !	2013-07-19 14:23:42 +02:00
contact.php	I killed <td nowrap>. Hello <td class="nowrap"> !	2013-07-19 14:23:42 +02:00
customer.php	standardize code	2013-06-20 09:18:12 +02:00
document.php	Prepare move to other licence. For the moment all answers for licence	2013-01-16 15:36:08 +01:00
fiche.php	Merge remote-tracking branch 'origin/3.4' into develop	2013-07-27 14:21:47 +02:00
index.php	I killed <td nowrap>. Hello <td class="nowrap"> !	2013-07-19 14:23:42 +02:00
info.php	Prepare move to other licence. For the moment all answers for licence	2013-01-16 15:36:08 +01:00
liste.php	Merge remote-tracking branch 'origin/3.4' into develop	2013-06-04 22:59:28 +02:00
note.php	I killed <td nowrap>. Hello <td class="nowrap"> !	2013-07-19 14:23:42 +02:00
orderstoinvoice.php	I killed <td nowrap>. Hello <td class="nowrap"> !	2013-07-19 14:23:42 +02:00