Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-07 16:41:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.8' into develop

Browse Source 
Conflicts:
	ChangeLog
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/admin/facture_cust_extrafields.php
	htdocs/compta/facture/admin/facturedet_cust_extrafields.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/card.php
This commit is contained in:
Laurent Destailleur
2015-10-16 10:12:36 +02:00
parent b43047bc2f 8a02c8288b
commit b3491ef4e5
54 changed files with 1624 additions and 1402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/margin/admin/margin.php
View File

@@ -164,7 +164,6 @@ print '<td>';
print '<input type="submit" class="button" value="'.$langs->trans("Modify").'" class="button">';
print '</td>';
print '<td>'.$langs->trans('MarginTypeDesc');
print ' ('.$langs->trans("PMPValueShort").')';
print '</td>';
print '</tr>';
print '</form>';