Frédéric FRANCE
4e18f46f28
doxygen
2020-12-05 23:53:55 +01:00
Zebedeu
1a1850c6f1
Fix | fixed the error of installation start of version 13.0.0-beta
2020-12-05 20:28:55 +01:00
Zebedeu
1917d9b508
Revert "Fix #15675 fixed the error of installation start of version 13.0.0-beta"
...
This reverts commit 7a8d031d56
2020-12-05 20:23:31 +01:00
Zebedeu
7a8d031d56
Fix #15675 fixed the error of installation start of version 13.0.0-beta
2020-12-05 20:17:57 +01:00
Laurent Destailleur
6c2d520e21
FIX caluclation of open days must not depends on TZ.
2020-12-05 17:41:05 +01:00
Frédéric FRANCE
d1204e5e9b
typo ortho
2020-12-05 15:35:52 +01:00
Laurent Destailleur
6023f2e16f
Fix php8
2020-12-05 14:57:41 +01:00
Laurent Destailleur
cb9d6318e7
Fix warning
2020-12-05 14:09:51 +01:00
Laurent Destailleur
15455690b9
Fix setup
2020-12-05 14:06:50 +01:00
Laurent Destailleur
5860bf69ce
fix warning
2020-12-05 13:48:51 +01:00
Laurent Destailleur
3b55eb1d82
FIX master must be after session_start but dol_getprefix must be before
...
and after filefunc.inc.php.
2020-12-05 13:26:58 +01:00
Frédéric FRANCE
325951877b
fix missing fields in box
2020-12-05 08:58:20 +01:00
Frédéric FRANCE
e9a12b5324
fix missing fields in box
2020-12-05 08:56:17 +01:00
Laurent Destailleur
8455e03a08
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-12-04 22:30:56 +01:00
Laurent Destailleur
af1bb09338
NEW: Graphics can be horizontal bars.
2020-12-04 22:30:34 +01:00
Laurent Destailleur
bb0c33a49e
Merge pull request #15654 from frederic34/commonkanban
...
keep common if wanted
2020-12-04 22:25:51 +01:00
Laurent Destailleur
b9f7d9ab4b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-12-04 22:12:43 +01:00
Laurent Destailleur
d8b01d9a33
Fix chart is default graph lib
2020-12-04 22:12:20 +01:00
Laurent Destailleur
a05021a344
Merge pull request #15653 from frederic34/typeusermenuleft
...
fix type_user not defined in left menu
2020-12-04 22:03:54 +01:00
Laurent Destailleur
c31cf08431
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/modCategorie.class.php
2020-12-04 21:55:57 +01:00
Laurent Destailleur
0536ed87a2
Avoid to process too large user agent
2020-12-04 21:38:33 +01:00
stickler-ci
d89970ddd1
Fixing style errors.
2020-12-04 19:31:53 +00:00
Frédéric FRANCE
c8407b2f91
keep common if wanted
2020-12-04 20:28:05 +01:00
Laurent Destailleur
2b267cf8e4
Fix warnings
2020-12-04 20:06:55 +01:00
Laurent Destailleur
3770eef8dc
Fix can import all categories
2020-12-04 19:51:14 +01:00
Laurent Destailleur
10bef6eb03
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
htdocs/opensurvey/class/opensurveysondage.class.php
htdocs/product/class/product.class.php
htdocs/supplier_proposal/card.php
2020-12-04 19:24:29 +01:00
Laurent Destailleur
e0b737b622
Merge pull request #15650 from atm-lena/12.0_FIX_PriceToNum_ConvertNegativToPositiv
...
pricetonum() - preg-replace() delete "-" negativ number
2020-12-04 18:19:22 +01:00
stickler-ci
08e6fcad0d
Fixing style errors.
2020-12-04 17:10:39 +00:00
Frédéric FRANCE
b0e40aa215
fix type_user not define in left menu
2020-12-04 18:00:31 +01:00
atm-lena
d22646e6ae
pricetonum() - preg-replace() delete "-" negativ number
2020-12-04 16:06:10 +01:00
Laurent Destailleur
f0dec80dae
css
2020-12-04 15:39:30 +01:00
Laurent Destailleur
6d4a90b543
Clean code
2020-12-04 14:53:52 +01:00
stickler-ci
6a2d842d3e
Fixing style errors.
2020-12-04 13:47:55 +00:00
lmarcouiller
9c191cda43
New #8172 : PHPExcel replace by PHPSpreadSheet
2020-12-04 14:28:09 +01:00
Laurent Destailleur
040d22ef0a
Fix phpcs
2020-12-04 01:59:47 +01:00
Frédéric FRANCE
e3037c7e1a
doxygen
2020-12-03 17:33:22 +01:00
Laurent Destailleur
f06d920460
FIX #15583
2020-12-03 16:22:03 +01:00
Laurent Destailleur
5bd6d6f388
Look and feel v13
2020-12-03 14:34:15 +01:00
Laurent Destailleur
1ec3d4cfdf
CSS
2020-12-03 13:19:35 +01:00
Laurent Destailleur
bfe4eb7309
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/emailcollector_card.php
htdocs/core/modules/modProduct.class.php
2020-12-03 11:26:53 +01:00
Laurent Destailleur
af4f473c93
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/boxes/box_produits.php
2020-12-03 11:22:34 +01:00
Laurent Destailleur
0ad6ee209a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-12-03 11:21:08 +01:00
lmarcouiller
28ac976438
Show won on graph
2020-12-03 11:14:58 +01:00
lmarcouiller
e08f6aeb2b
Fix #15383
2020-12-03 11:00:29 +01:00
Hystepik
7fc050e3ce
Merge branch 'develop' into develop#3
2020-12-03 10:39:25 +01:00
Laurent Destailleur
dd54d28dc6
Debug v13
2020-12-03 10:13:13 +01:00
Hystepik
ecb5a3b028
Merge branch 'develop' into develop#3
2020-12-03 10:12:19 +01:00
lmarcouiller
032116b235
changes to not diplay won and lost and add on migration
2020-12-03 10:11:16 +01:00
Laurent Destailleur
46171a6ec8
Fix option MAIN_USE_COMPANY_NAME_OF_CONTACT
2020-12-02 21:27:15 +01:00
Laurent Destailleur
bc1dc1e9f0
FIX #15590 manually
2020-12-02 19:34:04 +01:00
Laurent Destailleur
d88173d7ba
Fix bad column
2020-12-02 19:13:32 +01:00
Laurent Destailleur
9e18997e64
FIX #15595
2020-12-02 16:35:43 +01:00
Laurent Destailleur
ea1c55cf1e
Fix widgets that has disappeared
2020-12-02 15:16:20 +01:00
Laurent Destailleur
409b73fe2c
FIX #15582
2020-12-02 15:16:04 +01:00
lmarcouiller
c7a31b2458
new widget funnel of prospection
2020-12-02 14:42:56 +01:00
Laurent Destailleur
25bedc3497
Fix warning
2020-12-02 14:09:03 +01:00
Laurent Destailleur
49be354c3e
Fix warning
2020-12-02 14:05:17 +01:00
Laurent Destailleur
c8274f13eb
Merge pull request #15582 from Hystepik/develop
...
Close #15307 New Widget : Encours dépassé
2020-12-02 14:01:50 +01:00
Laurent Destailleur
c5ff32c2d2
Fix accept <u> and <i> into translation strings
2020-12-01 17:01:35 +01:00
Laurent Destailleur
c0c03f5270
Fix allow tag <center> into translation strings
2020-12-01 15:59:54 +01:00
Laurent Destailleur
3b3f9acdbb
Remove warning
2020-12-01 11:36:58 +01:00
stickler-ci
7d966d7a49
Fixing style errors.
2020-12-01 01:42:18 +00:00
Scrutinizer Auto-Fixer
6df4954b20
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-12-01 01:41:19 +00:00
Laurent Destailleur
99e4aab46e
CSS
2020-11-30 20:31:22 +01:00
Laurent Destailleur
2707c0b89b
Look and feel v13
2020-11-30 20:13:42 +01:00
Laurent Destailleur
de718837e4
Fix warnings
2020-11-30 19:43:43 +01:00
Laurent Destailleur
cf2dd28a21
Fix warning when setup not complete.
2020-11-30 19:40:53 +01:00
Laurent Destailleur
fc91e70e47
Update modFacture.class.php
2020-11-30 18:37:07 +01:00
Laurent Destailleur
c0baf483dc
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-11-30 18:28:24 +01:00
Laurent Destailleur
3443174f67
Sync transifex
2020-11-30 18:28:04 +01:00
lmarcouiller
ff30021d35
Close #15307 Encours dpassé with eldy suggestions
2020-11-30 16:50:12 +01:00
Laurent Destailleur
dc56c2bc3c
Merge pull request #15584 from frederic34/getpostint
...
introduce GETPOSTINT which returns only int
2020-11-30 16:08:20 +01:00
Frédéric FRANCE
765df41918
introduce GETPOSTINT
2020-11-30 15:44:29 +01:00
Laurent Destailleur
6f0d49d68d
Merge pull request #15578 from Tim-Otte/fix-product-supplier-price-extrafield
...
FIX for product supplier price extrafields
2020-11-30 15:44:04 +01:00
Laurent Destailleur
93a337b819
Merge pull request #15581 from frederic34/patch-8
...
remove syntax error
2020-11-30 15:41:26 +01:00
Laurent Destailleur
958893228a
Fix combo to add contact and status of contact on popup
2020-11-30 15:18:58 +01:00
lmarcouiller
cee1b3cee4
Close : Encours dépassé #15307
2020-11-30 14:52:27 +01:00
Laurent Destailleur
00ad6df395
Fight against $_POST
2020-11-30 14:47:07 +01:00
lmarcouiller
595bb893be
Close : Encours dépassé #15307
2020-11-30 14:01:56 +01:00
lmarcouiller
6e9a3c05f4
Close : Encours dépassé #15307
2020-11-30 13:52:02 +01:00
Frédéric FRANCE
ffcce1a4b4
remove syntax error
2020-11-30 13:02:05 +01:00
lmarcouiller
00dca7ff9b
NEW : Encours dépassé #15307
2020-11-30 13:01:45 +01:00
Laurent Destailleur
73ea6e40bb
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-11-30 12:55:11 +01:00
Laurent Destailleur
bd5dc6399b
Fix deprecated code
2020-11-30 12:35:05 +01:00
Laurent Destailleur
4f2259ea38
Fix warning
2020-11-30 12:03:04 +01:00
Tim Otte
16b69a069e
Fixed sql error where column names were used instead of sql column names
2020-11-30 10:21:10 +01:00
Laurent Destailleur
6af9c9f857
Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop
2020-11-30 07:50:26 +01:00
Laurent Destailleur
b6ccfaf180
css
2020-11-30 07:50:14 +01:00
Laurent Destailleur
7634212811
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/system/phpinfo.php
htdocs/commande/stats/index.php
htdocs/compta/facture/stats/index.php
2020-11-29 21:35:03 +01:00
Laurent Destailleur
58eaef37d2
Fix regression
2020-11-29 21:29:22 +01:00
Laurent Destailleur
de98ef1718
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2020-11-29 20:57:43 +01:00
Laurent Destailleur
d3a2aa664f
FIX #15572
2020-11-29 20:27:40 +01:00
Laurent Destailleur
66381a4f4d
FIX #15558
2020-11-29 19:41:11 +01:00
Laurent Destailleur
8eacbaaf5f
Merge pull request #15570 from frederic34/strike
...
simplify function
2020-11-29 19:10:06 +01:00
Laurent Destailleur
5ad1bb5b20
Merge pull request #15571 from frederic34/patch-14
...
Update mod_codecompta_aquarium.php
2020-11-29 19:08:29 +01:00
Laurent Destailleur
beafcc7853
Fix warning
2020-11-29 16:06:03 +01:00
Laurent Destailleur
150dd71774
Look and feel v13
2020-11-29 16:02:39 +01:00
Laurent Destailleur
404634919d
Look and feel v13
2020-11-29 15:47:08 +01:00
Laurent Destailleur
6c65ebef0d
Look and feel v13
2020-11-29 15:16:53 +01:00
Frédéric FRANCE
83c60d725a
Update mod_codecompta_aquarium.php
2020-11-28 23:45:32 +01:00
Frédéric FRANCE
3a041eed44
simplify function
2020-11-28 23:42:48 +01:00
Frédéric FRANCE
11a978ca08
simplify function
2020-11-28 23:41:44 +01:00
Frédéric FRANCE
eea9382b57
Update mod_codecompta_aquarium.php
2020-11-28 23:35:27 +01:00
Frédéric FRANCE
f9ef0f4d69
Update mod_codecompta_digitaria.php
2020-11-28 23:33:58 +01:00
Frédéric FRANCE
2f701f4889
Update mod_codecompta_aquarium.php
2020-11-28 23:24:13 +01:00
Frédéric FRANCE
fb871daf14
simplify function
2020-11-28 23:04:05 +01:00
Laurent Destailleur
fab9b3d50c
Fix warning
2020-11-28 18:34:13 +01:00
Laurent Destailleur
147a12a922
Fix warning
2020-11-28 15:02:05 +01:00
Laurent Destailleur
41984f9934
Clean code
2020-11-28 14:00:35 +01:00
Laurent Destailleur
b1603ed1f5
Fix warning
2020-11-28 12:12:31 +01:00
Laurent Destailleur
be39e50214
Merge pull request #15567 from andreubisquerra/develop
...
Improve free entries printing in TakePOS
2020-11-28 02:19:14 +01:00
Laurent Destailleur
df461d319e
Fix warning
2020-11-28 02:12:07 +01:00
Laurent Destailleur
7c4599a5c5
Look and feel v13
2020-11-28 01:15:23 +01:00
andreubisquerra
c9c2869eec
Fix travis
2020-11-27 19:45:40 +01:00
andreubisquerra
c3bc662675
Improve free entries printing in TakePOS
...
Improve free entries printing with Receipt Printer module in TakePOS
2020-11-27 19:24:27 +01:00
Laurent Destailleur
574919de52
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
htdocs/accountancy/bookkeeping/balance.php
htdocs/adherents/class/subscription.class.php
htdocs/compta/bank/categ.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/boxes/box_task.php
htdocs/core/class/commondocgenerator.class.php
htdocs/core/class/interfaces.class.php
htdocs/core/lib/project.lib.php
htdocs/core/modules/modCategorie.class.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fichinter/class/fichinterrec.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/install/repair.php
htdocs/main.inc.php
htdocs/product/price.php
htdocs/projet/tasks/time.php
htdocs/reception/card.php
2020-11-27 15:45:12 +01:00
Laurent Destailleur
4a5cdd0092
Several fixes in export and repair tool
2020-11-27 15:27:35 +01:00
Laurent Destailleur
9ce6d87b83
Clean code
2020-11-27 15:04:58 +01:00
Laurent Destailleur
ac3c129735
Clean code
2020-11-27 14:24:15 +01:00
Laurent Destailleur
47a5037155
Fix dolGetFirstLastname() for 4 and 5
2020-11-27 01:18:01 +01:00
Laurent Destailleur
2cf005d22c
Removed warning
2020-11-27 00:39:49 +01:00
Laurent Destailleur
250b42f60a
Fix phpcs
2020-11-27 00:37:36 +01:00
Laurent Destailleur
97f6efb079
Fix avoid to trigger sql injection detection
2020-11-26 23:50:00 +01:00
Laurent Destailleur
b3b511a6d4
FIX #15546
2020-11-26 22:44:11 +01:00
Laurent Destailleur
5d9098795f
Fix labels in combo
2020-11-26 19:17:09 +01:00
Laurent Destailleur
084b2411df
Merge pull request #15550 from OPEN-DSI/new-supplier-product-list-with-stock
...
NEW show stock in supplier product select list
2020-11-26 18:56:04 +01:00
Laurent Destailleur
82da0d01f1
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formorder.class.php
htdocs/fourn/commande/list.php
2020-11-26 18:52:00 +01:00
Laurent Destailleur
9aa657bc35
Debug v13
2020-11-26 18:48:51 +01:00
Laurent Destailleur
b043442b91
Fix link and selection of status of purchase order.
2020-11-26 17:53:57 +01:00
Laurent Destailleur
3588781180
Debug v13
2020-11-26 14:15:20 +01:00
lvessiller
17e13eb821
NEW show stock in supplier product select list
2020-11-26 14:12:02 +01:00
Laurent Destailleur
5d0a54c0de
Fix var not defined
2020-11-26 12:07:01 +01:00
Laurent Destailleur
e1a6e8f2fc
CSS
...
Security: Add param to fight against Clickjacking attacks
2020-11-26 11:29:16 +01:00
Laurent Destailleur
c7e5b0dcc1
Fix warning
2020-11-26 10:12:24 +01:00
Laurent Destailleur
e272130a6a
Fix phpcs
2020-11-26 08:40:08 +01:00
Laurent Destailleur
74605cec12
Fix warning
2020-11-25 18:07:52 +01:00
Laurent Destailleur
d8bf7b2714
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
2020-11-25 18:04:06 +01:00
Laurent Destailleur
16e3baeff2
FIX filter on project list
2020-11-25 17:28:53 +01:00
Laurent Destailleur
4d90fb22de
Fix sql syntax error
2020-11-25 15:07:26 +01:00
Laurent Destailleur
5030f0c587
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/opensurvey/wizard/create_survey.php
2020-11-25 14:55:31 +01:00
Laurent Destailleur
bf7b6ee00d
Fix delete of proposal
2020-11-25 14:15:59 +01:00
Frédéric FRANCE
0d24fc56b9
doxygen
2020-11-24 22:40:41 +01:00
Laurent Destailleur
d17ecbeccd
Fix #15438
2020-11-24 20:56:11 +01:00
Laurent Destailleur
bd0236edeb
Fix #15438
2020-11-24 20:53:42 +01:00
Laurent Destailleur
cf82581a2a
Move module to experimental
2020-11-24 14:06:02 +01:00
Laurent Destailleur
47ca74965b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-11-24 12:26:50 +01:00
Laurent Destailleur
d2f8b65dbf
Prepare use of session in db
2020-11-24 12:26:32 +01:00
Laurent Destailleur
817de18a5d
Fix remove log
2020-11-24 12:25:32 +01:00
Laurent Destailleur
81566289cd
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/commande/class/commande.class.php
2020-11-24 11:07:35 +01:00
Laurent Destailleur
53208e620e
Use of . as thousand separator. Can use it for decimal if not 3 digits.
2020-11-24 10:56:05 +01:00
Frédéric FRANCE
69ea0ea791
Update box_produits.php
2020-11-23 23:44:15 +01:00
Frédéric FRANCE
c7d886c918
fix status on tooltip in box last product
2020-11-23 23:25:09 +01:00
Laurent Destailleur
5fb3564bc0
Merge pull request #15467 from hregis/develop_bug2
...
FIX missing "enabled" value of extrafield after update
2020-11-23 22:18:02 +01:00
Laurent Destailleur
bc1d286673
Merge pull request #15495 from Givriz/dev
...
Feature : creation of a "button-cancel" class
2020-11-23 21:53:45 +01:00
Laurent Destailleur
5822fcfbed
FIX several warning with the barcode use in ODT templates
2020-11-23 21:38:45 +01:00
Laurent Destailleur
1e70790cd6
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/price.php
2020-11-23 19:55:13 +01:00
Laurent Destailleur
efc539c4b4
Fix css
2020-11-23 19:53:58 +01:00
Laurent Destailleur
c5278197fb
More phpunit test for price2num
2020-11-23 19:45:11 +01:00
Givriz
dca4cf5987
Feature : ajout de la class "button-cancel"
...
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
2020-11-23 15:12:52 +01:00
Laurent Destailleur
2f6f242d99
CSS
2020-11-23 12:29:38 +01:00
Laurent Destailleur
7d1b84d482
Fix warning
2020-11-22 22:58:14 +01:00
Laurent Destailleur
af2eabb24d
Fix warning
2020-11-22 15:06:53 +01:00
Laurent Destailleur
9b4b11b4bd
Fix var not defined
2020-11-22 14:49:30 +01:00
Laurent Destailleur
f6d6efa288
CSS
2020-11-22 13:23:56 +01:00
Laurent Destailleur
3d2da45f84
Remove warning
2020-11-22 11:36:07 +01:00
Regis Houssin
fe5dfab4be
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_bug2
2020-11-22 09:16:33 +01:00
Laurent Destailleur
986f918436
Fix image edition when gravatar module is on
2020-11-22 01:47:17 +01:00
Laurent Destailleur
e5e320fd90
Fix null
2020-11-22 01:26:58 +01:00
Laurent Destailleur
a30e842521
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-11-21 23:48:34 +01:00
Laurent Destailleur
60bfbe2e57
Merge pull request #15448 from Givriz/dev
...
Feature : creation of a "button-save" class
2020-11-21 23:44:30 +01:00
Laurent Destailleur
782e3b4c23
Merge pull request #15458 from frederic34/patch-23
...
doxygen
2020-11-21 23:42:56 +01:00
Laurent Destailleur
97e36502f0
Fix warning
2020-11-21 23:37:42 +01:00
Laurent Destailleur
73a3a03398
Fix for smartphone
2020-11-21 23:36:20 +01:00
Laurent Destailleur
9004be1df2
Debug feature to send remind by email
2020-11-21 17:42:07 +01:00
Laurent Destailleur
bf94ce6aad
Fix warnings
2020-11-21 16:49:54 +01:00
Laurent Destailleur
95b79094df
Fix warning.
...
Module cron is more clear.
2020-11-21 16:27:50 +01:00
Laurent Destailleur
3534555909
Fix setup of scheduled jobs
2020-11-21 14:14:53 +01:00
Regis Houssin
bd8faae9c1
FIX missing "enabled" value of extrafield after update
2020-11-20 15:59:50 +01:00
Damien BENOIT
ebd64d5e57
Merge pull request #5 from Dolibarr/develop
...
Update fork
2020-11-20 13:53:43 +01:00
Laurent Destailleur
07c192efb8
Merge pull request #15457 from frederic34/patch-22
...
Update ldap.class.php
2020-11-20 13:37:24 +01:00
Frédéric FRANCE
b4a5134a7f
doxygen
2020-11-19 22:25:02 +01:00
Frédéric FRANCE
5d4d7c99d6
Update ldap.class.php
...
The variable $result seems to be never defined.
2020-11-19 22:07:32 +01:00
Frédéric FRANCE
efa5c89c45
Update rssparser.class.php
...
The variable $**** does not seem to be defined for all execution paths leading up to this point.
2020-11-19 22:03:13 +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
aa7383f3d4
Fix warning
2020-11-19 18:15:40 +01:00
Laurent Destailleur
0760a268f6
Fix warning
2020-11-18 22:25:03 +01:00
Laurent Destailleur
83eaf16a22
Fix css
2020-11-18 16:23:08 +01:00
Laurent Destailleur
348185ff15
Fix js error
2020-11-18 16:04:05 +01:00
Laurent Destailleur
e78b9a421d
Fix sql
2020-11-18 13:14:29 +01:00
Laurent Destailleur
0dbacab68f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-11-18 13:12:12 +01:00
Laurent Destailleur
17f35e16b9
Merge pull request #15436 from OPEN-DSI/add_extended_infos_on_select_contacts
...
NEW: Add new option for displaying Contact email (or phones if not defined) and town info list (select list or combobox)
2020-11-18 13:12:03 +01:00
Laurent Destailleur
8d8f0026c2
Fix switch date to datetime
2020-11-18 13:06:30 +01:00
Laurent Destailleur
ce173d7b39
Merge pull request #15424 from Tim-Otte/fix-15423
...
Fix for #15423
2020-11-18 12:46:41 +01:00
Laurent Destailleur
a5a7197506
Update extrafields.class.php
2020-11-18 12:45:37 +01:00
Laurent Destailleur
95460e6372
Merge pull request #15422 from frederic34/patch-10
...
add optional tag which list all other tags in odt substitutions
2020-11-18 12:44:25 +01:00
Laurent Destailleur
68df96218f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-11-18 12:37:33 +01:00
Laurent Destailleur
2529448f1b
Fix path to files
2020-11-18 12:37:18 +01:00
Laurent Destailleur
166bb5cc75
Merge pull request #15421 from frederic34/patch-8
...
fix dir for member photo in odt tag
2020-11-18 12:37:03 +01:00
Laurent Destailleur
889a5d0be1
Update commondocgenerator.class.php
2020-11-18 12:04:41 +01:00
kamel
73b35f334e
NEW: Add new option for displaying Contact email (or phones if not defined) and town info list (select list or combobox)
...
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
2020-11-18 09:41:42 +01:00
Laurent Destailleur
17f78f9cec
FIX Protection to avoid duplicate submit when creating a payment.
2020-11-17 18:39:34 +01:00
Laurent Destailleur
3e4c6b9222
Fix warning
2020-11-17 13:13:11 +01:00
Frédéric FRANCE
3b1f50d5fc
Update functions.lib.php
2020-11-17 11:58:11 +01:00
Frédéric FRANCE
bf390ceb4d
Update doc_generic_member_odt.class.php
2020-11-17 11:56:11 +01:00
Frédéric FRANCE
fcfd630f84
Update doc_generic_user_odt.modules.php
2020-11-17 11:55:05 +01:00
Frédéric FRANCE
fb5385180f
Update functions.lib.php
2020-11-17 11:54:18 +01:00
Laurent Destailleur
6bbeb6d3a0
Fix debug creation of shipment with virtual product.
2020-11-16 16:31:05 +01:00
Laurent Destailleur
548a25b005
Fix use of token
2020-11-16 14:36:23 +01:00
Laurent Destailleur
ca02ac9e45
Remove warning for php8
2020-11-16 13:00:18 +01:00
Laurent Destailleur
ac5fa6c6df
Clean code
2020-11-16 12:54:16 +01:00
Laurent Destailleur
6c42535eb2
Maxi debug v13
2020-11-16 12:20:18 +01:00
Laurent Destailleur
65144f4d5a
fix warning
2020-11-16 11:37:28 +01:00
Tim Otte
4a1f61d759
Fix for #15423
2020-11-16 11:12:43 +01:00
Frédéric FRANCE
8cff0222cd
Update commondocgenerator.class.php
2020-11-15 23:58:35 +01:00
Frédéric FRANCE
d114c56672
add a tag which list all other tags in odt user
2020-11-15 23:49:16 +01:00
Frédéric FRANCE
35653bb855
fix dir for member photo in odt tag
2020-11-15 23:45:13 +01:00
Laurent Destailleur
e2ea25fd78
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-11-15 17:29:31 +01:00
Laurent Destailleur
cbe9fec51d
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/ticket/list.php
2020-11-15 17:29:19 +01:00
Laurent Destailleur
8e87729040
Merge pull request #15416 from frederic34/patch-25
...
doxygen
2020-11-15 17:06:34 +01:00
Laurent Destailleur
acfee5a0e1
Merge pull request #15415 from frederic34/patch-24
...
doxygen
2020-11-15 17:05:55 +01:00
Laurent Destailleur
041de0843a
Merge pull request #15414 from frederic34/patch-23
...
doxygen
2020-11-15 17:05:39 +01:00
Laurent Destailleur
27f3287ac4
Merge pull request #15413 from frederic34/patch-22
...
doxygen
2020-11-15 17:05:22 +01:00
Laurent Destailleur
c4094357c2
Merge pull request #15412 from frederic34/patch-21
...
doxygen
2020-11-15 17:05:03 +01:00
Laurent Destailleur
a1bdce06f5
Merge pull request #15411 from frederic34/patch-20
...
doxygen
2020-11-15 17:04:45 +01:00
Laurent Destailleur
db357da9a7
Merge pull request #15410 from frederic34/patch-19
...
doxygen
2020-11-15 17:04:17 +01:00
Laurent Destailleur
31c73403c0
Update pdf_eratosthene.modules.php
2020-11-15 17:04:07 +01:00
Laurent Destailleur
d0cf558604
Merge pull request #15409 from frederic34/patch-18
...
doxygen
2020-11-15 17:02:54 +01:00
Laurent Destailleur
ed6204183d
Merge pull request #15408 from frederic34/patch-17
...
doxygen
2020-11-15 17:00:54 +01:00
Laurent Destailleur
011e786996
Update pdf_sepamandate.modules.php
2020-11-15 17:00:37 +01:00
Laurent Destailleur
0db18136a5
Merge pull request #15407 from frederic34/patch-15
...
doxygen
2020-11-15 16:59:47 +01:00
Laurent Destailleur
c0ce41dc0d
Merge pull request #15406 from frederic34/patch-14
...
doxygen
2020-11-15 16:59:25 +01:00
Laurent Destailleur
89a77fad2c
Fix warning
2020-11-15 16:56:30 +01:00
Laurent Destailleur
5c15162c40
Fix warning
2020-11-15 15:10:15 +01:00
Laurent Destailleur
2e0e42e918
Fix warning
2020-11-15 14:37:21 +01:00
Laurent Destailleur
9fe8c003a4
Merge pull request #15398 from frederic34/odtformembers
...
Add odt for members
2020-11-15 13:19:43 +01:00
Frédéric FRANCE
41906fb5ee
Update pdf_cyan.modules.php
2020-11-14 22:15:05 +01:00
Frédéric FRANCE
92c28efe42
doxygen
2020-11-14 22:12:05 +01:00
Frédéric FRANCE
da0bdd0907
doxygen
2020-11-14 22:04:14 +01:00
Frédéric FRANCE
b994d0d84b
doxygen
2020-11-14 21:26:18 +01:00
Frédéric FRANCE
518ad097d0
Update pdf_sponge.modules.php
2020-11-14 21:21:58 +01:00
Frédéric FRANCE
9075e30a94
doxygen
2020-11-14 21:19:28 +01:00
Frédéric FRANCE
d6afdda8fe
Update pdf_rouget.modules.php
2020-11-14 21:09:02 +01:00
Frédéric FRANCE
0b097c74fa
Update pdf_merou.modules.php
2020-11-14 21:07:34 +01:00
Frédéric FRANCE
84ea018d81
doxygen
2020-11-14 21:05:53 +01:00
Frédéric FRANCE
c12c0a0d2f
Update pdf_strato.modules.php
2020-11-14 20:50:15 +01:00
Frédéric FRANCE
9c258b5dd4
Update pdf_eratosthene.modules.php
2020-11-14 20:46:49 +01:00
Frédéric FRANCE
e1c148a994
doxygen
2020-11-14 20:44:44 +01:00
Frédéric FRANCE
1db8afb4a9
doxygen
2020-11-14 20:40:17 +01:00
Frédéric FRANCE
a2fc7ce8c9
doxygen
2020-11-14 20:37:54 +01:00
Frédéric FRANCE
50e3fffbd8
doxygen
2020-11-14 20:35:52 +01:00
