Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
61,071 Commits 36 Branches 189 Tags
8f34de1036680906ebdb8c05e6460077b5dc4b43
Commit Graph

59 Commits

Author SHA1 Message Date
Laurent Destailleur
348a42542d Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/theme/eldy/style.css.php
 2017-08-21 13:29:08 +02:00
Laurent Destailleur
e8a2680e31 Sync transifex 2017-08-21 13:26:56 +02:00
Laurent Destailleur
22a7c9bd6b Merge pull request #7220 from guerrierk/develop 
NEW|Add possibility to propose last num releve in conciliation
 2017-08-17 23:42:07 +02:00
Laurent Destailleur
32eb2aba43 Sync transifex 2017-08-02 15:30:46 +02:00
GUERRIER Kevin
ded6b40489 Add possibility to propose last num releve in conciliation 2017-07-29 14:21:58 +02:00
Laurent Destailleur
e3943155f3 Sync transifex 2017-07-09 19:32:35 +02:00
Laurent Destailleur
504d376f84 Sync transifex 2017-06-19 21:34:33 +02:00
Laurent Destailleur
807eb56807 Add BHD currency 2017-03-03 13:15:20 +01:00
Laurent Destailleur
6c40110613 Sync transifex 2017-02-21 10:26:11 +01:00
Laurent Destailleur
05582e9586 Sync transifex 2017-01-23 17:31:09 +01:00
Laurent Destailleur
6ab9ba3284 Fix management of alternative language for Greek (el_CY) 2017-01-21 21:52:42 +01:00
Laurent Destailleur
7ec4bc055a Sync transifex 2016-12-10 11:51:55 +01:00
Laurent Destailleur
55e367742a Sync transyfex 2016-11-06 12:50:32 +01:00
Laurent Destailleur
e7a09c07f9 Sync and clean language files 2016-10-11 10:38:38 +02:00
Laurent Destailleur
f0fa9205a2 Sync transifex 2016-07-26 09:56:20 +02:00
Laurent Destailleur
2af7a8c584 Transifex sync 2016-07-07 10:06:35 +02:00
Laurent Destailleur
febf56e28c Sync transifex 2016-06-20 03:21:35 +02:00
Laurent Destailleur
2223d283dc Sync transifex 2016-06-20 00:45:25 +02:00
Laurent Destailleur
ebd8f2cf86 Prepare 4.0 2016-06-02 13:33:22 +02:00
Laurent Destailleur
0faebc25ba Update translations 2016-02-19 19:33:31 +01:00
Laurent Destailleur
b162eb1bb0 Update translation for 3.9 2016-01-29 00:40:15 +01:00
Laurent Destailleur
41516093bb Syn transifex 2015-12-28 12:21:24 +01:00
Laurent Destailleur
dc9c5ed5ef Enhance transifex sync 2015-12-18 18:25:09 +01:00
Laurent Destailleur
d59f62cd75 Sync transifex 2015-09-30 01:25:35 +02:00
Laurent Destailleur
b4c964760d Sync transifex 2015-09-13 23:25:55 +02:00
Laurent Destailleur
2a85fb542a Fix phpcs 
Sync transifex
 2015-08-31 17:22:36 +02:00
Laurent Destailleur
99c8a9211e Sync with transifex 2015-07-20 13:55:43 +02:00
Laurent Destailleur
db67ab0b5e Fix wrap into lang list. 
Sync with transifex
 2015-07-15 16:27:01 +02:00
Laurent Destailleur
f06b66c5f0 Sync from transifex 2015-07-03 15:31:51 +02:00
Juanjo Menent
ba97763ac4 Transifex Syncro 2015-06-26 17:40:47 +02:00
Laurent Destailleur
01aad8516d Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/adherents/list.php
	htdocs/compta/dons/card.php
	htdocs/compta/dons/class/don.class.php
	htdocs/contact/list.php
	htdocs/contrat/list.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/security.lib.php
	htdocs/main.inc.php
	htdocs/product/stock/massstockmove.php
	htdocs/public/test/test_arrays.php
	htdocs/public/test/test_forms.php
	htdocs/societe/societe.php
 2015-05-31 03:30:38 +02:00
Laurent Destailleur
3cfe4dc86e Sync language files 2015-05-31 03:07:17 +02:00
Laurent Destailleur
4f4ebfaed3 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/printipp/admin/printipp.php
 2015-05-04 12:09:39 +02:00
Laurent Destailleur
984aca28c3 Sync translation 2015-05-03 15:37:15 +02:00
Laurent Destailleur
100fa1067e Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/bank/virement.php
	htdocs/compta/facture/impayees.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/modProjet.class.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/en_GB/admin.lang
	htdocs/langs/es_AR/orders.lang
	htdocs/langs/es_AR/trips.lang
	htdocs/langs/es_CO/admin.lang
	htdocs/langs/es_CO/orders.lang
	htdocs/langs/es_CO/trips.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/pl_PL/interventions.lang
	htdocs/langs/pt_BR/trips.lang
	htdocs/langs/ro_RO/productbatch.lang
	htdocs/langs/ro_RO/trips.lang
	htdocs/main.inc.php
	htdocs/projet/element.php
 2015-04-22 17:57:57 +02:00
Laurent Destailleur
3d609d5fd0 Sync transifex 2015-04-22 14:58:06 +02:00
Laurent Destailleur
805c73b849 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/langs/en_GB/main.lang
	htdocs/langs/es_CO/salaries.lang
 2015-04-02 14:04:04 +02:00
Laurent Destailleur
acbeb2b360 Fix en_GB 2015-04-02 14:03:52 +02:00
Laurent Destailleur
cf0f458a51 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/dispatch.php
	htdocs/langs/el_GR/projects.lang
	htdocs/langs/en_GB/bills.lang
	htdocs/langs/en_GB/main.lang
	htdocs/langs/en_GB/orders.lang
	htdocs/langs/es_AR/bills.lang
	htdocs/langs/es_CO/admin.lang
	htdocs/langs/es_CO/main.lang
	htdocs/langs/es_ES/bills.lang
	htdocs/langs/es_ES/projects.lang
	htdocs/langs/fa_IR/categories.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/bills.lang
	htdocs/langs/fr_FR/other.lang
	htdocs/langs/fr_FR/projects.lang
	htdocs/langs/lv_LV/bills.lang
	htdocs/langs/nb_NO/bills.lang
	htdocs/langs/pl_PL/bills.lang
	htdocs/langs/pl_PL/mails.lang
	htdocs/langs/pl_PL/projects.lang
	htdocs/langs/ro_RO/bills.lang
	htdocs/langs/ro_RO/products.lang
	htdocs/langs/ro_RO/projects.lang
	htdocs/langs/ru_RU/bills.lang
	htdocs/langs/ru_RU/projects.lang
	htdocs/langs/sl_SI/main.lang
	htdocs/langs/tr_TR/bills.lang
	htdocs/langs/tr_TR/projects.lang
	htdocs/langs/vi_VN/bills.lang
 2015-04-02 13:57:20 +02:00
Laurent Destailleur
8d892e19c1 Sync from transifex 2015-04-02 13:56:32 +02:00
Laurent Destailleur
0f51314c7e Sync from transifex 2015-04-02 13:28:20 +02:00
Laurent Destailleur
b0b88be81f Sync transifex 2015-03-18 15:27:27 +01:00
Laurent Destailleur
0ef2369399 Enhance tools to make transifex sync 2015-03-14 02:37:18 +01:00
Laurent Destailleur
a8e7d90ea3 Sync transifex 2015-03-13 22:02:53 +01:00
Grand Philippe
1855ba556a fix misspelled words 2014-02-05 17:53:30 +01:00
Laurent Destailleur
94716c5314 Removed not used key 2013-10-23 14:05:26 +02:00
Laurent Destailleur
a880a8c51e Qual: Work to prepare usage of jquery data plugins. 2013-04-18 19:37:50 +02:00
Laurent Destailleur
1d7820c5ac New: English bank account need a bank code (called sort code) to 
identify an account.
 2012-10-31 00:22:13 +01:00
Regis Houssin
6b21ca442d New: add possibility to defined position/job of a user 
Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
 2012-10-05 12:40:19 +02:00
Regis Houssin
935bb09b99 Fix: better translation 2012-10-03 12:39:48 +02:00