Laurent Destailleur 0e743d5024 Merge remote-tracking branch 'origin/3.4' into develop ... Conflicts: ChangeLog htdocs/adherents/admin/adherent.php htdocs/comm/propal/class/propal.class.php htdocs/commande/document.php htdocs/compta/facture/class/facture.class.php htdocs/compta/facture/list.php htdocs/cron/card.php htdocs/expedition/class/expedition.class.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/class/fournisseur.facture.class.php htdocs/fourn/commande/document.php htdocs/langs/fr_FR/admin.lang htdocs/langs/fr_FR/cron.lang htdocs/langs/fr_FR/projects.lang htdocs/langs/nl_NL/admin.lang htdocs/langs/nl_NL/categories.lang htdocs/langs/nl_NL/commercial.lang htdocs/langs/nl_NL/companies.lang htdocs/langs/nl_NL/dict.lang htdocs/langs/nl_NL/main.lang htdocs/langs/nl_NL/margins.lang htdocs/langs/nl_NL/products.lang htdocs/societe/class/societe.class.php htdocs/societe/rib.php		2013-11-19 21:08:02 +01:00
..
class	Merge remote-tracking branch 'origin/3.4' into develop	2013-11-19 21:08:02 +01: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	Fix: Permissions on files	2013-08-06 00:36:21 +02:00
document.php	Merge remote-tracking branch 'origin/3.4' into develop	2013-11-19 21:08:02 +01:00
fiche.php	Make AJAX new line form work again	2013-11-19 17:54:36 +01: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	Fix: css class name	2013-10-28 13:04:16 +01:00
note.php	I killed <td nowrap>. Hello <td class="nowrap"> !	2013-07-19 14:23:42 +02:00
orderstoinvoice.php	Mark method classer_facturee deprecated.	2013-09-16 11:50:53 +02:00