Commit Graph

7379 Commits

Author SHA1 Message Date
Laurent Destailleur
d760686239 Fix case of newtoken() 2021-09-18 22:24:00 +02:00
Laurent Destailleur
0749d01c5a Fix add action delete* as sensitive action 2021-09-18 22:04:41 +02:00
Laurent Destailleur
8bdc53f469 Fix Add action classify as sensitive actions 2021-09-18 20:49:24 +02:00
Laurent Destailleur
7dfedd242a Fix add confirm_deleteline as sensitive action 2021-09-18 19:43:38 +02:00
Laurent Destailleur
62b721a904 Add deletecontact as sentitive action
Replace dol_buildpath with DOL_URL_ROOT
2021-09-18 19:34:46 +02:00
Laurent Destailleur
675a30d500 Fix phpcs 2021-09-17 19:42:41 +02:00
Laurent Destailleur
3d9be1437a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/compta/paiement/list.php
	htdocs/fourn/paiement/list.php
	htdocs/projet/tasks/time.php
2021-09-17 12:29:58 +02:00
Laurent Destailleur
b546f21ef4 Merge branch '12.0' of https://github.com/dolibarr/dolibarr into 13.0
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
2021-09-17 12:21:25 +02:00
Julien Gainza
65c4a21898 FIX move fetch_optionnal into $ac_static->fetch() 2021-09-13 16:35:13 +02:00
Laurent Destailleur
fa28621709 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/reception/list.php
2021-09-09 16:11:29 +02:00
Laurent Destailleur
5406e3d34e Fix phpcs 2021-09-09 16:06:16 +02:00
Laurent Destailleur
5d5b7c3af4 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/comm/action/peruser.php
	htdocs/main.inc.php
2021-09-09 15:15:26 +02:00
Laurent Destailleur
ff74fbdf16
Update card.php 2021-09-09 02:37:47 +02:00
Laurent Destailleur
034c5651c8 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/eventorganization/class/conferenceorbooth.class.php
	htdocs/langs/en_US/eventorganization.lang
	htdocs/public/eventorganization/attendee_subscription.php
2021-09-08 22:13:35 +02:00
Laurent Destailleur
4705d41ed2 FIX Relative discount with high nb of decimals 2021-09-08 22:00:16 +02:00
Regis Houssin
52419f28c5 FIX add DISTINCT 2021-09-07 12:38:15 +02:00
Regis Houssin
4aaaa8e21a FIX multicompany transverse mode compatibility 2021-09-07 12:10:35 +02:00
Julien Gainza
9d89e48d15 Fix : Add extrafields on API "get events list" 2021-09-06 15:55:33 +02:00
jpb
65a2486f94 merge conflict 2021-09-06 09:43:52 +02:00
Laurent Destailleur
ee066ad725 Cast sql var 2021-09-03 21:25:43 +02:00
Laurent Destailleur
248e68aada Code comment 2021-09-03 13:39:08 +02:00
Laurent Destailleur
77e9f15360 Work on #18448 2021-09-02 22:52:17 +02:00
henrynopo
4c1d857991 Update remx.php 2021-09-02 19:36:48 +02:00
Laurent Destailleur
b217c5d43e
Merge pull request #18537 from henrynopo/patch-15
Fix error no value of multicurrency discount amount consumed as payment to invoice
2021-09-02 19:36:12 +02:00
Laurent Destailleur
8193e792b5 Fix responsive 2021-09-01 22:39:01 +02:00
Laurent Destailleur
1bce356efa Fix responsive 2021-09-01 21:34:59 +02:00
Laurent Destailleur
a7b0a837d4 Fix cancel button must be named "$cancel" everywhere. 2021-09-01 18:46:06 +02:00
Laurent Destailleur
4810db3dbf
Merge pull request #18498 from GurvanKervern/undefVars2
Undef vars2
2021-09-01 18:36:26 +02:00
Laurent Destailleur
c4acfe5fc0
Merge pull request #18577 from Givriz/dev_2
Compatibility phpv8
2021-09-01 18:06:06 +02:00
Laurent Destailleur
38c0e93285 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/adherents/card.php
	htdocs/core/class/commonobjectline.class.php
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/public/project/index.php
2021-09-01 17:52:04 +02:00
Laurent Destailleur
443827ff42 FIX #18531 2021-09-01 17:10:26 +02:00
Givriz
688d217bed Compatibility phpv8 2021-09-01 16:39:28 +02:00
Laurent Destailleur
239599d1b1
Merge pull request #18564 from OPEN-DSI/new-agenda-ext-enable-default
NEW can enable/disable external calendar by default
2021-09-01 13:44:12 +02:00
Laurent Destailleur
d2d7b0defd Fix duplicate ; 2021-08-31 20:15:41 +02:00
lvessiller
163b12925a FIX stickler-ci 2021-08-31 18:37:34 +02:00
lvessiller
6c2cf4377a NEW can enable/disable external calendar by default 2021-08-31 18:14:16 +02:00
henrynopo
c9db6bfdf6
Update remx.php 2021-08-29 08:51:02 +08:00
Gurvan Kervern
39fcc53fa7
Update peruser.php 2021-08-29 00:51:01 +08:00
Laurent Destailleur
fb8723d884
Merge pull request #18487 from cfoellmann/PR/fix-remaining-buttons
replace remaining SubmitCancel buttons
2021-08-28 18:39:06 +02:00
Laurent Destailleur
8b996627eb
Merge pull request #18462 from grandoc/new_branch_22_08_2021
fix : Undefined property: stdClass:: in C:\wamp64\www\dolibarr-140\ht…
2021-08-28 18:35:40 +02:00
Laurent Destailleur
a5bb833a0a
Update peruser.php 2021-08-28 17:39:23 +02:00
Laurent Destailleur
64c4e25c02 Fix warning 2021-08-28 05:40:07 +02:00
Laurent Destailleur
aab6281ba6 Clean code 2021-08-28 05:38:40 +02:00
Laurent Destailleur
1b859fe723 Fix warning 2021-08-28 05:24:53 +02:00
Laurent Destailleur
2dd91bf312 Clean code 2021-08-27 23:36:06 +02:00
Laurent Destailleur
46d993c9a6 Clean code 2021-08-27 22:42:04 +02:00
Laurent Destailleur
2f225ee7e5 Clean code by adding cast int. 2021-08-27 16:33:03 +02:00
Anthony Berton
4880973ec5
Merge branch 'develop' into Edit_in_propal 2021-08-26 16:11:41 +02:00
stickler-ci
601cc865fb Fixing style errors. 2021-08-25 10:54:09 +00:00
GurvanKervern
d34e44e55c Fix undef vars 3
To remove PHP8 warnings
2021-08-25 18:02:57 +08:00
Christian Foellmann
f094b4c70c fix up most of the remaining submit inputs 2021-08-24 17:04:17 +02:00
Philippe Grand
ff47bf5226
Update card.php 2021-08-24 16:46:21 +02:00
Philippe Grand
0286a2e75d
Update card.php 2021-08-24 16:42:04 +02:00
Laurent Destailleur
07ab352877 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/list.php
2021-08-24 16:37:18 +02:00
Christian Foellmann
227f61a711 replace remaining SubmitCancel buttons 2021-08-24 16:10:20 +02:00
Laurent Destailleur
22339a3ed3
Merge pull request #18451 from cfoellmann/PR/form-buttons-function
improve forms - buttonsSaveCreate()
2021-08-24 15:26:03 +02:00
Laurent Destailleur
a6ddc90d5b Fix responsive 2021-08-23 23:53:58 +02:00
Laurent Destailleur
dc006b0ebb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.form.class.php
2021-08-23 19:44:02 +02:00
Laurent Destailleur
8485fee5f9 Cast numeric into on sql request 2021-08-23 19:33:24 +02:00
Laurent Destailleur
d4b5ee6c85 Fix cast into variable into sql request. 2021-08-23 17:41:11 +02:00
Philippe GRAND
ba9ede39bf fix : Undefined property: stdClass:: in C:\wamp64\www\dolibarr-140\htdocs\comm\propal\card.php on line 265 2021-08-22 22:28:53 +02:00
Philippe GRAND
665dfb48e4 fix : Undefined property: stdClass:: in C:\wamp64\www\dolibarr-140\htdocs\comm\propal\card.php on line 125 2021-08-22 11:40:32 +02:00
Christian Foellmann
d706c3b1ec use Forms::buttonsSaveCreate() to generate most of the Save|Cancel forms combination 2021-08-20 14:41:30 +02:00
Laurent Destailleur
3ee4a6556a
Merge branch 'develop' into undefined 2021-08-19 13:43:32 +02:00
stickler-ci
172b672437 Fixing style errors. 2021-08-19 10:19:25 +00:00
Gurvan Kervern
476dfc289e
Update index.php 2021-08-19 18:16:47 +08:00
Laurent Destailleur
7af265db8a
Update card.php 2021-08-18 22:03:16 +02:00
Laurent Destailleur
1df2aeb233
Update card.php 2021-08-18 22:01:53 +02:00
stickler-ci
88b0408e42 Fixing style errors. 2021-08-18 13:57:19 +00:00
Gurvan Kervern
ab95c5f463
Update index.php 2021-08-18 21:55:00 +08:00
Gurvan Kervern
2d35106e0b
Update card.php 2021-08-18 17:52:21 +08:00
Laurent Destailleur
84073c6373
Merge branch 'develop' into patch-169 2021-08-17 19:31:30 +02:00
Laurent Destailleur
59479a4c6e
Merge pull request #18405 from atm-gauthier/NEW/printFieldListFrom_on_several_lists
NEW : printFieldListFrom hook call on several lists
2021-08-17 15:58:28 +02:00
Laurent Destailleur
23083427e8 NEW Can use the result_mode of mysqli driver. Save memory for list count 2021-08-16 22:36:30 +02:00
Laurent Destailleur
06a0d922cc NEW Can use the result_mode of mysqli driver. Save memory for list count 2021-08-16 22:01:58 +02:00
stickler-ci
af1f29bb16 Fixing style errors. 2021-08-16 11:22:49 +00:00
Gurvan Kervern
9f1ced1fd0 fix warnings 6
Removing PHP8 warnings
2021-08-16 19:06:38 +08:00
Gurvan Kervern
b0ea9fed0a fix warnings 1
Removing all PHP8 warnings from error logs
2021-08-16 18:05:29 +08:00
Gauthier PC portable 024
b2dad4d2ce Merge branch 'NEW/printFieldListFrom_on_commande_list' of github.com:atm-gauthier/dolibarr into NEW/printFieldListFrom_on_several_lists 2021-08-12 15:44:20 +02:00
Gauthier PC portable 024
22eda3fd63 NEW : add missing printFieldListFrom hook call on several lists 2021-08-12 15:39:52 +02:00
Laurent Destailleur
012eee7e06
Merge pull request #18317 from altairisfr/PROPAL_NOT_BILLABLE
NEW : add constant PROPOSAL_ARE_NOT_BILLABLE
2021-08-11 21:00:53 +02:00
Francis Appels
68482c637b Update actioncomm.class
Property contactid should be contact_id
2021-08-06 18:45:25 +02:00
jpb
f99ba2c1e1 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_field_in_service_object 2021-08-04 17:26:23 +02:00
Laurent Destailleur
7245fcec11 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-04 00:09:51 +02:00
Laurent Destailleur
a571fab177 css 2021-08-03 23:54:36 +02:00
Christophe Battarel
f00694470f rename constant to PROPOSAL_ARE_NOT_BILLABLE 2021-08-03 15:40:01 +02:00
Christophe Battarel
7a7287489d NEW : add constant PROPAL_REOPEN_UNSIGNED_ONLY 2021-08-03 11:24:21 +02:00
Christophe Battarel
2998c94884 NEW : add constant PROPAL_NOT_BILLABLE 2021-08-03 11:12:19 +02:00
Laurent Destailleur
0058e32207 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-02 19:03:38 +02:00
Laurent Destailleur
bd35d86268 Debug v14 2021-07-31 17:20:48 +02:00
jpb
15578c2ec2 merge conflict 2021-07-30 10:57:04 +02:00
Laurent Destailleur
079b014b14 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-26 00:41:35 +02:00
Laurent Destailleur
505543e18e Fix #yogosha6704 2021-07-26 00:37:47 +02:00
Laurent Destailleur
062c39c40d Fix html entities when we should not 2021-07-21 01:40:45 +02:00
stickler-ci
2f0ba41a53 Fixing style errors. 2021-07-20 13:35:10 +00:00
jpb
1237c5ba55 add msg to formconfirm on propal invoice and commande 2021-07-20 14:46:56 +02:00
BENKE Charlene
29bdbe02f2
Update index.php 2021-07-19 10:21:18 +02:00
Laurent Destailleur
0fd980b005
Update index.php 2021-07-14 13:57:17 +02:00
BENKE Charlene
7406f2cc85
a interventional drafts on commercial index 2021-07-14 12:55:33 +02:00
Laurent Destailleur
d91051488c
Merge pull request #18125 from fr69400/develop
NEW add hookmanager on note pages
2021-07-11 20:25:16 +02:00