Laurent Destailleur 2c1e8d6535 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/bookkeeping/balance.php htdocs/expedition/class/expeditionbatch.class.php htdocs/public/payment/newpayment.php htdocs/stripe/config.php		2018-10-16 18:47:11 +02:00
..
admin	Merge branch 'develop' into FunctionDeclaration	2018-08-16 00:52:55 +02:00
ajax	Clean defined constant at begin of pages	2018-04-21 12:00:55 +02:00
canvas	move phpcs:ignore	2018-09-02 14:01:37 +02:00
class	Fix phpcs	2018-10-15 13:27:17 +02:00
composition	Standardize code	2018-08-14 09:55:58 +02:00
dynamic_price	Fix constructors does not need return value	2018-09-16 10:22:23 +02:00
inventory	Standardize code	2018-10-05 15:51:08 +02:00
stats	FIX Pagination stats	2018-10-01 01:15:19 +02:00
stock	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-10-16 18:47:11 +02:00
agenda.php	Standardize	2018-08-15 12:48:13 +02:00
card.php	deprecate formbarcode:form_barcode_type	2018-09-10 23:58:57 +02:00
document.php	Standardize	2018-08-15 12:48:13 +02:00
fournisseurs.php	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-29 20:22:50 +02:00
index.php	Standardize	2018-08-15 12:48:13 +02:00
list.php	remove superfluous spaces	2018-08-21 20:12:27 +02:00
note.php	Standardize	2018-08-15 12:48:13 +02:00
popuprop.php	Standardize	2018-08-15 12:48:13 +02:00
price.php	Merge branch 'develop' into trimtrailing	2018-08-16 00:47:09 +02:00
reassort.php	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-10-16 18:47:11 +02:00
reassortlot.php	Standardize	2018-08-15 12:48:13 +02:00
traduction.php	Standardize	2018-08-15 12:48:13 +02:00