Laurent Destailleur 8da5794777 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/lib/accounting.lib.php htdocs/product/stock/class/entrepot.class.php		2019-06-20 18:24:43 +02:00
..
ajax	Debug module BOM	2019-06-03 22:07:34 +02:00
boxes	Nowrap on amount	2019-06-19 09:21:18 +02:00
class	Fix phpcs	2019-06-20 13:56:20 +02:00
db	Fix scrutinizer warnings	2019-06-18 20:21:22 +02:00
filemanagerdol
js	Fix responsive	2019-05-22 16:08:21 +02:00
lib	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-06-20 18:24:43 +02:00
login	NEW Introduce a config parameter $dolibarr_main_instance_unique_id	2019-04-07 15:44:17 +02:00
menus	Debug page to export accounting documents	2019-06-17 17:53:43 +02:00
modules	Merge pull request #11354 from rycks/allowZeroAsAccountNumber	2019-06-20 03:09:37 +02:00
tpl	Look and feel v10	2019-06-17 18:44:08 +02:00
triggers	Close #11152 by a manual merge to keep only required things	2019-06-16 17:08:23 +02:00
actions_addupdatedelete.inc.php	Debug module BOM	2019-06-03 22:07:34 +02:00
actions_builddoc.inc.php
actions_changeselectedfields.inc.php	Fix phpcs	2019-04-01 18:10:14 +02:00
actions_comments.inc.php
actions_dellink.inc.php
actions_extrafields.inc.php
actions_fetchobject.inc.php	Debug modulebuilder	2019-06-03 18:11:53 +02:00
actions_lineupdown.inc.php
actions_linkedfiles.inc.php	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-05-21 15:13:25 +02:00
actions_massactions.inc.php	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-06-20 03:39:48 +02:00
actions_printing.inc.php
actions_sendmails.inc.php	Merge branch '9.0' of https://github.com/dolibarr/dolibarr into develop	2019-05-19 02:15:01 +02:00
actions_setmoduleoptions.inc.php
actions_setnotes.inc.php
antispamimage.php
commonfieldsinexport.inc.php
datepicker.php
doxygen.php
extrafieldsinexport.inc.php
get_info.php
get_menudiv.php
index.html
photos_resize.php	Fix cropping of image files for BOM module was ko	2019-06-12 19:00:34 +02:00
search_page.php
search.php
tools.php
website.inc.php	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-05-02 14:41:56 +02:00