Laurent Destailleur 5063f29532 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 ...

Conflicts:
	htdocs/comm/mailing/class/mailing.class.php
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/product/stock/replenish.php

2021-06-17 21:35:31 +02:00

..

admin

Fix bad test

2021-01-23 17:59:56 +01:00

ajax

FIX consider customer prices by qty in ajax fetch

2020-11-10 16:35:38 +01:00

canvas

Fix newToken()

2021-06-15 22:10:59 +02:00

class

FIX option MAIN_GENERATE_SUPPLIER_PROPOSAL_WITH_PICTURE

2021-05-28 18:04:45 +02:00

composition

Solve blocking feature. Can increase stock of a Kit without changing

2020-12-15 15:18:01 +01:00

dynamic_price

Ajout de la class "button-save"

2020-11-19 20:23:38 +01:00

inventory

FIX #16503

2021-03-02 23:09:55 +01:00

stats

Fix sql error

2021-02-26 11:27:03 +01:00

stock

Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0

2021-06-17 21:35:31 +02:00

agenda.php

Scrutinizer Auto-Fixes

2020-10-31 13:32:18 +00:00

card.php

Fix look and feel v13

2021-03-10 11:08:39 +01:00

document.php

move include_once to include when it's a tpl

2021-04-12 21:25:58 +02:00

fournisseurs.php

Fix css

2021-02-16 19:01:00 +01:00

index.php

Scrutinizer Auto-Fixes

2020-10-31 13:32:18 +00:00

list.php

Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0

2021-01-06 20:20:37 +01:00

note.php

Scrutinizer Auto-Fixes

2020-10-31 13:32:18 +00:00

popuprop.php

Scrutinizer Auto-Fixes

2020-10-31 13:32:18 +00:00

price.php

Fix lost code during previous merge

2021-06-11 19:05:33 +02:00

reassort.php

Scrutinizer Auto-Fixes

2020-10-31 17:51:30 +00:00

reassortlot.php

Scrutinizer Auto-Fixes

2020-10-31 13:32:18 +00:00

traduction.php

Feature : ajout de la class "button-cancel"

2020-11-23 15:12:52 +01:00