Commit Graph

91 Commits

Author SHA1 Message Date
Marcos García
a37392e34e Removed conflict with margins module name and description (already set in admin.lang) 2013-05-12 12:19:26 +02:00
Marcos García
d7a7f316d3 Replaced "Jours" with DurationDays translation key 2013-05-06 16:51:08 +02:00
Marcos García
5784cb120a Moved GenbarcodeLocation from products.lang to admin.lang 2013-04-27 12:32:20 +02:00
Laurent Destailleur
a880a8c51e Qual: Work to prepare usage of jquery data plugins. 2013-04-18 19:37:50 +02:00
Laurent Destailleur
e5a945ba5b Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	ChangeLog
	htdocs/admin/propal.php
	htdocs/compta/journal/purchasesjournal.php
	htdocs/compta/journal/sellsjournal.php
	htdocs/core/class/conf.class.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/lib/files.lib.php
	htdocs/core/modules/mailings/contacts2.modules.php
	htdocs/langs/ca_ES/admin.lang
	htdocs/langs/en_US/admin.lang
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/public/demo/index.php
2013-04-14 01:46:33 +02:00
Laurent Destailleur
2b94188414 Fix: Languages files permissions and loading 2013-04-13 14:09:50 +02:00
Laurent Destailleur
72f0ca194c Fix: Solve conflict of translation 2013-04-10 19:28:54 +02:00
Grand Philippe
c5e742278e fix : trad error 2013-03-24 07:11:44 +01:00
fhenry
8971e6fe15 [ task #710 ] Envoi de mail 2013-03-23 14:39:23 +01:00
Laurent Destailleur
277784af25 New: Start to work on a cron module 2013-03-13 19:55:21 +01:00
Laurent Destailleur
ae7ae7458a Trans: Update turkish language files 2013-03-10 13:58:49 +01:00
Raphaël Doursenaud
e76ffca9ba Removed UTF-8 BOM 2013-03-01 14:11:42 +01:00
Laurent Destailleur
6c8b00b82f Fix: Removed duplictae key 2012-11-25 21:00:51 +01:00
Laurent Destailleur
e76ef823b8 New: Add a tab into members statistics to count members by nature. 2012-11-21 23:01:36 +01:00
Laurent Destailleur
6a97a45111 Qual: Rename translation key 2012-11-20 11:27:50 +01:00
Laurent Destailleur
d1a4a6a090 New: Support synchro of field job/title.
New: Add script to synchronize users from ldap to dolibarr.
2012-10-24 21:19:10 +02:00
Marcos García
952204564f Missing dict translation because of translated key 2012-08-17 23:43:08 +02:00
Marcos García
46db54da21 Renamed ECMNoDirecotyYet to ECMNoDirectoryYet 2012-08-15 16:06:53 +02:00
Laurent Destailleur
d57a54fd04 Fix: Removed deprecated string key 2012-08-10 03:03:52 +02:00
Laurent Destailleur
a29205cea9 Fix: tr_TR 2012-08-03 17:09:07 +02:00
Raphaël Doursenaud
d34c4518d2 Removed BOM from UTF-8 files
Fix: convert line delimiters (regis)

Conflicts:
	htdocs/core/filemanagerdol/browser/default/js/common.js
	htdocs/core/filemanagerdol/browser/default/js/fckxml.js
2012-07-28 19:04:50 +02:00
Marcos García
2204c09e5a Applied commits 16-22 2012-07-27 23:04:05 +02:00
Marcos García
5fd7fcb6c4 Applied commits 1-8 2012-07-27 18:40:06 +02:00
Laurent Destailleur
9392cf2832 Update translation for tr_TR 2012-07-25 17:39:17 +02:00
Marcos García
9eb9fe6d2c Moved bookmark translations from other.lang to bookmarks.lang, also
removed unused translations

Conflicts:
	htdocs/langs/tr_TR/bookmarks.lang
2012-07-22 16:44:16 +02:00
Laurent Destailleur
66ea44886b Fix: Permissions when using web services. 2012-07-22 02:33:21 +02:00
Laurent Destailleur
393f407341 Update turkish language files 2012-07-17 02:33:14 +02:00
Regis Houssin
6935598ced Fix: optimization 2012-07-11 12:05:43 +02:00
Regis Houssin
d1e80afe62 Fix: move "classify billed propal with order" in workflow manager 2012-07-08 13:19:13 +02:00
Laurent Destailleur
6c433db348 New: Update turkish translation 2012-07-06 11:14:45 +02:00
Laurent Destailleur
9669deb737 Turkish translation 2012-06-24 19:59:24 +02:00
Laurent Destailleur
98676ddaa1 Qual: Enhance mailmanspip module.
New: When a member is validated, we can subscribe to mailing-lists
according to its type.
2012-06-10 21:49:19 +02:00
Laurent Destailleur
655c317645 Fix: Turkish translation 2012-06-09 00:22:41 +02:00
Laurent Destailleur
0fd372e5da Trans: Update language files
New: Prepare code to allow any module to change/add content of
predefined mail and signature.
2012-03-22 23:52:02 +01:00
Regis Houssin
fdd7b71417 Fix: trad 2012-03-14 09:21:05 +01:00
Laurent Destailleur
e4a5a67b47 Update languages files 2012-02-29 17:51:21 +01:00
Laurent Destailleur
a606b79af8 Move error code into error lang file. 2012-02-15 16:14:48 +01:00
Laurent Destailleur
f32733b1df Move NumberWord module translation into module. 2012-01-25 23:16:17 +01:00
Laurent Destailleur
10961fb2c9 New: Can choose warehouse for stock change on supplier approbation or
supplier invoice validation
2011-11-09 22:10:58 +01:00
Laurent Destailleur
253084feb3 New: Can choose warehouse for invoice validation 2011-11-09 14:31:43 +01:00
Regis Houssin
42e608bd63 Fix: chmod 644 2011-11-03 18:03:52 +01:00
Laurent Destailleur
c747376945 Can input note (public and private) during trip and expense creation 2011-10-17 14:15:27 +02:00
eldy
f5007addc3 test 2011-10-10 19:28:07 +02:00
eldy
6207b9262b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	dev/translation/langAutoParser.class.php
	htdocs/langs/tr_TR/agenda.lang
	htdocs/langs/tr_TR/boxes.lang
	htdocs/langs/tr_TR/install.lang
	htdocs/langs/tr_TR/other.lang
2011-10-10 15:10:14 +02:00
eldy
86006b0f30 Update tr_TR language file 2011-10-10 14:13:37 +02:00
eldy
f419df68a9 Trans: Maxi fix of translations 2011-10-10 13:11:05 +02:00
Laurent Destailleur
605355c89c Fix: When creating invoice from other object, discount are created
automatically
2011-09-10 17:52:21 +00:00
Laurent Destailleur
22cafc4ed1 New: Can edit prefix of accountancy code 2011-08-27 16:03:47 +00:00
Laurent Destailleur
506792a8ea Qual: Move an error message into error file 2011-08-20 16:59:14 +00:00
Laurent Destailleur
c2b7ce16c1 Fix: Debug new features 2011-07-18 19:25:46 +00:00