dolibarr/htdocs/core/modules/supplier_proposal
Laurent Destailleur 1875b6a49b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/security2.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
	htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
	htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
2020-02-05 14:53:47 +01:00
..
doc Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-05 14:53:47 +01:00
index.html
mod_supplier_proposal_marbre.php Move Gnu.org to https 2019-09-23 21:55:30 +02:00
mod_supplier_proposal_saphir.php Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
modules_supplier_proposal.php Move Gnu.org to https 2019-09-23 21:55:30 +02:00