dolibarr/htdocs/cashdesk
Marcos García de La Fuente 7e1cf124b8 Merge branch 'develop' into syslog
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/product/class/product.class.php
	htdocs/product/stock/lib/replenishment.lib.php
	htdocs/societe/soc.php
2014-07-02 21:20:02 +02:00
..
admin Removed closing php tag 2014-05-03 18:18:44 +02:00
class More substitutions 2014-06-12 11:31:53 +02:00
css CSS fixes 2013-09-05 20:54:19 +02:00
img Look: More neutral css to match with other skins 2013-06-07 16:39:29 +02:00
include Add option to enable keypad (in most cases, we don't need this). 2014-06-26 21:57:49 +02:00
javascript Create keypad.js 2014-06-08 14:35:53 +02:00
tpl Update facturation1.tpl.php 2014-06-08 14:39:04 +02:00
affContenu.php Fix: security 2014-05-28 19:38:30 +02:00
affIndex.php Update affIndex.php 2014-06-08 14:36:31 +02:00
affPied.php Fix: Miscellaneous fixes into cachdesk module: 2013-06-07 15:59:47 +02:00
deconnexion.php Removed closing php tag 2014-05-03 18:18:44 +02:00
facturation_dhtml.php More substitutions 2014-06-12 11:31:53 +02:00
facturation_verif.php Qual: remove PHP closing tag (again) 2014-05-26 13:51:25 +02:00
facturation.php More substitutions 2014-06-12 11:31:53 +02:00
index_verif.php Qual: remove PHP closing tag (again) 2014-05-26 13:51:25 +02:00
index.php Removed closing php tag 2014-05-03 18:18:44 +02:00
validation_ok.php Removed closing php tag 2014-05-03 18:18:44 +02:00
validation_ticket.php Removed closing php tag 2014-05-03 18:18:44 +02:00
validation_verif.php Removed closing php tag 2014-05-03 18:18:44 +02:00
validation.php Qual: remove PHP closing tag (again) 2014-05-26 13:51:25 +02:00