Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-15 22:11:36 +01:00
Code Issues Packages Projects Releases Wiki Activity
41,866 Commits 36 Branches 190 Tags
4b9d1b901bccd39b6cd8967ae13b84f8221b0e00
Commit Graph

5142 Commits

Author SHA1 Message Date
Laurent Destailleur
9b96e38a35 Fix: Update vat rates for canada 
Conflicts:
	htdocs/langs/fr_CA/main.lang
 2013-06-01 02:49:44 +02:00
Laurent Destailleur
9934852f13 Trans 2013-06-01 01:16:42 +02:00
Laurent Destailleur
3395fd6d8d Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/langs/fr_CA/main.lang
	htdocs/main.inc.php
 2013-06-01 00:04:51 +02:00
Laurent Destailleur
500c29f014 Merge pull request #1008 from fappels/patch-2 
Fix: translations
 2013-05-31 14:53:35 -07:00
Laurent Destailleur
743da5a214 Fix: function to get localtax1 or 2 value from vat rate return bad value 
when countries differs.

Conflicts:
	htdocs/langs/fr_CA/main.lang
 2013-05-31 21:33:48 +02:00
Laurent Destailleur
a85fea9317 Fix: function to get localtax1 or 2 value from vat rate return bad value 
when countries differs.
 2013-05-31 21:03:24 +02:00
Laurent Destailleur
06fc0eec5b Fix: Update vat rates for canada 2013-05-31 19:53:45 +02:00
Francis Appels
62bd20ad1b Fix: translations 
Fixed some (auto)translations. Merged with nl_BE, browser detects nl_NL in Belgium.
 2013-05-30 23:52:45 +02:00
Francis Appels
43c2bbd664 Completed missing keys + corrections 
Added missing keys and language corrections
 2013-05-30 23:31:05 +02:00
Laurent Destailleur
3601cd13dd Merge pull request #1004 from viniciusvgn/develop 
Translation pt-BR
 2013-05-30 13:42:19 -07:00
Marcos García
f6057bd794 Reverting PR #1002 
Incorrect translation that shouldn't have been accepted
 2013-05-30 16:48:04 +02:00
Vinicius Nogueira
d163c95e02 Translation pt-BR 
Updated file with phrases that were missing and improvements in the
translation.
 2013-05-29 22:35:41 -03:00
Laurent Destailleur
5bba5782a4 Merge remote-tracking branch 'origin/3.4' into develop 2013-05-29 21:22:27 +02:00
Florian Henry
8b2dc49734 update trans 2013-05-29 16:06:04 +02:00
Florian Henry
eb6e6ecc71 update trans 2013-05-29 16:05:35 +02:00
Florian Henry
7ab46b8e7b add translation 2013-05-29 15:59:16 +02:00
Florian Henry
b563877f5a Add translation from pcbelt@hotmail.com(Rodrigo Beltrán) get from 
assodolibarr@gmail.com
 2013-05-29 15:56:32 +02:00
Vinicius Nogueira
15e663ae15 Translation pt-BR 
Updating translation files pt-BR
 2013-05-28 23:07:08 -03: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
Laurent Destailleur
2c1e293d96 Sync lang files 2013-05-27 23:05:33 +02:00
Laurent Destailleur
b61ca887d5 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/cache.manifest
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql
 2013-05-27 12:57:57 +02:00
Laurent Destailleur
dee7ac2823 Add missing lang files 2013-05-27 12:02:31 +02:00
Laurent Destailleur
d8cef10ea3 Make comment generic for all files 2013-05-27 10:38:50 +02:00
Laurent Destailleur
c955a274ed Merge pull request #990 from open-minds/develop 
Minor fixes
 2013-05-27 00:29:57 -07:00
Laurent Destailleur
c5737e214b Synchro with transifex 2013-05-26 20:08:09 +02:00
Laurent Léonard
dc783ed06e Fix typo in admin french language file 2013-05-26 19:59:57 +03:00
Laurent Destailleur
402f392fde Second pull, push 2013-05-26 15:55:19 +02:00
Laurent Destailleur
4be5ffc937 Fix: Syntax error 2013-05-26 15:38:17 +02:00
Laurent Destailleur
c041774950 Trans: First try to commit files pulled from transifex. 2013-05-26 15:37:50 +02:00
zcattacz
407639fcde Update translation 
- all 'invoice's are changed to bill, since there is no real equivalence in Simplified Chinese.
Invoice is issued before payment, but Chinese 'invoice/FaPiao' is a state printed RECEIPT issued only after payment. Regarding the function of the invoice module, 'Bill/ZhangDan' in Chinese seems by far best understood by most ppl.
 2013-05-26 14:36:01 +08:00
Laurent Destailleur
9ecb1ddcb4 Fix: Missing translation 2013-05-24 18:53:28 +02:00
Laurent Destailleur
6e634eb722 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-05-24 18:24:17 +02:00
Laurent Destailleur
92a7037c1d Fix: Missing translation 2013-05-24 18:20:28 +02:00
Christophe Battarel
4b1ae9e9a9 add ability to include products on intervention card (some companies prefer to have both products and services on the intervention card that they give to their consultant) 2013-05-21 11:44:11 +02:00
Laurent Destailleur
12681994ea Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/fichinter/class/fichinter.class.php
	htdocs/fichinter/fiche.php
 2013-05-20 21:21:03 +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
Laurent Destailleur
71e14df62f Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
 2013-05-20 17:37:08 +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
Christophe Battarel
7efe39495a french translation for CostPrice 2013-05-17 15:18:50 +02:00
Laurent Destailleur
bd92adf092 Better trans 2013-05-17 11:20:44 +02:00
Grand Philippe
f7f59f962b missing translation for script 2013-05-17 10:35:42 +02:00
fhenry
faa2399b80 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	ChangeLog

Change-Id: I7abbbefde190dbe86f8cb7ae43451da9eca1c9aa
 2013-05-17 09:49:06 +02:00
Juanjo Menent
38e1ff6f59 Merge pull request #952 from aponzio/develop 
Fixed odd translation
 2013-05-17 00:45:35 -07:00
Alessandro Ponzio
03a2b4e5c9 Fixed odd translation 
Improved translation of entry for the project tabs ("Contatti" instead of "Progetto contatti")
 2013-05-16 12:33:03 +02:00
Laurent Destailleur
85eac29925 New: Add balance before and after column 2013-05-15 19:30:32 +02:00
Laurent Destailleur
3a11e0baad New: Script export-bank-receipts should be ready for test. 2013-05-14 23:59:59 +02:00