Laurent Destailleur 48d7378282 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	ChangeLog
	htdocs/comm/action/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/filefunc.inc.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/langs/ar_IQ/bills.lang
	htdocs/langs/ar_IQ/cashdesk.lang
	htdocs/langs/ar_IQ/modulebuilder.lang
	htdocs/langs/ar_IQ/partnership.lang
	htdocs/langs/ar_IQ/propal.lang
	htdocs/langs/ar_IQ/stocks.lang
	htdocs/langs/ar_IQ/ticket.lang
	htdocs/langs/en_AE/admin.lang
	htdocs/langs/en_US/receptions.lang
	htdocs/langs/en_ZA/admin.lang
	htdocs/product/stock/class/mouvementstock.class.php
	htdocs/reception/class/reception.class.php

2021-11-19 23:14:39 +01:00

..

accountancy.lang

…

admin.lang

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

2021-11-16 10:46:38 +01:00

agenda.lang

…

assets.lang

…

banks.lang

…

bills.lang

…

bookmarks.lang

…

boxes.lang

…

cashdesk.lang

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

2021-11-16 10:46:38 +01:00

categories.lang

…

commercial.lang

…

companies.lang

…

compta.lang

…

contracts.lang

…

deliveries.lang

…

dict.lang

…

donations.lang

…

ecm.lang

…

errors.lang

…

exports.lang

…

externalsite.lang

…

holiday.lang

…

install.lang

…

interventions.lang

…

languages.lang

…

ldap.lang

…

mails.lang

…

main.lang

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

2021-11-16 10:46:38 +01:00

members.lang

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

2021-11-16 10:46:38 +01:00

modulebuilder.lang

…

orders.lang

…

other.lang

…

partnership.lang

…

paybox.lang

…

paypal.lang

…

products.lang

…

projects.lang

…

propal.lang

…

sendings.lang

…

sms.lang

…

stocks.lang

…

supplier_proposal.lang

…

ticket.lang

…

trips.lang

…

users.lang

…

withdrawals.lang

…