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

Conflicts:
	htdocs/admin/dict.php
	htdocs/bom/tpl/objectline_create.tpl.php
	htdocs/bom/tpl/objectline_edit.tpl.php
	htdocs/bom/tpl/objectline_view.tpl.php
	htdocs/core/boxes/box_shipments.php
	htdocs/societe/class/societe.class.php

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

..

ajax

Scrutinizer Auto-Fixes

2020-01-30 00:48:28 +00:00

class

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

2021-01-02 17:01:03 +01:00

commande

Fix load lang

2021-01-05 10:44:28 +01:00

facture

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

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

js

Scrutinizer Auto-Fixes

2020-04-10 08:59:32 +00:00

paiement

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

2020-12-08 18:17:02 +01:00

product

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

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

card.php

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

2020-12-20 14:31:54 +01:00

contact.php

Scrutinizer Auto-Fixes

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

index.php

add new rule

2020-05-21 15:05:19 +02:00

recap-fourn.php

Scrutinizer Auto-Fixes

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