Laurent Destailleur
|
cb4a293020
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/webservices/server_productorservice.php
|
2020-12-30 13:22:43 +01:00 |
|
Laurent Destailleur
|
e34fb394a0
|
Fix warning
|
2020-12-30 12:38:45 +01:00 |
|
Laurent Destailleur
|
7e9fcfe664
|
Fix warning
|
2020-12-30 12:31:33 +01:00 |
|
Laurent Destailleur
|
87a452c6f4
|
Fix warning
|
2020-12-30 12:16:01 +01:00 |
|
Laurent Destailleur
|
cef2057ff2
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
Conflicts:
htdocs/societe/class/societe.class.php
htdocs/webservices/server_productorservice.php
|
2020-12-29 17:01:24 +01:00 |
|
Laurent Destailleur
|
483ea559f5
|
Fix warning #15823
|
2020-12-29 16:54:28 +01:00 |
|
Laurent Destailleur
|
620a088827
|
Fix warning
|
2020-12-29 16:33:58 +01:00 |
|
Frédéric FRANCE
|
9b3bbb723d
|
remove warnings
|
2020-12-28 20:37:33 +01:00 |
|
Laurent Destailleur
|
b7cd27e76a
|
Fix warning
|
2020-12-28 12:42:55 +01:00 |
|
Laurent Destailleur
|
cec96b33ae
|
Fix warning
|
2020-12-28 12:30:59 +01:00 |
|
Laurent Destailleur
|
00c847b743
|
Fix warning
|
2020-12-27 16:56:44 +01:00 |
|
Laurent Destailleur
|
f20f4cc599
|
Fix warnings
|
2020-12-26 19:23:25 +01:00 |
|
Laurent Destailleur
|
ea0ae758a3
|
Fix warnings
|
2020-12-24 02:48:32 +01:00 |
|
Laurent Destailleur
|
fa05982a8b
|
Fix CSS v13
|
2020-12-12 18:37:51 +01:00 |
|
Givriz
|
c48129e279
|
Ajout de la class "button-save"
Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)
|
2020-11-19 20:23:38 +01:00 |
|
Laurent Destailleur
|
90884d8085
|
Fix compatibility with date_delivery
|
2020-11-11 18:08:40 +01:00 |
|
Scrutinizer Auto-Fixer
|
ab25e047c0
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-10-31 17:51:30 +00:00 |
|
Scrutinizer Auto-Fixer
|
7f52920716
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-10-31 13:32:18 +00:00 |
|
Scrutinizer Auto-Fixer
|
a2a9c51e50
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-10-27 18:46:07 +00:00 |
|
Laurent Destailleur
|
ec6c735d89
|
Clean code
|
2020-10-27 19:44:15 +01:00 |
|
Frédéric FRANCE
|
ae3228b9e0
|
retrieve the spelling 🎉
|
2020-10-23 20:08:35 +02:00 |
|
Laurent Destailleur
|
cd8ebd9500
|
Fix warnings
|
2020-09-20 16:57:53 +02:00 |
|
Laurent Destailleur
|
b3dd51b790
|
Fix warnings
|
2020-09-20 16:46:29 +02:00 |
|
Laurent Destailleur
|
d38168f49e
|
Fix escape
|
2020-09-19 22:59:04 +02:00 |
|
Laurent Destailleur
|
b8fe2188a6
|
Standardize code around model_pdf
|
2020-09-10 01:49:09 +02:00 |
|
Laurent Destailleur
|
ad87e753b4
|
Clean trim on GETPOST (already included inside GETPOST when not 'none'
|
2020-08-28 21:27:50 +02:00 |
|
Laurent Destailleur
|
333d4873c3
|
Properties ->contactid has been renamed into ->contact_id
|
2020-06-25 12:17:47 +02:00 |
|
Laurent Destailleur
|
2f5dbdc8a3
|
Fix bad property
|
2020-06-25 11:54:37 +02:00 |
|
Laurent Destailleur
|
3b22b6192d
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-05-28 21:36:08 +02:00 |
|
Laurent Destailleur
|
46a362b7d8
|
doxygen
|
2020-05-28 21:25:47 +02:00 |
|
stickler-ci
|
459154edc0
|
Fixing style errors.
|
2020-05-21 13:11:06 +00:00 |
|
Frédéric FRANCE
|
ee6fadd0d5
|
add new rule
|
2020-05-21 01:41:27 +02:00 |
|
Laurent Destailleur
|
b5f3be4599
|
Clean phpcs rule file
|
2020-05-13 00:29:46 +02:00 |
|
Laurent Destailleur
|
4d6a45d491
|
Major doxygen fix
|
2020-05-03 22:48:35 +02:00 |
|
Scrutinizer Auto-Fixer
|
444c293c01
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-04-10 08:59:32 +00:00 |
|
Scrutinizer Auto-Fixer
|
e8083e2a65
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-03-23 14:54:02 +00:00 |
|
Laurent Destailleur
|
73f2e9e5de
|
WIP migrate num_paiement into num_payment
Fix label for free product in takepos
|
2020-03-16 19:23:18 +01:00 |
|
Laurent Destailleur
|
1dbf3a7ae8
|
Look and feel v11
|
2020-02-21 20:14:55 +01:00 |
|
Laurent Destailleur
|
f44b85f557
|
Fix $_SESSION['newtoken'] must be newToken()
|
2019-12-18 23:12:31 +01:00 |
|
Frédéric FRANCE
|
39da0bef9e
|
Update server_order.php
|
2019-12-09 23:56:46 +01:00 |
|
Frédéric FRANCE
|
72c30c4101
|
Update server_order.php
|
2019-12-07 23:39:09 +01:00 |
|
Scrutinizer Auto-Fixer
|
ac40dd8bbe
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 18:35:39 +00:00 |
|
Laurent Destailleur
|
c02cd80b75
|
Clean code
|
2019-11-12 10:11:30 +01:00 |
|
Frédéric FRANCE
|
35751a80ab
|
100% centpercent
|
2019-11-05 21:24:41 +01:00 |
|
Laurent Destailleur
|
e087ac434d
|
Merge pull request #12283 from frederic34/socid
replace deprecated user->societe_id by user->socid
|
2019-11-02 13:34:21 +01:00 |
|
Laurent Destailleur
|
45c77b4560
|
Renaming some libelle into label
|
2019-11-02 12:59:38 +01:00 |
|
Frédéric FRANCE
|
e93aaa2a75
|
replace deprecated user->societe_id by user->socid
|
2019-10-31 20:46:31 +01:00 |
|
Frédéric FRANCE
|
a7797ba1da
|
clean indent in variants directory
|
2019-10-26 20:53:39 +02:00 |
|
Frédéric FRANCE
|
e75f7d448c
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
|
2019-10-16 20:00:01 +02:00 |
|
Laurent Destailleur
|
c2a7ae23bc
|
Merge pull request #12034 from aspangaro/11_faicon
Fix Fa-icon
|
2019-10-07 13:03:27 +02:00 |
|
Laurent Destailleur
|
2b66282b61
|
NEW Code for extrafields uses the new array $extrafields->attributes
|
2019-10-06 14:41:52 +02:00 |
|
Alexandre SPANGARO
|
ddadff5731
|
Add globe fa-icon
|
2019-10-03 21:32:55 +02:00 |
|
Laurent Destailleur
|
8ad81a092a
|
Clean code
|
2019-10-01 16:19:54 +02:00 |
|
Alexandre SPANGARO
|
02dbc11f98
|
Move Gnu.org to https
|
2019-09-23 21:55:30 +02:00 |
|
Laurent Destailleur
|
7d51c62d93
|
Fix warning when array empty
|
2019-08-31 14:14:24 +02:00 |
|
Laurent Destailleur
|
74454c3766
|
Fix use new extrafields array
|
2019-08-31 13:06:21 +02:00 |
|
Laurent Destailleur
|
48db5c2a44
|
Replace deprecated actioncomm->note into actioncomm->note_private
|
2019-08-31 02:46:39 +02:00 |
|
Laurent Destailleur
|
43fc0466e5
|
Fix position of modules
|
2019-06-23 20:05:15 +02:00 |
|
Laurent Destailleur
|
cc971f4204
|
Fix ident
|
2019-05-23 14:30:34 +02:00 |
|
Laurent Destailleur
|
54714bc755
|
Deprecated property ->fk_departement is now ->state_id everywhere.
|
2019-04-05 20:06:13 +02:00 |
|
Laurent Destailleur
|
8fe1be1a67
|
Removed deprecated use of string in dol_print_date(). Only date allowed.
|
2019-04-01 19:27:34 +02:00 |
|
Laurent Destailleur
|
c0b6699b25
|
All methods set_draft() were renamed into setDraft()
|
2019-03-15 19:01:40 +01:00 |
|
florian HENRY
|
e2d13c0e1f
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
dev_importproduct_measuringunit
Conflicts:
htdocs/contact/consumption.php
htdocs/webservices/server_productorservice.php
|
2019-02-13 09:23:52 +01:00 |
|
florian HENRY
|
5c059c897d
|
fix travis (mosty for dev no conerne by my changes)
|
2019-02-13 09:21:14 +01:00 |
|
Laurent Destailleur
|
f1500281ef
|
Fix phpcs
|
2019-02-12 19:00:50 +01:00 |
|
Frédéric FRANCE
|
1e43f8e54a
|
PEAR FunctionCallSignature
|
2019-02-10 10:45:49 +01:00 |
|
Frédéric FRANCE
|
970392adb8
|
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
|
2019-02-03 22:41:57 +01:00 |
|
Frédéric FRANCE
|
80a12fcd1c
|
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
|
2019-02-03 14:29:45 +01:00 |
|
Laurent Destailleur
|
e18bd6f986
|
Merge branch 'develop' into nospaceaftercomma
|
2019-01-30 18:27:35 +01:00 |
|
Frédéric FRANCE
|
b10558bacd
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-01-27 23:23:38 +01:00 |
|
Laurent Destailleur
|
f30a3d59ba
|
Merge branch 'develop' into toomanylines
|
2019-01-27 17:59:13 +01:00 |
|
Laurent Destailleur
|
4f9f0fd7b5
|
Merge branch 'develop' into elseif
|
2019-01-27 17:54:06 +01:00 |
|
Frédéric FRANCE
|
f0cdf300d1
|
Squiz.Functions.FunctionDeclarationArgumentSpacing
|
2019-01-27 15:20:16 +01:00 |
|
Frédéric FRANCE
|
496fa9b0fb
|
PSR2.Files.EndFileNewline.TooMany
|
2019-01-27 14:10:35 +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 |
|
Laurent Destailleur
|
98b8113a39
|
Fix multicompany
|
2018-12-14 16:20:23 +01:00 |
|
Laurent Destailleur
|
f97b561af0
|
Merge branch 'develop' into qual_rename_facnumber
|
2018-12-13 20:24:12 +01:00 |
|
Laurent Destailleur
|
b47e7b2267
|
Work on new unsubscribe process
|
2018-12-11 09:49:46 +01:00 |
|
Maxime Kohlhaas
|
2e496ea83a
|
QUAL rename facnumber by ref
|
2018-12-02 17:33:44 +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 |
|
Frédéric FRANCE
|
54a078149a
|
function declaration
|
2018-08-15 17:34:35 +02:00 |
|
Laurent Destailleur
|
1ca17fb781
|
Merge pull request #9229 from Conspir3D/patch-2
fix: wrong position of counter reset
|
2018-08-12 19:16:15 +02:00 |
|
Jan
|
c007ea62a7
|
wrong position of counter reset
extrafields will work now ;) and not the first product gets the last extrafields values
|
2018-08-09 20:57:32 +02:00 |
|
Frédéric FRANCE
|
b00164ca39
|
test phpcs v3
|
2018-08-09 11:03:50 +02:00 |
|
Philippe GRAND
|
59cd0a5e5e
|
uniformize
|
2018-08-04 15:58:05 +02:00 |
|
Frédéric FRANCE
|
a0a5d33641
|
test include
|
2018-07-26 17:30:53 +02:00 |
|
Frédéric FRANCE
|
fa2de55109
|
test include
|
2018-07-26 11:50:54 +02:00 |
|
Frédéric FRANCE
|
3f4db55614
|
test include
|
2018-07-26 11:34:51 +02:00 |
|
Laurent Destailleur
|
04934cc4aa
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/class/contrat.class.php
htdocs/core/lib/functions.lib.php
htdocs/projet/tasks/time.php
|
2018-02-27 19:18:43 +01:00 |
|
Laurent Destailleur
|
41638e6dff
|
Fix back link of look and feel v7
|
2018-02-26 09:20:05 +01:00 |
|
Laurent Destailleur
|
b4446764f8
|
Clean code of deprecated usage
|
2018-02-21 14:48:25 +01:00 |
|
Laurent Destailleur
|
9d10eb57f2
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
dev/dolibarr_changes.txt
htdocs/compta/facture/card.php
htdocs/compta/facture/list.php
htdocs/main.inc.php
|
2017-12-20 13:28:41 +01:00 |
|
Laurent Destailleur
|
ef9468f78a
|
Fix missing field label
|
2017-12-12 11:48:51 +01:00 |
|
Laurent Destailleur
|
e9eeb59068
|
Revert "Add invoice label in supplier invoice web service"
This reverts commit 8b288d99ff.
|
2017-12-12 11:45:12 +01:00 |
|
Laurent Destailleur
|
8b288d99ff
|
Add invoice label in supplier invoice web service
|
2017-12-12 11:43:53 +01:00 |
|
Laurent Destailleur
|
b07895a26a
|
Fix for php7.2
|
2017-11-17 18:04:55 +01:00 |
|
Laurent Destailleur
|
ede1f3fdfc
|
PHP7.2
|
2017-11-17 17:53:20 +01:00 |
|
Laurent Destailleur
|
d40dda83cf
|
Add API "close" for proposals
Standardize code
|
2017-10-18 11:10:08 +02:00 |
|