Laurent Destailleur
|
4d36f5de09
|
Merge pull request #12280 from atm-josselin/FIX_productlot_field_misspelling
Fix misspelling on field of productlot
|
2019-11-02 13:02:28 +01:00 |
|
Laurent Destailleur
|
d232b7a387
|
Merge pull request #12286 from grandoc/new_branch_01_11_2019
add some comment
|
2019-11-02 13:00:23 +01:00 |
|
Laurent Destailleur
|
58ffb73627
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-11-02 12:59:49 +01:00 |
|
Laurent Destailleur
|
45c77b4560
|
Renaming some libelle into label
|
2019-11-02 12:59:38 +01:00 |
|
Laurent Destailleur
|
25e64b0610
|
Merge branch 'develop' into socid
|
2019-11-02 12:01:06 +01:00 |
|
stickler-ci
|
6744f10ff2
|
Fixing style errors.
|
2019-11-02 11:00:43 +00:00 |
|
Laurent Destailleur
|
c12e66e2a2
|
Merge branch 'develop' into new_branch_01_11_2019
|
2019-11-02 12:00:04 +01:00 |
|
stickler-ci
|
b43d06db37
|
Fixing style errors.
|
2019-11-02 10:55:24 +00:00 |
|
Laurent Destailleur
|
37f4ebb1b2
|
Update xcal.lib.php
|
2019-11-02 11:56:01 +01:00 |
|
Laurent Destailleur
|
537f678268
|
Merge pull request #12285 from frederic34/patch-13
Update define_holiday.php
|
2019-11-02 11:51:38 +01:00 |
|
Laurent Destailleur
|
68691ddd8a
|
Merge pull request #12265 from grandoc/new_branch_30_10_2019
add comment
|
2019-11-02 11:49:28 +01:00 |
|
Laurent Destailleur
|
7e6732c11b
|
Merge pull request #12263 from defrance/patch-144
fix: delete function optional and id value
|
2019-11-02 11:49:04 +01:00 |
|
Laurent Destailleur
|
1797b49778
|
Merge pull request #12288 from frederic34/patch-14
form_select_status_action returns void
|
2019-11-02 11:48:07 +01:00 |
|
Laurent Destailleur
|
41a3861465
|
Merge pull request #12290 from ptibogxiv/patch-273
FIX prices by customer API
|
2019-11-02 11:47:32 +01:00 |
|
Laurent Destailleur
|
d9f333d828
|
Merge pull request #12289 from frederic34/datetime
php is > 5.4
|
2019-11-02 11:46:34 +01:00 |
|
Laurent Destailleur
|
23d238c16d
|
Merge pull request #12291 from frederic34/patch-15
give a value by default
|
2019-11-02 11:43:02 +01:00 |
|
Laurent Destailleur
|
5785cd101a
|
Merge pull request #12293 from frederic34/patch-18
Update translation.php
|
2019-11-02 11:41:55 +01:00 |
|
Frédéric FRANCE
|
e191dd7cc0
|
$key is overwriting a variable from outer foreach loop
|
2019-11-02 11:39:32 +01:00 |
|
Laurent Destailleur
|
f8afd70f28
|
Merge pull request #12292 from frederic34/patch-17
FIX $key is overwriting a variable from outer foreach loop
|
2019-11-02 11:38:54 +01:00 |
|
Laurent Destailleur
|
baba123757
|
Merge pull request #12301 from grandoc/new_branch_02_11_2019
New branch 02 11 2019
|
2019-11-02 11:38:03 +01:00 |
|
Laurent Destailleur
|
3943cb18c2
|
Merge pull request #12295 from frederic34/actioncomm_doxygen
doxygen for actioncomm class
|
2019-11-02 11:37:30 +01:00 |
|
Laurent Destailleur
|
f9031cdbfd
|
Clean code
|
2019-11-02 11:36:48 +01:00 |
|
Laurent Destailleur
|
68c971a2b5
|
All properties 'type_libelle' were renamed into 'type_label'.
|
2019-11-02 11:12:57 +01:00 |
|
stickler-ci
|
dc97a54d82
|
Fixing style errors.
|
2019-11-02 09:39:05 +00:00 |
|
Philippe GRAND
|
3ff5389c4e
|
add some comment
|
2019-11-02 10:35:43 +01:00 |
|
Philippe GRAND
|
8569020e34
|
add some comment
|
2019-11-02 10:30:29 +01:00 |
|
Laurent Destailleur
|
82bda63920
|
Merge pull request #12296 from frederic34/patch-20
Update index.php
|
2019-11-02 10:09:55 +01:00 |
|
Laurent Destailleur
|
5d3db95dd5
|
Merge pull request #12297 from frederic34/patch-21
Update index.php
|
2019-11-02 10:09:27 +01:00 |
|
Laurent Destailleur
|
4fd20157c2
|
Merge pull request #12298 from frederic34/patch-22
Update propal.class.php
|
2019-11-02 10:08:33 +01:00 |
|
Laurent Destailleur
|
c078ef991f
|
Merge pull request #12300 from frederic34/patch-23
doxygen Commande class
|
2019-11-02 10:08:14 +01:00 |
|
Laurent Destailleur
|
f266e757f5
|
Merge pull request #12299 from Dolibarr/scrutinizer-patch-2
Scrutinizer Auto-Fixes
|
2019-11-02 10:07:55 +01:00 |
|
Frédéric FRANCE
|
385cb1a26c
|
doxygen Commande class
|
2019-11-02 09:27:06 +01:00 |
|
Frédéric FRANCE
|
77d4ca81dc
|
Merge remote-tracking branch 'upstream/develop' into socid
|
2019-11-02 09:14:15 +01:00 |
|
Laurent Destailleur
|
8c90c80107
|
Clean code
|
2019-11-02 01:30:51 +01:00 |
|
Scrutinizer Auto-Fixer
|
50f55cac35
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-02 00:17:45 +00:00 |
|
Laurent Destailleur
|
a14aab5eb1
|
Fix template
|
2019-11-02 00:18:50 +01:00 |
|
Laurent Destailleur
|
941043dd67
|
Fix navigation on resources
|
2019-11-02 00:17:08 +01:00 |
|
Laurent Destailleur
|
cea2c3a9f4
|
Look and feel v11
|
2019-11-01 23:58:14 +01:00 |
|
Laurent Destailleur
|
8608c5db9c
|
Fix color of task progression
|
2019-11-01 23:16:08 +01:00 |
|
Frédéric FRANCE
|
7bd88f33a0
|
Update define_holiday.php
|
2019-11-01 22:22:07 +01:00 |
|
Frédéric FRANCE
|
dbed10a701
|
Merge remote-tracking branch 'upstream/develop' into socid
|
2019-11-01 21:39:20 +01:00 |
|
Laurent Destailleur
|
b19593bb8e
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/holiday/card.php
|
2019-11-01 21:30:19 +01:00 |
|
Laurent Destailleur
|
cf2ee892ee
|
FIX security check. A user can see holiday with link without permissions
|
2019-11-01 21:27:19 +01:00 |
|
Laurent Destailleur
|
2d9135b6ad
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/expedition/card.php
htdocs/holiday/list.php
|
2019-11-01 21:06:06 +01:00 |
|
Laurent Destailleur
|
4616519dcf
|
FIX Search on leave request ref
|
2019-11-01 20:52:30 +01:00 |
|
Laurent Destailleur
|
a3a326b25e
|
FIX Search on leave request ref
|
2019-11-01 20:52:11 +01:00 |
|
Laurent Destailleur
|
83cc9ea643
|
FIX Search on leave request ref
|
2019-11-01 20:48:46 +01:00 |
|
stickler-ci
|
0e260c859b
|
Fixing style errors.
|
2019-11-01 19:28:39 +00:00 |
|
Frédéric FRANCE
|
693506cebd
|
Update propal.class.php
socid is int
|
2019-11-01 20:26:55 +01:00 |
|
ptibogxiv
|
6f77885686
|
Update api_products.class.php
|
2019-11-01 20:26:39 +01:00 |
|