Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-06 17:13:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	htdocs/commande/fiche.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
This commit is contained in:
Laurent Destailleur
2013-03-08 01:57:32 +01:00
parent b43fffafa9 44698fcde0
commit c86f3ef4b4
6 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/langs/en_US/main.lang
View File

@@ -301,6 +301,8 @@ TotalHT=Total (net of tax)
TotalTTC=Total (inc. tax)
TotalTTCToYourCredit=Total (inc. tax) to your credit
TotalVAT=Total tax
TotalLT1=Total tax 2
TotalLT2=Total tax 3
TotalLT1ES=Total RE
TotalLT2ES=Total IRPF
IncludedVAT=Included tax

2
htdocs/langs/fr_FR/main.lang
View File

@@ -303,6 +303,8 @@ TotalHT=Total HT
TotalTTC=Total TTC
TotalTTCToYourCredit=Total TTC à votre crédit
TotalVAT=Total TVA
TotalLT1=Total Taxe 2
TotalLT2=Total Taxe 3
TotalLT1ES=Total RE
TotalLT2ES=Total IRPF
IncludedVAT=Dont TVA