Commit Graph

102360 Commits

Author SHA1 Message Date
Laurent Destailleur
e332ca88e4 Fix missing sql 2021-09-09 15:06:30 +02:00
Laurent Destailleur
402757bdfe Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-09 14:41:51 +02:00
Laurent Destailleur
3581c37b83
Merge pull request #18626 from fr69400/develop
FIX : line reorder dont work on supplier_proposal
2021-09-09 14:41:30 +02:00
Laurent Destailleur
cbe08183ac
Merge pull request #18648 from atm-gauthier/NEW_mass_delete_objects
NEW : mass action delete, no more break if at least one object has child
2021-09-09 14:38:49 +02:00
Laurent Destailleur
d9cdddd688
Update actions_massactions.inc.php 2021-09-09 14:35:19 +02:00
Laurent Destailleur
7eba2f6f39 Code comment 2021-09-09 14:32:59 +02:00
Laurent Destailleur
dca743142e
Merge pull request #18636 from Hystepik/develop#2
Close #18607 : Implementation of salary button
2021-09-09 14:29:56 +02:00
Laurent Destailleur
97f3296c73
Update card.php 2021-09-09 14:29:42 +02:00
Laurent Destailleur
4914ce74ab
Merge pull request #18658 from atm-gregr/NEW/develop_SupplierOrder_ValidateMassAction
New : supplier order validate mass action
2021-09-09 14:21:43 +02:00
Laurent Destailleur
6df4f250a5
Update list.php 2021-09-09 14:21:20 +02:00
stickler-ci
1e8870eb95 Fixing style errors. 2021-09-09 09:30:29 +00:00
Gauthier PC portable 024
ceaa96c014 Merge branch 'NEW_mass_delete_objects' of github.com:atm-gauthier/dolibarr into NEW_mass_delete_objects 2021-09-09 11:27:55 +02:00
Gauthier PC portable 024
4e78a24a13 FIX : if delete return < 0, we break and rollback, if == 0, we set event message warning and we test other objects of list 2021-09-09 11:25:46 +02:00
stickler-ci
3da71418ac Fixing style errors. 2021-09-09 08:52:26 +00:00
atm-gregr
b88a16b563 Merge branch '11.0_SupplierOrder_ValidateMassAction' of github.com:atm-gregr/dolibarr into NEW/develop_SupplierOrder_ValidateMassAction 2021-09-09 10:49:05 +02:00
atm-gregr
24117851cc NEW : massaction validate on supplier orders 2021-09-09 10:43:15 +02:00
Laurent Destailleur
ba38bfd038
Merge pull request #18616 from cfoellmann/fix-redirect-soc
fix GET parameter on redirect
2021-09-09 04:58:44 +02:00
Laurent Destailleur
ca2aa6d031 Clean comment 2021-09-09 04:37:08 +02:00
Laurent Destailleur
5de3d7d5d2 Clean var not initialized 2021-09-09 03:49:07 +02:00
Laurent Destailleur
7533092f27 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2021-09-09 03:42:12 +02:00
Laurent Destailleur
88cd9afe84
Merge pull request #18643 from Gecka-Apps/14-takepos-fast-product-search
TakePos - fast product search
2021-09-09 03:37:52 +02:00
Laurent Destailleur
66a7992441 Fix var init 2021-09-09 03:34:51 +02:00
Laurent Destailleur
8b58de50d5 Clean code 2021-09-09 03:21:41 +02:00
Laurent Destailleur
722cc5f3f9
Merge pull request #18647 from Hystepik/develop#4
Fix fatal error with php 8.0 holiday creation
2021-09-09 03:06:54 +02:00
Laurent Destailleur
4db234e036 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-09 02:29:10 +02:00
Laurent Destailleur
ad9bf27bea Clean code 2021-09-09 02:26:49 +02:00
Laurent Destailleur
89ed156d7e Complete getOutstandingBills() 2021-09-09 02:18:50 +02:00
Laurent Destailleur
39dd1e2dd1 Code comment 2021-09-09 02:00:07 +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
30856d5b18 FIX Relative discount with high nb of decimals 2021-09-08 22:09:02 +02:00
Laurent Destailleur
4705d41ed2 FIX Relative discount with high nb of decimals 2021-09-08 22:00:16 +02:00
Laurent Destailleur
8326ecee78 Fix phpcs 2021-09-08 21:19:40 +02:00
Laurent Destailleur
e0fa4e4b5c Fix phpcs 2021-09-08 21:19:01 +02:00
Laurent Destailleur
bfa75e91e2 Code comment 2021-09-08 20:59:56 +02:00
Laurent Destailleur
57a2ea3a53 Fix sql error 2021-09-08 19:49:24 +02:00
Laurent Destailleur
405beb77f5 Fix sql error 2021-09-08 19:45:55 +02:00
Laurent Destailleur
0b68da4e9e Debug organizedeventregistration module 2021-09-08 02:27:52 +02:00
Laurent Destailleur
f5903c9b02 Debug organizedeventregistration module 2021-09-08 02:17:00 +02:00
Laurent Destailleur
880ac07661 Debug organizedeventregistration module 2021-09-08 01:41:59 +02:00
Laurent Destailleur
b92784c04b Fix autoselect of thirdparty 2021-09-07 23:38:33 +02:00
Laurent Destailleur
3cc888f4df Debug event module 2021-09-07 23:19:36 +02:00
Laurent Destailleur
07d48e627e Debug event organization module 2021-09-07 23:19:16 +02:00
Laurent Destailleur
6089de568e Fix sort order 2021-09-07 23:15:06 +02:00
Laurent Destailleur
3df005778c Debug event module 2021-09-07 19:48:32 +02:00
Laurent Destailleur
f54e4690e6 Debug event organization module 2021-09-07 18:13:55 +02:00
Laurent Destailleur
32a09e9494 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/salaries/paiement_salary.php
2021-09-07 17:47:00 +02:00
Laurent Destailleur
1fda7d43ef Fix sql 2021-09-07 17:45:22 +02:00
Laurent Destailleur
83ec43a2ee css 2021-09-07 17:44:57 +02:00
Laurent Destailleur
0edf2f344b Fix sql 2021-09-07 17:38:46 +02:00
Laurent Destailleur
f2df3aa151 css 2021-09-07 17:27:29 +02:00