Commit Graph

37 Commits

Author SHA1 Message Date
Laurent Destailleur
48c990a8bf Sync transifex 2022-01-02 18:22:18 +01:00
Laurent Destailleur
514bcc87ea Sync transifex 2021-10-17 15:53:29 +02:00
Laurent Destailleur
39654260d6 Sync transifex 2021-04-20 00:45:48 +02:00
Laurent Destailleur
f9c3b25dbd Sync transifex 2019-12-22 12:55:38 +01:00
Laurent Destailleur
84e4def180 Transifex sync 2019-06-27 13:39:54 +02:00
Laurent Destailleur
b652c53379 Sync transifex 2018-04-11 13:26:23 +02:00
Laurent Destailleur
a3851ec32a Sync transifex 2018-03-27 12:23:39 +02:00
Laurent Destailleur
e3943155f3 Sync transifex 2017-07-09 19:32:35 +02:00
Laurent Destailleur
e7a09c07f9 Sync and clean language files 2016-10-11 10:38:38 +02:00
Laurent Destailleur
2223d283dc Sync transifex 2016-06-20 00:45:25 +02:00
Laurent Destailleur
b162eb1bb0 Update translation for 3.9 2016-01-29 00:40:15 +01:00
Laurent Destailleur
dc9c5ed5ef Enhance transifex sync 2015-12-18 18:25:09 +01:00
Laurent Destailleur
72cabe2fc3 More complete description of margin rules calculation 2015-10-06 19:27:48 +02:00
Laurent Destailleur
4567f56980 Sync from transifex 2015-07-30 17:09:18 +02:00
Laurent Destailleur
99c8a9211e Sync with transifex 2015-07-20 13:55:43 +02:00
Laurent Destailleur
46b1e213b9 Sync from transifex 2015-02-13 21:26:43 +01:00
Laurent Destailleur
931c1fc671 Sync from transifex 2014-11-30 16:20:58 +01:00
Laurent Destailleur
50f690787b Sync transifex 2014-11-09 19:16:41 +01:00
Christophe Battarel
44882f4035 improve "hide margin infos" button : hide ALL informations relatives to margin AND store the state of the button in a cookie instead of shared config option 2014-11-05 17:03:53 +01:00
Laurent Destailleur
897a9b7446 Sync from transifex. 2014-03-31 19:01:28 +02: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
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
Christophe Battarel
89a5638908 Fix bad translation on margin config 2013-11-17 12:59:33 +01:00
Laurent Destailleur
94716c5314 Removed not used key 2013-10-23 14:05:26 +02:00
Laurent Destailleur
012228aca7 Another try to sync with transifex 2013-07-31 16:35:57 +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
Christophe Battarel
7efe39495a french translation for CostPrice 2013-05-17 15:18:50 +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
Marcos García
6252857440 Fixed translations and BILL_SUPPLIER_BUILDDOC trigger 2013-04-06 17:56:10 +02:00
simnandez
d8651ca830 Trad: Add missing margins translations 2012-12-01 15:47:28 +01:00
Laurent Destailleur
4136c27516 RESTORE CODE WITH ID D2adaf7. The Merge daacf79 as lost more than 50
commits !
2012-12-01 15:45:05 +01:00
simnandez
dda12c3d70 Trad: Add missing margins translations 2012-11-30 17:58:12 +01:00
Christophe Battarel
951b98a963 add option to select contact type associated to commercial agents for margin and commission modules 2012-09-18 09:44:34 +02:00
simnandez
8a19946e4a Trad: Commissions and margins
Conflicts:
	htdocs/langs/fr_FR/margins.lang
2012-07-28 20:22:38 +02:00
Marcos García
de7595922e Fixed some typos in es_ES and allowed some strings to be translated 2012-07-28 19:53:13 +02:00
Regis Houssin
fafd79a0f8 Fix: uniformize code (in progress) 2012-07-20 09:57:50 +02:00