Laurent Destailleur
|
9a08a6bf6d
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/categories/traduction.php
htdocs/compta/facture/class/facture.class.php
htdocs/contact/card.php
htdocs/core/modules/modSociete.class.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/langs/en_US/products.lang
htdocs/margin/agentMargins.php
htdocs/margin/customerMargins.php
htdocs/margin/productMargins.php
htdocs/margin/tabs/productMargins.php
htdocs/margin/tabs/thirdpartyMargins.php
|
2019-12-23 14:13:26 +01:00 |
|
VESSILLER
|
558d577309
|
FIX add and modify category translate form with posted values on errors
|
2019-12-23 11:53:19 +01:00 |
|
Laurent Destailleur
|
f44b85f557
|
Fix $_SESSION['newtoken'] must be newToken()
|
2019-12-18 23:12:31 +01:00 |
|
Scrutinizer Auto-Fixer
|
8a527631a0
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 18:35:02 +00:00 |
|
Frédéric FRANCE
|
35751a80ab
|
100% centpercent
|
2019-11-05 21:24:41 +01:00 |
|
Frédéric FRANCE
|
e93aaa2a75
|
replace deprecated user->societe_id by user->socid
|
2019-10-31 20:46:31 +01:00 |
|
Laurent Destailleur
|
aff52b0386
|
Update traduction.php
|
2019-10-17 17:52:20 +02:00 |
|
VESSILLER
|
59f6b9168c
|
FIX add and modify category form with posted values on errors
|
2019-10-17 14:47:47 +02:00 |
|
Alexandre SPANGARO
|
02dbc11f98
|
Move Gnu.org to https
|
2019-09-23 21:55:30 +02:00 |
|
Laurent Destailleur
|
a6dde3d6bd
|
Merge branch 'develop' into nospaceaftercomma
|
2019-02-03 19:27:16 +01:00 |
|
Frédéric FRANCE
|
03701fa091
|
psr2
|
2019-02-02 18:25:01 +01:00 |
|
Frédéric FRANCE
|
b10558bacd
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-01-27 23:23:38 +01:00 |
|
Frédéric FRANCE
|
7ee086b402
|
PSR2 space after comma in function call
|
2019-01-27 11:55:16 +01:00 |
|
Frédéric FRANCE
|
6e91b3cefc
|
PSR2 usage of else if is discouraged
|
2019-01-27 10:49:34 +01:00 |
|
Regis Houssin
|
569d59d251
|
FIX change my deprecated email
|
2018-10-27 14:43:12 +02:00 |
|
Frédéric FRANCE
|
86d854f3f4
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
|
2018-10-24 23:04:26 +02:00 |
|
Philippe GRAND
|
de70bf983e
|
standardize
|
2018-07-29 13:40:35 +02:00 |
|
Frédéric FRANCE
|
a0055174c4
|
loadlangs
|
2018-05-27 09:58:23 +02:00 |
|
Laurent Destailleur
|
6fcb54b2d6
|
FIX #7072
|
2017-07-25 19:57:51 +02:00 |
|
Laurent Destailleur
|
e2ea5945dd
|
Work on look and feel v6
|
2017-04-06 21:48:28 +02:00 |
|
Laurent Destailleur
|
65f7de8f64
|
Fix css and look 5.0
|
2017-01-22 12:13:32 +01:00 |
|
Laurent Destailleur
|
ac44aa6d81
|
FIX security bugs
|
2016-12-18 13:24:06 +01:00 |
|
Laurent Destailleur
|
16ce156631
|
Fix responsive design
|
2016-11-25 18:32:52 +01:00 |
|
florian HENRY
|
a4ce756724
|
Manage project category
|
2016-08-29 10:32:00 +02:00 |
|
Laurent Destailleur
|
6987d3db28
|
Fix css
|
2016-05-21 15:03:02 +02:00 |
|
Laurent Destailleur
|
a278fd66d0
|
Fix color of link for categories
|
2016-05-21 14:51:33 +02:00 |
|
frederic34
|
17463b4927
|
categories account like other categories
|
2016-04-30 14:45:24 +02:00 |
|
Laurent Destailleur
|
2764fb240f
|
Fix text color for category tags
Fix banner for category translation tab
|
2016-01-10 00:11:49 +01:00 |
|
Paris Liakos
|
146aa7815b
|
Add X_SET_MULTILANGS triggers to make possible reacting on translation changes for products and categories
|
2015-11-16 20:27:51 +02:00 |
|
philippe grand
|
67c9db6a51
|
[Qual] Uniformize code
|
2015-11-06 09:36:16 +01:00 |
|
Raphaël Doursenaud
|
ee808cdfd7
|
Added types constants to categories
|
2015-05-23 18:52:31 +02:00 |
|
aspangaro
|
c4c69e191b
|
Replace <center> tags
|
2014-11-25 20:13:43 +01:00 |
|
Marcos García de La Fuente
|
ac824728bc
|
Migrated old error notifications to the """new""" system
|
2014-07-20 01:09:43 +02:00 |
|
Raphaël Doursenaud
|
f8f502d013
|
Removed closing php tag
http://php.net/manual/en/language.basic-syntax.phptags.php
|
2014-05-03 18:18:44 +02:00 |
|
jfefe
|
098fa7027c
|
Remove unused note into category translation
|
2014-04-25 15:36:00 +02:00 |
|
jfefe
|
d256799abf
|
Work on adding catgory translation
|
2014-04-25 15:17:12 +02:00 |
|