Laurent Destailleur
36eaad89aa
Merge pull request #17777 from dolibit-ut/patch-339
...
Update card.php
2021-06-04 10:35:11 +02:00
Laurent Destailleur
7608f0b383
Merge pull request #17778 from tuxgasy/fix_check_stock_with_batch
...
Fix: Do a strict comparison when check if stock is enough
2021-06-04 10:34:29 +02:00
Laurent Destailleur
174c6f8a45
Update mouvementstock.class.php
2021-06-04 10:33:13 +02:00
Laurent Destailleur
2069eeceda
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-04 10:30:02 +02:00
Laurent Destailleur
8c9bec3e3b
Code comment
2021-06-04 10:29:30 +02:00
Laurent Destailleur
47eb2471f1
Merge pull request #17779 from OGPayet/fix/addMissingHooksInSocieteList
...
add missing hooks in societe list.php
2021-06-04 10:10:54 +02:00
Laurent Destailleur
4c592401e6
Merge pull request #17781 from cfoellmann/refuse-note
...
ADD note to supplier order refusal
2021-06-04 10:10:17 +02:00
Laurent Destailleur
402d90554a
Clean code
2021-06-04 10:04:56 +02:00
Laurent Destailleur
9b0605f979
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-06-04 09:41:35 +02:00
Laurent Destailleur
5f74e378a6
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-04 09:39:36 +02:00
Laurent Destailleur
164fe9fb4a
Merge pull request #17786 from FHenry/12_fix_ordersupplierstats
...
FIX: order supplier stats by category now display figures
2021-06-04 09:39:17 +02:00
Laurent Destailleur
6c8341a43f
Merge pull request #17787 from Hystepik/develop#5
...
Fix #17726 : holliday with advanced perms works
2021-06-04 09:37:32 +02:00
Laurent Destailleur
c7e21daee7
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-04 09:36:20 +02:00
Laurent Destailleur
621aa9e6f3
Fix typo
2021-06-04 09:27:33 +02:00
Laurent Destailleur
d8aa7a7f33
Merge pull request #17792 from Hystepik/develop#6
...
Fix #17791 : Error when loading chart of accounts
2021-06-04 09:25:24 +02:00
Laurent Destailleur
935ba6ae18
Merge pull request #17796 from atm-john/13.0_fix_warehouse_id
...
FIX Warehouse id
2021-06-04 09:09:18 +02:00
Laurent Destailleur
81cc8cef75
Merge pull request #17797 from Hystepik/develop#7
...
Fix propal/index.php error on thirdparty display
2021-06-04 09:07:53 +02:00
Laurent Destailleur
d79be7615c
Merge pull request #17799 from atm-john/13.0_fix_wrong_context
...
FIX : wrong hook context
2021-06-04 09:07:02 +02:00
Laurent Destailleur
5e0eef68d0
Merge pull request #17809 from atm-gauthier/fix_status_holiday_list
...
FIX : field name is search_status and not search_statut
2021-06-04 08:59:07 +02:00
Laurent Destailleur
ce64ebc167
Merge pull request #17805 from frederic34/patch-22
...
fix warning
2021-06-04 08:58:53 +02:00
Laurent Destailleur
c39c7d6a81
Merge pull request #17806 from frederic34/patch-23
...
fix warning
2021-06-04 08:58:43 +02:00
Laurent Destailleur
3ae3137eaf
Missing picto
2021-06-04 08:57:48 +02:00
Laurent Destailleur
8ba651bb88
Merge pull request #17812 from frederic34/patch-24
...
fix warning
2021-06-04 08:57:10 +02:00
Laurent Destailleur
a8aacb3150
Merge pull request #17818 from frederic34/setmodetransport
...
debug intracomm report transport mode
2021-06-04 08:41:42 +02:00
Laurent Destailleur
350a421544
Update card.php
2021-06-04 08:41:26 +02:00
Laurent Destailleur
b674835d89
Merge pull request #17813 from frederic34/patch-25
...
fix warning
2021-06-04 08:39:20 +02:00
Frédéric FRANCE
ca66cdad01
debug intracomm report transport mode
2021-06-03 21:47:10 +02:00
Frédéric FRANCE
0b28587e65
fix warnings
2021-06-03 15:28:47 +02:00
Frédéric FRANCE
e83e399cb6
fix warning
2021-06-03 15:19:54 +02:00
Frédéric FRANCE
ee55a5568f
fix warning
2021-06-03 15:14:31 +02:00
Inovea Conseil
c534b7fcce
FIX delete object actionComm
2021-06-03 14:36:47 +02:00
Gauthier PC portable 024
093705a1b5
FIX : field name is search_status and not search_statut
2021-06-03 11:32:41 +02:00
lmarcouiller
71856984a3
Fix #17791 : fix for at account
2021-06-03 09:35:31 +02:00
lmarcouiller
fa71402a9b
Fix 17791 : fix for at account
2021-06-03 09:34:49 +02:00
lmarcouiller
8f7daf7f57
Fix 17791 : fix for at account
2021-06-03 09:32:58 +02:00
lmarcouiller
583acfbad4
Fix #17791 : fix at account
2021-06-03 09:29:12 +02:00
lmarcouiller
aa1ade5224
Fix #17791 : fix for SKR03
2021-06-03 09:13:48 +02:00
Frédéric FRANCE
c3d58ad044
fix warning
2021-06-03 08:36:50 +02:00
Frédéric FRANCE
ef032f9fa0
fix warning
2021-06-03 08:33:44 +02:00
Laurent Destailleur
456356ded7
Fix migration
2021-06-02 18:45:48 +02:00
ATM john
38423ba260
Fix wrong hook context
2021-06-02 16:31:31 +02:00
Laurent Destailleur
1468761073
Fix select
2021-06-02 16:29:38 +02:00
Laurent Destailleur
da7d821a3e
css
2021-06-02 15:32:39 +02:00
lmarcouiller
431691cec4
Fix propal/index.php error on thirdparty display
2021-06-02 15:18:45 +02:00
Laurent Destailleur
db5bcd1b99
Fix css
2021-06-02 13:41:08 +02:00
Laurent Destailleur
b5680a91d0
css
2021-06-02 13:03:20 +02:00
ATM john
3aca9bdb9e
Fix warehouse id
2021-06-02 12:02:27 +02:00
Quentin VIAL-GOUTEYRON
b8b30a9af6
wrong where cabyprodserv
2021-06-02 10:53:04 +02:00
Quentin VIAL-GOUTEYRON
89f6b66c2a
wrong join, request too long
2021-06-02 10:32:30 +02:00
atm-greg
f875bcfe09
update ->nom field if different from ->name
2021-06-02 10:30:48 +02:00
lmarcouiller
6d049f5c2e
Fix #17791 : Error when loading chart of accounts
2021-06-02 09:31:04 +02:00
Christian Foellmann
68579f9cda
fix html linebreak
2021-06-02 08:17:34 +02:00
Laurent Destailleur
33a4c98dc3
Fix popup
2021-06-02 04:34:10 +02:00
Laurent Destailleur
5a260865dc
FIX Creation of reception (missing extrafields). Lose data if error.
...
Conflicts:
htdocs/reception/card.php
2021-06-02 04:23:19 +02:00
Laurent Destailleur
bda42403b2
FIX Creation of reception (missing extrafields). Lose data if error.
2021-06-02 04:15:21 +02:00
ATM john
f13388122c
Add fetch stock order
2021-06-01 21:43:05 +02:00
Laurent Destailleur
49f4de8728
Fix massaction on cron
2021-06-01 16:57:55 +02:00
lmarcouiller
af509742e6
Fix #17726 : holliday with advanced perms works
2021-06-01 16:34:39 +02:00
Florian HENRY
c91b9d613a
FIX: order supplier stats by category now display figures
2021-06-01 15:30:17 +02:00
stickler-ci
3cc65989c1
Fixing style errors.
2021-06-01 07:25:29 +00:00
ATM john
cf9c9ec882
fix condition
2021-06-01 09:07:05 +02:00
ATM john
a5c2ce1727
NEW/FIX : Allow auto picking for child warehouse and taking into account of the quantities already affected in list
2021-06-01 08:45:45 +02:00
Laurent Destailleur
d18c1ea0c0
css
2021-06-01 00:41:51 +02:00
Laurent Destailleur
9d44df8a64
Fix escape
2021-06-01 00:05:43 +02:00
Laurent Destailleur
2dc9ca334f
CSS
2021-05-31 23:36:37 +02:00
Laurent Destailleur
c19f624eb5
Code comment
2021-05-31 16:00:03 +02:00
Laurent Destailleur
0071d63fbb
Fix for ro-md language
2021-05-31 13:35:03 +02:00
Pierre Payet
90ae16372c
add missing hooks in societe list.php
2021-05-31 12:11:16 +02:00
Laurent Destailleur
ffc7ae0389
Fix missing test
2021-05-31 12:02:03 +02:00
TuxGasy
e1de510c38
Do a strict comparison when check if stock is enough
2021-05-31 11:06:52 +02:00
Christian Foellmann
55d48077a3
ADD note to supplier order refusal
2021-05-31 10:45:34 +02:00
UT from dolibit
7aae5be54a
Update card.php
2021-05-31 10:36:43 +02:00
UT from dolibit
fed7878d18
Update card.php
...
$lineid was duplicate
2021-05-31 10:33:36 +02:00
UT from dolibit
a97efdbdfa
Update list.php
...
$title = $langs->trans('Supplier')." - ".$langs->trans('ProductsAndServices');
2021-05-31 10:31:25 +02:00
UT from dolibit
2c6eee2528
Update llx_00_c_country.sql
...
Roumanie -> Romania
Rwanda = Rwanda
Sainte-Hélène -> Saint Helena
Saint-Christophe-et-Niévès -> Saint Kitts and Nevis
Sainte-Lucie -> Saint Lucia
Saint-Pierre-et-Miquelon -> Saint Pierre and Miquelon
Saint-Vincent-et-les-Grenadines -> Saint Vincent and the Grenadines
Samoa = Samoa
Saint-Marin -> San Marino
Sao Tomé-et-Principe -> Saint Thomas and Prince
Serbie -> Serbia
Seychelles = Seychelles
Sierra Leone = Sierra Leone
Slovaquie -> Slovakia
Slovénie -> Slovenia
2021-05-31 10:26:05 +02:00
lmarcouiller
301d6ecd57
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#4
2021-05-31 09:31:58 +02:00
lmarcouiller
ab64f467f5
add of a new param in selectGroupTicket
2021-05-31 09:31:38 +02:00
Laurent Destailleur
ea21e1dbfb
Fix color selection for ticket graph
2021-05-30 20:19:02 +02:00
Laurent Destailleur
356e349944
Fix reposition
2021-05-30 20:01:29 +02:00
Laurent Destailleur
d2bda7ad09
Set a maxlength on fields
2021-05-30 19:01:43 +02:00
Laurent Destailleur
2f969f154e
More examples
2021-05-30 17:10:38 +02:00
Laurent Destailleur
1834d642b3
Fix phpcs
2021-05-30 17:04:12 +02:00
Frédéric FRANCE
baea57ec05
force reload css after activate/desactivate module
2021-05-30 08:38:07 +02:00
Laurent Destailleur
48867c39aa
Fix missing link to edit translation
2021-05-29 04:54:53 +02:00
Laurent Destailleur
ab4941a558
Fix not visible button when missing permission
2021-05-29 02:22:30 +02:00
Laurent Destailleur
4f6385338a
Fix option CAT_HIGH_QUALITY_IMAGES
2021-05-28 18:15:26 +02:00
Florian HENRY
f33869bf1c
fix: uploaddir for productlot
2021-05-28 18:08:01 +02:00
Laurent Destailleur
81a94f5642
FIX option MAIN_GENERATE_SUPPLIER_PROPOSAL_WITH_PICTURE
2021-05-28 18:04:45 +02:00
Laurent Destailleur
94467ea8cf
Fix selection
2021-05-28 17:05:26 +02:00
Laurent Destailleur
1c75ce8862
Code comment
2021-05-28 14:12:22 +02:00
Matthias Haberl
fed5db032a
Fix label of subaccount
2021-05-28 11:26:55 +02:00
Florian HENRY
c4f7a8194c
remove space
2021-05-28 10:32:53 +02:00
Florian HENRY
11bbd2ace3
fix: bad GETPOST test on payment module configuration
2021-05-28 10:31:54 +02:00
lmarcouiller
05a966b93e
Fix of a bug on mass mailing
2021-05-28 10:29:46 +02:00
lmarcouiller
e3a5abe20e
Fix error name of menu knowledge management system
2021-05-28 10:02:48 +02:00
lmarcouiller
e87d175041
Fix inventory/inventory.php
2021-05-28 09:57:21 +02:00
Frédéric FRANCE
ca0654323f
fix warnings
2021-05-27 23:11:05 +02:00
Frédéric FRANCE
d0b8a80c7a
fix warning
2021-05-27 22:56:20 +02:00
Frédéric FRANCE
4c1503a93b
fix warnings
2021-05-27 22:50:56 +02:00
Frédéric FRANCE
0b6457d83f
fix warning
2021-05-27 22:44:05 +02:00
Frédéric FRANCE
e1a427f160
fix warnings
2021-05-27 22:40:26 +02:00
Frédéric FRANCE
3b381dccc3
fix warnings
2021-05-27 22:33:25 +02:00
Frédéric FRANCE
52d44bd75e
fix warnings
2021-05-27 22:28:59 +02:00
daraelmin
4095c69582
Fix #17743 newpayement source membersubscription is member
...
Fix #17743 newpayement source membersubscription is not valid anymore
@eldy I'm not sure, but the bug may still occure with external module referring to membersubscription instead of member.
2021-05-27 21:09:49 +02:00
Frédéric FRANCE
f1b32dce17
Update pdf_canelle.modules.php
2021-05-27 17:07:59 +02:00
Frédéric FRANCE
00d60aa65a
doxygen
2021-05-27 16:54:41 +02:00
Florian HENRY
14fdd4d0c6
fix rollback to rollbac
2021-05-27 16:43:49 +02:00
stickler-ci
dfb2e54750
Fixing style errors.
2021-05-27 14:25:42 +00:00
Frans Bosman
fd2d10d443
Update card.php
2021-05-27 16:23:33 +02:00
Francis Appels
48f5cea917
Fix update receipt eatby
2021-05-27 16:03:17 +02:00
Francis Appels
8ed24d6796
Add missing trigger LINERECEPTION_DELETE
2021-05-27 16:02:12 +02:00
Laurent Destailleur
819e6e1122
Fix duplicate
2021-05-27 14:59:44 +02:00
Laurent Destailleur
a33f6a8977
css
2021-05-27 14:57:16 +02:00
Laurent Destailleur
cc0560c73d
css
2021-05-27 14:47:06 +02:00
Laurent Destailleur
e7f9d317c3
css
2021-05-27 14:45:16 +02:00
Laurent Destailleur
e9cf33dac5
css
2021-05-27 14:35:20 +02:00
Laurent Destailleur
61138b8210
Fix look and feel v14
2021-05-27 14:25:00 +02:00
UT from dolibit
d0a8dc9df9
Update llx_c_chargesociales.sql
...
idea: fk_pays at first - id as second (based on fk_pays)
2021-05-27 13:25:00 +02:00
UT from dolibit
ca7e52d861
Update llx_c_email_templates.sql
...
- formatting
- removed *tms* at eventorganization
2021-05-27 13:09:03 +02:00
stickler-ci
c31530e7ed
Fixing style errors.
2021-05-27 10:24:18 +00:00
Frans Bosman
61753791b4
Update card.php
...
Add Batchinfo on invoice detail lines if hidden feature INCUDE_BATCHINFO_ON_INVOICE is set
2021-05-27 12:20:42 +02:00
Laurent Destailleur
5a5fa1edbb
Fix regression amount was always empty.
2021-05-27 11:57:17 +02:00
Laurent Destailleur
531dee31fd
Fix securekey
2021-05-27 11:16:23 +02:00
Laurent Destailleur
2caaa52e85
Doc
2021-05-27 02:52:51 +02:00
Laurent Destailleur
4f61286ae2
Small perf fix
2021-05-27 02:36:16 +02:00
Laurent Destailleur
240ca50a84
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-05-27 01:53:06 +02:00
Laurent Destailleur
7983ce941e
Fix performance page
2021-05-27 01:52:52 +02:00
Frédéric FRANCE
3ebe6eb014
fix bad setup of MAIN_USE_BACKGROUND_ON_PDF
2021-05-27 00:02:01 +02:00
Frédéric FRANCE
4237b374dd
Update list.php
2021-05-26 23:45:45 +02:00
Frédéric FRANCE
223ece5ca5
Update list.php
2021-05-26 23:43:14 +02:00
Frédéric FRANCE
0d62d3bace
fix warnings
2021-05-26 23:36:36 +02:00
Frédéric FRANCE
879a401724
fix warnings
2021-05-26 20:00:23 +02:00
Frédéric FRANCE
9b51699228
fix warnings
2021-05-26 19:55:47 +02:00
Frédéric FRANCE
60250443a1
fix warning
2021-05-26 18:55:48 +02:00
Frédéric FRANCE
371f2e4f37
fix warnings
2021-05-26 18:24:06 +02:00
Laurent Destailleur
5372912b0b
Merge pull request #17642 from Givriz/dev
...
Compatibility phpv8
2021-05-26 18:22:46 +02:00
Laurent Destailleur
3187c096c3
Merge pull request #17731 from atm-adrien/FIX_add_parameters_for_user_DoActions_hook
...
FIX : Add parameters (object and action) for user list DoActions hook
2021-05-26 17:48:42 +02:00
Laurent Destailleur
9720dddc9f
Merge pull request #17730 from ibuiv/patch-form-fourn-products
...
Fix param in select_produits_fournisseur_list
2021-05-26 17:47:32 +02:00
Laurent Destailleur
9952fdb6d3
FIX #17648 #17712
2021-05-26 17:45:45 +02:00
Laurent Destailleur
8b1b2019f8
Update html.form.class.php
2021-05-26 17:24:27 +02:00
Laurent Destailleur
c3c0ad1c8d
Update html.form.class.php
2021-05-26 17:20:09 +02:00
Antonin MARCHAL
d11d1a2018
lint(stickler)
2021-05-26 17:10:12 +02:00
Adrien Raze
9c83bdff51
FIX : Add parameters (object and action) for user list DoActions hook
2021-05-26 17:02:34 +02:00
Antonin MARCHAL
8dd2af42df
fix(param) select_produits_fournisseur_list
2021-05-26 16:44:35 +02:00
Laurent Destailleur
421681cda4
FIX Navigation in list of holiday
...
Conflicts:
htdocs/holiday/view_log.php
2021-05-26 15:25:44 +02:00
Laurent Destailleur
48945533e4
Clean code
2021-05-26 15:22:56 +02:00
Laurent Destailleur
7c41be7f0a
FIX Navigation in list of holiday
2021-05-26 15:22:49 +02:00
Maxime Kohlhaas
b3a6bcd34f
Fix Winfic accountancy export for due date
2021-05-26 15:01:31 +02:00
Maxime Kohlhaas
1d5b8cbb19
Fix Quadra accountancy export for due date
2021-05-26 14:59:28 +02:00
Laurent Destailleur
38ef028310
Clean code. Fix check for lot that must be unique.
2021-05-26 12:44:15 +02:00
Laurent Destailleur
83fdc2841a
Merge pull request #17725 from frederic34/patch-7
...
fix warning
2021-05-26 10:55:47 +02:00
Dorian Vabre
fe6b25ede6
fix on $value
2021-05-26 09:48:13 +02:00
Frédéric FRANCE
60196c0417
Update card.php
2021-05-26 08:53:17 +02:00
Frédéric FRANCE
9a51333662
fix warning
2021-05-26 08:49:54 +02:00
Frédéric FRANCE
eec254f066
fix warning
2021-05-26 08:42:35 +02:00
Laurent Destailleur
156279d6a1
Fix nojs
2021-05-26 00:34:52 +02:00
Laurent Destailleur
80c5aa7271
Merge pull request #17722 from frederic34/patch-10
...
Update api_stockmovements.class.php
2021-05-26 00:31:28 +02:00
Laurent Destailleur
8302ad4490
Merge pull request #17721 from frederic34/patch-9
...
fix warning
2021-05-26 00:31:03 +02:00
Laurent Destailleur
3e049479c7
Merge pull request #17718 from frederic34/patch-7
...
fix status/percent
2021-05-26 00:30:33 +02:00
Laurent Destailleur
f839ea9059
Merge pull request #17720 from frederic34/patch-8
...
fix warning
2021-05-26 00:30:07 +02:00
Laurent Destailleur
27d9606ca8
Merge pull request #17719 from frederic34/patch-5
...
fix warnings
2021-05-26 00:29:56 +02:00
Frédéric FRANCE
429ebe6662
Update api_stockmovements.class.php
2021-05-25 23:49:49 +02:00
Laurent Destailleur
94c8246f68
Debug v14
2021-05-25 23:30:06 +02:00
Laurent Destailleur
f9d6438bae
Debug v14
2021-05-25 23:26:03 +02:00
Frédéric FRANCE
8221011d7d
Update list.php
2021-05-25 23:22:43 +02:00
Frédéric FRANCE
e316437a0e
fix warning
2021-05-25 23:20:55 +02:00
Frédéric FRANCE
4067ac19dc
fix warning
2021-05-25 23:17:34 +02:00
Frédéric FRANCE
1662d4a829
fix warnings
2021-05-25 23:14:36 +02:00
Laurent Destailleur
f252748dbf
Merge pull request #17343 from atm-gauthier/develop_new_collapse_batch_detail
...
NEW : collapse batch detail
2021-05-25 23:04:50 +02:00
Frédéric FRANCE
9e3de39245
fix status/percent
...
in sql it is a.datep as dp, not datep
2021-05-25 23:00:21 +02:00
Laurent Destailleur
c75da78a22
Merge pull request #17717 from frederic34/comm_action_card
...
fix warnings
2021-05-25 22:54:41 +02:00
Laurent Destailleur
a22a659d6e
Merge pull request #17716 from frederic34/patch-5
...
fix allowed preview
2021-05-25 22:53:28 +02:00
Laurent Destailleur
8576cf1b72
Fix combo when we must no hide value with key -1
2021-05-25 22:51:37 +02:00
Frédéric FRANCE
332d8c9105
fix warnings
2021-05-25 22:24:46 +02:00
Frédéric FRANCE
4c698ce798
Update html.form.class.php
2021-05-25 22:11:30 +02:00
Frédéric FRANCE
c76cf60e15
Update html.form.class.php
2021-05-25 22:09:58 +02:00
Laurent Destailleur
8f9de222c1
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-05-25 21:53:56 +02:00
Laurent Destailleur
9aee8a2a0b
FIX #17406
2021-05-25 21:53:44 +02:00
Laurent Destailleur
9b2fb74dca
Merge pull request #17635 from FHenry/fix_13_cyan_salesman_as_note
...
fix : hidden option MAIN_ADD_CREATOR_IN_NOTE should use dol_concatdesc rather than php concat oparator
2021-05-25 21:40:12 +02:00
Laurent Destailleur
bad90240bc
Update pdf_cyan.modules.php
2021-05-25 21:39:50 +02:00
Laurent Destailleur
2ac9099e7d
Merge pull request #17618 from piernov/12.0-fix-addUserToGroupLDAP
...
Fix add/del user to group modifies LDAP group
2021-05-25 21:23:17 +02:00
Laurent Destailleur
4b47611e23
Debug v14
2021-05-25 21:21:09 +02:00
Laurent Destailleur
c7a56e3f99
Merge pull request #17690 from Givriz/dev_1
...
Compatibility phpv8
2021-05-25 20:36:56 +02:00
Laurent Destailleur
714334c585
Merge pull request #17698 from OPEN-DSI/new-translate-order-supplier
...
NEW translate supplier order menus and button
2021-05-25 20:34:17 +02:00
Laurent Destailleur
988660025a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-05-25 20:32:42 +02:00
Laurent Destailleur
a09db63c7b
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/balance.php
htdocs/contrat/list.php
htdocs/don/class/api_donations.class.php
htdocs/societe/class/societe.class.php
2021-05-25 20:17:54 +02:00
Laurent Destailleur
98d60870d5
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-05-25 20:12:46 +02:00
Laurent Destailleur
1b5f7b78b5
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-05-25 20:12:34 +02:00
Laurent Destailleur
307c5cb276
Merge pull request #17702 from r3dge/13.0
...
bug fix : replacing orders by donations and setting required field to…
2021-05-25 20:12:07 +02:00
Laurent Destailleur
0d31db0ba5
Update don.class.php
2021-05-25 20:11:46 +02:00
Laurent Destailleur
80e77f597d
Merge pull request #17701 from FHenry/13.0_fix_formconfirm
...
fix: formconfim if type radio must be :checked to get correct value
2021-05-25 20:03:10 +02:00
Laurent Destailleur
673eb73d0a
Merge branch 'develop' into dev_1
2021-05-25 19:55:31 +02:00
Laurent Destailleur
3dfb22b05e
Update task.class.php
2021-05-25 19:54:09 +02:00
Laurent Destailleur
9d6e93fd01
Update security.php
2021-05-25 19:50:53 +02:00
Laurent Destailleur
2b8e1cb46b
Merge pull request #17697 from dolibit-ut/patch-333
...
Update llx_00_c_country.sql
2021-05-25 19:48:35 +02:00
stickler-ci
708deaac00
Fixing style errors.
2021-05-25 17:47:28 +00:00
Laurent Destailleur
67372ff7d4
Merge branch 'develop' into patch-1
2021-05-25 19:45:56 +02:00
Laurent Destailleur
f1169a4f22
Merge pull request #17705 from andreubisquerra/master
...
FIX Search bug when hide product images in TakePOS
2021-05-25 19:39:35 +02:00
Laurent Destailleur
daababb97f
Update index.php
2021-05-25 19:39:06 +02:00
Laurent Destailleur
2cb8401921
Merge pull request #17695 from aspangaro/14b10
...
NEW Add hook on balance list
2021-05-25 19:38:24 +02:00
Laurent Destailleur
6d637bf1e1
Merge pull request #17707 from FHenry/12_fix_export_balance
...
fix: export balance with double quote
2021-05-25 19:36:57 +02:00
Laurent Destailleur
40a6159bb8
Merge pull request #17714 from Hystepik/develop#3
...
Fix #11882 : fix of module opensurvey for datesurvey
2021-05-25 19:32:20 +02:00
lmarcouiller
263f1c8101
Fix #11882 : fix of module opensurvey for datesurvey
2021-05-25 17:26:56 +02:00
Laurent Destailleur
b9de8561a9
Fix regression
2021-05-25 15:59:36 +02:00
Laurent Destailleur
d18fc6ca3c
Fix init
2021-05-25 15:38:12 +02:00
Laurent Destailleur
a840afa72a
Fix missing entry into table
2021-05-25 15:24:28 +02:00
Laurent Destailleur
71b35ef0e5
Fix regression - can't reset parent company
2021-05-25 12:11:06 +02:00
Laurent Destailleur
fb6aea72b8
Fix syntax error
2021-05-25 12:06:29 +02:00
Laurent Destailleur
857be16e12
Log
2021-05-25 12:03:38 +02:00
Laurent Destailleur
fedf7645b1
Fix regression, can't reset parent company.
2021-05-25 12:02:33 +02:00
Laurent Destailleur
97154f8267
Fix timezone into widgets
2021-05-25 00:29:32 +02:00
Laurent Destailleur
dd48c3ee9d
Remove deprecated __REFCLIENT__ (Replaced with __REF_CLIENT__)
2021-05-25 00:08:06 +02:00
Laurent Destailleur
bb64a25638
Fix CWE-269 - huntr - Fix set of email without edit user permission
2021-05-24 22:11:24 +02:00
Laurent Destailleur
31af74f852
FIX CWE-269 - huntr - Can download files of an agenda event
2021-05-24 20:07:04 +02:00
Laurent Destailleur
d4310f49c4
FIX CWE-79 - huntr - Fix option MAIN_ALLOW_SVG_FILES_AS_IMAGES
2021-05-24 19:46:19 +02:00
Laurent Destailleur
cdf3b7f9a8
Fix responsive
2021-05-24 19:05:25 +02:00
piernov
60176f7f5e
Fix add/del user to group modifies LDAP group
...
Adding or removing a user from a group modifies the user object on Dolibarr's side.
In LDAP however, members of a group are stored in the group itself.
Therefore group must be updated after adding/removing a user from it.
Update group in LDAP with new list of users at the end of USER_MODIFY trigger.
2021-05-24 18:01:27 +02:00
Florian HENRY
7d223beae5
fix: export balance with doublequote
2021-05-24 12:51:58 +02:00
r3dge
647997af28
fixing error on date
2021-05-23 18:15:00 +02:00
r3dge
f81136231a
fixing PUT request for donation update
2021-05-23 18:09:10 +02:00
jove@bisquerra.com
83245d321b
FIX Search bug when hide product images
2021-05-23 09:55:01 +02:00
gmilad
89f150dd95
Fix #16100 Update utils.class.php
...
Fix #16100
End French Forum :
https://www.dolibarr.fr/forum/t/erreur-sauvegarde-dump-base-de-donnees/35009/7
2021-05-22 21:28:45 +02:00
TuxGasy
2fdd8486c9
No try to translate label field in dictionary for new
2021-05-22 06:13:16 +02:00
Laurent Destailleur
a0418fc17d
FIX CWE-269 huntr - download of files of project
2021-05-21 18:53:09 +02:00
Laurent Destailleur
4df70dc3f4
Fix CWE-269 huntr
2021-05-21 16:22:45 +02:00
Dorian Vabre
12d10adc17
Merge branch 'dev_EventOrganizer_suggest' of github.com:DorianVabre/dolibarr into dev_EventOrganizer_suggest
2021-05-21 16:02:22 +02:00
Dorian Vabre
fe272d3292
wip name of contact to add on ics file
2021-05-21 16:01:44 +02:00
r3dge
67cab8c1f2
bug fix : replacing orders by donations and setting required field to allow post action in rest API for url donations. See issue #17700
2021-05-21 16:01:04 +02:00
Laurent Destailleur
11fa523070
FIX CWE-269
2021-05-21 15:54:11 +02:00
Florian HENRY
609d405685
fix: formconfim if type radio must be :checked to get correct value
2021-05-21 15:38:03 +02:00
lvessiller
38bd595ebd
NEW translate supplier order menus and button
2021-05-21 14:18:46 +02:00
Laurent Destailleur
b5af3b17d5
Update doc
2021-05-21 14:03:52 +02:00
UT from dolibit
a5001899eb
Update llx_00_c_country.sql
...
Nouvelle-Calédonie -> New Caledonia
Nouvelle-Zélande -> New Zealand
Nicaragua = Nicaragua
Niger = Niger
Nigeria = Nigeria
Nioué -> Niue
Ile Norfolk -> Norfolk Island
Mariannes du Nord -> Northern Mariana Islands
Norvège -> Norway
Oman = Oman
Pakistan = Pakistan
Palaos -> Palau
Territoire Palestinien Occupé -> Palestinian territories
Panama = Panama
Papouasie-Nouvelle-Guinée -> Papua New Guinea
Paraguay = Paraguay
Peru = Peru
Philippines = Philippines
Iles Pitcairn -> Pitcairn Islands
Pologne -> Poland
Porto Rico -> Puerto Rico
Qatar = Qatar
2021-05-21 13:32:09 +02:00
Laurent Destailleur
fbe491c4da
FIX CWE-79 huntr
2021-05-21 12:17:56 +02:00
Alexandre SPANGARO
ac9d9e9314
NEW Add hook on balance list
2021-05-21 07:04:58 +02:00
Laurent Destailleur
cfd035e1de
css
2021-05-20 21:25:36 +02:00
Laurent Destailleur
7833ac8fb0
Code comment
2021-05-20 17:53:28 +02:00
stickler-ci
6f050fc23a
Fixing style errors.
2021-05-20 15:48:04 +00:00
Givriz
0c5a934e10
Compatibility phpv8
2021-05-20 17:40:44 +02:00
Dorian Vabre
bbce806cb5
typo
2021-05-20 17:32:48 +02:00
Dorian Vabre
83555da795
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganizer_suggest
2021-05-20 17:26:07 +02:00
Dorian Vabre
720a368b29
link ics ok (todo: add name of speaker)
2021-05-20 17:24:27 +02:00
Laurent Destailleur
c561669edf
Code comment
2021-05-20 17:02:22 +02:00
Dorian Vabre
ab4ae85eb8
fix: getpost exportagenda apha to alpha
2021-05-20 16:33:04 +02:00
Dorian Vabre
df81ac8622
wip
2021-05-20 16:30:49 +02:00
Dorian Vabre
307ab92bc0
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganizer_suggest
2021-05-20 16:13:42 +02:00
Laurent Destailleur
625aab34d6
Fix phpcs
2021-05-20 15:30:33 +02:00
Laurent Destailleur
eb0f4d9765
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-05-20 15:26:26 +02:00
Laurent Destailleur
93501a1147
Fix phpcs
2021-05-20 15:25:56 +02:00
Laurent Destailleur
3359ae93d8
Merge pull request #17654 from atm-adrien/FIX_missing_hooks
...
FIX : Missing hook in cibles.php (for mailing)
2021-05-20 15:24:12 +02:00
Laurent Destailleur
5191a419d3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-05-20 15:05:55 +02:00
Laurent Destailleur
45bc686f7f
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/product/price.php
2021-05-20 15:05:30 +02:00
Laurent Destailleur
04e9f2c988
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/admin/translation.php
2021-05-20 15:00:39 +02:00
Laurent Destailleur
93558d5bbb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2021-05-20 14:58:57 +02:00
Laurent Destailleur
865ecf7a94
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/admin/translation.php
2021-05-20 14:58:50 +02:00
Laurent Destailleur
91f85abb7e
Fix only comment to understand code are allowed
2021-05-20 14:55:37 +02:00
Laurent Destailleur
7a24d6399b
Merge pull request #17680 from SylvainLegrand/13.0
...
avoid an infinite loop between a parent company and a branch when updating customer rates
2021-05-20 14:54:28 +02:00
Laurent Destailleur
28487fac12
Create societe.class.php
2021-05-20 14:53:50 +02:00
stickler-ci
94ca682cbf
Fixing style errors.
2021-05-20 12:51:53 +00:00
Laurent Destailleur
b64c307358
Update societe.class.php
2021-05-20 14:50:02 +02:00
Laurent Destailleur
890d0f8040
Update societe.class.php
2021-05-20 14:38:24 +02:00
Laurent Destailleur
5eeb7d474c
Merge pull request #17655 from ATM-Consulting/FIX_13.0_wrong_error_message_MAIN_DISABLE_ALL_MAILS
...
FIX 13.0 - wrong error message for mail sending failure
2021-05-20 14:33:40 +02:00
Laurent Destailleur
e6e6574cb8
Merge pull request #17667 from aspangaro/11p1
...
FIX wrong variable fk_code_ventilation register for addline
2021-05-20 14:31:52 +02:00
Laurent Destailleur
90443e26ac
Merge pull request #17660 from gmilad/gmilad-fix-17608-b11
...
Fix issue #17608 for branch 11
2021-05-20 14:30:30 +02:00
Laurent Destailleur
4c1e6afe2c
Merge pull request #17664 from Givriz/dev_1
...
Compatibility phpv8
2021-05-20 14:29:18 +02:00
Laurent Destailleur
30ab0b05b7
Update list.php
2021-05-20 14:28:43 +02:00
Laurent Destailleur
eec1fefaa5
Update list.php
2021-05-20 14:25:54 +02:00
Laurent Destailleur
2604b8f9b5
Update list.php
2021-05-20 14:18:00 +02:00
Laurent Destailleur
b71eb6b75e
Merge pull request #17668 from atm-john/13.0_fix_dirt
...
FIX : Remove forgotten echo
2021-05-20 14:14:25 +02:00
Laurent Destailleur
a0dc991fb1
Merge pull request #17672 from dolibit-ut/patch-331
...
Update llx_00_c_country.sql
2021-05-20 14:13:58 +02:00
Laurent Destailleur
1414a24fdd
Merge pull request #17671 from dolibit-ut/patch-330
...
Update llx_20_c_departements.sql
2021-05-20 14:13:35 +02:00
Laurent Destailleur
854292b77e
Merge pull request #17665 from frederic34/patch-4
...
Fix issue when loading external libs (pb with autoloader conflict and luracast)
2021-05-20 14:06:27 +02:00
Laurent Destailleur
afd9c09c8f
Merge pull request #17685 from FHenry/dev_fix_search_filter_company_Var
...
fix: change societe by company varaible name in all file
2021-05-20 13:54:01 +02:00
Laurent Destailleur
c80c261db5
Merge pull request #17684 from FHenry/dev_fix_inventorylink_into_stockmvt
...
add inventory link into mvt stock list
2021-05-20 13:52:54 +02:00
Laurent Destailleur
1ada0ddcb1
Merge pull request #17682 from frederic34/patch-5
...
complete tooltip product
2021-05-20 13:52:25 +02:00
Florian HENRY
5e6d6ccf67
same bug on invoie list
2021-05-20 13:45:52 +02:00
Florian HENRY
d83dbd1922
fix: on mass action confirm box tag filter must not make LEFT JOIN
2021-05-20 13:24:30 +02:00
Florian HENRY
7874be6e37
bad comment remove
2021-05-20 12:48:18 +02:00
Florian HENRY
d93cf0beb7
fix: change societe by company varaible name in all file
2021-05-20 12:36:26 +02:00
Florian HENRY
1e6f3d0624
add inventory link into mvt stock list
2021-05-20 12:30:02 +02:00
Laurent Destailleur
a3c28edfbb
Fix regenerate wrapper when rebuilding cache
2021-05-20 10:34:49 +02:00
Laurent Destailleur
1a8b10328f
Fix title of rss file
2021-05-20 10:07:50 +02:00
Laurent Destailleur
dc3b5846fb
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-05-20 09:24:09 +02:00
Laurent Destailleur
dbd7292cd6
Replace doubleval into floatval
2021-05-20 09:22:55 +02:00
Laurent Destailleur
03c81acb42
Merge pull request #17676 from dolibit-ut/patch-332
...
Update mo_agenda.php
2021-05-20 09:18:16 +02:00
Laurent Destailleur
7390f4653a
Merge pull request #17674 from frederic34/phpcs_enable
...
fix phpcs was disabled
2021-05-20 09:18:00 +02:00
Frédéric FRANCE
c8b1eb180a
doxygen
2021-05-20 08:50:15 +02:00
Frédéric FRANCE
0d8c75268e
Update card.php
2021-05-19 23:32:14 +02:00
Frédéric FRANCE
b214fcb5e0
complete tooltip product
2021-05-19 23:29:35 +02:00
Laurent Destailleur
20c3ebeb51
Make SimplePOS deprecated
2021-05-19 19:46:46 +02:00
Sylvain Legrand
70c85cfd72
Merge branch '13.0' of https://github.com/SylvainLegrand/dolibarr into 13.0
2021-05-19 19:09:27 +02:00
Sylvain Legrand
a3d1b49c65
Error in list when using alias name of thirdparty
2021-05-19 19:08:58 +02:00
stickler-ci
b5ac78d9a0
Fixing style errors.
2021-05-19 16:56:52 +00:00
Sylvain Legrand
8a9c21c642
Update societe.class.php
2021-05-19 18:47:07 +02:00
UT from dolibit
50637ab76b
Update mo_agenda.php
2021-05-19 16:07:27 +02:00
Frédéric FRANCE
83521311dc
fix phpcs was disabled
2021-05-19 15:48:08 +02:00
Laurent Destailleur
217ee260c2
css
2021-05-19 15:11:47 +02:00
Laurent Destailleur
cf0da5cee7
css
2021-05-19 15:00:44 +02:00
Laurent Destailleur
fdf6dd2d9c
css
2021-05-19 14:50:41 +02:00
Laurent Destailleur
3550fa2be4
Fix css
2021-05-19 14:48:30 +02:00
Laurent Destailleur
92ccf5982a
Fix responsive
2021-05-19 14:38:39 +02:00
lvessiller
e2e6d4ba14
FIX keep special code on supplier order lines for external modules
2021-05-19 14:29:46 +02:00
Laurent Destailleur
8f5c898dae
CSS
2021-05-19 14:13:42 +02:00
Laurent Destailleur
173ef6e877
Look and feel v14
2021-05-19 14:04:01 +02:00
UT from dolibit
f9fb296ea6
Update llx_00_c_country.sql
...
République Tchèque -> Czech Republic
Danemark -> Denmark
Djibouti = Djibouti
Dominique -> Dominica
République Dominicaine -> Dominican Republic
Equateur -> Republic of Ecuador
Egypte -> Egypt
Salvador -> El Salvador
Guinée Equatoriale -> Equatorial Guinea
Erythrée -> Eritrea
2021-05-19 13:59:36 +02:00
Laurent Destailleur
a8d36a3a55
Debug v14
2021-05-19 13:56:13 +02:00
UT from dolibit
82e819d059
Update llx_20_c_departements.sql
...
USA
2021-05-19 13:43:13 +02:00
Laurent Destailleur
026cc1b35a
Debug for smartphone
2021-05-19 13:21:09 +02:00
Laurent Destailleur
58ffee193f
Debug v14
2021-05-19 13:07:25 +02:00
Laurent Destailleur
e472d2d5d1
Fix bad permission position for external modules
2021-05-19 12:44:26 +02:00
Laurent Destailleur
059c286262
css
2021-05-19 12:19:18 +02:00
Laurent Destailleur
75f7ab41f0
css
2021-05-19 12:13:21 +02:00
Laurent Destailleur
90835eaab4
css
2021-05-19 12:08:17 +02:00
ATM john
3bf71d456d
fix doc
2021-05-19 12:01:47 +02:00
ATM john
1512abf96a
Remove hpcs:disable
2021-05-19 12:00:27 +02:00
Laurent Destailleur
7b4ed859eb
css
2021-05-19 11:57:12 +02:00
ATM john
9219dcfecb
Fix price log spam
2021-05-19 11:52:34 +02:00
Laurent Destailleur
78cf2b59c8
Debug feature copy-paste on smarpthone
2021-05-19 11:47:58 +02:00
ATM john
5fd02992c0
Remove forgotten echo
2021-05-19 10:26:04 +02:00
Alexandre SPANGARO
f86e10b453
FIX wrong variable fk_code_ventilation register for addline
2021-05-19 06:37:02 +02:00
Frédéric FRANCE
dffb244776
Update AutoLoader.php
2021-05-18 21:04:43 +02:00
Laurent Destailleur
4d42235670
Complete experimental module knowledge management
2021-05-18 20:46:14 +02:00
Givriz
1cf7d0cee7
Compatibility phpv8
2021-05-18 20:13:26 +02:00
gmilad
4bb18db905
Fix issue #17608 for branch 11
...
Fix issue #17608 for branch 11
2021-05-18 19:53:35 +02:00
gmilad
57732d4265
Fix issue #17608 for branch 10
...
Fix issue #17608 for branch 10
2021-05-18 19:45:15 +02:00
Laurent Destailleur
8e39eff180
Look and feel v14
2021-05-18 18:18:00 +02:00
Florian Mortgat
6cccd77508
FIX 13.0 - error message says MAIN_DISABLE_ALL_MAILS is set when it isn't + unhandled swiftmailer error (failed recipients due to RFC 2822 non-compliance)
2021-05-18 17:57:23 +02:00
Laurent Destailleur
f99b1b261a
Fix phpcs
2021-05-18 17:25:31 +02:00
Laurent Destailleur
271ba884db
css
2021-05-18 17:24:17 +02:00
Laurent Destailleur
a00ae6c918
css
2021-05-18 17:00:20 +02:00
Laurent Destailleur
ba595d8b74
Minor fix
2021-05-18 16:56:57 +02:00
Laurent Destailleur
2974a23332
css
2021-05-18 16:54:31 +02:00
Laurent Destailleur
a829d8cedc
css
2021-05-18 16:31:59 +02:00
Laurent Destailleur
f3803bab91
Responsive
2021-05-18 16:28:30 +02:00
Damien BENOIT
38a5dfb263
Update listevents.php
...
Added $optioncss
2021-05-18 15:26:55 +02:00
Damien BENOIT
e7ac39fe35
Update modules.php
...
Added $param
2021-05-18 15:23:29 +02:00
Adrien Raze
90d159fbc3
FIX : Missing hook in cibles.php (for mailing)
2021-05-18 14:58:46 +02:00
Laurent Destailleur
fbaba3b81b
css
2021-05-18 14:13:08 +02:00
Laurent Destailleur
c2cb055b0a
Fix look and feel v14
2021-05-18 14:00:29 +02:00
Laurent Destailleur
7569275d28
Fix generation of invoice
2021-05-18 13:36:07 +02:00
Laurent Destailleur
74f35177ff
Fix group by
2021-05-18 13:20:14 +02:00
Laurent Destailleur
303d60a0bd
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-05-18 12:45:34 +02:00
Laurent Destailleur
0c4884bb2c
Fix sql error
2021-05-18 12:44:56 +02:00
Laurent Destailleur
40ed79aa06
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-05-18 12:44:10 +02:00
Laurent Destailleur
5babd107a0
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/replenish.php
2021-05-18 12:43:52 +02:00
Laurent Destailleur
23514c957c
Merge pull request #17641 from WimpyMan/fix_sql_projects
...
html.form.class.php: Fixed SQL error (projects)
2021-05-18 12:36:18 +02:00
Laurent Destailleur
495d2e79f4
Update html.form.class.php
2021-05-18 12:35:30 +02:00
Laurent Destailleur
2ef713bd5f
Merge branch 'develop' into look_feel_user_author_list
2021-05-18 12:27:30 +02:00
Laurent Destailleur
a34401aacb
Merge pull request #17646 from aspangaro/14b10
...
FIX Social contrib. - Missing language file
2021-05-18 12:16:14 +02:00
Laurent Destailleur
7b9161ec63
Merge pull request #17644 from bb2a/thirdparty_infos_list
...
Add popup thirdparty info in list
2021-05-18 12:15:51 +02:00
Laurent Destailleur
7ececbb174
Merge pull request #17645 from aspangaro/14b9
...
Fix Title salary
2021-05-18 12:12:40 +02:00
Laurent Destailleur
6d34c34cb5
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/product/stock/replenish.php
2021-05-18 12:11:33 +02:00
Laurent Destailleur
6b12dd4143
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-05-18 12:02:52 +02:00
Laurent Destailleur
6170b28c3b
FIx #17651
2021-05-18 11:58:49 +02:00
Laurent Destailleur
2771d50ffe
code comment
2021-05-18 11:55:56 +02:00
Gauthier PC portable 024
078fc892a2
FIX : cast int
2021-05-18 09:01:55 +02:00
Alexandre SPANGARO
9b0988e7be
FIX Social contrib. - Missing language file
2021-05-18 08:40:28 +02:00
Alexandre SPANGARO
90d7a851b4
Merge remote-tracking branch 'upstream/develop' into 14b9
2021-05-18 04:19:54 +02:00
Laurent Destailleur
f51e892a97
Fix phpcs
2021-05-18 02:06:35 +02:00
Laurent Destailleur
b6dbe45242
Fix permissions on page to move position of file
2021-05-18 01:58:54 +02:00
Anthony Berton
6fe9fe330d
delete fetch
2021-05-17 23:54:31 +02:00
Laurent Destailleur
ba0e95a4ff
FIX huntr CWE-79
2021-05-17 23:47:16 +02:00
Anthony Berton
58db723502
thirdparty info popup list
2021-05-17 23:27:33 +02:00
Alexandre SPANGARO
91b8b6a600
Fix Title salary info card
2021-05-17 22:41:00 +02:00
Alexandre SPANGARO
c3c760c269
Fix Title salary document card
2021-05-17 22:18:46 +02:00
Alexandre SPANGARO
4236471a6f
Fix Title salary card
2021-05-17 22:12:01 +02:00
Laurent Destailleur
de6134965b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-05-17 19:50:19 +02:00
Laurent Destailleur
cc1f98329d
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/dict.php
htdocs/product/stock/replenish.php
htdocs/ticket/card.php
htdocs/user/class/api_users.class.php
2021-05-17 19:50:10 +02:00
Laurent Destailleur
d3ece31969
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/user/class/api_users.class.php
2021-05-17 19:29:03 +02:00
Laurent Destailleur
df2297bca3
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/user/class/api_users.class.php
2021-05-17 19:21:58 +02:00
Laurent Destailleur
a865f49d72
Fix phpcs
2021-05-17 19:19:26 +02:00
Givriz
6bbd6db84b
Compatibility phpv8
2021-05-17 18:39:08 +02:00
Bastien Schils
1a38d075a6
html.form.class.php: Fixed SQL error (projects)
...
1. Strings should be quoted by single quotes
2. GROUP BY declaration must list all fields from SELECT statement
2021-05-17 18:35:50 +02:00
Anthony Berton
31cd71d8a3
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into look_feel_user_author_list
2021-05-17 18:34:41 +02:00
Anthony Berton
9dcf2044a9
Update list.php
2021-05-17 18:33:27 +02:00
Anthony Berton
0b7f474dd3
look_feel user author in list
2021-05-17 18:04:21 +02:00
Laurent Destailleur
51a8ef8853
Merge pull request #17638 from bb2a/add_infos_user_popup
...
Modif info in user popup info
2021-05-17 16:30:41 +02:00
Laurent Destailleur
d888e4b3bf
Merge pull request #17385 from Givriz/dev_1
...
Compatibility phpv8
2021-05-17 16:29:49 +02:00
Laurent Destailleur
caea6f8d6c
Update listevents.php
2021-05-17 16:29:00 +02:00
Laurent Destailleur
caf1c625a3
Update listevents.php
2021-05-17 16:28:19 +02:00
Laurent Destailleur
c8758c53d2
Update listevents.php
2021-05-17 16:27:14 +02:00
Laurent Destailleur
68fe68b844
Update listevents.php
2021-05-17 16:25:25 +02:00
Laurent Destailleur
3c9d8bc931
Fix perms on API user
2021-05-17 16:17:03 +02:00
Laurent Destailleur
c54e010126
Fix perms on API user
2021-05-17 16:16:45 +02:00
Anthony Berton
9bde70feba
Update user.class.php
2021-05-17 16:08:48 +02:00
Laurent Destailleur
c0274e74ed
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-05-17 15:52:48 +02:00
Florian HENRY
6f3d19b7b6
dol_concatdesc better than concat operator
2021-05-17 15:12:25 +02:00
Antonin MARCHAL
779c868eae
fix mistake and removed hookmanager unused
2021-05-17 13:48:21 +02:00
Laurent Destailleur
bffdc8fa95
Merge pull request #17587 from FHenry/dev_fix_sale_top_menu_supplieronly
...
fix: when only supplier module is Active top menu should be displayed
2021-05-17 13:48:03 +02:00
Laurent Destailleur
4a488ad60a
Update eldy.lib.php
2021-05-17 13:47:48 +02:00
Antonin MARCHAL
c6aa078892
renamed LibStatut hook + removed useless hook
2021-05-17 13:46:01 +02:00
Laurent Destailleur
4e5a3a22c8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-05-17 13:36:48 +02:00
Laurent Destailleur
7d82a20995
Add missing property
2021-05-17 13:36:27 +02:00
Laurent Destailleur
0121150e02
Merge pull request #17631 from fappels/14_reception
...
Fix: Add test to delete supplier order if reception exist
2021-05-17 13:22:34 +02:00
stickler-ci
a3aba28c95
Fixing style errors.
2021-05-17 10:06:41 +00:00
Francis Appels
c3bea1b46e
Fix: Add test to delete supplier order if reception exist
2021-05-17 12:00:56 +02:00
Dorian Vabre
547f1dd370
Fix: user rest api rights
2021-05-17 11:54:53 +02:00
Florian HENRY
f95bd2f439
fixw that
2021-05-17 11:40:36 +02:00
Laurent Destailleur
1b25c4daa0
Fix phpcs
2021-05-17 11:29:51 +02:00
Laurent Destailleur
f25c57b1f6
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-05-17 11:26:43 +02:00
Laurent Destailleur
6402ef9496
Fix colors
2021-05-17 11:26:31 +02:00
Laurent Destailleur
082ae2e627
Fix trans
2021-05-17 11:11:17 +02:00
Laurent Destailleur
b2ba1f5540
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/admin/dict.php
htdocs/product/stock/replenish.php
2021-05-17 10:47:00 +02:00
Laurent Destailleur
985301939d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-05-17 10:31:25 +02:00
Laurent Destailleur
35c27b8eb8
Merge pull request #17588 from frederic34/completeTabHead
...
add sample completeTabHead for template modulebuilder
2021-05-17 10:29:51 +02:00
Laurent Destailleur
d0c634a99c
Merge pull request #17489 from Hystepik/develop#1
...
Fix #17475 : Add of List-Unsubscribe in mass emailing
2021-05-17 10:23:21 +02:00
Ferran Marcet
f923c70f38
Fix: Before there was no mistake
2021-05-17 10:17:54 +02:00
Laurent Destailleur
21896370a6
Merge pull request #17528 from bb2a/phone_head_document
...
Add phone and address in popup Thirdparty info
2021-05-17 10:16:49 +02:00
Laurent Destailleur
261414cb7f
Update societe.class.php
2021-05-17 10:16:33 +02:00
Laurent Destailleur
1093e66d26
Update societe.class.php
2021-05-17 10:14:14 +02:00
Laurent Destailleur
296c1c2978
Merge pull request #17583 from AisukoWasTaken/develop
...
Fix SQL error for Panama Provinces
2021-05-17 10:09:15 +02:00
Laurent Destailleur
979b66177d
Merge pull request #17589 from dolibit-ut/patch-321
...
Update llx_00_c_country.sql
2021-05-17 10:07:23 +02:00
Laurent Destailleur
6217d83846
Merge pull request #17599 from fbagnol/develop
...
Add soc in categories contacts list
2021-05-17 09:54:26 +02:00
Laurent Destailleur
f95f0748e3
Update viewcat.php
2021-05-17 09:54:04 +02:00
Laurent Destailleur
fd6147578a
Merge pull request #17611 from atm-maxime/fix/supplier_discount_replenish
...
Fix use supplier relative discount in replenish order creation
2021-05-17 09:44:39 +02:00
Laurent Destailleur
2f9a504dce
Fix label
2021-05-17 09:30:09 +02:00
Laurent Destailleur
7bb71dd89f
FIX #17602
2021-05-17 09:25:18 +02:00
Florian HENRY
6ffbc2744e
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_fix_sale_top_menu_supplieronly
2021-05-17 09:22:51 +02:00
Laurent Destailleur
c013a22008
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-05-17 09:20:40 +02:00
Laurent Destailleur
88d1ce7e49
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-05-17 09:19:39 +02:00
Laurent Destailleur
af2f40cc18
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/admin/dict.php
2021-05-17 09:19:31 +02:00
Laurent Destailleur
892a38e681
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-05-17 09:15:21 +02:00
Laurent Destailleur
592cfb5e93
Merge pull request #17602 from fmarcet/11.0
...
FIX: Impossible to add multiple localtax2
2021-05-17 09:13:58 +02:00
Laurent Destailleur
608e4e8891
Merge pull request #17601 from ptibogxiv/patch-426
...
NEW report contact/adresses on credit note from invoice
2021-05-17 09:12:12 +02:00
Laurent Destailleur
6a9fa11539
Merge branch 'develop' into 11.0-fix-LDAPposixAccount
2021-05-17 09:07:30 +02:00
Laurent Destailleur
8dc6241aee
Clean dead code
2021-05-17 08:58:02 +02:00
Laurent Destailleur
ac95302fa7
Clean comment
2021-05-17 08:48:02 +02:00
Laurent Destailleur
242db33311
Merge pull request #17620 from atm-maxime/fix/hrm
...
Fix quick create dropdown + translations
2021-05-17 08:31:54 +02:00
stickler-ci
67fc5bce5f
Fixing style errors.
2021-05-17 06:30:30 +00:00
Laurent Destailleur
6308c17c5f
Update main.inc.php
2021-05-17 08:30:12 +02:00
Laurent Destailleur
77bcd7ecff
Merge pull request #17628 from atm-maxime/fix/ticket3
...
Fix missing substitutionarray on ticket presend
2021-05-17 08:01:21 +02:00
Laurent Destailleur
d4162f3076
Update card.php
2021-05-17 08:00:33 +02:00
Laurent Destailleur
4768729c09
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/core/class/rssparser.class.php
htdocs/core/tpl/admin_extrafields_view.tpl.php
htdocs/core/tpl/extrafields_list_search_sql.tpl.php
htdocs/expedition/list.php
2021-05-17 07:57:32 +02:00
stickler-ci
bdf876ead4
Fixing style errors.
2021-05-17 05:38:46 +00:00
Laurent Destailleur
dd88f9cd76
Update card.php
2021-05-17 07:37:01 +02:00
Laurent Destailleur
c36f231f41
Update card.php
2021-05-17 07:34:56 +02:00
Laurent Destailleur
ea78462167
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-05-17 07:33:37 +02:00
Laurent Destailleur
2f2ba933f8
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/core/tpl/admin_extrafields_view.tpl.php
htdocs/user/class/usergroup.class.php
2021-05-17 07:33:28 +02:00
Laurent Destailleur
b8b2928dd1
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-05-17 07:29:30 +02:00
Laurent Destailleur
5a15dbf545
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/user/class/usergroup.class.php
2021-05-17 07:29:19 +02:00
Laurent Destailleur
17b08cc22f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-05-17 07:27:13 +02:00
Laurent Destailleur
6bf66adff0
Fix remove some $_REQUEST
2021-05-17 07:27:02 +02:00
Laurent Destailleur
6236721067
Merge pull request #17607 from fappels/14_selectwarehouses
...
fix implode on string for formproduct loadwarehouse
2021-05-17 07:20:15 +02:00
Laurent Destailleur
84ae2a2f91
Merge pull request #17624 from atm-maxime/patch-2
...
Update box_dolibarr_state_board.php
2021-05-17 07:15:50 +02:00
Laurent Destailleur
6a2afabcac
Merge pull request #17617 from piernov/11.0-fix-LDAPposixGroupId
...
Fix: properly set gid for Group LDAP synchro
2021-05-17 07:14:25 +02:00
Laurent Destailleur
88cdda2b8a
Merge pull request #17612 from frederic34/patch-3
...
avoid sql error with sql_mode=only_full_group_by
2021-05-17 07:12:11 +02:00
Laurent Destailleur
ad64b43e30
Update html.form.class.php
2021-05-17 07:11:41 +02:00
Laurent Destailleur
3428c1f165
Merge pull request #17619 from atm-maxime/fix/usergroup_entity
...
Fix entity was set to 0 on group creation (HOT FIX)
2021-05-17 07:09:11 +02:00
Laurent Destailleur
7d0fa95d81
Update card.php
2021-05-17 07:08:45 +02:00
Laurent Destailleur
0cc519a26d
Merge pull request #17622 from atm-maxime/fix/expense_id
...
Fix id of expense report must be before object fetch (HOT FIX)
2021-05-17 07:01:25 +02:00
Laurent Destailleur
428ab1b67a
Merge pull request #17626 from atm-maxime/fix/ticket
...
Fix ticket when module societe not enabled
2021-05-17 06:59:32 +02:00
Laurent Destailleur
c7fff29c54
Merge pull request #17623 from atm-maxime/fix/hrm_homepage
...
Fix HRM homepage
2021-05-17 06:58:57 +02:00
Laurent Destailleur
ea5d374f23
Update index.php
2021-05-17 06:57:21 +02:00
Laurent Destailleur
90d6f70bce
Comment
2021-05-17 06:54:39 +02:00
Laurent Destailleur
78b38f75a1
Minor fixes
2021-05-17 06:39:18 +02:00
Laurent Destailleur
d1ff2e3590
Add comment
2021-05-17 06:18:47 +02:00
Laurent Destailleur
9a8bd2c24b
Add missing field
...
Fix duplicate / in url
2021-05-17 06:13:26 +02:00
Maxime Kohlhaas
1fbd53993f
Fix missing substitutionarray on ticket presend
2021-05-16 19:07:36 +02:00
Maxime Kohlhaas
d3ff549b21
Fix ticket when module societe not enabled
2021-05-16 18:48:18 +02:00
Maxime Kohlhaas
d4aa0ae422
Update box_dolibarr_state_board.php
...
Global stats box is always enabled
2021-05-16 18:26:26 +02:00
Maxime Kohlhaas
78633ccb2b
Fix expensereport and recruitment homepages
2021-05-16 16:20:46 +02:00
Maxime Kohlhaas
240137b768
Fix HRM homepage
2021-05-16 16:04:19 +02:00
Aisuko
3aa40e97cb
Merge branch 'Dolibarr:develop' into develop
2021-05-16 13:56:01 +02:00
Maxime Kohlhaas
c820231363
Fix id of expense report must be before object fetch
2021-05-16 12:24:27 +02:00
Maxime Kohlhaas
7af0bda3a5
Update admin_extrafields_view.tpl.php
2021-05-16 11:33:07 +02:00
Maxime Kohlhaas
c8b725165e
Fix use img_picto in quick create dropdown
2021-05-16 11:16:07 +02:00
Maxime Kohlhaas
3c3613a71a
Fix missing quick create holiday and expense report
2021-05-16 11:06:49 +02:00
Maxime Kohlhaas
baf0dda19c
Fix missing load langs for my company info in user block
2021-05-16 10:52:51 +02:00
Maxime Kohlhaas
3859e7f00e
Fix translations on expensereport list
2021-05-16 10:49:00 +02:00
Maxime Kohlhaas
e5e317bae3
Fix entity was set to 0 on group creation
2021-05-16 09:58:34 +02:00
piernov
1cbe0e3f2d
Fix: properly set gid for Group LDAP synchro
...
Even if the gidNumber field was set in the configuration, a gid different from the Dolibarr's one was generated and stored into LDAP.
Now the gidNumber is properly set to Dolibarr's gid if gidNumber field is set in the LDAP module configuration.
2021-05-15 18:01:34 +02:00
piernov
beff175de1
Fix use login for User homedir in LDAP
...
posixAccount objectclass (intended to be used with the uid/gid/homedir fields) requires a homedir.
Always set a homedir in LDAP for the User class even if user does not have a firstname by using the login instead.
Additionally on Linux the login is typically used for the home directory rather than the first name.
It also avoids having accentuated or other special characters (commonly found in names) in the home directory path.
2021-05-15 16:48:43 +02:00
piernov
014b34acc6
Fix default gid 65534 for User in LDAP
...
posixAccount objectclass (intended to be used with the uid/gid/homedir fields) requires a gid.
Always set a gid in LDAP for the User class even if the user does not belong to any group.
By default 65534 which corresponds to the nobody group on major distributions (incl. Debian).
2021-05-15 16:44:46 +02:00
Maxime Kohlhaas
db32f882e8
Fix use of DatePropal instead of Date
2021-05-15 07:45:04 +02:00
Anthony Berton
334f37052c
Update card.php
2021-05-15 02:36:56 +02:00
Anthony Berton
1d7765ce12
update phone and address in popup
2021-05-15 02:29:15 +02:00
Frédéric FRANCE
cff0b69ce0
avoid sql error with sql_mode=only_full_group_by
...
SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_customer as ref_client, t.ref_supplier, SUM(td.total_ht) as total_ht FROM llx_societe as s, llx_contrat as t, llx_contratdet as td WHERE t.fk_soc = s.rowid AND td.fk_contrat = t.rowid AND t.fk_soc IN (2) AND t.entity IN (1)[DB_ERROR_1140] In aggregated query without GROUP BY, expression #4 of SELECT list contains nonaggregated column 'dolibarrdev.t.rowid'; this is incompatible with sql_mode=only_full_group_by
2021-05-14 18:30:56 +02:00
Maxime Kohlhaas
acadef72c1
Fix use supplier relative discount in replenish order creation
2021-05-14 18:01:22 +02:00
stickler-ci
50d4d28c14
Fixing style errors.
2021-05-14 11:54:50 +00:00
Ferran Marcet
ce6df0ee4a
FIX: Filter of the dates in the lists is lost
2021-05-14 13:50:12 +02:00
Francis Appels
009588e04d
fix implode on string for formproduct loadwarehouse
2021-05-14 11:02:55 +02:00
Laurent Destailleur
a9ddf2a5ad
Fix phpcs
2021-05-13 19:07:47 +02:00
Laurent Destailleur
d1f36ec20c
Fix phpcs
2021-05-13 15:45:47 +02:00
Ferran Marcet
c577d1c51e
FIX: Impossible to add multiple localtax2
2021-05-13 13:35:28 +02:00
stickler-ci
05ea8761a1
Fixing style errors.
2021-05-13 08:28:14 +00:00
ptibogxiv
b9336570ff
NEW report contact/adresses on credit note from invoice
...
keep same contact/adresses from source invoice (ir: usefull for correct notifications)
2021-05-13 10:26:09 +02:00
stickler-ci
79b51baa3d
Fixing style errors.
2021-05-12 22:46:09 +00:00
Frédéric Bagnol
8d035f5ec2
Add soc in categories contacts list
2021-05-13 00:40:56 +02:00
Laurent Destailleur
5917a9f73e
Fix phpcs
2021-05-12 23:08:52 +02:00
Frédéric FRANCE
59e046112c
Merge remote-tracking branch 'upstream/develop' into completeTabHead
2021-05-12 22:57:23 +02:00
Laurent Destailleur
e471181089
css
2021-05-12 22:52:50 +02:00
Laurent Destailleur
097f493315
css
2021-05-12 22:43:47 +02:00
Laurent Destailleur
488f242e25
css
2021-05-12 22:42:10 +02:00
Laurent Destailleur
5e0f2f9781
Debug v14. Fix regression.
2021-05-12 22:35:21 +02:00
Laurent Destailleur
ba6e675273
css
2021-05-12 22:21:20 +02:00
Laurent Destailleur
19a203bd40
Fix amount of memberships
2021-05-12 22:09:06 +02:00
UT from dolibit
95a5e480a1
Update llx_00_c_country.sql
2021-05-12 21:55:31 +02:00
Laurent Destailleur
9eda9c1e21
Enhance setup
2021-05-12 19:55:16 +02:00
Laurent Destailleur
f504cbcec4
Fix log
2021-05-12 19:18:51 +02:00
Givriz
81d899947d
Update listevents.php
2021-05-12 18:41:41 +02:00
Laurent Destailleur
aa2d85276e
Debug v14
2021-05-12 18:38:22 +02:00
Frédéric FRANCE
23fe7d1b63
add sample completeTabHead
2021-05-12 18:29:56 +02:00
Laurent Destailleur
75bd440591
Trans
2021-05-12 18:29:02 +02:00
stickler-ci
ea0d860593
Fixing style errors.
2021-05-12 14:55:32 +00:00
Antonin MARCHAL
1bfcfc3a0c
rename Hook and moved it into LibStatut method
2021-05-12 16:55:03 +02:00
Laurent Destailleur
866c9d012f
Fix fetch for customer and vendor relative discount
2021-05-12 14:19:12 +02:00
Florian HENRY
394d43543d
fix: when only supplier module is ON top menu should be displayed
2021-05-12 12:04:50 +02:00
Laurent Destailleur
a665ff5bda
Copy-Paste works also for hidden fields
2021-05-12 11:51:39 +02:00
Laurent Destailleur
ce8c606132
Clean APIs
2021-05-12 11:04:22 +02:00
Quentin VIAL-GOUTEYRON
56d78cf12a
FIX missing town and zip filter in contract list sql request
2021-05-12 11:02:27 +02:00
Laurent Destailleur
cfded75d11
Debug v14
2021-05-12 09:27:04 +02:00
Laurent Destailleur
f334f2a255
Fix inventory
2021-05-12 09:22:49 +02:00
lmarcouiller
06c1817930
Update mailing-send script and mailling card
2021-05-12 09:21:28 +02:00
lmarcouiller
cd4583a841
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1
2021-05-12 09:08:19 +02:00
Laurent Destailleur
b8254186ce
Clean code
2021-05-12 09:07:36 +02:00
Laurent Destailleur
dd00feae00
Clean code
2021-05-12 08:57:06 +02:00
Laurent Destailleur
fac32ee913
Better performance
2021-05-12 08:54:36 +02:00
Laurent Destailleur
3ea6cd1c66
Fix missing columns
2021-05-12 08:53:29 +02:00
Laurent Destailleur
dd7ed720e5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-05-12 00:01:04 +02:00
Laurent Destailleur
49f7f85762
Fix example
2021-05-12 00:00:51 +02:00
Laurent Destailleur
8971fde420
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-05-11 23:49:59 +02:00
Laurent Destailleur
f84817f0f6
FIX rss module on servers with allow_url_fopen=0
2021-05-11 23:49:33 +02:00
Aisuko Hakumei
8a4fd56b23
Fix SQL error for Panama Provinces
2021-05-11 22:54:26 +02:00
Laurent Destailleur
7454b8ff0b
Merge pull request #17581 from frederic34/patch-3
...
fix phpcs
2021-05-11 22:26:28 +02:00
Frédéric FRANCE
a948fc4ed8
Update extrafields.class.php
2021-05-11 22:12:15 +02:00
Laurent Destailleur
60dd26f21d
Fix do not lose selection if error
2021-05-11 22:10:40 +02:00
Frédéric FRANCE
4a735ccc4d
fix phpcs
2021-05-11 22:09:45 +02:00
Laurent Destailleur
3b0f79c3e2
Clean code
2021-05-11 21:46:19 +02:00
Laurent Destailleur
670b604d24
Clean code
2021-05-11 21:45:37 +02:00
Laurent Destailleur
e2ccacd4a9
Merge pull request #17512 from altairisfr/productcard_traceability_fields
...
Stock product card traceability fields
2021-05-11 21:40:50 +02:00
Laurent Destailleur
b5a43c8d1d
FIX #17502
2021-05-11 21:31:43 +02:00
Laurent Destailleur
4ec763a436
Merge pull request #17497 from Hystepik/develop_v13#2
...
Fix #17491 : date extrafield filter works well now
2021-05-11 21:15:50 +02:00
Laurent Destailleur
91312f0411
Fix url for emailing unsubscribe
2021-05-11 21:13:52 +02:00
Laurent Destailleur
207aa8550a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-05-11 21:02:38 +02:00
Laurent Destailleur
dc2c5aa0a8
Add substitution __UNSUBSCRIBE_URL__ for link to unsubscribe
...
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/theme/eldy/global.inc.php
htdocs/theme/eldy/info-box.inc.php
2021-05-11 21:02:27 +02:00
Laurent Destailleur
5a81395ffa
Merge pull request #17474 from dolibit-ut/patch-318
...
Update llx_20_c_departements.sql
2021-05-11 20:51:35 +02:00
Laurent Destailleur
d576e56129
Merge pull request #17526 from daraelmin/daraelmin-V13-DarkMode-1
...
Fix #17114 dark display for enabled module in dark mode
2021-05-11 20:44:24 +02:00
Laurent Destailleur
8cf99448e1
Merge pull request #17523 from bb2a/warhouse_mod_stock_activ
...
Warehouse filter if stock activate and not sending
2021-05-11 20:43:28 +02:00
Laurent Destailleur
aa05788d62
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/compta/bank/class/account.class.php
htdocs/core/class/extrafields.class.php
htdocs/core/lib/security.lib.php
htdocs/core/modules/societe/mod_codeclient_elephant.php
htdocs/filefunc.inc.php
test/phpunit/CodingPhpTest.php
2021-05-11 20:34:46 +02:00
Laurent Destailleur
c0689b3884
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-05-11 20:18:43 +02:00
Laurent Destailleur
c3b5491805
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-05-11 20:18:36 +02:00
Laurent Destailleur
8dc1e1cb33
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-05-11 20:17:24 +02:00
Laurent Destailleur
3683461c40
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
.travis.yml
htdocs/societe/consumption.php
2021-05-11 20:17:15 +02:00
Laurent Destailleur
971d611eb6
Fix phpcs
2021-05-11 20:12:25 +02:00
Laurent Destailleur
63db00486d
Fix setup
2021-05-11 19:57:20 +02:00
Laurent Destailleur
b090516a73
Merge pull request #17527 from daraelmin/daraelmin-setup-newmembermorphy
...
Fix missing FORCEMORPHY in new member form setup
2021-05-11 19:52:35 +02:00
Laurent Destailleur
780254bfd4
Merge pull request #17533 from daraelmin/daraelmin-mailing-subskey
...
New substitution key for member new form url in mailing
2021-05-11 19:41:12 +02:00
Laurent Destailleur
6591c3f50e
Merge pull request #17538 from AlexisLaurier/fix/restrictedAreaPaymentFournDelete
...
bug fix - deletion of invoice supplier payment
2021-05-11 19:27:05 +02:00
Laurent Destailleur
52d4e7e2a8
Merge pull request #17535 from frederic34/uniformizecode
...
uniformize supplier cards
2021-05-11 19:25:26 +02:00
Laurent Destailleur
6bec5d7e3c
Update document.php
2021-05-11 19:23:46 +02:00
Laurent Destailleur
70451050ae
Update contact.php
2021-05-11 19:22:46 +02:00
Laurent Destailleur
1c477d2131
Update card.php
2021-05-11 19:21:38 +02:00
Laurent Destailleur
bccd1b9a41
Update prelevement.php
2021-05-11 19:21:08 +02:00
Laurent Destailleur
74de4edc42
Merge pull request #17531 from daraelmin/daraelmin-patch-1
...
Fix vulnerability - Wrong permission in adherent card
2021-05-11 19:17:33 +02:00
Laurent Destailleur
0ff473aba7
Update card.php
2021-05-11 19:15:30 +02:00
Laurent Destailleur
fe21c318d4
Merge pull request #17534 from ibuiv/patch-8
...
Fix bug PMP per entity
2021-05-11 19:13:53 +02:00
Laurent Destailleur
8336f56b40
Merge pull request #17539 from AlexisLaurier/fix/elephantClientCodeVerifDispoMultiEntity
...
add entity check on verif_dispo mod_codeclient_elephant
2021-05-11 19:13:17 +02:00
Laurent Destailleur
e3cb04e235
Merge pull request #17540 from ibuiv/ibuiv-supplierorder-hooks
...
New Hooks for Supplier Order Card tabs
2021-05-11 19:12:24 +02:00
Laurent Destailleur
a4f9025843
Merge pull request #17541 from fappels/14_debug_dispatch
...
Fix edit-delete from dispatch card when reception activated.
2021-05-11 19:03:18 +02:00
Laurent Destailleur
8024e769fd
Merge pull request #17552 from aspangaro/14b2
...
Fix Title customer proposal
2021-05-11 18:55:02 +02:00
Laurent Destailleur
fe4227d04d
Merge pull request #17546 from kastoras/fix_get_documents_response_problem
...
Fix #17545 /get /documents response data problem
2021-05-11 18:53:02 +02:00
Laurent Destailleur
3aac68d65b
Update ecmfiles.class.php
2021-05-11 18:52:49 +02:00
Laurent Destailleur
3cce99d706
Merge pull request #17548 from aspangaro/14b1
...
FIX Migration script
2021-05-11 18:50:43 +02:00
Laurent Destailleur
c37588025f
Update 13.0.0-14.0.0.sql
2021-05-11 18:50:02 +02:00
Laurent Destailleur
dce5ce66eb
Merge pull request #17563 from frederic34/filecheck
...
align filecheck code
2021-05-11 18:46:09 +02:00
Laurent Destailleur
e4aff1a97e
Merge pull request #17578 from frederic34/patch-4
...
fix php8 warning
2021-05-11 18:45:27 +02:00
Laurent Destailleur
fe9b6c0799
Merge pull request #17579 from frederic34/patch-5
...
fix $db in class
2021-05-11 18:45:01 +02:00
Laurent Destailleur
d4616ff0ac
Merge pull request #17549 from frederic34/patch-3
...
Delete files not needed
2021-05-11 18:44:34 +02:00
Laurent Destailleur
f5909be16f
Merge pull request #17551 from grandoc/new_branch_09_05_2021
...
comment translation
2021-05-11 18:43:31 +02:00
Frédéric FRANCE
dc90103526
Update document.php
2021-05-11 18:36:27 +02:00
Frédéric FRANCE
e0cc6a4981
fix $db in class
2021-05-11 18:34:43 +02:00
Frédéric FRANCE
23858f0ab1
fix php8 warning
2021-05-11 18:25:20 +02:00
Laurent Destailleur
5943f17b94
Merge pull request #17553 from aspangaro/14b3
...
Fix Title company card
2021-05-11 18:19:58 +02:00
Laurent Destailleur
f87f80b004
Merge pull request #17554 from aspangaro/14b4
...
Fix Title customer order
2021-05-11 18:19:11 +02:00
Laurent Destailleur
eab3ac0615
Merge pull request #17558 from aspangaro/14b6
...
Fix Title supplier proposal
2021-05-11 18:18:35 +02:00
Laurent Destailleur
22b1d87973
Merge pull request #17555 from andreubisquerra/develop
...
NEW DOL_VALUE_PLACE tag in TakePOS template
2021-05-11 18:17:01 +02:00
Laurent Destailleur
88ca25903d
Merge pull request #17559 from aspangaro/14b7
...
Fix Title supplier order
2021-05-11 18:15:02 +02:00
Laurent Destailleur
8a2a996595
Merge pull request #17562 from oscim/patch-42
...
Update card.php
2021-05-11 18:10:07 +02:00
Laurent Destailleur
ce8d6c77ed
Merge pull request #17565 from ksar-ksar/patch-4
...
FIX #13955
2021-05-11 18:09:14 +02:00
Frédéric FRANCE
680092cb8a
Merge remote-tracking branch 'upstream/develop' into uniformizecode
2021-05-11 18:09:05 +02:00
Frédéric FRANCE
0c997e4260
Merge remote-tracking branch 'upstream/develop' into filecheck
2021-05-11 18:06:17 +02:00
Frédéric FRANCE
4c77e07a1b
Merge remote-tracking branch 'upstream/develop' into filecheck
2021-05-11 18:04:04 +02:00
Laurent Destailleur
d98e046fbd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-05-11 18:02:37 +02:00
Laurent Destailleur
56b0b5a1f1
Merge pull request #17575 from frederic34/patch-12
...
fix php8 warning
2021-05-11 18:00:29 +02:00
Laurent Destailleur
1900e1cc54
Merge pull request #17567 from frederic34/patch-4
...
fix $mysoc not defined (php8 warning)
2021-05-11 17:59:50 +02:00
Laurent Destailleur
f2d70e2be0
Merge pull request #17571 from frederic34/patch-8
...
fix php8 warnings
2021-05-11 17:59:29 +02:00
Laurent Destailleur
8eae14fb01
Merge pull request #17572 from frederic34/patch-9
...
fix php8 warning
2021-05-11 17:59:14 +02:00
Laurent Destailleur
bea1b83e3f
Merge pull request #17570 from frederic34/patch-7
...
fix php8 warning
2021-05-11 17:58:59 +02:00
Laurent Destailleur
1294f6d912
Merge pull request #17573 from frederic34/patch-10
...
fix php8 warning
2021-05-11 17:58:41 +02:00
Laurent Destailleur
1c79b47147
Merge pull request #17574 from frederic34/patch-11
...
fix php8 warning
2021-05-11 17:58:17 +02:00
Laurent Destailleur
5178100c1d
Merge pull request #17569 from frederic34/patch-5
...
fix php8 warning
2021-05-11 17:58:07 +02:00
Laurent Destailleur
d8cbb735a3
Fix rtl language for pdf
2021-05-11 17:58:00 +02:00
Laurent Destailleur
c37ccc10b1
Debug v14
2021-05-11 14:50:04 +02:00
atm-lena
8fb474c687
Add Hook Extrafields Update - init extrafieldssdao
2021-05-11 11:35:54 +02:00
Laurent Destailleur
200c36836b
v14
2021-05-11 10:44:53 +02:00
Laurent Destailleur
73972bcbd0
More complete log
2021-05-11 10:30:46 +02:00
Frédéric FRANCE
eccfa40396
fix php8 warning
...
remove variables not used
2021-05-11 08:28:35 +02:00
Frédéric FRANCE
7e1ed07910
fix php8 warning
2021-05-11 08:26:03 +02:00
Frédéric FRANCE
0c8b74b54c
fix php8 warning
2021-05-11 08:20:31 +02:00
Frédéric FRANCE
da7f5e4626
fix php8 warning
2021-05-11 08:15:44 +02:00
Frédéric FRANCE
edad8cdf8f
Update card.php
2021-05-11 08:13:40 +02:00
Frédéric FRANCE
3c52636c22
fix php8 warnings
2021-05-11 08:09:56 +02:00
Frédéric FRANCE
9725c8f309
fix php8 warning
2021-05-11 08:05:30 +02:00
Frédéric FRANCE
c2de343b4e
fix php8 warning
2021-05-11 08:01:13 +02:00
Alexandre SPANGARO
44514475b6
Merge remote-tracking branch 'upstream/develop' into 14b2
2021-05-11 07:04:07 +02:00
Alexandre SPANGARO
461673d814
Merge remote-tracking branch 'upstream/develop' into 14b3
2021-05-11 07:03:43 +02:00
Alexandre SPANGARO
a67ab81b4d
Merge remote-tracking branch 'upstream/develop' into 14b4
2021-05-11 07:03:18 +02:00
Alexandre SPANGARO
427221c8d3
Merge remote-tracking branch 'upstream/develop' into 14b6
2021-05-11 07:02:04 +02:00
Alexandre SPANGARO
a830e498de
Merge remote-tracking branch 'upstream/develop' into 14b7
2021-05-11 07:01:39 +02:00
Frédéric FRANCE
20724efd44
fix $mysoc not defined (php8 warning)
2021-05-11 00:04:11 +02:00
Laurent Destailleur
b01e795723
Fix of build package
2021-05-10 21:28:11 +02:00
Laurent Destailleur
837c828b1d
Prepare 13.0.3
2021-05-10 21:06:48 +02:00
Laurent Destailleur
d7a5e342ab
Optimize some widgets
2021-05-10 20:16:51 +02:00
Laurent Destailleur
f8581a1a01
Look and feel v14
2021-05-10 19:33:45 +02:00
Laurent Destailleur
1ca73e609c
Clean code
2021-05-10 19:26:47 +02:00
Laurent Destailleur
23d19a8af3
Fix permissions
2021-05-10 19:20:17 +02:00
Laurent Destailleur
73f63509e3
Fix permissions
2021-05-10 19:12:03 +02:00
Dorian Vabre
1e90e618f0
wip filter
2021-05-10 17:25:00 +02:00
Dorian Vabre
e31d8f89f5
wip filter
2021-05-10 17:13:57 +02:00
Dorian Vabre
c85b75924f
wip on adding a filter for the ics file + fix on class name
2021-05-10 16:57:48 +02:00
Dorian Vabre
48bbb500d3
fix on replacing thirdparty in attendees when merging multiple thirdparties
2021-05-10 16:25:44 +02:00
Dorian Vabre
bf25fd0834
confattendee merge OK to replace thirdparty
2021-05-10 16:04:13 +02:00
Dorian Vabre
f6956d6a62
using validate() function instead of settStatut(1) to validate an attendee
2021-05-10 15:58:54 +02:00
Dorian Vabre
7d0c3dcf6d
transition done from cookies to session
2021-05-10 15:50:29 +02:00
ksar
107374748e
FIX #13955
2021-05-10 15:42:24 +02:00
Dorian Vabre
d71dc37a75
fix
2021-05-10 15:39:39 +02:00
Dorian Vabre
ee4e8dd99f
cookies to session transition
2021-05-10 15:37:25 +02:00
Dorian Vabre
c5dc20b9dc
opti
2021-05-10 15:31:52 +02:00
Laurent Destailleur
6499270619
v14
2021-05-10 15:29:23 +02:00
Laurent Destailleur
2dd3148e3f
Fix look and feel v14
2021-05-10 15:24:07 +02:00
Frédéric FRANCE
81008fa0da
greenlight
2021-05-10 14:39:40 +02:00
Frédéric FRANCE
0d3afb573a
align check code
2021-05-10 14:33:26 +02:00
stickler-ci
b9bdd9ed8a
Fixing style errors.
2021-05-10 12:13:50 +00:00
oscim
dfe0ccee45
Update card.php
...
Add hook for block boxstats in fourn card
2021-05-10 14:10:54 +02:00
Dorian Vabre
0e62edfd42
fix error on fetching thirdparty when there is none
2021-05-10 12:47:09 +02:00
Laurent Destailleur
a2cd181435
FIX Debug reception module
2021-05-10 11:53:19 +02:00
Laurent Destailleur
ed18045807
FIX The comment of a reception was not correctly managed
2021-05-10 11:30:37 +02:00
lmarcouiller
d293be56ce
Merge branch '13.0' of github.com:Dolibarr/dolibarr into develop_v13#2
2021-05-10 10:41:56 +02:00
Dorian Vabre
0dce9ee359
now using correct email templates after booth/conf suggestion
2021-05-10 10:22:45 +02:00
Francis Appels
cd8c71497d
replace deprecated warehouse 'libelle'
2021-05-10 10:10:30 +02:00
Dorian Vabre
d86b393d60
useless line removed
2021-05-10 09:54:26 +02:00
Gauthier PC portable 024
f9afe7e81a
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_collapse_batch_detail
2021-05-10 09:17:15 +02:00
Alexandre SPANGARO
7993e4634a
Fix Title supplier order info card
2021-05-10 07:01:24 +02:00
Alexandre SPANGARO
eccd883156
Fix Title supplier order document card
2021-05-10 06:54:17 +02:00
Alexandre SPANGARO
db50f8c27b
Fix Title supplier order note card
2021-05-10 06:49:49 +02:00
Alexandre SPANGARO
9f0cdb0153
Fix Title supplier order contact card
2021-05-10 06:48:27 +02:00
Alexandre SPANGARO
1f00689831
Fix Title supplier order card
2021-05-10 06:46:07 +02:00
Alexandre SPANGARO
6089332a2b
Fix Title supplier proposal document card
2021-05-10 06:40:14 +02:00
Alexandre SPANGARO
7a105a054a
Fix Title supplier proposal info card
2021-05-10 06:40:01 +02:00
Alexandre SPANGARO
d66d38a846
Fix Title supplier proposal note card
2021-05-10 06:36:22 +02:00
