Fix: translation
"or" into if instead of ||
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
Fix: translation
Fix: Duplicate line when project has no tasks.
Merge pull request #1585 from FHenry/3.5

 	"or" into if instead of ||
Fix: Nb of notes and doc not visible onto tasks.
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
Fix: Bad translation into title of action buttons
Fix: [ bug #1372 ] Margin calculation does not work in proposals
Corrected strings not translated and typos in English language
Fix: use wrong css
Fix: [ bug #1381 ] PHP Warning when listing stock transactions page
Fix: [ bug #1381 ] PHP Warning when listing stock transactions page
Fix: [ bug #1367 ] "Show invoice" link after a POS sell throws an error
Fix: [ bug #1367 ] "Show invoice" link after a POS sell throws an error
Merge pull request #1590 from marcosgdf/language-typo

Corrected strings not translated and typos in English language
Fix: TCPDF error file not found in member card generation
Fix page numerotation as in company list
Fix: [ bug #1380 ] Customer invoices are not grouped in company results
report