lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
104,600 Commits 43 Branches 150 Tags 886 MiB
5dd2bedffa
Commit Graph

92480 Commits

Author SHA1 Message Date
Laurent Destailleur
142e9473c5 Responsive 2021-11-07 18:28:59 +01:00
Laurent Destailleur
f5edd25f6d Clean code 2021-11-07 18:14:49 +01:00
Laurent Destailleur
eaf2c6e89c Fix $action not defined 2021-11-07 17:49:31 +01:00
Laurent Destailleur
5613ec71d6 Fix syntax 2021-11-07 17:48:01 +01:00
Laurent Destailleur
2e499c2d17 Fix unknown property 2021-11-07 17:46:08 +01:00
Laurent Destailleur
6829507372 Fix missing $db 2021-11-07 17:44:34 +01:00
Laurent Destailleur
66f85d674d Fix warning scrutinizer 2021-11-07 17:43:17 +01:00
Laurent Destailleur
1934a37676 Escape to avoid false positive, even if it should be useless. 2021-11-07 17:35:43 +01:00
Laurent Destailleur
4247275465 css 2021-11-07 17:27:37 +01:00
Laurent Destailleur
969fe16442 Debug mass actions of partnership module 2021-11-07 16:51:18 +01:00
Laurent Destailleur
ed9806576a Trans 2021-11-07 16:07:16 +01:00
Laurent Destailleur
6d10facf5b Debug v15 2021-11-07 16:04:37 +01:00
Laurent Destailleur
98ba48c0e7 Look and feel v15 2021-11-07 15:58:46 +01:00
Laurent Destailleur
552d32ccd6 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-11-07 13:54:07 +01:00
Laurent Destailleur
3b7c385c6c Fix syntax error 2021-11-07 13:53:30 +01:00
Laurent Destailleur
2234522519 Debug module parnership. Add the type of partnership. 2021-11-07 13:51:31 +01:00
Laurent Destailleur
e8a2fc33c3 Fix visiblity of dictionnary for MAIN_USE_EXPENSE_IK 2021-11-07 12:47:03 +01:00
Laurent Destailleur
09d9d1ac42 Add missing unique key 2021-11-07 12:38:44 +01:00
Laurent Destailleur
11bb7428ce Clean code 2021-11-07 12:34:08 +01:00
Laurent Destailleur
713db0e613 Removed function pdf_getTotalQty (duplicate with pdf_getlineqty) 2021-11-07 12:26:44 +01:00
Laurent Destailleur
ccc1d4d1fa Fix warning 2021-11-07 12:24:25 +01:00
Laurent Destailleur
dd2207d6c5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/customer/list.php
	htdocs/core/db/DoliDB.class.php
	htdocs/resource/list.php
 2021-11-06 21:11:05 +01:00
Laurent Destailleur
7e68f9e013 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/db/DoliDB.class.php
	htdocs/resource/list.php
 2021-11-06 21:04:17 +01:00
Laurent Destailleur
ddb68a3ae8 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-11-06 20:40:34 +01:00
Laurent Destailleur
fc70adb2e7 Fix ref suffix for patnership into PSHIP 2021-11-06 20:40:26 +01:00
Laurent Destailleur
edbcf78495 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-11-06 20:39:05 +01:00
Laurent Destailleur
0bc5ec8c78 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-11-06 20:38:29 +01:00
Laurent Destailleur
65105a3e05 Better log 2021-11-06 19:27:50 +01:00
Laurent Destailleur
77864f2c2c NEW Can set value for EHLO smtp command in MAIL_SMTP_USE_FROM_FOR_HELO 2021-11-06 19:11:47 +01:00
Nicolas Domenech
61d97ccd22 NEW : redirect after connection in login page 2021-11-05 16:02:24 +01:00
Laurent Destailleur
257fe444af
Merge pull request #19181 from frederic34/commandelist 
fix warnings in commande list
 2021-11-05 14:32:17 +01:00
Laurent Destailleur
9f3fec40cb
Merge pull request #19262 from atm-maxime/new_element_tag_table 
New : prepare future element_tag table
 2021-11-05 14:31:37 +01:00
Laurent Destailleur
b56828219c
Merge pull request #19277 from javieralapps4up/develop 
Update card.php ($usergroup->members is not necessary and wastes resources)
 2021-11-05 14:29:46 +01:00
Laurent Destailleur
c7000037e5
Merge pull request #19278 from frederic34/patch-8 
remove old field
 2021-11-05 14:25:34 +01:00
Laurent Destailleur
44b129f754
Merge pull request #19286 from BadPixxel/patch-7 
FIX: Status propagation from Parent Product
 2021-11-05 14:25:02 +01:00
Laurent Destailleur
897b00faf0 Clean code 2021-11-05 14:23:19 +01:00
daraelmin
9d7f7e2090
Better condition 2021-11-05 14:03:56 +01:00
Laurent Destailleur
e8a550cb21
Merge pull request #19273 from frederic34/patch-1 
fix warning (bad const)
 2021-11-05 14:02:41 +01:00
Laurent Destailleur
aaa8849dff
Merge pull request #19274 from frederic34/patch-4 
fix change sql
 2021-11-05 14:01:51 +01:00
Laurent Destailleur
b9d5f77937
Merge pull request #19276 from frederic34/patch-7 
fix warnings
 2021-11-05 14:01:14 +01:00
Laurent Destailleur
c0c894d6f4
Merge pull request #19288 from OPEN-DSI/fix_00018 
FIX second approval back in stable feature as is the setting for minimum amount (last part from PR#14286)
 2021-11-05 14:00:41 +01:00
Laurent Destailleur
2b6d296e63 Rename var 2021-11-05 13:58:11 +01:00
Laurent Destailleur
d32ecfe5aa
Merge pull request #19291 from OPEN-DSI/fix_00019 
NEW: Can show Paid button if invoice or supplier invoice has no payments with global
 2021-11-05 13:37:39 +01:00
Laurent Destailleur
e430fe5f94
Merge pull request #19302 from FHenry/dev_addhook_dolbanner 
NEW: for developpers add hook for moreHTMLRef in dol_banner_tab
 2021-11-05 13:28:39 +01:00
Laurent Destailleur
f8cc75ecf2
Merge pull request #19296 from daraelmin/daraelmin-stats-1 
Add link year subscription list in subscription by year stats page
 2021-11-05 13:19:05 +01:00
Laurent Destailleur
15bc4a7d6b
Update index.php 2021-11-05 13:18:37 +01:00
Laurent Destailleur
5cf9ae7162
Merge pull request #19299 from vincentjdc/credit-note-no-invoice 
Handle case where credit note has no source invoice
 2021-11-05 13:12:39 +01:00
Laurent Destailleur
bc7b035846
Update card.php 2021-11-05 13:11:54 +01:00
Laurent Destailleur
02200b9810
Update card.php 2021-11-05 13:10:44 +01:00
Laurent Destailleur
01b1ce5fb5
Merge pull request #19313 from cfoellmann/PR/fix-holiday-docpreview 
fix DocumentPreview on holiday documents
 2021-11-05 13:03:22 +01:00
Laurent Destailleur
19b9412c13 FIX #19305 2021-11-05 12:49:33 +01:00
Laurent Destailleur
58abcf7e5a
Merge pull request #19307 from fmarcet/develop 
Qual: If hidden option BANK_CAN_RECONCILIATE_CASHACCOUNT is activated
 2021-11-05 12:43:39 +01:00
Laurent Destailleur
3959d12a39
Update DoliDB.class.php 2021-11-05 12:42:42 +01:00
Vincent Dieltiens
4af8a4e9fd Add EXPENSEREPORT_FILE_IS_REQUIRED global var to force user to join a file for each line of an expense report 2021-11-05 12:11:54 +01:00
Christian Foellmann
58ae45a88b fix DocumentPreview on holiday documents 2021-11-04 13:58:38 +01:00
ATM john
dd8d4e9e98 Fix missing return status 2021-11-04 12:10:19 +01:00
Ferran Marcet
3f426abc29 Qual: If hidden option BANK_CAN_RECONCILIATE_CASHACCOUNT is activated, show Account Statements tab on Cash Accounts 2021-11-04 10:56:55 +01:00
stickler-ci
586005ff2e Fixing style errors. 2021-11-03 21:43:30 +00:00
daraelmin
f9db196512
Update subscription.php 2021-11-03 22:31:45 +01:00
daraelmin
0e91b32e99
Update subscription.php 2021-11-03 20:40:09 +01:00
daraelmin
973f408b6e
Fix default enddate subscription must be in futur 2021-11-03 20:35:57 +01:00
Florian HENRY
054d98b942 fix ref 2021-11-03 16:31:35 +01:00
Florian HENRY
a4c4732d5d NEW: for developpers add hook for moreHTMLRef in dol_banner_tab 2021-11-03 16:18:03 +01:00
Vincent Dieltiens
a359c7a681 Handle case where credit note has no source invoice 2021-11-03 14:22:08 +01:00
daraelmin
d334fe1292
Fix Bad count of subscription by year 
If
 2021-11-03 13:12:33 +01:00
daraelmin
b02c89bd8b
Add link year subscription list in subscription by year stats page 2021-11-02 23:07:46 +01:00
kamel
d91c24233c NEW: Can show Paid button if invoice or supplier invoice has no payments with global INVOICE_CAN_FORCE_PAID_WHEN_NO_PAIEMENTS and SUPPLIER_INVOICE_CAN_FORCE_PAID_WHEN_NO_PAIEMENTS 2021-11-02 16:43:09 +01:00
Benjamin Chantalat
49d955b794 Uniformization of the table code as the line above 2021-11-02 15:53:57 +01:00
Benjamin Chantalat
0c1d4c9d51 No need of escape htmltag thanks to GETPOST before 2021-11-02 15:48:12 +01:00
Benjamin Chantalat
126fbf9f63 Change date format to be equal to mass stock transfert 2021-11-02 15:46:04 +01:00
kamel
82b7f0e9e4 FIX second approval back in stable feature as is the setting for minimum amount (last part from PR#14286) 2021-11-02 15:21:14 +01:00
stickler-ci
5c10cd5ba9 Fixing style errors. 2021-11-02 13:20:41 +00:00
BadPixxel
98929f2dba
FIX: Status propagation from Parent Product 
toSell or toBuy Status propagation should be done only when parent is updated. 

Otherwise, any modification made on the parent will overwrite the specific configuration made at the child level.
 2021-11-02 14:16:55 +01:00
Anthony Berton
5bb6185e64 add_substitution 2021-11-02 12:37:39 +01:00
Frédéric FRANCE
d40e9bb304
remove old field 
field skype has been removed
 2021-11-01 13:52:06 +01:00
javieralapps4up
8bfb656228
Update card.php 
Load $usergroup->members is not necessary and wastes resources
 2021-11-01 13:47:52 +01:00
Frédéric FRANCE
d7c0d87aeb
Update mod_facture_fournisseur_tulip.php 2021-11-01 13:35:25 +01:00
Frédéric FRANCE
18918d4e9d
Update actions_addupdatedelete.inc.php 2021-11-01 13:34:13 +01:00
Frédéric FRANCE
55243dedb6
fix typo 2021-11-01 13:32:19 +01:00
Laurent Destailleur
960319fd8a dol_htmlentities is better for future than htmlentities 2021-11-01 10:33:54 +01:00
Maxime Kohlhaas
3508aa92d6 Fix : uk and index on element_tag table 2021-11-01 10:24:19 +01:00
Maxime Kohlhaas
8858b2ba55 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_element_tag_table 2021-11-01 10:06:42 +01:00
Frédéric FRANCE
b992deb084
fix warnings 2021-11-01 09:44:43 +01:00
Frédéric FRANCE
f99a11b876
Update evaluationdet.class.php 2021-11-01 09:28:51 +01:00
Frédéric FRANCE
aaadeb1b9d
fix change sql 2021-11-01 09:27:32 +01:00
Frédéric FRANCE
cb8e1ce8f0
fix warning 2021-11-01 09:20:22 +01:00
Laurent Destailleur
7d07da527d Debug v15 2021-11-01 03:30:22 +01:00
Laurent Destailleur
3e1fa44657 Fix phpdoc 2021-11-01 03:23:38 +01:00
Laurent Destailleur
2f7e246ab3 Merge 2021-11-01 03:18:12 +01:00
Laurent Destailleur
6acc8a6582 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/class/ldap.class.php
 2021-11-01 03:17:51 +01:00
Laurent Destailleur
3e46d58129 FIX Type of field progression in ticket must be integer 2021-11-01 03:14:54 +01:00
Laurent Destailleur
7dcd98b9bb
Merge pull request #19234 from hregis/fix_see_ldap_connected_server 
FIX show connected server if we have a primary and secondary ldap server
 2021-11-01 02:46:28 +01:00
Laurent Destailleur
1b336456ce Code comment 2021-11-01 02:44:14 +01:00
Laurent Destailleur
82d02e8465
Merge pull request #19270 from frederic34/patch-9 
replace function each deprecated in php 7.2
 2021-11-01 02:36:54 +01:00
Laurent Destailleur
d4348b8e53
Merge pull request #19264 from frederic34/patch-1 
fix warning
 2021-11-01 02:35:48 +01:00
Laurent Destailleur
58e55a3d86
Merge pull request #19263 from frederic34/displaydnsspf 
display spf info from dns
 2021-11-01 02:35:32 +01:00
Laurent Destailleur
3c69fb0ea3
Update mails.php 2021-11-01 02:35:15 +01:00
Laurent Destailleur
992c36f521
Merge pull request #19265 from frederic34/patch-4 
fix warning
 2021-11-01 02:32:23 +01:00
Laurent Destailleur
6480425130
Merge pull request #19269 from frederic34/patch-8 
fix unknown function
 2021-11-01 02:31:59 +01:00
Laurent Destailleur
0bdfa84bbf
Merge pull request #19266 from frederic34/rankisreserved 
replace reseved word rank
 2021-11-01 02:31:16 +01:00
Laurent Destailleur
ce9e7067ac
Merge pull request #19268 from frederic34/patch-7 
fix scrutinizer
 2021-11-01 02:29:28 +01:00
Laurent Destailleur
6d3053ae94
Merge pull request #19267 from frederic34/patch-5 
fix scrutinizer
 2021-11-01 02:29:18 +01:00
Laurent Destailleur
e4613b3104 FIX sql error when values for natural_search is an array 2021-11-01 02:28:41 +01:00
Laurent Destailleur
2313da5beb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-11-01 02:17:18 +01:00
Laurent Destailleur
d5130f2541 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop FIX #19013
 2021-11-01 02:16:50 +01:00
Frédéric FRANCE
e02565190a
replace function each deprecated in php 7.2 
Warning This function has been DEPRECATED as of PHP 7.2.0, and REMOVED as of PHP 8.0.0. Relying on this function is highly discouraged.

Avertissement Cette fonctionnalité est OBSOLÈTE à partir de PHP 7.2.0 et a été SUPPRIMÉE à partir de PHP 8.0.0.
 2021-11-01 01:10:30 +01:00
Frédéric FRANCE
75eff571d9
fix unknown function 2021-10-31 22:27:39 +01:00
Frédéric FRANCE
270ddfda1f
fix scrutinizer 2021-10-31 22:24:25 +01:00
Frédéric FRANCE
445fea18bb
fix scrutinizer 
dol_set_focus returns void
 2021-10-31 22:20:02 +01:00
Frédéric FRANCE
9a68a97fc6
replace commentaire_abandon by abort_comment 2021-10-31 21:18:59 +01:00
Frédéric FRANCE
bc972554c6
replace reseved word rank 2021-10-31 21:13:15 +01:00
Frédéric FRANCE
af8f74103a
Update knowledgerecord_list.php 2021-10-31 20:48:13 +01:00
Frédéric FRANCE
033d983f05
fix warning 2021-10-31 20:41:07 +01:00
Frédéric FRANCE
7d60cddaac
fix warning 
same test at line 65
 2021-10-31 19:36:31 +01:00
Frédéric FRANCE
8ce70aac5d
display spf info from dns 2021-10-31 18:43:11 +01:00
Laurent Destailleur
b4895c4dd2
Merge pull request #18975 from aspangaro/14p23 
FIX Accountancy - If deposit invoice is used, force binding in deposit accounting account to solve transaction
 2021-10-31 18:13:54 +01:00
Laurent Destailleur
cb648705ce
Merge pull request #19186 from ptibogxiv/patch-448 
Fix excluded member display in takepos
 2021-10-31 18:04:19 +01:00
Laurent Destailleur
d21278b0ef
Merge branch 'develop' into fix_php8 2021-10-31 17:54:32 +01:00
Laurent Destailleur
ca53176b14
Merge pull request #19179 from frederic34/tasklist 
fix warnings in task list
 2021-10-31 17:52:31 +01:00
Laurent Destailleur
40683720a3
Merge pull request #19182 from frederic34/propallist 
fix warnings in propal list
 2021-10-31 17:51:52 +01:00
Laurent Destailleur
6a4344af8a
Merge pull request #19187 from frederic34/patch-8 
fix warning
 2021-10-31 17:51:16 +01:00
Laurent Destailleur
8f54143bfb
Merge pull request #19178 from frederic34/patch-1 
fix not defined
 2021-10-31 17:47:34 +01:00
Laurent Destailleur
1d1e75683d
Merge pull request #19183 from frederic34/patch-5 
fix warning
 2021-10-31 17:47:23 +01:00
Laurent Destailleur
216eb7bd5a
Merge pull request #19185 from frederic34/bankentrieslist 
fix warnings in bankentries list
 2021-10-31 17:47:14 +01:00
Laurent Destailleur
43b4a783a5
Merge pull request #19184 from frederic34/patch-7 
fix search
 2021-10-31 17:47:05 +01:00
Laurent Destailleur
e1047afb05
Merge pull request #19194 from atm-florianm/FIX_minor_remove_two_unused_js_lines 
[minor] remove two unused js lines
 2021-10-31 17:46:00 +01:00
Laurent Destailleur
fdf5d457a8
Merge pull request #19196 from atm-gauthier/FIX_default_price_base_type_with_variants 
FIX : We need a default price base type in variant creation case with…
 2021-10-31 17:42:58 +01:00
Laurent Destailleur
cee573cf96
Update ProductCombination.class.php 2021-10-31 17:42:43 +01:00
Laurent Destailleur
c0bde3e271
Merge pull request #19200 from frederic34/patch-9 
fix warning
 2021-10-31 17:38:23 +01:00
Laurent Destailleur
d90253eb08
Merge pull request #19203 from frederic34/patch-12 
fix rights and warnings
 2021-10-31 17:38:02 +01:00
Laurent Destailleur
ae103f20ca
Merge pull request #19204 from FHenry/fix_introduced_scrutinizer 
Fix introduced scrutinizer
 2021-10-31 17:37:31 +01:00
Laurent Destailleur
df5b2b6728
Update viewcat.php 2021-10-31 17:36:56 +01:00
Laurent Destailleur
8ebbe32781
Merge pull request #19205 from frederic34/patch-13 
fix warnings
 2021-10-31 17:34:46 +01:00
Laurent Destailleur
eecd82a0fd
Merge pull request #19202 from frederic34/patch-11 
backport fix
 2021-10-31 17:34:38 +01:00
Laurent Destailleur
aaa8efbddc
Merge pull request #19201 from frederic34/patch-10 
fix warning
 2021-10-31 17:34:25 +01:00
Laurent Destailleur
ef21b5ca78
Merge pull request #19206 from frederic34/patch-14 
fix warning
 2021-10-31 17:34:18 +01:00
Laurent Destailleur
b513d21bca
Merge pull request #19208 from Quentin-Seekness/patch-1 
FIX: Can't create new attendee
 2021-10-31 17:33:42 +01:00
Laurent Destailleur
efa8b7943e Merge 2021-10-31 17:22:40 +01:00
Laurent Destailleur
bea85db413 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-31 17:20:09 +01:00
Laurent Destailleur
0e4c113e7f Fix phpcs 2021-10-31 17:11:23 +01:00
Laurent Destailleur
ffc1d8fb97
Merge pull request #19211 from FHenry/14_fix_modulebuilder 
fix: setup template on module builder (error SQL when not tag exists)
 2021-10-31 17:09:15 +01:00
Laurent Destailleur
42b043feef
Merge pull request #19213 from atm-greg/FIX_restrictedArea_for_payment_delete 
FIX restrictedArea for payment delete
 2021-10-31 17:06:47 +01:00
Laurent Destailleur
682ad98918
Update security.lib.php 2021-10-31 17:06:37 +01:00
Laurent Destailleur
e79dd52c9c
Merge pull request #19212 from fr69400/develop 
[minor] Fix some warning
 2021-10-31 17:04:47 +01:00
Laurent Destailleur
fb6a1d1f51 FIX #19210 2021-10-31 16:59:48 +01:00
Laurent Destailleur
a635dc6df3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/bookmarks/card.php
 2021-10-31 16:50:34 +01:00
Laurent Destailleur
51b0758263
Merge pull request #19219 from FHenry/14_fix_warning 
fix: warning dol_print_date setTimeStamp when time empty
 2021-10-31 16:49:13 +01:00
Laurent Destailleur
c73c962459
Merge pull request #19220 from frederic34/patch-4 
remove duplicate code
 2021-10-31 16:47:33 +01:00
Laurent Destailleur
ad6f7e1a48 Default target is same window for a link on app, external if not defined 2021-10-31 16:31:15 +01:00
Laurent Destailleur
82898b1aca Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-10-31 16:25:46 +01:00