Commit Graph

80 Commits

Author SHA1 Message Date
Laurent Destailleur
74890ce656 Sync transifex 2018-06-06 12:02:33 +02:00
Laurent Destailleur
b652c53379 Sync transifex 2018-04-11 13:26:23 +02:00
ATM-Nicolas
30c6891b95 NEW : Add product categories filter on product margin 2018-01-10 11:17:23 +01: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
2f2b0df6f8 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/contact/exportimport.php
	htdocs/contact/info.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/core/modules/modSociete.class.php
	htdocs/core/tpl/document_actions_pre_headers.tpl.php
	htdocs/langs/fr_FR/categories.lang
	htdocs/main.inc.php
	htdocs/product/reassort.php
	htdocs/projet/list.php
	htdocs/societe/info.php
2015-07-19 12:26:31 +02:00
Laurent Destailleur
db67ab0b5e Fix wrap into lang list.
Sync with transifex
2015-07-15 16:27:01 +02:00
phf
bde4503abd FIX : translation for 1 word do not work if product/service module are disabled because the translation search in products.lang 2015-07-15 14:46:29 +02:00
Juanjo Menent
ba97763ac4 Transifex Syncro 2015-06-26 17:40:47 +02:00
Laurent Destailleur
9b55bedf66 FIX bad calculation for stock value 2015-05-04 22:04:58 +02:00
Laurent Destailleur
984aca28c3 Sync translation 2015-05-03 15:37:15 +02:00
Laurent Destailleur
3d609d5fd0 Sync transifex 2015-04-22 14:58:06 +02:00
Laurent Destailleur
ddde869ca4 Sync transifex 2015-04-08 21:35:27 +02:00
Laurent Destailleur
0f51314c7e Sync from transifex 2015-04-02 13:28:20 +02:00
Laurent Destailleur
931c1fc671 Sync from transifex 2014-11-30 16:20:58 +01:00
Laurent Destailleur
58c06264e4 Merge branch 'develop' of github.com:BadPixxel/dolibarr into
BadPixxel-develop

Conflicts:
	htdocs/langs/en_US/categories.lang
	htdocs/langs/fr_FR/categories.lang
2014-11-15 12:17:46 +01:00
Laurent Destailleur
8a98f8461d Sync transifex 2014-10-11 14:33:22 +02:00
Laurent Destailleur
a19e8aa89d Sync transifex 2014-10-09 17:15:15 +02:00
BadPixxel
12e6d1bf6c Missing Key for getNomUrl function 2014-09-30 19:09:59 +02:00
Laurent Destailleur
302bcc2fd5 Translation: Sync from transifex.com 2014-03-17 16:15:00 +01:00
Laurent Destailleur
94716c5314 Removed not used key 2013-10-23 14:05:26 +02:00
Laurent Destailleur
87ca1d2e2e Fix: translation 2013-10-08 15:18:00 +02:00
Laurent Destailleur
012228aca7 Another try to sync with transifex 2013-07-31 16:35:57 +02:00
Florian Henry
60bb595248 Finnalise categorie contact 2013-07-30 17:24:27 +02:00
Florian Henry
c518aa1019 Add translation 2013-07-16 21:11:06 +02:00
Florian Henry
e07eac9b17 [ task #519 ] Add category association with contacts 2013-07-16 21:04:58 +02:00
Laurent Destailleur
c5737e214b Synchro with transifex 2013-05-26 20:08:09 +02:00
Laurent Destailleur
2e81fa342e Uniformize code, order of fiels in card and language files. 2013-04-28 01:12:40 +02:00
simnandez
a9de14c145 Trad: Add missing translations 2013-02-01 17:49:41 +01:00
Laurent Destailleur
24b50b8ed3 Fix: Example an label of category import 2013-01-09 13:29:12 +01:00
Laurent Destailleur
ba25905926 New: [ task #454 ] Add "No category" into filters on category
combo for product list
2012-07-18 00:20:33 +02:00
Laurent Destailleur
c520eb3ec6 Trans 2011-07-13 18:30:29 +00:00
Laurent Destailleur
6effbfbefa Trad 2010-03-28 23:44:23 +00:00
Laurent Destailleur
e89c3ba08e New: Enhancement in category module 2010-03-20 20:24:32 +00:00
Laurent Destailleur
10f1df53e0 New: Enhancement in category module 2010-03-20 13:12:00 +00:00
Laurent Destailleur
5a58b6b6ea New: Enhancement in category module 2010-03-20 00:07:47 +00:00
Philippe Grand
ba5de65c0c Some spelling changes 2010-03-15 09:11:59 +00:00
Philippe Grand
3e6a26e72c Some spelling changes 2010-03-14 16:57:17 +00:00
Laurent Destailleur
8371684535 Fix: Error management in categories creation 2009-08-28 16:37:45 +00:00
Juanjo Menent
d287b92a96 Improve translations. Exports 2009-03-05 11:11:32 +00:00
Laurent Destailleur
43a6797e1b Removed treemenu libraries 2009-01-30 21:21:22 +00:00
Laurent Destailleur
fd2782edc8 Convert iso files to utf 2009-01-22 01:00:42 +00:00
Laurent Destailleur
e23bb856c7 Update charset in language files. 2009-01-19 19:43:16 +00:00
Laurent Destailleur
5eb51bbc0d Renamed bank "categories" into "rubriques" to avoid confusion with category module. 2008-12-05 11:51:16 +00:00
Laurent Destailleur
78f894ff25 Add categories export dataset 2008-12-04 23:06:45 +00:00
Laurent Destailleur
25d53161d7 Translation 2008-12-04 17:13:43 +00:00
Regis Houssin
b8410445ff Added ability to assign a category of product to a customer 2008-10-27 18:29:21 +00:00
Regis Houssin
cf937a4278 Added ability to assign a category of product to a customer 2008-10-07 12:24:33 +00:00