dolibarr/htdocs/expedition
Laurent Destailleur 3cbced439a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/tools/listevents.php
	htdocs/compta/bank/line.php
	htdocs/compta/facture/class/facture-rec.class.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/compta/paiement/cheque/card.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/lib/date.lib.php
	htdocs/core/lib/ticket.lib.php
	htdocs/core/modules/mailings/modules_mailings.php
	htdocs/core/tpl/extrafields_view.tpl.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/cron/list.php
	htdocs/expedition/card.php
	htdocs/mrp/mo_list.php
	htdocs/product/stock/productlot_card.php
	htdocs/public/emailing/mailing-read.php
	htdocs/public/emailing/mailing-unsubscribe.php
	htdocs/ticket/list.php
	test/phpunit/FactureRecTest.php
2021-03-05 19:29:09 +01:00
..
class code syntax expedition directory 2021-02-25 22:38:35 +01:00
stats code syntax expedition directory 2021-02-25 22:38:35 +01:00
tpl code syntax expedition directory 2021-02-25 22:38:35 +01:00
card.php Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-03-05 19:29:09 +01:00
contact.php code syntax expedition directory 2021-02-25 22:38:35 +01:00
document.php code syntax expedition directory 2021-02-25 22:38:35 +01:00
index.php code syntax expedition directory 2021-02-25 22:38:35 +01:00
list.php Code change to follow modulebuilder template 2021-02-27 18:33:01 +01:00
note.php code syntax expedition directory 2021-02-25 22:38:35 +01:00
shipment.php code syntax expedition directory 2021-02-25 22:38:35 +01:00