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

6654 Commits

Author SHA1 Message Date
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
fhenry
d0b4cef7a4 Change duration _planned by planned_workload 2013-05-14 20:22:33 +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
95fac9aace Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-05-14 01:08:58 +02:00
Laurent Destailleur
83b35b5b64 Merge pull request #950 from aponzio/develop 
Translateded missing entries "ThirdPartiesOfSaleRepresentative"
 2013-05-13 16:08:27 -07:00
Laurent Destailleur
dc28335ed5 Merge pull request #948 from marcosgdf/translations 
Improved translations
 2013-05-13 16:07:22 -07:00
Laurent Destailleur
80817fd8fb Fix: translation 2013-05-14 01:04:21 +02:00
Laurent Destailleur
cc20b000df Merge pull request #945 from zcattacz/translation 
zh_cn/admin.lang reworkred
 2013-05-13 15:46:32 -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
zcattacz
b911afcddb revised 
- unify the usage of full/half-width punctuations characters.
- chk chk
 2013-05-13 22:10:42 +08:00
Alessandro Ponzio
e0365ac900 Translateded missing entry "ThirdPartiesOfSaleRepresentative" 2013-05-13 11:57:20 +02:00
Alessandro Ponzio
e1b4cdb7e3 Translateded missing entry "LinkedToSpecificUsers" 2013-05-13 11:55:51 +02:00
Laurent Destailleur
2c05d99742 Qual: Uniformize code 2013-05-12 20:10:16 +02:00
Laurent Destailleur
d9e477d748 Fix: Civility translation 2013-05-12 16:38:38 +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
zcattacz
a25fe2e59d Adjust word order 2013-05-12 16:42:43 +08:00
fhenry
aa7e3c2fdd [ task #892 ] Add option in thridparty customer/supplier admin to hide 
non active in select_company method
 2013-05-11 17:10:11 +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
zcattacz
a00f298f22 Chinese transaltion reworked for admin.lang 
- unsure translation start with *
- unused translation (by me) revert to English string
  the original machine translation is barely readable :(
 2013-05-11 14:02:50 +08:00
Laurent Destailleur
fa4fc8495b Fix: Missing translation key 
Fix: Minor css style missing
Fix: Create draft proposal return error if no contact defined.
Fix: W3C
 2013-05-11 02:12:34 +02:00
Laurent Destailleur
d1d9a65de5 Merge pull request #940 from aponzio/develop 
Fixed odd translation
 2013-05-10 07:31:44 -07:00
Alessandro Ponzio
a5199962f3 Fixed odd translation 2013-05-10 08:16:36 +03:00
Laurent Destailleur
ce6e1dc2a6 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-05-09 23:35:04 +02:00
Laurent Destailleur
cc500cceba Fix: form into table is not W3C (broken with some uncommon browsers). 2013-05-09 22:39:31 +02:00
Alessandro Ponzio
d7527b68da Fixed odd translation 
Improved translation of general-purpose entry ("Trimestre" instead of "Quadri")
 2013-05-09 19:03:40 +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
simnandez
191fc8eb45 Trad: Added missing translations 2013-05-08 18:04:22 +02:00
simnandez
bbb4fcad28 Trad: Added missing translations 2013-05-08 18:00:15 +02:00
simnandez
5e059fb15d Trad: Added missing translations 2013-05-08 17:59:16 +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
simnandez
b9583d389e Trad: Add products missing translations 2013-05-08 12:24:50 +02:00
Marcos García
54a2d3ca72 Corrected translations of info tooltips in document models description 2013-05-07 22:04:08 +02:00