Laurent Destailleur
0e743d5024
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
ChangeLog
htdocs/adherents/admin/adherent.php
htdocs/comm/propal/class/propal.class.php
htdocs/commande/document.php
htdocs/compta/facture/class/facture.class.php
htdocs/compta/facture/list.php
htdocs/cron/card.php
htdocs/expedition/class/expedition.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/fourn/commande/document.php
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/cron.lang
htdocs/langs/fr_FR/projects.lang
htdocs/langs/nl_NL/admin.lang
htdocs/langs/nl_NL/categories.lang
htdocs/langs/nl_NL/commercial.lang
htdocs/langs/nl_NL/companies.lang
htdocs/langs/nl_NL/dict.lang
htdocs/langs/nl_NL/main.lang
htdocs/langs/nl_NL/margins.lang
htdocs/langs/nl_NL/products.lang
htdocs/societe/class/societe.class.php
htdocs/societe/rib.php
2013-11-19 21:08:02 +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
19ae524ad9
Fix: Local for SeparatorDecimal and SeparatorThousand were lost during
...
transifex synchro.
2013-10-25 12:27:13 +02:00
Laurent Destailleur
f3d7f87025
Fix: Translation
2013-10-23 23:13:32 +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
d2c4de9232
Fix: translation
2013-10-09 15:00:42 +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
2685c47185
Download transifex changes
2013-09-08 00:52:48 +02:00
Laurent Destailleur
b02bf5a2a7
Syn with transifex
2013-09-03 00:42:54 +02:00
Laurent Destailleur
8c90ad8afa
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
ChangeLog
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/core/modules/modFacture.class.php
htdocs/core/modules/modFournisseur.class.php
htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
htdocs/expedition/fiche.php
htdocs/fourn/fiche.php
htdocs/langs/el_GR/admin.lang
htdocs/langs/el_GR/agenda.lang
htdocs/langs/el_GR/banks.lang
htdocs/langs/el_GR/bills.lang
htdocs/langs/el_GR/bookmarks.lang
htdocs/langs/el_GR/boxes.lang
htdocs/langs/el_GR/cashdesk.lang
htdocs/langs/el_GR/categories.lang
htdocs/langs/el_GR/commercial.lang
htdocs/langs/el_GR/companies.lang
htdocs/langs/el_GR/compta.lang
htdocs/langs/el_GR/contracts.lang
htdocs/langs/el_GR/cron.lang
htdocs/langs/el_GR/deliveries.lang
htdocs/langs/el_GR/dict.lang
htdocs/langs/el_GR/donations.lang
htdocs/langs/el_GR/ecm.lang
htdocs/langs/el_GR/errors.lang
htdocs/langs/el_GR/exports.lang
htdocs/langs/el_GR/externalsite.lang
htdocs/langs/el_GR/ftp.lang
htdocs/langs/el_GR/help.lang
htdocs/langs/el_GR/holiday.lang
htdocs/langs/el_GR/install.lang
htdocs/langs/el_GR/interventions.lang
htdocs/langs/el_GR/languages.lang
htdocs/langs/el_GR/ldap.lang
htdocs/langs/el_GR/mailmanspip.lang
htdocs/langs/el_GR/mails.lang
htdocs/langs/el_GR/main.lang
htdocs/langs/el_GR/margins.lang
htdocs/langs/el_GR/members.lang
htdocs/langs/el_GR/opensurvey.lang
htdocs/langs/el_GR/orders.lang
htdocs/langs/el_GR/oscommerce.lang
htdocs/langs/el_GR/other.lang
htdocs/langs/el_GR/paybox.lang
htdocs/langs/el_GR/paypal.lang
htdocs/langs/el_GR/products.lang
htdocs/langs/el_GR/projects.lang
htdocs/langs/el_GR/propal.lang
htdocs/langs/el_GR/sendings.lang
htdocs/langs/el_GR/shop.lang
htdocs/langs/el_GR/sms.lang
htdocs/langs/el_GR/stocks.lang
htdocs/langs/el_GR/suppliers.lang
htdocs/langs/el_GR/trips.lang
htdocs/langs/el_GR/users.lang
htdocs/langs/el_GR/withdrawals.lang
htdocs/langs/el_GR/workflow.lang
htdocs/margin/productMargins.php
2013-08-24 22:41:32 +02:00
Laurent Destailleur
06c49e99bb
Update for greek
2013-08-05 23:43:24 +02:00
Laurent Destailleur
784c8acaf7
Trans: Upgrade language file
2013-08-05 23:27:13 +02:00
Laurent Destailleur
8ddeff69d6
Trans: update el_GR
2013-08-05 23:26:40 +02:00
Laurent Destailleur
012228aca7
Another try to sync with transifex
2013-07-31 16:35:57 +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
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
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
Laurent Destailleur
0ffb01e347
Fix: Remove duplicate key
2013-06-08 16:35:52 +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
08b234ed01
Corrected translation key BuyingPrice from lang files
2013-05-19 12:08:18 +02:00
Laurent Destailleur
80817fd8fb
Fix: translation
2013-05-14 01:04:21 +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
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
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
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
ce10c87e09
Fix: No message to show result
...
Fix: Must not overwrite property of object
2012-11-14 18:58:55 +01:00
Laurent Destailleur
5f3ceb0081
Fix: Label for payment by cheque using the wrong translation key
...
Fix: Option to overwrite translation did not work as expected
Fix: Bad translation for greece
2012-11-02 15:41:09 +01:00
Laurent Destailleur
6bfe3e3905
Fix: Translation
2012-10-30 09:43:31 +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
Laurent Destailleur
f701c1afba
Fix translations
2012-10-24 17:33:47 +02:00
Laurent Destailleur
4c5d696bb7
Translations
2012-10-17 16:13:06 +02:00
Laurent Destailleur
61958f445d
Fix translation
2012-10-03 14:15:07 +02:00
Marcos García
cb4044755b
Fixed export translations
...
Added missing strings
Corrected some translations
2012-09-12 19:11:03 +02:00
Laurent Destailleur
5bd14b20d5
Trans: Add bg_BG language and fix monor strings
...
Fix: Removed warning into autotranslator tool.
2012-09-08 18:57:52 +02:00
