lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
109,623 Commits 43 Branches 150 Tags 886 MiB
develop
Commit Graph

259 Commits

Author SHA1 Message Date
Laurent Destailleur
849628f020 Fix: Typo and translation 2014-12-17 01:56:36 +01:00
Laurent Destailleur
d2398dd1b1 Sync from transifex 2014-12-15 10:31:40 +01:00
Laurent Destailleur
792eba4810 Merge branch '3.7-transifex' of github.com:GPCsolutions/dolibarr into 
GPCsolutions-3.7-transifex

Conflicts:
	htdocs/langs/pt_BR/oscommerce.lang
 2014-12-03 13:28:38 +01:00
Laurent Destailleur
931c1fc671 Sync from transifex 2014-11-30 16:20:58 +01:00
Raphaël Doursenaud
92b54fd496 Removed deprecated oscommerce language files 
Note to transifex sync personnel: you may have to manually remove the file
from Transifex to prevent it from coming back!
 2014-11-28 16:03:45 +01:00
Laurent Destailleur
f498921715 Merge branch 'droposcommerce' of github.com:GPCsolutions/dolibarr into 
GPCsolutions-droposcommerce

Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/vi_VN/admin.lang
	htdocs/langs/vi_VN/shop.lang
 2014-10-13 00:50:51 +02:00
Laurent Destailleur
8a98f8461d Sync transifex 2014-10-11 14:33:22 +02:00
Laurent Destailleur
69475b7bf8 Sync from transifex. 
Fix var not initialized.
 2014-10-04 12:49:30 +02:00
Laurent Destailleur
e35135d5b1 Merge branch 'develop-accounting' of github.com:aspangaro/dolibarr into 
develop

Conflicts:
	htdocs/compta/ventilation/card.php
	htdocs/compta/ventilation/fournisseur/card.php
	htdocs/compta/ventilation/fournisseur/list.php
	htdocs/compta/ventilation/list.php
	htdocs/core/menus/init_menu_auguria.sql
 2014-09-29 16:31:35 +02:00
Raphaël Doursenaud
f01e76f686 Removed unmaintaned OScommerce module 2014-09-29 15:22:48 +02:00
aspangaro
e147259e95 Renamed all constants COMPTA_* into ACCOUNTING_* and migration of module ACCOUNTINGEX 3.6 2014-09-21 20:30:55 +02:00
aspangaro
ab9226aab6 Delete elements have a link with old module ventilation - Replace today by module Accounting Expert 2014-09-19 05:55:54 +02:00
Laurent Destailleur
2f6493dabd Sync transifex 2014-09-08 11:58:45 +02:00
Laurent Destailleur
bd29d3c7f4 Sync from transifex 2014-08-08 14:38:20 +02:00
Laurent Destailleur
80e8ff8db3 Sync from transifex 2014-08-01 02:01:51 +02:00
Laurent Destailleur
e94ffceac9 Transifex sync for 3.6 2014-07-18 20:16:46 +02:00
Laurent Destailleur
dae7f8643b Transifex sync 2014-06-22 23:37:20 +02:00
Laurent Destailleur
e04822a7c4 Sync from transifex 2014-06-10 02:22:50 +02:00
Laurent Destailleur
d219916f0a Transifex sync 2014-05-30 16:47:24 +02:00
Laurent Destailleur
584ddde5aa Sync transifex 2014-05-10 15:33:34 +02:00
Laurent Destailleur
48bab56697 Transifex sync 2014-05-05 19:12:52 +02:00
Laurent Destailleur
a96f762f40 Sync from transifex. 2014-04-07 09:23:50 +02:00
Laurent Destailleur
5eeb6b8445 Fix: Use "Space" instead of " " when we need space as Thousand 
Separator.
 2014-04-06 23:43:32 +02:00
Laurent Destailleur
d2b1b1a86c Merge branch 'actiontriggers' of 
https://github.com/GPCsolutions/dolibarr into
GPCsolutions-actiontriggers

Conflicts:
	htdocs/langs/de_DE/other.lang
 2014-04-04 23:47:36 +02:00
Laurent Destailleur
897a9b7446 Sync from transifex. 2014-03-31 19:01:28 +02:00
Raphaël Doursenaud
cd7a378eb0 Action triggers/Langs: fixed a bad translation key 2014-03-27 12:04:03 +01:00
Laurent Destailleur
302bcc2fd5 Translation: Sync from transifex.com 2014-03-17 16:15:00 +01:00
Laurent Destailleur
dd3169e1ed Sync from transifex 2014-03-05 20:47:22 +01:00
Laurent Destailleur
24b0ea6613 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/comm/propal.php
	htdocs/compta/facture.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2014-03-03 19:38:02 +01:00
Marcos García de La Fuente
968b5771db Corrected project contact types translation 2014-02-25 02:42:10 +01:00
Laurent Destailleur
492dec0854 Sync from transifex 2014-02-11 23:19:22 +01:00
Laurent Destailleur
46e9b5d550 Merge branch 'develop' of https://github.com/grandoc/dolibarr into 
grandoc-develop

Conflicts:
	htdocs/langs/ar_SA/admin.lang
	htdocs/langs/el_GR/admin.lang
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/nl_NL/admin.lang
	htdocs/langs/tr_TR/admin.lang
 2014-02-10 01:30:48 +01:00
Laurent Destailleur
e22e4fc4d7 Sync from transifex 2014-02-05 23:10:44 +01:00
Grand Philippe
1855ba556a fix misspelled words 2014-02-05 17:53:30 +01:00
Laurent Destailleur
9cf745b127 Sync with transifex 2014-01-26 23:12:25 +01:00
Marcos García de La Fuente
4f57e82975 Removed odd messages 2014-01-05 09:36:35 +01:00
Marcos García de La Fuente
fba3c63050 Starting to make survey creation a user-only access page 2014-01-05 07:28:04 +01:00
Marcos García de La Fuente
dd8d8e8e42 Removed unused translation strings 2014-01-05 04:59:15 +01:00
Laurent Destailleur
eadccb5d9b Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/langs/bg_BG/main.lang
	htdocs/langs/el_GR/cron.lang
	htdocs/langs/el_GR/help.lang
	htdocs/langs/el_GR/main.lang
	htdocs/langs/el_GR/margins.lang
	htdocs/langs/el_GR/stocks.lang
	htdocs/langs/el_GR/suppliers.lang
	htdocs/langs/et_EE/admin.lang
	htdocs/langs/et_EE/agenda.lang
	htdocs/langs/et_EE/banks.lang
	htdocs/langs/et_EE/bills.lang
	htdocs/langs/et_EE/commercial.lang
	htdocs/langs/et_EE/companies.lang
	htdocs/langs/et_EE/compta.lang
	htdocs/langs/et_EE/dict.lang
	htdocs/langs/et_EE/help.lang
	htdocs/langs/et_EE/main.lang
	htdocs/langs/et_EE/margins.lang
	htdocs/langs/et_EE/other.lang
	htdocs/langs/et_EE/stocks.lang
	htdocs/langs/et_EE/suppliers.lang
	htdocs/langs/et_EE/users.lang
	htdocs/langs/et_EE/withdrawals.lang
	htdocs/langs/lv_LV/admin.lang
	htdocs/langs/lv_LV/agenda.lang
	htdocs/langs/lv_LV/banks.lang
	htdocs/langs/lv_LV/bills.lang
	htdocs/langs/lv_LV/boxes.lang
	htdocs/langs/lv_LV/opensurvey.lang
	htdocs/langs/lv_LV/users.lang
	htdocs/langs/ro_RO/admin.lang
	htdocs/langs/ro_RO/banks.lang
	htdocs/langs/ro_RO/bills.lang
	htdocs/langs/ro_RO/companies.lang
	htdocs/langs/ro_RO/compta.lang
	htdocs/langs/ro_RO/cron.lang
	htdocs/langs/ro_RO/dict.lang
	htdocs/langs/ro_RO/help.lang
	htdocs/langs/ro_RO/main.lang
	htdocs/langs/ro_RO/margins.lang
	htdocs/langs/ro_RO/other.lang
	htdocs/langs/ro_RO/stocks.lang
	htdocs/langs/ro_RO/suppliers.lang
	htdocs/langs/ro_RO/withdrawals.lang
	htdocs/langs/uz_UZ/main.lang
 2013-12-31 12:18:31 +01:00
Laurent Destailleur
f44a45feb2 Fix: Missing some languages into the transifex sync script. 
Trans: Sync language files from transifex.
 2013-12-31 12:03:37 +01:00
Laurent Destailleur
7af5cc18bc Sync from transifex 2013-12-14 03:09:51 +01:00
Laurent Destailleur
9af2ac1afa Sync from transifex 2013-12-14 01:05:33 +01:00
Laurent Destailleur
14f85dc8f1 Revert "Sync from transifex" 
This reverts commit 579e7f8e63.
 2013-12-13 17:50:28 +01:00
Laurent Destailleur
579e7f8e63 Sync from transifex 2013-12-09 09:26:48 +01:00
Laurent Destailleur
0ed2f4b891 Trans: Add usbek language 2013-11-11 22:25:32 +01:00
Laurent Destailleur
19ae524ad9 Fix: Local for SeparatorDecimal and SeparatorThousand were lost during 
transifex synchro.
 2013-10-25 12:27:13 +02:00
Laurent Destailleur
94716c5314 Removed not used key 2013-10-23 14:05:26 +02:00
Laurent Destailleur
1075806282 Sync from transifex 2013-10-19 18:26:14 +02:00
Laurent Destailleur
053d5eeff7 Set name of vat number for some countries according to 
http://en.wikipedia.org/wiki/VAT_identification_number
 2013-10-10 22:50:22 +02:00
Laurent Destailleur
abe7946883 Synchro with transifex 2013-09-28 19:54:28 +02:00
Laurent Destailleur
7544c7e5a4 Synchro with transifex 2013-09-28 18:10:42 +02:00
Laurent Destailleur
4ec85e6722 Update romanian language files 
Added vietnamese language files
 2013-08-25 01:38:31 +02:00
Laurent Destailleur
b4f040bc63 Synchronize romania from transifex. 2013-08-09 13:20:34 +02:00
Laurent Destailleur
012228aca7 Another try to sync with transifex 2013-07-31 16:35:57 +02:00
Laurent Destailleur
5d1dfdc7c1 Upgrade tcpdf to 6.0 2013-06-08 16:29:59 +02:00
Cédric Salvador
b747b0349d merge 2013-06-06 18:31:33 +02:00
Laurent Destailleur
4c3dcec7b8 Sync with transifex: After this commit, all langs files use same order 
of keys than source file (en_US).
Note: Please continue to prefer commiting your change into language
files into git. For the moment transifex does not support conflict
management, diff, versionning, ...
 2013-05-27 23:53:06 +02:00
Laurent Destailleur
dee7ac2823 Add missing lang files 2013-05-27 12:02:31 +02:00
Marcos García
0a5bb491d3 Corrected translation key BuyingPrice from lang files 2013-05-19 12:24:19 +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
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
350bcea183 Merge 2013-03-22 17:10:17 +01:00
Laurent Destailleur
33a7692fbc Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/exports/class/export.class.php
 2013-03-16 17:07:35 +01:00
Grand Philippe
36e99e100b fix trad 2013-03-15 12:13:23 +01:00
Laurent Destailleur
277784af25 New: Start to work on a cron module 2013-03-13 19:55:21 +01:00
Grand Philippe
dd248e9d58 fix : dyslexia 2013-03-11 17:19:03 +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
Marcos García
5fd7fcb6c4 Applied commits 1-8 2012-07-27 18:40:06 +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
035b2d201b Fix: Translation 2012-07-13 16:17:30 +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
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
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
Regis Houssin
f2df94bf32 Fix: for shared thirdparties 
Conflicts:

	htdocs/core/class/html.form.class.php
	htdocs/societe/societe.php
 2012-02-01 15:04:31 +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
Laurent Destailleur
7e1715d025 Avoid having duplicate translations 2011-10-30 18:24:59 +01:00
Juanjo Menent
5c9ba8a548 [task 189] Move Error* key from other.lang into errors.lang files 2011-10-29 23:52:05 +02:00
Regis Houssin
9d9c3a6af8 Move datepicker i18n 2011-10-28 23:03:17 +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
Laurent Destailleur
7466634121 Fix: Translation of id prof 2011-07-18 17:54:09 +00:00
Laurent Destailleur
9b51497cd3 Update translations 2011-06-26 15:05:22 +00:00
Regis Houssin
994d41aad1 New: unified action and event with trigger name 2011-06-04 18:49:45 +00:00
Laurent Destailleur
dd06491277 Qual: Removed deprecated files 2011-02-19 14:23:55 +00:00
Laurent Destailleur
6e77cede0e Fix: Trad of bookmarks 2011-01-23 13:56:38 +00:00
Laurent Destailleur
df832e125c Fix: Slovenian language code is sl_SI 2011-01-20 22:01:25 +00:00
Laurent Destailleur
e6af47e3d3 Fix: Maxi debug for 3.0 2010-12-21 01:35:08 +00:00
Laurent Destailleur
75174ecc62 Restore work lost by savannah backup 2010-12-01 21:38:00 +00:00
Laurent Destailleur
c7c4a83f58 Work on compatibility between FPDF and TCPDF. Now language file main.lang can be used to defined which font to use with TCPDF (Always Helvetica with FPDF). 2010-11-13 02:58:29 +00:00
Laurent Destailleur
3685ba82e3 New: Better way to define url in clicktodial module 2010-11-07 11:27:22 +00:00
Laurent Destailleur
3ab4e40f3d Fix: focus on login 
Fix: Permission number for some modules
 2010-10-01 17:59:02 +00:00
Regis Houssin
62927dbbc0 Works on multi-company module 
Fix: move language files
 2010-09-24 17:06:59 +00:00
Laurent Destailleur
b45c3a3ded Update trad 2010-09-04 00:31:30 +00:00
Laurent Destailleur
849179cb58 Trad: Remove nb_NO translation in non nb_NO files. 2010-09-01 12:47:47 +00:00
Laurent Destailleur
2809631a4f Qual: Removed deprecated translation 2010-07-25 20:11:57 +00:00
Laurent Destailleur
cd7eb850d4 Fix: Trad 2010-07-25 20:03:09 +00:00
Laurent Destailleur
d59a000bdf Fix: Trad 2010-07-20 21:23:57 +00:00
Laurent Destailleur
cf21f13ed0 Trad: Update translation files 2010-07-17 11:42:47 +00:00
Laurent Destailleur
622ab55415 Trad: Update translation files 2010-07-17 11:27:44 +00:00
Laurent Destailleur
abc6e4402f Trad: Update translation files 2010-07-17 10:50:06 +00:00
Laurent Destailleur
347cd94d6f Trad: Update translation files 2010-07-17 10:43:35 +00:00
Laurent Destailleur
86998fa382 Trad: Update translation files 2010-07-17 10:13:00 +00:00
Laurent Destailleur
6f2017e45e Fix: A lot of fix in translations 2010-07-15 20:50:58 +00:00
Laurent Destailleur
41ab0b845c Fix: Bad translation 2010-07-13 19:59:21 +00:00
Laurent Destailleur
9e38c13285 Fix: A lot of missing translation. All language files from standard modules must be inside htdocs/lang directory. 2010-07-10 00:27:35 +00:00
Laurent Destailleur
1a53d5637a Fix: Try a better fix for numbering modules to be more stable when using another module 2010-06-01 07:31:40 +00:00
Regis Houssin
dc77231df7 Fix: change proformat to proforma 2010-05-17 15:41:17 +00:00
Laurent Destailleur
83aebbb2ce Fix: Removed a duplicate permission 2010-05-12 12:41:38 +00:00
Laurent Destailleur
b7570ff18a Fix: Better error management 2010-05-04 18:03:45 +00:00
Laurent Destailleur
9db9f23d71 Restore lang files into global lang directory. Usage of lang into modules directory must be used only for external modules to be self-dependent but must be kept for dolibarr core feature into unique htdocs/langs directory as this make working on translation a big headache and break a lot of automated translation tools. 2010-05-02 17:05:07 +00:00
Philippe Grand
64cc3f70e6 according to new tree directory 2010-05-02 16:55:56 +00:00
Philippe Grand
17a2034b02 according to new tree directory 2010-05-02 10:01:18 +00:00
Philippe Grand
9e887c8980 according to new tree directory 2010-05-01 14:19:21 +00:00
Philippe Grand
905f9c7e27 according to new tree directory 2010-04-28 15:30:44 +00:00
Regis Houssin
e7855d0bc7 Fix: remove spaces before sign equal 2010-04-03 15:15:43 +00:00
Regis Houssin
7585fd2948 Fix: migration du module droitpret en module externe 2010-03-23 07:57:30 +00:00
Regis Houssin
062e9da861 Fix: translation 2010-01-25 08:55:17 +00:00
Laurent Destailleur
d26083e8fe Fix: A lot of fix in translations 2009-12-15 09:27:46 +00:00
Regis Houssin
dd3aaa3062 Work on DoliMamp for Mac OS X 2009-10-31 13:58:23 +00:00
Laurent Destailleur
4b1adb053e Fix: Rename protocol SMTPS into SMTP-AUTH as the class SMTPS is not a SSL/TLS class but a SMTP-AUTH class. 2009-10-29 17:43:31 +00:00
Laurent Destailleur
131553106e Uniformize code 2009-10-14 11:04:09 +00:00
Laurent Destailleur
b96e84ed6d Trad: Missing translation 2009-09-29 17:18:36 +00:00
Laurent Destailleur
2b054271e2 New: Add module FTP client 2009-09-27 23:22:00 +00:00
Laurent Destailleur
0598ee3668 New: Add experimental module Point of sale 2009-09-11 14:29:36 +00:00
Laurent Destailleur
5fd9e9193b Trad: The war against typo errors 2009-08-19 19:49:50 +00:00
Laurent Destailleur
73a4dbd21f Trad: The war against typo errors 2009-08-19 19:18:26 +00:00
Laurent Destailleur
9c53f0ed8e Fix: Fix global typo error 2009-08-19 17:16:47 +00:00
Laurent Destailleur
f25e136db8 Fix: Fix global typo error 2009-08-19 17:07:48 +00:00
Laurent Destailleur
ef9a2e3efd Trad 2009-08-17 17:53:00 +00:00
Laurent Destailleur
4cd2c1ad9e Update translation files 2009-08-13 19:16:43 +00:00
Laurent Destailleur
7ca35c1ca0 Enhance translation tool 2009-08-13 18:15:10 +00:00
Laurent Destailleur
3fdee29536 New: Change to support arabe languages. 2009-08-12 17:40:47 +00:00
Laurent Destailleur
252795ad05 Typo 2009-07-15 19:43:42 +00:00