lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
f1f4fc18e9
dolibarr/htdocs/langs/en_US
History
Laurent Destailleur 14ab409ca9 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/admin/stock.php
	htdocs/admin/system/index.php
	htdocs/comm/fiche.php
	htdocs/core/lib/admin.lib.php
	htdocs/core/lib/holiday.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/login/functions_forceuser.php
	htdocs/core/login/functions_http.php
	htdocs/core/menus/standard/auguria.lib.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/filefunc.inc.php
	htdocs/holiday/define_holiday.php
	htdocs/opensurvey/fonctions.php
	htdocs/societe/canvas/actions_card_common.class.php
	test/phpunit/CompanyBankAccountTest.php
	test/phpunit/ExportTest.php
	test/phpunit/FactureTest.php
	test/phpunit/FunctionsLibTest.php
	test/phpunit/PropalTest.php
	test/phpunit/SocieteTest.php
	test/phpunit/WebservicesInvoicesTest.php
	test/phpunit/WebservicesThirdpartyTest.php
2014-09-28 02:14:32 +02:00
..
accountancy.lang Renamed all constants COMPTA_* into ACCOUNTING_* and migration of module ACCOUNTINGEX 3.6 2014-09-21 20:30:55 +02:00
admin.lang Move language key into admin.lang file 2014-09-08 21:51:40 +02:00
agenda.lang Fix: Can edit status of event. 2014-09-15 19:04:30 +02:00
banks.lang
bills.lang Fix: Missing translation string 2014-09-04 14:38:02 +02:00
bookmarks.lang
boxes.lang
cashdesk.lang
categories.lang
commercial.lang
companies.lang
compta.lang Merge remote-tracking branch 'origin/3.6' into develop 2014-09-28 02:14:32 +02:00
contracts.lang
cron.lang
deliveries.lang
dict.lang Fix: cents for indian ruppes are calle paisa and paise. 2014-09-15 22:43:49 +02:00
donations.lang Add Dunning into compta report 2014-09-16 21:05:57 +02:00
ecm.lang
errors.lang Merge remote-tracking branch 'origin/3.6' into develop 2014-09-18 10:17:43 +02:00
exports.lang
externalsite.lang
ftp.lang
help.lang
holiday.lang
install.lang
interventions.lang Fix: Solve conflict of translation key 2014-09-18 08:58:47 +02:00
languages.lang
ldap.lang
link.lang
mailmanspip.lang
mails.lang
main.lang New: PDF event report show project and status of event 2014-09-15 12:48:24 +02:00
margins.lang
members.lang
opensurvey.lang
orders.lang
oscommerce.lang
other.lang
paybox.lang
paypal.lang
printipp.lang
productbatch.lang
products.lang Merge pull request #1855 from grandoc/develop 2014-09-05 09:34:58 +02:00
projects.lang Better ressource management on project and task 2014-09-20 10:14:26 +02:00
propal.lang
resource.lang Merge 2014-09-07 12:22:04 +02:00
salaries.lang New: Add hourly and daily amount on user card. Add weekly working hours 2014-09-13 17:41:26 +02:00
sendings.lang
shop.lang
sms.lang
stocks.lang
suppliers.lang
trips.lang Fix: Missing status "refunded". 2014-09-06 17:16:24 +02:00
users.lang New: Add hourly and daily amount on user card. Add weekly working hours 2014-09-13 17:41:26 +02:00
withdrawals.lang
workflow.lang