Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 01:28:19 +01:00
Code Issues Packages Projects Releases Wiki Activity
36,953 Commits 36 Branches 190 Tags
c97d1cb15b94d9b3850d2d179d620e0e3d828fb1
Commit Graph

4411 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
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
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
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
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
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
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
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
simnandez
5e059fb15d Trad: Added missing translations 2013-05-08 17:59:16 +02:00
Marcos García
e18eb3a6b3 Added missing translations 2013-05-08 17:20:20 +02:00
Marcos García
f9093e00bb Missing es_ES translations 2013-05-06 18:14:16 +02:00
Marcos García
d7a7f316d3 Replaced "Jours" with DurationDays translation key 2013-05-06 16:51:08 +02:00
Juanjo Menent
ea2109b635 Merge pull request #922 from marcosgdf/translations 
Corrected es_ES translations
 2013-05-06 07:06:01 -07:00
fhenry
441ad8c6d0 Fix Trad Fr 2013-05-06 09:53:58 +02:00
fhenry
8bd7c6a763 Fix Trad Fr 2013-05-06 09:53:23 +02:00
Marcos García
a5009fd555 Corrected es_ES translations 2013-05-04 19:35:38 +02:00
Laurent Destailleur
fc0d5abd14 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	ChangeLog
	htdocs/compta/prelevement/bons.php
	htdocs/compta/prelevement/fiche-stat.php
	htdocs/contact/class/contact.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/modSociete.class.php
	htdocs/projet/fiche.php
	test/phpunit/FilesLibTest.php
 2013-05-03 00:15:02 +02:00
Laurent Destailleur
fa497cf5fc Fix: Trans and wrap 2013-05-02 18:25:27 +02:00
Marcos García
95f63a8171 Corrected some es_ES translations and fixed problems with translations not being translated 2013-05-01 20:43:08 +02:00
Laurent Destailleur
f8b4551ef6 Merge pull request #901 from marcosgdf/develop 
Holidays module improvements
 2013-04-29 10:28:47 -07:00
Marcos García
bf36376215 Corrected ca_ES translations 
Translations made by Juanjo Menent (simnandez)
 2013-04-29 18:05:11 +02:00
Marcos García
da9cbc6e58 Corrected translation key 2013-04-29 18:02:18 +02:00
simnandez
00adb1b9ab Fix: [ bug #855 ] Holiday approval email in French 2013-04-29 12:46:07 +02:00
BENKE Charles
1d68a01298 Update projects.lang 
Add Link element on elements page
 2013-04-29 12:49:03 +03:00
Laurent Destailleur
f6c2bd4928 Fix: Uniformize menu conditions 2013-04-28 23:25:28 +02:00
Laurent Destailleur
80e470a4ce Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture.php
	htdocs/compta/facture/impayees.php
	htdocs/compta/index.php
	htdocs/core/boxes/box_produits_alerte_stock.php
	htdocs/core/class/html.form.class.php
	htdocs/core/modules/syslog/mod_syslog_file.php
	htdocs/fourn/facture/impayees.php
	htdocs/holiday/class/holiday.class.php
	htdocs/holiday/fiche.php
 2013-04-28 01:24:58 +02:00
Laurent Destailleur
7b85baa5e4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-28 01:12:48 +02:00
Laurent Destailleur
2e81fa342e Uniformize code, order of fiels in card and language files. 2013-04-28 01:12:40 +02:00
Laurent Destailleur
4c9a728799 Merge pull request #890 from marcosgdf/translations 
Improved translations
 2013-04-27 12:53:15 -07:00
simnandez
823b716042 Trad: Add ca_ES holiday translations 2013-04-27 17:52:14 +02:00
simnandez
d982148b7b Fix: [ bug #855 ] Holiday approval email in French 2013-04-27 17:20:02 +02:00
Laurent Destailleur
e29f533b7a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/comm/propal/class/propal.class.php
 2013-04-27 15:15:31 +02:00
Laurent Destailleur
52952c6fce Uniformize code for liste_array 
Fix visibility of elements into product page (manage external users)
 2013-04-27 15:08:35 +02:00
Marcos García
bd2b363e40 Modified traslation keys to reflect expected translation 2013-04-27 14:50:14 +02:00
Marcos García
8e7b72d09e Fixed incorrect translations in holidays module 2013-04-27 14:42:37 +02:00
Marcos García
be5fcfdce3 Improved es_ES translations + replaced lang key in margins module admin page 2013-04-27 12:56:57 +02:00
Marcos García
36574771a6 Translation of barcode internal engine string 2013-04-27 12:49:19 +02:00
Marcos García
5784cb120a Moved GenbarcodeLocation from products.lang to admin.lang 2013-04-27 12:32:20 +02:00
fhenry
c988944f1a PDF admin : Add option to hide num TVA intra into adress of customer 2013-04-26 13:25:51 +02:00
Laurent Destailleur
271dcf578f Fix: Better error message during import of csv with records split onto 
several lines.
 2013-04-25 23:49:24 +02:00
Laurent Destailleur
542a9608a7 Missing translation 2013-04-25 13:04:06 +02:00
fhenry
5789a5d6e9 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-24 17:53:59 +02:00