Laurent Destailleur
|
ec15f9251d
|
Merge pull request #10738 from frederic34/patch-2
phpcs fix
|
2019-03-05 18:42:22 +01:00 |
|
Laurent Destailleur
|
db5dd7f9aa
|
Fix phpunit
|
2019-03-05 18:19:37 +01:00 |
|
Frédéric FRANCE
|
f283782445
|
change visibility
|
2019-03-04 19:57:46 +01:00 |
|
Laurent Destailleur
|
1d6028dfb0
|
FIX PHPUnit
|
2019-03-04 19:38:52 +01:00 |
|
Laurent Destailleur
|
06a40726bb
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-03-04 16:29:23 +01:00 |
|
Laurent Destailleur
|
27402f432a
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/don/class/don.class.php
htdocs/product/stock/card.php
htdocs/theme/eldy/style.css.php
|
2019-03-04 16:29:16 +01:00 |
|
Laurent Destailleur
|
3b48808916
|
Update list.php
|
2019-03-04 16:13:38 +01:00 |
|
Laurent Destailleur
|
16d13b223a
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-03-03 20:43:35 +01:00 |
|
Laurent Destailleur
|
526bd1d02e
|
Fix number format
|
2019-03-03 17:36:43 +01:00 |
|
futurehousestore
|
b710a41707
|
Update list.php
Display full product name
|
2019-03-03 16:23:10 +00:00 |
|
Frédéric FRANCE
|
014f69850e
|
add visibility
|
2019-03-01 23:08:57 +01:00 |
|
Frédéric FRANCE
|
bd2e541fd6
|
add visibility
|
2019-03-01 18:28:51 +01:00 |
|
Frédéric FRANCE
|
796ea6f4ea
|
add visibility
|
2019-02-28 23:19:58 +01:00 |
|
Frédéric FRANCE
|
4f9e35f350
|
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing
|
2019-02-28 20:48:23 +01:00 |
|
Laurent Destailleur
|
9967adaf09
|
Merge pull request #10436 from wdammak/patch-23
Add links and related documents for a stock movement
|
2019-02-27 15:50:06 +01:00 |
|
Frédéric FRANCE
|
6ee186096c
|
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing
|
2019-02-24 23:48:51 +01:00 |
|
Frédéric FRANCE
|
27218b7087
|
wip
|
2019-02-24 23:32:09 +01:00 |
|
Laurent Destailleur
|
6b46a927f1
|
Merge branch 'develop' into PSR2MethodsFunctionCallSignatureSpaceBeforeOpenBracket
|
2019-02-24 20:53:54 +01:00 |
|
Frédéric FRANCE
|
894123fb06
|
PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket
|
2019-02-24 20:06:55 +01:00 |
|
Frédéric FRANCE
|
167a857f4c
|
replace html code by html5 in contact
|
2019-02-24 14:47:47 +01:00 |
|
Frédéric FRANCE
|
a1d2d3bddc
|
replace html code by html5
|
2019-02-24 11:18:55 +01:00 |
|
Frédéric FRANCE
|
390766babf
|
replace html code by html5
|
2019-02-23 23:36:21 +01:00 |
|
Frédéric FRANCE
|
6ee29559f9
|
doc comment entrepot.class.php
|
2019-02-23 09:44:45 +01:00 |
|
Laurent Destailleur
|
ec5461a4d1
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/multicurrency/class/multicurrency.class.php
|
2019-02-21 22:31:27 +01:00 |
|
Laurent Destailleur
|
6cdf5c5673
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-02-21 22:28:25 +01:00 |
|
Regis Houssin
|
1c3541295b
|
FIX wrong class name "CUnits instead CMeasuringUnits"
|
2019-02-19 09:24:30 +01:00 |
|
Regis Houssin
|
45d05da6ed
|
FIX missing $ismultientitymanaged for previous/next ref
|
2019-02-14 16:14:19 +01:00 |
|
Laurent Destailleur
|
e6e18ff616
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/menus/edit.php
htdocs/product/stock/card.php
htdocs/product/stock/info.php
htdocs/product/stock/movement_list.php
|
2019-02-14 15:33:17 +01:00 |
|
Laurent Destailleur
|
89050da856
|
Merge
|
2019-02-14 15:27:31 +01:00 |
|
Laurent Destailleur
|
2c2052d113
|
Update card.php
Avoid regression on restrictArea
|
2019-02-14 15:23:34 +01:00 |
|
Laurent Destailleur
|
4ac086ab70
|
Update info.php
|
2019-02-14 15:23:07 +01:00 |
|
Laurent Destailleur
|
173d28cf5a
|
Update mouvement.php
Avoid regression on restrictArea
|
2019-02-14 15:22:22 +01:00 |
|
Regis Houssin
|
aa4c5ae839
|
FIX missing access security checking with multicompany
|
2019-02-14 10:12:15 +01:00 |
|
Laurent Destailleur
|
2311912d8a
|
Merge branch 'develop' into dev_importproduct_measuringunit
|
2019-02-13 16:35:46 +01:00 |
|
florian HENRY
|
020fa52507
|
travis
|
2019-02-13 15:30:20 +01:00 |
|
Frédéric FRANCE
|
fa6bc309d6
|
Merge branch 'develop' into fixphpcs
|
2019-02-13 15:24:37 +01:00 |
|
florian HENRY
|
5bb260d3d1
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
dev_importproduct_measuringunit
Conflicts:
htdocs/product/stock/movement_card.php
|
2019-02-13 13:52:35 +01:00 |
|
florian HENRY
|
9caefc9483
|
fix travis
|
2019-02-13 13:50:57 +01:00 |
|
florian HENRY
|
dd9896516b
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
dev_importproduct_measuringunit
Conflicts:
htdocs/margin/agentMargins.php
htdocs/product/stock/movement_card.php
htdocs/projet/tasks/time.php
htdocs/resource/class/html.formresource.class.php
|
2019-02-13 12:52:07 +01:00 |
|
Laurent Destailleur
|
44fd36b15c
|
Fix phpcs
|
2019-02-13 12:39:26 +01:00 |
|
florian HENRY
|
37c66c2ece
|
travis
|
2019-02-13 12:32:06 +01:00 |
|
Laurent Destailleur
|
ced386fdca
|
Fix phpcs
|
2019-02-13 11:32:00 +01:00 |
|
florian HENRY
|
de87321c15
|
fix travcis
|
2019-02-13 10:28:08 +01:00 |
|
florian HENRY
|
5c059c897d
|
fix travis (mosty for dev no conerne by my changes)
|
2019-02-13 09:21:14 +01:00 |
|
florian HENRY
|
d88475c61a
|
Merge branch 'develop' of local repository into dev_importproduct_measuringunit
|
2019-02-13 08:59:18 +01:00 |
|
Frédéric FRANCE
|
484acc2e00
|
fix phpcs
|
2019-02-12 20:55:55 +01:00 |
|
florian HENRY
|
5b5f96bafb
|
NEW : measuring unit dictionnary and product size/unit import
|
2019-02-12 16:58:11 +01:00 |
|
Laurent Destailleur
|
41863bb127
|
Merge
|
2019-02-12 16:42:51 +01:00 |
|
Frédéric FRANCE
|
b041eeae22
|
first parameter of print_liste_field_titre was translated
|
2019-02-10 18:11:34 +01:00 |
|
Frédéric FRANCE
|
1e43f8e54a
|
PEAR FunctionCallSignature
|
2019-02-10 10:45:49 +01:00 |
|