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

1365 Commits

Author SHA1 Message Date
Laurent Destailleur
0dc82cddf1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/langs/es_ES/accountancy.lang
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/es_ES/agenda.lang
	htdocs/langs/es_ES/categories.lang
	htdocs/langs/es_ES/companies.lang
	htdocs/langs/es_ES/compta.lang
	htdocs/langs/es_ES/donations.lang
	htdocs/langs/es_ES/errors.lang
	htdocs/langs/es_ES/holiday.lang
	htdocs/langs/es_ES/interventions.lang
	htdocs/langs/es_ES/projects.lang
	htdocs/langs/es_ES/sendings.lang
	htdocs/langs/es_ES/suppliers.lang
 2014-10-11 14:42:45 +02:00
Laurent Destailleur
8a98f8461d Sync transifex 2014-10-11 14:33:22 +02:00
Juanjo Menent
f1104275b4 Trad: Syncro es_ES/compta.lang from transifex 2014-10-10 22:11:00 +02:00
Juanjo Menent
2f3abd3774 Trad: Syncro es_ES from transifex 2014-10-10 21:50:05 +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
6d26a7a46d Merge remote-tracking branch 'Upstream/develop' into develop-accounting 2014-09-20 06:36:31 +02:00
Juanjo Menent
f426b9dcd2 Minor accountancy updates 2014-09-19 15:04:36 +02:00
Juanjo Menent
d16a1e587e Trad: Syncro es_ES from transifex 2014-09-19 09:04:45 +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
99f1876aa2 Merge pull request #1903 from aspangaro/develop-accounting 
Patch Accounting Expert module
 2014-09-18 17:24:40 +02:00
Laurent Destailleur
9666d5e3ae Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/.gitignore
	htdocs/core/lib/functions2.lib.php
	htdocs/install/mysql/migration/repair.sql
	htdocs/langs/en_US/errors.lang
 2014-09-18 10:17:43 +02:00
Juanjo Menent
039105a3f1 Fix: Invoices payments may be older than invoices. fr and es trans 2014-09-18 10:02:03 +02:00
aspangaro
5216bbca72 Traduce button 2014-09-16 21:31:58 +02:00
Juanjo Menent
08a4713101 Trad: Syncro from transifex 2014-09-11 19:42:46 +02:00
aspangaro
289f46977b List financial journals into admin 2014-09-08 21:19:05 +02:00
aspangaro
70b8ccd441 Merge remote-tracking branch 'Upstream/develop' into develop-accounting 2014-09-08 20:18:45 +02:00
Laurent Destailleur
2f6493dabd Sync transifex 2014-09-08 11:58:45 +02:00
aspangaro
f9dc25cf3f Patch Accounting Expert Module 2014-09-06 09:50:42 +02:00
aspangaro
18a6a3f499 Update langs - Tks Juanjo for es_ES 2014-08-31 13:57:30 +02:00
aspangaro
d03763f6c3 Update Accounting Expert integration 2014-08-28 06:30:01 +02:00
aspangaro
71265558d2 Integrate module Accounting Expert 2014-08-27 07:03:42 +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
354ceddb87 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/es_ES/contracts.lang
	htdocs/langs/es_ES/exports.lang
	htdocs/langs/es_ES/mails.lang
	htdocs/langs/es_ES/main.lang
	htdocs/langs/es_ES/products.lang
	htdocs/langs/es_ES/stocks.lang
 2014-05-30 18:17:52 +02:00
Juanjo Menent
8e3f36e9cc Trad: Update es_ES from transifex 2014-05-30 16:48:41 +02:00
Laurent Destailleur
d219916f0a Transifex sync 2014-05-30 16:47:24 +02:00
Laurent Destailleur
39ce76ba1b Sync from transifex 2014-05-18 12:25:20 +02:00
Juanjo Menent
373b16f7be Trad: Update es_ES from transifex 2014-05-10 17:33:23 +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
dfb81e7997 Sync transifex 2014-05-02 16:52:32 +02:00
Juanjo Menent
3b97e1ae1c Trad: Update es_ES from transifex 2014-05-01 09:42:38 +02:00
Juanjo Menent
cdf5155d87 Trad: Update es_ES from transifex 2014-05-01 09:22:31 +02:00
Laurent Destailleur
97fce71218 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/install/mysql/migration/repair.sql
	htdocs/langs/en_US/errors.lang
	htdocs/product/fiche.php
	htdocs/projet/tasks/task.php
 2014-04-26 22:35:35 +02:00
Laurent Destailleur
c54d9d9171 Fix: [ bug #1351 ] VIES verification link broken 2014-04-26 16:27:06 +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
Juanjo Menent
334455f8dd Update es_ES from transifex 2014-03-22 10:28:24 +01:00
Juanjo Menent
79ab420997 Update es_ES from transifex 2014-03-22 09:41:14 +01:00
Laurent Destailleur
302bcc2fd5 Translation: Sync from transifex.com 2014-03-17 16:15:00 +01:00
Simnandez
4e73e4e7c7 Update es_ES from transifex 2014-03-15 16:49:18 +01:00
Simnandez
5216a14e37 Trad: Update es_ES from transifex 2014-03-15 16:36:25 +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
Laurent Destailleur
a084887442 Merge branch 'project-translations' of 
https://github.com/marcosgdf/dolibarr into
marcosgdf-project-translations

Conflicts:
	ChangeLog
 2014-03-01 13:38:50 +01:00
Laurent Destailleur
480b09f192 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/societe/class/societe.class.php
 2014-02-26 15:49:29 +01:00
Laurent Destailleur
7241714551 Merge pull request #1435 from marcosgdf/export-translations 
Corrected export translations
 2014-02-25 14:11:40 +01:00
Marcos García de La Fuente
4411908b23 Fixed translations of project export wizard 2014-02-25 04:18:13 +01:00
Marcos García de La Fuente
4157452c6d Translated export filters 2014-02-25 03:23:08 +01:00
Marcos García de La Fuente
7ac405e067 Added SpecialCode translation key 2014-02-25 03:20:37 +01:00
Marcos García de La Fuente
968b5771db Corrected project contact types translation 2014-02-25 02:42:10 +01:00
simnandez
36bc225208 Trad: es_ES Sync from transifex 2014-02-21 12:49:24 +01:00
simnandez
c2db656c86 Fix: Action event SHIPPING_VALIDATE is not implemented 2014-02-19 17:33:22 +01:00
simnandez
7511f626b3 Fix: Action event SHIPPING_VALIDATE is not implemented 2014-02-19 17:32:20 +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
simnandez
34e73e1b7c Trad: es_ES Sync from transifex 2014-02-07 18:12:30 +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
simnandez
714be2cd62 Trad: Add missing ca_ES and es_ES files 2014-01-23 17:05:51 +01:00
simnandez
21d6e22f03 Trad: Add missing ca_ES and es_ES files 2014-01-23 17:05:07 +01:00
simnandez
2866deb3c4 Thousand separator must be space into Spain 2014-01-23 12:18:57 +01:00
simnandez
35051f8c77 Thousand separator must be space into Spain 2014-01-23 12:18:15 +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
9e5e74cb58 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/fourn/commande/fiche.php
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/es_ES/languages.lang
	htdocs/langs/es_ES/main.lang
 2013-12-19 21:03:15 +01:00
simnandez
aac21c7a3c Trad: Improve es_ES trans 2013-12-19 18:33:54 +01:00
simnandez
4d3290e4bf Trad: Improve es_ES trans 2013-12-19 18:33:03 +01:00
simnandez
bfaf6d8ac8 Trad: Add missing es_ES trans 
Conflicts:
	htdocs/langs/es_ES/companies.lang
 2013-12-19 18:20:16 +01:00
simnandez
e4da8623f8 Trad: Add missing es_ES trans 2013-12-19 18:18:26 +01:00
simnandez
c35fc6b2d8 Trad: Fix missing translation 2013-12-19 12:48:19 +01:00
simnandez
8e247e8615 Trad: Fix missing translation 2013-12-19 12:47:39 +01:00
simnandez
42dbe88baa Trad: Add missing trans 
Conflicts:
	htdocs/langs/es_ES/main.lang
 2013-12-19 10:51:06 +01:00
simnandez
1d4cf1a255 Trad: Update es_ES translations 
Conflicts:
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/es_ES/languages.lang
	htdocs/langs/es_ES/main.lang
	htdocs/langs/es_ES/stocks.lang
 2013-12-19 10:48:55 +01:00
simnandez
2e840a3d37 Trad: Add missing trans 2013-12-19 10:41:44 +01:00
simnandez
3b3b66e612 Trad: Update es_ES translations 2013-12-19 10:29:34 +01:00
Laurent Destailleur
7af5cc18bc Sync from transifex 2013-12-14 03:09:51 +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
Marcos García de La Fuente
02036af782 Added missing translations for permissions of margins module 2013-12-08 21:18:01 +02:00
simnandez
58a8f590e6 New: Add graph stats for suppliers orders in tab "stats" on products. 2013-11-22 14:47:16 +01:00
simnandez
0aba9b02b8 Add alert for outstanding bill 2013-11-15 17:43:13 +01:00
simnandez
b9c8852471 Qual: Improve suppliers orders manual receivings 2013-11-14 17:08:59 +01:00
simnandez
e66371c6d1 New: Link to communities. Add official Support links 2013-11-13 16:35:02 +01:00
simnandez
d01a66ac9d Trad: Update es_ES 2013-11-12 12:43:26 +01:00
simnandez
3c097f34b8 Trad: Update es_ES 2013-11-12 12:35:45 +01:00
simnandez
84d6c96d79 Trad: Update es_ES 2013-11-12 10:55:27 +01:00
simnandez
058578c5b3 Trad: Fix bad source file 2013-11-12 10:19:12 +01:00
simnandez
3af6f683d9 Trad: Update admin.lang es_ES 2013-11-12 10:16:52 +01:00
Laurent Destailleur
0ed2f4b891 Trans: Add usbek language 2013-11-11 22:25:32 +01:00
Florian Henry
f512ef344a Better managent of contact status and fix COMPANY_DONOTSEARCH_ANYWHERE 
use every where before SOCIETE_DONOTSEARCH_ANYWHERE was used
 2013-10-30 12:24:51 +01:00
Laurent Destailleur
cb2e8551d8 Add cs_CZ language 
Sync with transifex
 2013-10-26 11:26:22 +02: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
5ee05836b6 Missing translation languages 2013-10-11 10:06:30 +02:00
Laurent Destailleur
3e91a4d982 Fix translation for paraguay 2013-10-09 21:43:31 +02:00
Laurent Destailleur
8aff0e2e1e Trans: Add language file for paraguay. 2013-10-09 21:31:17 +02:00
Laurent Destailleur
7544c7e5a4 Synchro with transifex 2013-09-28 18:10:42 +02:00
simnandez
f7299f1a28 [ task #1063 ] Allow edit localtaxes rate for thirds 2013-09-17 18:06:06 +02:00
simnandez
6ae3603549 Trad: Add missing translations 2013-09-03 18:16:30 +02:00
simnandez
614f376392 Trad: Fix bad descriptor 2013-09-03 09:25:14 +02:00
Laurent Destailleur
b02bf5a2a7 Syn with transifex 2013-09-03 00:42:54 +02:00
simnandez
2a8aa50163 Fix: Intervention box links to contracts id 
Conflicts:
	htdocs/core/boxes/box_ficheinter.php
 2013-08-29 12:12:02 +02:00
simnandez
c78b0dbcc6 Trad: Add ca_ES and es_ES boxes translations 2013-08-26 13:00:47 +02:00
simnandez
a796337fc6 Trad: Add ca_ES and es_ES boxes translations 2013-08-26 12:41:35 +02:00
simnandez
a9772edeff Trad: Add ca_ES and es_ES boxes translations 2013-08-26 12:31:41 +02:00
simnandez
8fa9e3251e Trad: Update ca_ES and es_ES translations 2013-08-26 12:17:11 +02:00
simnandez
68b4278ec6 Add ca_ES and es_ES workflow translations 2013-08-26 12:03:17 +02:00
simnandez
f5947abc71 Trad: Add ca_ES and es_ES boxes translations 2013-08-26 11:49:22 +02:00
simnandez
057df6df85 Trad: Update ca_ES and es_ES admin.lang 2013-08-09 11:50:12 +02:00
simnandez
868571061b Trad: Update ca_ES and es_ES bills.lang 2013-08-09 11:44:12 +02:00
simnandez
728edd0ab3 Trad: Update ca_ES and es_ES companies.lang 2013-08-09 11:41:27 +02:00
simnandez
a79cb97235 Trad: Update ca_ES and es_ES main.lang 2013-08-09 11:37:39 +02:00
simnandez
e762f76d86 Trad: Update ca_ES and es_ES users.lang 2013-08-09 11:32:35 +02:00
simnandez
372ef135d5 Trad: Update ca_ES and es_ES commercial.lang 2013-08-09 11:28:24 +02:00
simnandez
f853039b2f Trad: Update ca_ES and es_ES ecm.lang 2013-08-09 11:26:12 +02:00
simnandez
55436940e1 Trad: Update ca_ES and es_ES holiday.lang 2013-08-09 11:19:59 +02:00
simnandez
a7431c1165 Trad: Update ca_ES and es_ES banks.lang 2013-08-09 11:10:52 +02:00
simnandez
3aa9de7cfa Trad: Update ca_ES and es_ES interventions.lang 2013-08-09 10:57:41 +02:00
simnandez
6b1484c2ea Fix: [ bug #992 ] Proforma invoices don't have a separated numeric count 2013-08-08 17:11:54 +02:00
Laurent Destailleur
fe3e59ed12 Fix: Use reserved word None when we don't want thousand separator. 2013-08-08 01:47:22 +02:00
simnandez
16eba64568 Trad: Add missing modules info 2013-08-05 17:05:59 +02:00
simnandez
a16b3b6e73 Trad: Add missing translation 2013-08-05 16:32:35 +02:00
simnandez
2e3db5e7e3 Trad: Add ca_ES and es_ES printipp.lang 2013-08-05 16:14:50 +02:00
simnandez
b9d9044208 Trad: Update ca_ES and es_ES cron.lang 2013-08-05 16:07:54 +02:00
simnandez
f6fe439766 Trad: Update ca_ES and es_ES boxes.lang 2013-08-05 15:59:08 +02:00
simnandez
5dd17bbe0a Trad: Update ca_ES and es_ES projects.lang 2013-08-05 15:48:33 +02:00
simnandez
2867641ebb Trad: Update ca_ES and es_ES mails.lang 2013-08-05 12:54:50 +02:00
simnandez
438badce02 Trad: Update ca_ES and es_ES products.lang 2013-08-05 12:50:36 +02:00
simnandez
10e0c528a5 Trad: Update ca_ES and es_ES propal.lang 2013-08-05 12:46:26 +02:00
simnandez
4c7798ff98 Trad: Update suppliers.lang 2013-08-05 12:40:55 +02:00
simnandez
25a7bb994d Trad: Update ca_ES and es_ES compta.lang 2013-08-05 12:24:12 +02:00
simnandez
4ca8852eaf Trad: Update ca_ES and es_ES sendings.lang 2013-08-05 12:10:42 +02:00
simnandez
06228569ef Trad: Update ca_ES and es_ES orders.lang 2013-08-05 12:04:19 +02:00
simnandez
fd475f385f Trad: Update ca_ES and es_ES stocks.lang 2013-08-05 11:55:33 +02:00
simnandez
def59df002 Trad: Update ca_ES and es_ES agenda.lang 2013-08-05 11:47:24 +02:00
simnandez
ef6a063cfb Trad: Update ca_ES and es_ES categories.lang 2013-08-05 11:38:43 +02:00
simnandez
00943410cd Trad: Update ca_ES and es_ES contracts.lang 2013-08-05 11:32:11 +02:00
simnandez
7a47e910ff Trad: Update ca_ES and es_ES errors.lang 2013-08-05 11:26:48 +02:00
simnandez
86156746cf Trad: Update ca_ES and es_ES bills.lang 2013-08-05 11:14:53 +02:00
simnandez
673b6f21a0 Trad: Update ca_ES and es_ES languages.lang 2013-08-05 10:32:56 +02:00
simnandez
9111226761 Trad: Update ca_ES and es_ES admin.lang 2013-08-05 10:00:34 +02:00
Laurent Destailleur
447d0063af Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/langs/ca_ES/withdrawals.lang
	htdocs/langs/es_ES/withdrawals.lang
	htdocs/langs/fr_FR/withdrawals.lang
	htdocs/langs/ja_JP/compta.lang
	htdocs/langs/ja_JP/contracts.lang
	htdocs/langs/sl_SI/withdrawals.lang
	htdocs/langs/zh_CN/admin.lang
	htdocs/langs/zh_CN/agenda.lang
	htdocs/langs/zh_CN/bills.lang
	htdocs/langs/zh_CN/boxes.lang
	htdocs/langs/zh_CN/commercial.lang
	htdocs/langs/zh_CN/companies.lang
	htdocs/langs/zh_CN/compta.lang
	htdocs/langs/zh_CN/contracts.lang
	htdocs/langs/zh_CN/errors.lang
	htdocs/langs/zh_CN/exports.lang
	htdocs/langs/zh_CN/install.lang
	htdocs/langs/zh_CN/interventions.lang
	htdocs/langs/zh_CN/mails.lang
	htdocs/langs/zh_CN/main.lang
	htdocs/langs/zh_CN/members.lang
	htdocs/langs/zh_CN/orders.lang
	htdocs/langs/zh_CN/other.lang
	htdocs/langs/zh_CN/products.lang
	htdocs/langs/zh_CN/propal.lang
	htdocs/langs/zh_CN/stocks.lang
	htdocs/langs/zh_CN/suppliers.lang
	htdocs/langs/zh_CN/users.lang
	htdocs/langs/zh_TW/admin.lang
	htdocs/langs/zh_TW/agenda.lang
	htdocs/langs/zh_TW/banks.lang
	htdocs/langs/zh_TW/boxes.lang
	htdocs/langs/zh_TW/companies.lang
	htdocs/langs/zh_TW/compta.lang
	htdocs/langs/zh_TW/contracts.lang
	htdocs/langs/zh_TW/errors.lang
	htdocs/langs/zh_TW/exports.lang
	htdocs/langs/zh_TW/install.lang
	htdocs/langs/zh_TW/interventions.lang
	htdocs/langs/zh_TW/mails.lang
	htdocs/langs/zh_TW/members.lang
	htdocs/langs/zh_TW/orders.lang
	htdocs/langs/zh_TW/propal.lang
	htdocs/langs/zh_TW/suppliers.lang
 2013-08-03 16:24:52 +02:00
Laurent Destailleur
4ec86717be Fix: Bad char % 2013-08-03 15:51:32 +02:00
simnandez
283d9eb064 Text for invoices numbering modules more clear. Update ChangeLog 2013-08-02 15:27:37 +02:00
simnandez
6d1a021382 New: [ task #1005 ] Update mercure module with replacement invoices. 2013-08-02 12:11:14 +02:00
simnandez
d0bd188e74 New: [ task #1005 ] Improves and best adaptations 2013-08-02 10:44:14 +02:00
Laurent Destailleur
012228aca7 Another try to sync with transifex 2013-07-31 16:35:57 +02:00
simnandez
7efacecb08 New: [ task #1005 ] Adapting to Spanish legislation bill numbering 2013-07-26 12:46:34 +02:00
Laurent Destailleur
bf9b255c92 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_opensuse.spec
 2013-07-24 15:25:00 +02:00
simnandez
442ca8ea35 Trad: Fix ca_ES and es_ES missing translation 2013-07-11 11:51:13 +02:00
simnandez
11bf611618 Trad: Fix ca_ES and es_ES missing translation 2013-07-11 11:50:31 +02:00
Laurent Destailleur
5385d87995 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/langs/ca_ES/admin.lang
	htdocs/langs/ca_ES/errors.lang
	htdocs/langs/ca_ES/main.lang
	htdocs/langs/ca_ES/opensurvey.lang
	htdocs/langs/ca_ES/paybox.lang
	htdocs/langs/ca_ES/products.lang
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/es_ES/errors.lang
	htdocs/langs/es_ES/main.lang
	htdocs/langs/es_ES/products.lang
 2013-07-05 21:56:54 +02:00
simnandez
66ce0582a1 Trad: Fix missing = into es_ES admin.lang 2013-07-03 16:42:53 +02:00
simnandez
64a04ef150 Trad: Add missing trans before 3.4 final release 2013-07-03 12:14:37 +02:00
Laurent Destailleur
314d45a9ee Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/langs/el_GR/admin.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/it_IT/admin.lang
	htdocs/langs/nb_NO/admin.lang
	htdocs/langs/nl_NL/admin.lang
	htdocs/langs/pt_BR/admin.lang
	htdocs/langs/pt_PT/admin.lang
	htdocs/langs/sl_SI/admin.lang
	htdocs/langs/zh_TW/admin.lang
 2013-06-28 00:52:09 +02:00
Laurent Destailleur
b3bdc76da3 Trans: More complete examples 2013-06-26 00:05:00 +02:00
Laurent Destailleur
af4651f1a2 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	build/perl/virtualmin/dolibarr.pl
	htdocs/core/lib/files.lib.php
	htdocs/langs/en_US/projects.lang
	htdocs/langs/fr_FR/projects.lang
	htdocs/public/paybox/paymentko.php
	htdocs/public/paybox/paymentok.php
	htdocs/public/paypal/paymentko.php
	htdocs/public/paypal/paymentok.php
	htdocs/webservices/server_other.php
 2013-06-25 23:22:00 +02:00
Laurent Destailleur
8359a34545 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	ChangeLog
	build/debian/changelog
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/perl/virtualmin/dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/compta/facture/class/facture-rec.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/filefunc.inc.php
 2013-06-25 21:31:24 +02:00
simnandez
ba6b5d27a5 New: TODO il faut incrementer le stock si on supprime une expedition 
validee
 2013-06-20 18:37:23 +02:00
Marcos García
76d9ba6a43 Fixed es_ES translation typo 2013-06-19 10:24:24 +02:00
Marcos García
13bcb5daaa Merge branch 'develop' into clone-composition 
Conflicts:
	ChangeLog
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
 2013-06-12 16:39:23 +02:00
Laurent Destailleur
a50cd7b698 Fix bug into script that fix CRLF into LF 2013-06-12 11:59:55 +02:00
Marcos García
e727100cf0 New: Clone product/service composition 2013-06-10 00:11:25 +02:00
Laurent Destailleur
51d11ff190 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/compta/facture/stats/index.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/pdf.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/includes/tcpdf/tcpdf.php
	htdocs/langs/el_GR/other.lang
	htdocs/langs/en_US/cashdesk.lang
	htdocs/langs/en_US/main.lang
	htdocs/langs/es_ES/products.lang
	htdocs/main.inc.php
	test/phpunit/NumberingModulesTest.php
 2013-06-09 16:49:47 +02:00
Marcos García
17efbd41c7 Improved es_ES translation 2013-06-08 20:18:09 +02:00
Marcos García
000de9530d Fixed wrong translation key and and improved es_ES translations 2013-06-08 20:15:48 +02:00
simnandez
0219242484 Fix: Trad categories more accurate 2013-05-28 15:20:14 +02:00
simnandez
485c7bc477 Fix: Trad categories more accurate 2013-05-28 15:19:24 +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
simnandez
1470b75e5c Trad: Fix Catalan words into Spanish 2013-05-20 18:44:41 +02:00
simnandez
3f1dabb4e2 Trad: Fix Catalan words into Spanish 2013-05-20 18:43:21 +02:00
Marcos García
0a5bb491d3 Corrected translation key BuyingPrice from lang files 2013-05-19 12:24:19 +02:00
Marcos García
08b234ed01 Corrected translation key BuyingPrice from lang files 2013-05-19 12:08:18 +02:00
Laurent Destailleur
ee890a87a3 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/compta/prelevement/class/rejetprelevement.class.php
	htdocs/compta/prelevement/ligne.php
	htdocs/langs/en_US/admin.lang
 2013-05-14 01:15:05 +02:00
Laurent Destailleur
dc28335ed5 Merge pull request #948 from marcosgdf/translations 
Improved translations
 2013-05-13 16:07:22 -07:00
simnandez
0c853b3ebd Fix: Some bugs on withdrawal rejects 2013-05-13 17:35:30 +02:00
simnandez
5fe70e0bee Fix: Some bugs on withdrawal rejects 2013-05-13 17:15:23 +02:00
simnandez
050ca946e9 Fix: Debug of withdrawals rejects 2013-05-13 16:30:52 +02:00
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
Laurent Destailleur
6c4e47514d Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/holiday/fiche.php
 2013-05-11 15:26:24 +02:00
simnandez
7358faeb96 New: [ task #812 ] Add more Scripts. expire contract services ordered by 
date end
 2013-05-09 09:41:32 +02:00
simnandez
1af8057158 Trad: Spanish predefined mail content still more friendly 2013-05-08 18:50:30 +02:00
Marcos García
e86a742383 Added missing translations 2013-05-08 17:56:32 +02:00
Juanjo Menent
278d2c6cb1 Merge pull request #935 from marcosgdf/translations-develop 
Corrected translations of info tooltips in document models description
 2013-05-08 08:54:44 -07:00
simnandez
a91dc0e32a Trad: Spanish predefined mail content more friendly 2013-05-08 17:52:08 +02:00
Marcos García
e18eb3a6b3 Added missing translations 2013-05-08 17:20:20 +02:00
Marcos García
edfcfb9bbd Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into translations-develop 
Conflicts:
	htdocs/admin/commande.php
	htdocs/admin/expedition.php
	htdocs/admin/facture.php
	htdocs/admin/fichinter.php
	htdocs/admin/livraison.php
	htdocs/admin/supplier_invoice.php
	htdocs/admin/supplier_order.php
	htdocs/societe/admin/societe.php
 2013-05-08 15:37:41 +02:00