dolibarr/htdocs/expedition
Laurent Destailleur 80e470a4ce Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture.php
	htdocs/compta/facture/impayees.php
	htdocs/compta/index.php
	htdocs/core/boxes/box_produits_alerte_stock.php
	htdocs/core/class/html.form.class.php
	htdocs/core/modules/syslog/mod_syslog_file.php
	htdocs/fourn/facture/impayees.php
	htdocs/holiday/class/holiday.class.php
	htdocs/holiday/fiche.php
2013-04-28 01:24:58 +02:00
..
class Merge remote-tracking branch 'origin/3.3' into develop 2013-04-28 01:24:58 +02:00
stats Optimize size of graph 2013-04-04 21:13:51 +02:00
tpl Corrected incorrect lang trans key 2013-04-27 13:51:05 +02:00
contact.php Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap 2013-04-25 01:13:13 +02:00
fiche.php New: [ task #823 ] Shipping_validate email notification 2013-04-21 14:14:30 +02:00
index.php Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap 2013-04-25 01:13:13 +02:00
liste.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
note.php Qual: Reduce number of methods. Mutualize update_note code. 2013-04-10 10:58:38 +02:00
shipment.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00