Frédéric FRANCE
9f23bac505
use hasRight
2023-02-20 18:55:52 +01:00
Laurent Destailleur
6da47ea49b
Fix qodana
2023-02-20 02:33:44 +01:00
Laurent Destailleur
eaa0e5eb3e
CSS
2023-02-19 02:39:39 +01:00
Laurent Destailleur
2168578f2e
Fix inline css
2023-02-18 14:00:25 +01:00
Frédéric FRANCE
ae48571135
use user->hasRight
2023-02-14 22:56:12 +01:00
FLIO
156922fc51
Fix (qodana) Incompatible return type
2023-02-14 14:09:56 +01:00
Frédéric FRANCE
1fa1d11500
Merge remote-tracking branch 'upstream/develop' into ajaxtooltip
2023-02-09 15:26:40 +01:00
muhalikin
821b423a24
Fix Shipment Creation from Order via REST API
2023-02-08 15:34:18 +03:00
Laurent Destailleur
cd2e82f4a5
Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop
2023-02-07 00:22:27 +01:00
Laurent Destailleur
95b306ba84
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
2023-02-07 00:19:54 +01:00
Frédéric FRANCE
8a5e983d7e
clean code
2023-02-06 22:21:54 +01:00
Frédéric FRANCE
a224d7c824
Merge remote-tracking branch 'upstream/develop' into ajaxtooltip
2023-02-06 20:57:49 +01:00
Laurent Destailleur
fe35f5ec28
Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop
2023-02-06 14:21:25 +01:00
Frédéric FRANCE
b238830c82
keep original label
2023-02-05 23:19:56 +01:00
Frédéric FRANCE
19631fef74
fix tooltip
2023-02-05 20:41:29 +01:00
Philippe GRAND
d903008786
fix : Warning: Undefined variable in /home/httpd/vhosts/aflac.fr/domains/dev.aflac.fr/httpdocs/commande/card.php on line 688
2023-02-05 15:14:23 +01:00
Frédéric FRANCE
04610763aa
Merge remote-tracking branch 'upstream/develop' into ajaxtooltip
2023-02-04 18:31:40 +01:00
Laurent Destailleur
2690dd6274
Merge pull request #23730 from altairis-benjamin/commandcard
...
FIX Get data back when error on command create
2023-02-04 17:06:32 +01:00
Laurent Destailleur
1f195a3be5
Fix #yogosha14963
2023-02-04 14:04:25 +01:00
Frédéric FRANCE
41dd574b16
clean js
2023-02-02 22:59:54 +01:00
Frédéric FRANCE
2df357c7c2
do not use cache for thirdparty in order list
2023-02-01 22:28:29 +01:00
Frédéric FRANCE
7eb0b71252
work on ajax tooltip
2023-01-31 22:47:30 +01:00
Frédéric FRANCE
993c1d28c4
work on ajax tooltip
2023-01-31 22:08:32 +01:00
Benjamin Falière
9f85e4a60f
Fixed another little error
2023-01-30 14:21:10 +01:00
Benjamin Falière
e7c6eac984
Replaced GETPOST with GETPOSTISSET
2023-01-30 14:06:49 +01:00
stickler-ci
f2c877f66a
Fixing style errors.
2023-01-30 11:06:30 +00:00
Benjamin Falière
79f401f5fb
Get data back when error on command create
2023-01-30 11:50:23 +01:00
Laurent Destailleur
d39318aae0
Merge pull request #23592 from BB2A/FIX---Order-list-det-sortfield-default
...
FIX - Order list det sortfield default
2023-01-25 18:51:59 +01:00
Frédéric FRANCE
823a7ee72b
fix undeclared properties
2023-01-18 22:37:08 +01:00
Laurent Destailleur
80d46a22f1
Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop
2023-01-18 21:36:57 +01:00
Laurent Destailleur
cd5009d8a4
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
2023-01-18 21:21:49 +01:00
Laurent Destailleur
8a12f337ab
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
2023-01-18 20:54:19 +01:00
Laurent Destailleur
283ad1abcf
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
2023-01-18 20:54:16 +01:00
Laurent Destailleur
2a299068ad
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2023-01-18 20:45:44 +01:00
Ferran Marcet
a00fa5a192
FIX: Do not convert negative line to discount if variable is active
2023-01-18 16:11:22 +01:00
stickler-ci
4ee0ede6d8
Fixing style errors.
2023-01-18 08:53:28 +00:00
Noé Courtier
d344e108c9
FIX: Errors Handling for CreateFrom Hooks
2023-01-18 09:44:23 +01:00
Anthony Berton
947365fabf
Update list_det.php
2023-01-17 17:48:37 +01:00
Laurent Destailleur
d4d7a7cc1d
Merge pull request #23589 from BB2A/Fix-pos-total-qty
...
Fix - pos total qty in order list det
2023-01-17 17:40:12 +01:00
Laurent Destailleur
0785186ec2
Merge pull request #23590 from BB2A/NEW---Add-sub-total-in-order-list-det
...
NEW - Add sub total in order list det
2023-01-17 17:40:00 +01:00
Laurent Destailleur
48161b8400
Debug v17. Bad param for selection of project
2023-01-17 13:50:23 +01:00
Anthony Berton
c3a5d32b8d
FIX - Filter checkbox memory to reload page
2023-01-17 12:07:02 +01:00
Anthony Berton
a165489237
Move checkbox
2023-01-17 11:46:39 +01:00
Anthony Berton
957e8538a4
FIX - Order list det sortfield default
2023-01-17 11:36:03 +01:00
Anthony Berton
eb6b42d1e3
NEW - Add sub total in order list det
2023-01-17 11:25:16 +01:00
Anthony Berton
95b391ae0a
Fix - pos total qty
2023-01-17 10:21:00 +01:00
Laurent Destailleur
707101b913
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
2023-01-13 12:56:24 +01:00
Laurent Destailleur
24651aaa6c
FIX #22731 #23524
2023-01-12 12:41:02 +01:00
Laurent Destailleur
8ced29cb00
Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop
2023-01-11 21:32:41 +01:00
Laurent Destailleur
4f350d878c
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
2023-01-11 21:07:43 +01:00
Laurent Destailleur
577ef4a8a1
Merge pull request #23501 from aspangaro/18a4
...
Use isModEnabled()
2023-01-11 10:29:37 +01:00
Alexandre SPANGARO
8f5edcab02
Use isModEnabled()
2023-01-11 06:11:41 +01:00
Laurent Destailleur
714ec2ce48
Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop
2023-01-10 22:11:40 +01:00
Laurent Destailleur
3c169ae09a
Fix look and feel v17
2023-01-10 21:54:37 +01:00
Laurent Destailleur
098e6c4075
Fix look and feel v17
2023-01-10 21:49:51 +01:00
Laurent Destailleur
3769861a8a
NEW VAT can be modified during add of line
2023-01-10 21:46:11 +01:00
Laurent Destailleur
ac5a07fee8
Debug v17
2023-01-10 17:27:19 +01:00
Laurent Destailleur
ccf231bc44
Fix sql error
2023-01-09 16:01:20 +01:00
Laurent Destailleur
b80c0e1b13
Merge pull request #21596 from BB2A/NEW---List-product-in-orders
...
NEW - List product in orders
2023-01-08 14:41:30 +01:00
Laurent Destailleur
5280d070e3
Fix technical debt
2023-01-06 19:24:57 +01:00
Laurent Destailleur
ba08457171
Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop
2023-01-06 16:55:41 +01:00
Laurent Destailleur
98b37d6648
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
2023-01-06 16:53:03 +01:00
Laurent Destailleur
2755e3dad7
Fix typo
2023-01-06 15:53:25 +01:00
mgabriel
a7de5e4c72
Added &$arrayfields to $parameters so that hooks can manipulate list columns.
2023-01-05 11:59:43 +01:00
Laurent Destailleur
9aa6e59f9b
Look and feel v18
2023-01-05 04:04:16 +01:00
Laurent Destailleur
27792fe1ad
Fix qodana
2023-01-04 18:34:54 +01:00
Laurent Destailleur
43a0ccce2b
Clean code
2023-01-04 11:37:24 +01:00
Laurent Destailleur
ba6374e6be
Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop
2023-01-03 15:31:00 +01:00
Laurent Destailleur
8d4e973e00
Fix warnings
2023-01-03 15:29:49 +01:00
Laurent Destailleur
00fa438c05
Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop
2023-01-03 02:40:22 +01:00
Laurent Destailleur
96f44ab5f8
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
2023-01-03 02:37:14 +01:00
Laurent Destailleur
deb110d556
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
2023-01-03 02:35:13 +01:00
Laurent Destailleur
10674a59bb
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2023-01-03 02:33:59 +01:00
Laurent Destailleur
67144020c6
Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop
2023-01-02 20:24:13 +01:00
stickler-ci
59ed7b9f96
Fixing style errors.
2023-01-02 11:52:34 +00:00
Amael
658753d242
Merge branch '17.0' into Amael-PE-FIX-23334
2023-01-02 12:47:45 +01:00
Christian Humpel
2aef5e94df
Set $remise_percent to 0, if GETPOST is empty.
2023-01-02 00:17:06 +01:00
Christian Humpel
da4567c875
Set $remise_percent to 0, if GETPOST is empty.
2023-01-01 15:05:04 +01:00
Laurent Destailleur
e523c04ce7
Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-12-31 14:25:11 +01:00
Laurent Destailleur
751f79b672
Debug v17
2022-12-31 14:21:16 +01:00
Laurent Destailleur
3ca8e8c493
Fix warning
2022-12-31 13:47:09 +01:00
Laurent Destailleur
ea42fc7605
Clean code, fix warnings
2022-12-30 18:43:43 +01:00
Laurent Destailleur
cdb9aa5ba0
Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-12-30 13:29:06 +01:00
Laurent Destailleur
54936c916c
Fix MO hang when no thirdparties are set
2022-12-30 13:27:12 +01:00
Laurent Destailleur
9319f56599
Fix css
2022-12-30 03:10:37 +01:00
Laurent Destailleur
6824f82cc8
Fix warnings
2022-12-28 13:58:23 +01:00
Laurent Destailleur
77d6b9510b
Clean code
2022-12-28 13:04:11 +01:00
stickler-ci
50e2545bea
Fixing style errors.
2022-12-25 23:41:03 +00:00
Amael
07a1f8e651
FIX #23334 Implement a price equivalent in command
...
Implement a price equivalent when dealing with minimum prices and foreign currencies.
Added in command/card.php for add and update.
2022-12-26 00:05:34 +01:00
Laurent Destailleur
8f02fb2ab8
Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-12-22 20:34:22 +01:00
lamrani abdelwadoud
bb1869b463
Merge branch 'develop' into kanbanModeOrdre
2022-12-22 10:53:58 +01:00
Gauthier PC portable 024
2c7e0afabd
FIX : travis
2022-12-21 17:17:33 +01:00
Gauthier PC portable 024
69b0cf9bcf
FIX : include class multicurrency
2022-12-21 14:05:54 +01:00
stickler-ci
3b9d39c1d2
Fixing style errors.
2022-12-21 10:00:26 +00:00
Gauthier PC portable 024
0582653a67
FIX : get multicurrency infos of propal when create order from propal with "WORKFLOW_PROPAL_AUTOCREATE_ORDER" conf
2022-12-21 10:55:03 +01:00
Francis Appels
b3aef891e2
FIX trigger LINEORDER_DELETE, extrafields should be removed after delete trigger.
2022-12-20 10:24:43 +01:00
hystepik
27cb4b4d86
Fix: php 8.1 warnings
2022-12-15 14:46:29 +01:00
Laurent Destailleur
50c76110bb
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
2022-12-14 11:19:12 +01:00
Laurent Destailleur
62b0447c7b
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
2022-12-14 11:02:23 +01:00
Laurent Destailleur
64de591770
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-12-14 10:20:47 +01:00
stickler-ci
0db8a0b831
Fixing style errors.
2022-12-08 09:34:48 +00:00
Lamrani Abdel
26e274beb9
NEW view mode for List of Orders
2022-12-07 16:59:19 +01:00
atm-lena
9fef8b7dc2
FIX Search List Alias Name
2022-12-07 10:11:57 +01:00
Florian HENRY
f405f859ca
ineer join is better than coma and where
2022-12-02 22:49:52 +01:00
Laurent Destailleur
a0e53a402d
Fix reponsive
2022-12-02 19:23:12 +01:00
Florian HENRY
8ddc4c8db6
FIX: propal and order stats broken on Tag+User(retricted customer list)
2022-12-01 14:28:00 +01:00
Laurent Destailleur
33afe96762
Merge pull request #23033 from atm-steve/fix_lists_missing_alias
...
FIX Alias on commande list
2022-11-29 10:37:18 +01:00
atm-steve
9c64b7baca
add parameters to getnomurl function to enable and disable alias
2022-11-29 10:01:07 +01:00
Laurent Destailleur
bb46cdb0af
Fix regression sql error
2022-11-27 21:10:37 +01:00
Maxime Kohlhaas
8c597543e1
Fix : use count() in lists - part 1
2022-11-26 00:54:49 +01:00
Laurent Destailleur
ce5bb5cd64
Fix warning
2022-11-24 22:49:37 +01:00
Anthony Berton
cb262b5305
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into pr/bb2a/21596
2022-11-10 09:07:17 +01:00
Laurent Destailleur
08985fbe62
Merge pull request #22792 from noec764/14_FIX_Add_Missing_LibStatut_Hooks
...
FIX: Add Missing "LibStatut" hooks in propal, commande, facture
2022-11-09 15:39:43 +01:00
stickler-ci
89876d8d52
Fixing style errors.
2022-11-08 15:24:05 +00:00
Noé Courtier
73b857c1b3
FIX: Add Missing "LibStatut" hook in propal, commande, facture
2022-11-08 16:21:32 +01:00
Anthony Berton
ce7e59a4b2
ADD colum warehouse
2022-11-07 14:15:21 +01:00
MB Informatique
52365b2d87
Merge branch 'Dolibarr:develop' into develop
2022-11-07 14:07:03 +01:00
Anthony Berton
c62a23b75a
clean code
2022-11-07 13:07:50 +01:00
Anthony Berton
31c7385dd7
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into pr/bb2a/21596
2022-11-07 11:24:24 +01:00
Laurent Destailleur
1984feeae1
Merge pull request #22681 from bb2a/FIX---/td-in-if-to-MAIN_CHECKBOX_LEFT_COLUMN
...
FIX - </td> in if to MAIN_CHECKBOX_LEFT_COLUMN
2022-11-02 00:38:28 +01:00
Laurent Destailleur
1431d7fa2a
Merge pull request #22708 from bb2a/FIX---php-8-totalarray
...
FIX - php 8 warnings, totalarray commande liste
2022-11-01 21:08:39 +01:00
Laurent Destailleur
4f38cfc435
Merge pull request #22714 from frederic34/strftimedeprecated
...
strftime is deprecated in php 8.1
2022-11-01 20:04:05 +01:00
Laurent Destailleur
124a969127
Debug v17
2022-10-31 15:35:00 +01:00
Frédéric FRANCE
754881a6ef
strftime is deprecated in php 8.1
2022-10-31 10:42:40 +01:00
Anthony Berton
1c0dd84d6f
OK
2022-10-29 21:57:58 +02:00
Anthony Berton
df2f3b0469
FIX - php 8 totalarray
2022-10-29 21:50:23 +02:00
Anthony Berton
1d08d2c8ab
erreur
2022-10-29 21:50:06 +02:00
Anthony Berton
8efaf03ec9
FIX - php 8 totalarray
2022-10-29 21:49:03 +02:00
Anthony Berton
1fc644572d
FIX - totalarray
2022-10-29 21:45:45 +02:00
Anthony Berton
6c4b77a23c
Hook
2022-10-26 18:35:58 +02:00
Anthony Berton
12db216f1e
FIX - $totalarray['nbfield']++;
2022-10-26 16:05:10 +02:00
Anthony Berton
0f842fdb3a
FIX - $totalarray['nbfield']++;
2022-10-26 16:02:25 +02:00
Anthony Berton
cb3680a91b
FIX - td
2022-10-26 15:43:59 +02:00
Anthony Berton
2ed2f74c8a
FIX - /td in if to MAIN_CHECKBOX_LEFT_COLUMN
2022-10-26 15:35:27 +02:00
Anthony Berton
e1ee0b7d66
FIX - /td
2022-10-26 15:34:04 +02:00
Anthony Berton
7b3ab23dca
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into pr/bb2a/21596
2022-10-26 14:11:54 +02:00
Anthony Berton
1a9f1e5574
rename file
2022-10-26 14:04:25 +02:00
Anthony Berton
78063b864a
FIX - Delete button ADD order
2022-10-26 14:01:54 +02:00
Anthony Berton
60acbe8186
FIX - contextpage
2022-10-26 12:45:09 +02:00
Laurent Destailleur
b15f0093cc
Merge branch 'develop' into fix_missing_hook_parameters
2022-10-25 17:19:38 +02:00
Anthony Berton
16c2e8cbc9
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into pr/bb2a/21596
2022-10-24 20:06:29 +02:00
Laurent Destailleur
290d02c0df
Merge pull request #22627 from noec764/14_FIX_Invoice_Order_FetchLines
...
FIX: Missing return 0 if object not found
2022-10-24 19:45:41 +02:00
Anthony Berton
64bc7a93c3
ADD - Option Products to buy only
2022-10-24 18:43:23 +02:00
Anthony Berton
2671bd6433
FIX - no ligne title or sub-total or comment
2022-10-24 18:28:00 +02:00
Anthony Berton
9c6dd0f5df
FIX - removefilter
2022-10-24 18:24:11 +02:00
Anthony Berton
7d911aad20
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into pr/bb2a/21596
2022-10-24 18:11:01 +02:00
Laurent Destailleur
81813225aa
Look and feel v17
2022-10-24 01:25:50 +02:00
Laurent Destailleur
003df66f6a
Clean code
2022-10-22 02:32:43 +02:00
Laurent Destailleur
f87ec74b9f
Replace LEFT JOIN with EXISTS
2022-10-22 00:22:54 +02:00
Laurent Destailleur
d9c2528b62
Clean code
2022-10-21 23:49:45 +02:00
Laurent Destailleur
330a1199e4
Look and feel v17
2022-10-21 15:08:54 +02:00
Regis Houssin
9145388301
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_missing_hook_parameters
2022-10-21 11:09:45 +02:00
Regis Houssin
f57412107b
FIX missing hook parameters
2022-10-21 11:09:36 +02:00
Laurent Destailleur
06d94c9a97
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-10-19 17:11:32 +02:00
Noé Courtier
477f5e2890
FIX: Missing return 0 if object not found
2022-10-19 11:53:17 +02:00
mbinformatique68
d30b1b4860
NEW Add the formEditObjectLine hook on commande card
2022-10-18 16:33:30 +02:00
Regis Houssin
0e63591604
FIX avoid warning (php8) missing hook parameters
2022-10-18 10:45:48 +02:00
lvessiller
2d181f01be
NEW rename MAIN_LIST_ALLOW_NOTES by MAIN_LIST_HIDE_NOTES
2022-10-17 11:37:09 +02:00
lvessiller
121ebb671b
NEW resize parent company column in order list
2022-10-14 08:45:24 +02:00
Laurent Destailleur
9fa00c1771
Fix trans in comments
2022-10-12 15:29:30 +02:00
Nicolas
5528dc3843
FIX closed warehouse for shipping
2022-10-11 10:26:03 +02:00
Laurent Destailleur
ae4f8b23d5
Standardize code for action buttons Delete
2022-10-10 11:39:50 +02:00
Laurent Destailleur
63109d2844
Merge pull request #22182 from frederic34/pr/dolibit-ut/22136
...
sample deprecated function
2022-10-06 12:20:15 +02:00
Laurent Destailleur
395312737b
Merge pull request #22406 from aspangaro/17p6
...
Use isModEnabled
2022-10-04 18:01:59 +02:00
lvessiller
ebeafa487a
FIX cache on parent company list
2022-10-03 12:29:12 +02:00
lvessiller
b894136dd9
NEW parent company column and filter in order list
2022-10-03 09:52:46 +02:00
Laurent Destailleur
07966f5e6b
Clean code
2022-10-01 14:00:43 +02:00
Alexandre SPANGARO
51aa7e8027
Merge remote-tracking branch 'upstream/develop' into 17p6
2022-10-01 07:52:48 +02:00
Laurent Destailleur
fb28d14097
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2022-09-28 21:20:37 +02:00
Laurent Destailleur
98ed321514
Merge branch 'develop' into 17p6
2022-09-28 20:55:43 +02:00
Frédéric France
3a3dad6fb8
Merge remote-tracking branch 'upstream/develop' into pr/dolibit-ut/22136
2022-09-28 20:23:40 +02:00
Laurent Destailleur
52b12ee47d
Trans
2022-09-27 14:12:37 +02:00
Laurent Destailleur
edaa111461
Replace use of png file for module image with a font awesome image
2022-09-27 12:05:11 +02:00
Laurent Destailleur
41270d585e
css
2022-09-27 11:17:10 +02:00
Alexandre SPANGARO
ef94f2af70
Use isModEnabled
2022-09-25 22:45:10 +02:00
Laurent Destailleur
acaf066d1d
Merge pull request #22011 from SylvainLegrand/PR_Option_for_input_of_customer_or_supplier_references
...
Add an option to manage input size for customer / supplier references
2022-09-25 18:48:55 +02:00
Laurent Destailleur
2a98ff313e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2022-09-25 17:12:25 +02:00
Laurent Destailleur
f5e5de1eba
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2022-09-25 17:12:03 +02:00
Laurent Destailleur
86091c3fde
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
2022-09-25 17:01:44 +02:00
Alexandre SPANGARO
d06fef47f8
Use isModEnabled
2022-09-25 15:28:36 +02:00
Laurent Destailleur
118b975f91
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-09-25 11:56:05 +02:00
Alexandre SPANGARO
fc9e6c541e
Use isModEnabled
2022-09-25 06:30:33 +02:00
Alexandre SPANGARO
5eaffd64e7
Use isModEnabled
2022-09-25 06:13:22 +02:00
Alexandre SPANGARO
5fc79979bc
Use isModEnabled
2022-09-25 06:02:13 +02:00
Alexandre SPANGARO
58ac8d196c
Use isModEnabled
2022-09-25 06:01:40 +02:00
priojk
33291b7cc7
FIX #21799 inactive companies cannot be selected
2022-09-24 17:19:52 +02:00
Philippe GRAND
fb9db96ecc
update code toward php8 compliance
2022-09-24 14:37:57 +02:00
Laurent Destailleur
e1b5e5033f
Clean code of deprecated field
2022-09-23 09:35:17 +02:00
Laurent Destailleur
6fb9a4713c
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-09-21 01:30:40 +02:00
Regis Houssin
f5fe366525
FIX broken feature, wrong fk_parent_line
2022-09-16 15:03:53 +02:00
Laurent Destailleur
91bdaae898
Look and feel v17
2022-09-15 03:08:33 +02:00
Regis Houssin
a3a973466f
FIX broken feature, wrong fk_parent_line after cloning object
2022-09-13 15:16:17 +02:00
Laurent Destailleur
209bf00b69
Trans
2022-09-13 00:12:57 +02:00
Laurent Destailleur
a11a33a804
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-09-11 22:21:18 +02:00
Frédéric France
e96eee56b0
sample deprecated function
2022-09-10 13:55:40 +02:00
Alexandre SPANGARO
6b4bd6c09e
FIX #21859 - Don't show html balise on list for private/public note
2022-09-09 15:56:17 +02:00
Frédéric France
1c2a89f52d
Merge remote-tracking branch 'upstream/develop' into loaddolibarrenv
2022-09-09 08:09:12 +02:00
Laurent Destailleur
7c7ccc2393
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-09-09 01:45:59 +02:00
Laurent Destailleur
fb60c100e5
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
2022-09-09 01:39:52 +02:00
Laurent Destailleur
3177a065cd
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-09-09 01:31:43 +02:00
Frédéric France
da8617e3ff
Merge remote-tracking branch 'upstream/develop' into loaddolibarrenv
2022-09-08 18:59:23 +02:00
Laurent Destailleur
ee05abaa27
Clean code
2022-09-08 15:13:16 +02:00
Laurent Destailleur
aa9036a0f5
Clean code
2022-09-08 15:05:51 +02:00
Frédéric France
8d33953142
add comment
2022-09-07 20:08:59 +02:00
Alexandre SPANGARO
9a5927d833
FIX Column label
2022-09-06 05:30:35 +02:00
Laurent Destailleur
760c6e581e
Merge pull request #22060 from grandoc/new_branch_03_09_2022
...
Update code
2022-09-03 11:44:36 +02:00
Philippe GRAND
7997776cbb
Update code
2022-09-03 11:12:52 +02:00
Philippe GRAND
4a8f61838d
Update code
2022-09-03 11:11:38 +02:00
Philippe GRAND
120fb10738
Update code
2022-09-03 11:09:59 +02:00
Frédéric FRANCE
9150f5102e
Merge remote-tracking branch 'upstream/develop' into pr/grandoc/22009
2022-09-02 11:44:45 +02:00
Laurent Destailleur
027e597776
Merge branch 'develop' into productbatch
2022-09-02 10:11:47 +02:00
stickler-ci
9a7ad0a7dc
Fixing style errors.
2022-09-01 19:17:42 +00:00
UT from dolibit
33e112eda7
Update list.php
2022-09-01 21:06:30 +02:00
Anthony Berton
c0c12a40b0
Fix inithook
2022-09-01 16:37:13 +02:00
Philippe GRAND
9ba54b502d
update code
2022-09-01 09:41:59 +02:00
Sylvain Legrand
a1bae3453a
Add an option to manage input size for customer / supplier references
2022-09-01 08:34:22 +02:00
Frédéric France
bb58f3a18f
use isModEnabled
2022-08-31 22:38:53 +02:00
Frédéric France
8e66b7207e
replace ! empty by !empty
2022-08-31 22:14:20 +02:00
Philippe GRAND
81c13bcc4c
update code
2022-08-31 22:03:33 +02:00
Frédéric France
e71692e745
fix php8 warnings
2022-08-31 22:02:31 +02:00
Philippe GRAND
52fed85676
update code
2022-08-31 21:59:06 +02:00
Philippe GRAND
b04125f9f9
update code
2022-08-31 21:58:38 +02:00
Philippe GRAND
1b7934062f
update code
2022-08-31 21:57:27 +02:00
Philippe GRAND
18fba7a8e7
update code
2022-08-31 21:56:58 +02:00
Philippe GRAND
c86617c7b1
update code
2022-08-31 21:56:30 +02:00
Frédéric France
fc01cc66cd
fix php8 warnings
2022-08-31 21:55:55 +02:00
Philippe GRAND
f26b1cccdc
update code
2022-08-31 21:55:54 +02:00
Laurent Destailleur
e0b1ad308b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2022-08-30 19:38:35 +02:00
UT from dolibit
2b59e9261b
Update index.php
2022-08-29 18:58:51 +02:00
Laurent Destailleur
5acd2b0702
Merge pull request #21917 from dolibit-ut/patch-444
...
Update card.php
2022-08-29 00:54:53 +02:00
UT from dolibit
c6c5ddd485
Update commande.class.php
2022-08-27 13:55:27 +02:00
stickler-ci
2ee2dfeea2
Fixing style errors.
2022-08-27 10:26:09 +00:00
UT from dolibit
765b8053cf
Update card.php
2022-08-27 12:21:01 +02:00
Laurent Destailleur
bfb01ae928
Clean code
2022-08-26 18:24:42 +02:00
Laurent Destailleur
af69270a0e
NEW Can enter the unit price including the vat
2022-08-26 17:39:41 +02:00
UT from dolibit
1efca018d9
Update list.php
2022-08-24 23:13:27 +02:00
Frédéric France
e78f9a56be
use isModEnabled
2022-08-23 20:16:28 +02:00
Anthony Berton
6d625d6128
Add options for clean list
2022-08-23 20:09:40 +02:00
Frédéric France
86a7a7c8bb
use isModEnabled
2022-08-23 20:05:09 +02:00
Frédéric France
4bef0f5745
use isModEnabled
2022-08-23 20:01:34 +02:00
Anthony Berton
19248016bf
Fix - $generic_commande mount
2022-08-23 15:40:12 +02:00
Anthony Berton
d7387ecd17
optimise
2022-08-23 12:33:03 +02:00
Anthony Berton
b3c903723f
Add menu and clean
2022-08-23 11:37:08 +02:00
Anthony Berton
be2ecf1c3a
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into pr/bb2a/21596
2022-08-23 10:52:21 +02:00
Anthony Berton
5eb495224b
clean
2022-08-23 10:51:38 +02:00
Anthony Berton
dac8613c39
Add new file
2022-08-23 10:46:09 +02:00
Laurent Destailleur
72c010622b
FIX empty with hasRight and add phpunit to avoid this in future
2022-08-14 16:38:20 +02:00
Laurent Destailleur
24b1085639
Clean code. Prepare for inputing prices with taxes
2022-08-13 19:30:26 +02:00
Laurent Destailleur
95b1b3f990
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/card.php
htdocs/commande/card.php
htdocs/emailcollector/class/emailcollector.class.php
htdocs/index.php
htdocs/website/index.php
2022-08-10 13:16:02 +02:00
Regis Houssin
b20144c3d0
FIX php8 compatibility
2022-08-08 11:39:43 +02:00
Laurent Destailleur
654e7bf638
Merge branch 'develop' into FIX---php-V8-user-right-order-card
2022-07-28 14:21:20 +02:00
Anthony Berton
a778a5ff78
and order lib
2022-07-28 11:50:42 +02:00
Anthony Berton
03e265b080
FIX - php V8 user right order card
2022-07-28 11:43:00 +02:00
Anthony Berton
d8ae2361a9
NEW - Add user right order generete doc
2022-07-28 11:29:36 +02:00
Anthony Berton
8dfb4288ec
Clean
2022-07-27 17:27:05 +02:00
Anthony Berton
133375157a
Merge branch 'NEW---List-product-in-orders' of https://github.com/bb2a/dolibarr into NEW---List-product-in-orders
2022-07-27 16:52:51 +02:00
Anthony Berton
716adb103f
FIX - Error with MAIN_CHECKBOX_LEFT_COLUMN
2022-07-27 16:52:48 +02:00
stickler-ci
7740c81f3b
Fixing style errors.
2022-07-27 14:38:59 +00:00
Anthony Berton
5f3dc1b01f
Add search in sql
2022-07-27 16:11:16 +02:00
Anthony Berton
7df1f876f5
Add removefilter
2022-07-27 16:02:27 +02:00
Anthony Berton
887d30e1b4
Add option ORDER_ADD_OPTION_SHOW_DETAIL_LIST
2022-07-27 16:01:45 +02:00
Anthony Berton
0e796a2a02
Clean
2022-07-27 15:35:35 +02:00
BB2A Anthony Berton
da7f267df3
[200~Merge branch NEX---List-product-in-orders of https://github.com/bb2a/dolibarr into NEX---List-product-in-
2022-07-27 15:02:37 +02:00
BB2A Anthony Berton
7a8006c0a0
init
2022-07-27 14:40:45 +02:00
Berton Anthony
e77c51eabb
conf
2022-07-25 12:18:07 +02:00
Berton Anthony
eb463341b4
ok
2022-07-25 12:17:02 +02:00
Laurent Destailleur
fb96145b49
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-07-12 02:05:20 +02:00
Laurent Destailleur
204bf2e618
Update card.php
2022-07-11 10:54:23 +02:00
This Charlène
796f718012
Update card.php
2022-07-11 07:14:46 +02:00
This Charlène
8be15e8e27
php v8 fix warning
...
missing and bad name variables
2022-07-11 07:11:45 +02:00
Laurent Destailleur
2ce695f939
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-07-10 19:48:20 +02:00
Laurent Destailleur
9a92c7d9b0
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/core/class/extrafields.class.php
2022-07-10 19:28:16 +02:00
Laurent Destailleur
a871aa8f85
Merge pull request #21382 from fboitel/NEW#20650
...
NEW #20650 Checkbox column on left for lists
2022-07-07 21:48:51 +02:00
Christian Foellmann
4c5e05e411
fix page titles
...
Conflicts:
htdocs/compta/bank/annuel.php
htdocs/contact/list.php
htdocs/product/stock/movement_list.php
htdocs/user/list.php
2022-07-06 19:19:08 +02:00
Laurent Destailleur
76e3c10c06
Revert "fix page titles"
2022-07-06 15:56:04 +02:00
Laurent Destailleur
bd28a7e038
Debug v16
2022-07-03 12:54:58 +02:00
Laurent Destailleur
4c4e081997
Debug v16
2022-06-28 13:09:53 +02:00
Christian Foellmann
89d1389e2d
fix page titles
2022-06-27 12:48:04 +02:00
Laurent Destailleur
0d25e3d236
Merge pull request #21392 from bb2a/FIX---php-V8-order-liste
...
FIX - php V8 order liste
2022-06-27 12:20:31 +02:00
Laurent Destailleur
bc81f372ac
Merge pull request #21362 from bb2a/FIX---Cancel-order
...
FIX - Right close order
2022-06-27 11:46:55 +02:00
Laurent Destailleur
a1f974f356
Merge pull request #21374 from aspangaro/17p2
...
Look & Feel v16 - Align amount to right on card
2022-06-27 11:39:31 +02:00
BB2A Anthony Berton
2208d39b39
FIX - php V8 order liste
2022-06-27 11:29:15 +02:00
Alexandre SPANGARO
11a1273211
PHP8 warning & typo on key
2022-06-25 07:13:15 +02:00
Alexandre SPANGARO
cadf8ebe29
Look & Feel v16 - Align amount to right on card
2022-06-25 06:55:10 +02:00
Faustin
10a9ab5ed1
NEW #20650 enabled checkcolumn on left for commande list
2022-06-24 13:56:24 +02:00
BB2A Anthony Berton
0d00c4b26d
FIX
2022-06-23 15:34:45 +02:00
Laurent Destailleur
4b79d91437
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-06-23 12:35:24 +02:00
BENKE Charlene
710e556845
fix $fk_product instead $this->fk_product
...
$fk_product not present on $commande object
2022-06-20 16:07:22 +02:00
GregM
d370571963
FIX class center linkedObjectblock order date
2022-06-20 14:59:13 +02:00
Laurent Destailleur
28234c6f44
Merge pull request #21276 from badre-agtaib/scru4
...
FIX bug :The properties product_tosell & product_tobuy do not exist on OrderLine
2022-06-15 11:05:34 +02:00
bagtaib
22152dd254
declaring the propreties product_tosell & product_tobuy
2022-06-15 00:50:34 +02:00
Laurent Destailleur
2370ff4dfc
Clean code
2022-06-14 21:00:05 +02:00
Laurent Destailleur
dd392143e1
Fix conf->projet conf->project
2022-06-14 17:53:17 +02:00
bagtaib
267a6f908d
The properties product_tosell & product_tobuy do not exist on OrderLine
2022-06-14 17:26:18 +02:00
Laurent Destailleur
f261846990
Fix look and feel v16
2022-06-14 10:21:10 +02:00
Frédéric France
3fdbce7a31
use isModEnabled function
2022-06-11 09:46:28 +02:00
Frédéric France
5dcfc28913
use isModEnabled function
2022-06-09 22:41:59 +02:00
Laurent Destailleur
f5705e89a8
Merge branch 'develop' into patch-195
2022-06-01 22:03:19 +02:00
lmarcouiller
2d13b47441
fix php8.0 warnings
2022-05-31 11:36:54 +02:00
BENKE Charlene
2ad50b77b7
php V8 warning
2022-05-27 16:34:56 +02:00
Laurent Destailleur
4c10c04f9f
Merge pull request #20495 from atm-john/new_fix_regression_select_extrafield_search
...
FIX : regression select extrafield search + fix function name
2022-05-24 21:55:33 +02:00
Laurent Destailleur
259a292704
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-05-24 16:33:24 +02:00
Laurent Destailleur
34199cf0fb
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
...
Conflicts:
htdocs/comm/propal/card.php
htdocs/core/modules/modRecruitment.class.php
2022-05-24 16:31:45 +02:00
Laurent Destailleur
324721ac1e
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/card.php
htdocs/core/tpl/list_print_total.tpl.php
htdocs/fichinter/list.php
htdocs/fourn/class/fournisseur.commande.class.php
2022-05-22 12:54:40 +02:00
Eric Seigne
4a222fe5d5
fix potential warning ($conf->ficheinter->enabled)
2022-05-22 01:38:32 +02:00
Regis Houssin
6372bea326
FIX php8 warning
2022-05-22 00:14:01 +02:00
Laurent Destailleur
2c2544d471
Fix scrutinizer
2022-05-21 15:31:08 +02:00
Laurent Destailleur
7c9d360019
Merge pull request #20937 from atm-maxime/fix_date_creation_visible
...
Fix : date_creation must have visible=-2
2022-05-21 10:34:01 +02:00
Maxime Kohlhaas
755bce9fe1
Fix : date_creation must have visible=-2
2022-05-21 00:22:47 +02:00
Maxime Kohlhaas
cff5ec8605
Fix : fields must check module enabled
2022-05-21 00:08:18 +02:00
Laurent Destailleur
4162a02cc1
Fix deprecated remise must be remove from insert
2022-05-20 20:10:45 +02:00
Frédéric FRANCE
243dfacb15
Update card.php
2022-05-19 12:46:15 +02:00
Frédéric FRANCE
ad3276b579
Update card.php
2022-05-19 12:42:15 +02:00
Frédéric FRANCE
2114e51b0e
Update card.php
2022-05-19 12:34:54 +02:00
Frédéric FRANCE
e44e9d812a
Update card.php
2022-05-19 12:28:50 +02:00
Laurent Destailleur
7fd3bb0aae
Remove deprecated code
2022-05-19 12:08:03 +02:00
Laurent Destailleur
38aced687b
Fix scrutinizer
2022-05-18 23:52:43 +02:00
Laurent Destailleur
2e15a14c14
css
2022-05-18 00:10:44 +02:00
Laurent Destailleur
a483af70df
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/contrat/index.php
2022-05-17 23:27:11 +02:00
Laurent Destailleur
c475789433
Debug v16
2022-05-17 23:23:50 +02:00
stickler-ci
f70a9ad04c
Fixing style errors.
2022-05-11 13:42:27 +00:00
Gauthier PC portable 024
da2a8a59f3
Merge branch '14.0_NEW_rang_on_api_put_line' of github.com:atm-gauthier/dolibarr into NEW/can_update_rank_on_api_put_function
2022-05-11 14:38:16 +02:00
Gauthier PC portable 024
b053dee279
NEW : update rank line is possible on API for orders propal and supplier invoice
2022-05-11 14:26:21 +02:00
Laurent Destailleur
720a09dacb
Fix regression
2022-05-09 15:57:10 +02:00
Laurent Destailleur
522c092aeb
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2022-05-09 09:26:10 +02:00
Laurent Destailleur
b3b6337c4c
Merge branch 'develop' into NEW_deposit_payment_terms
2022-05-08 23:09:06 +02:00
Laurent Destailleur
6592eb5d73
Debug for php 8.1
2022-05-08 18:25:22 +02:00
Philippe GRAND
2467dd0615
fix : do not display html tags into list
2022-05-04 09:18:46 +02:00
Laurent Destailleur
a99e647348
Merge pull request #20658 from Hystepik/develop#1
...
NEW #20653 edit discount pourcentage for all lines in one shot
2022-05-04 01:20:49 +02:00
Laurent Destailleur
fa7254be9a
Fix picto and perm
2022-05-03 17:05:14 +02:00
Laurent Destailleur
fa8ce6e4fd
Merge pull request #20710 from fappels/develop_confirm_createbills
...
Move massaction 'confirm_createbills' from actions_massactions.inc.php to commande/list.php
2022-04-29 17:19:18 +02:00
Laurent Destailleur
708d3610a5
Look and feel v16
2022-04-29 13:04:29 +02:00
Francis Appels
e9cfb9b69c
Improve error handling confirm_billcreate
2022-04-25 11:24:09 +02:00
Francis Appels
e6ce81bf8b
Move confirm_createbills mass action to order list
2022-04-25 11:20:00 +02:00
lmarcouiller
1ccf209c47
Close #20653 : edit discount pourcentage
2022-04-15 14:31:44 +02:00
BB2A Anthony Berton
d154696c32
morecss select_compagny
2022-04-13 16:15:07 +02:00
Laurent Destailleur
cb15a21e41
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/core/tpl/originproductline.tpl.php
htdocs/fourn/facture/card.php
htdocs/install/mysql/migration/14.0.0-15.0.0.sql
htdocs/user/card.php
2022-04-11 21:22:27 +02:00
Laurent Destailleur
3ac268c200
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
...
Conflicts:
htdocs/core/lib/security.lib.php
htdocs/holiday/card.php
htdocs/user/card.php
2022-04-11 21:14:51 +02:00
Gauthier PC portable 024
83e8e07416
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop
2022-04-08 09:25:08 +02:00
Laurent Destailleur
75b66eace0
Merge pull request #19417 from atm-adrien/FIX_commandeFourn_Stats
...
FIX : Supplier order stats
2022-04-07 18:35:10 +02:00
Laurent Destailleur
26c3e235cf
Merge pull request #19459 from frederic34/productmerge
...
can merge products
2022-04-07 15:02:03 +02:00
Laurent Destailleur
4693ef42bd
Enhance responsive
2022-04-07 11:18:56 +02:00
Laurent Destailleur
2690f4459f
NEW Enhance the import. Can use 'auto' for the ref (import of orders)
2022-04-04 13:17:45 +02:00
Laurent Destailleur
5b91ae062f
All triggers with a name XXX_UPDATE have been renamed XXX_MODIFY for
...
code consistency purpose.
2022-04-02 10:31:58 +02:00
Laurent Destailleur
408608ebea
Merge pull request #20430 from atm-GregM/DolGetButtonAction_Commande
...
FIX: replacing to dolGetButtonAction on Commande card
2022-04-01 20:10:13 +02:00
Laurent Destailleur
9389b96d1d
Merge pull request #20478 from rycks/develop
...
fix #20477 : add online_payment_url on orders API requests
2022-04-01 14:47:38 +02:00
Laurent Destailleur
a3dbcd0c27
Clean language files
2022-04-01 13:09:11 +02:00
Eric Seigne
1589afde19
fix #20477 : add online_payment_url as public var
2022-03-30 14:06:15 +02:00
ATM john
c1d9ea95dc
fix function name
2022-03-30 12:16:17 +02:00
Laurent Destailleur
63d9f69732
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
2022-03-29 15:55:47 +02:00
Laurent Destailleur
1251e80963
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
...
Conflicts:
htdocs/accountancy/index.php
htdocs/commande/list.php
htdocs/langs/en_US/errors.lang
htdocs/projet/class/task.class.php
2022-03-29 15:10:11 +02:00
Eric Seigne
9f2480712b
end of #20477
2022-03-29 10:32:14 +02:00
Eric Seigne
53ff837d0f
fix #20477 : add online_payment_url on orders API requests
2022-03-29 09:48:18 +02:00
Laurent Destailleur
95dc25587c
Standardize code of the fetch_lines()
2022-03-28 13:50:47 +02:00
Marc de Lima Lucio
cbba7d7d5f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms
2022-03-25 16:14:53 +01:00
Laurent Destailleur
4a80f35aaa
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/fourn/class/fournisseur.commande.class.php
2022-03-23 17:26:25 +01:00
Ferran Marcet
ccf8b01020
Fix: The origin of the stock movement is not being recorded
2022-03-22 13:46:55 +01:00
GregM
4fb62ee15a
replacing to dolGetButtonAction on Commande card
2022-03-22 12:04:51 +01:00
Laurent Destailleur
8603d493ad
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contrat/list.php
htdocs/install/mysql/tables/llx_partnership.key.sql
2022-03-19 17:34:26 +01:00
Laurent Destailleur
ed631b2b06
Fix doxygen, missing error message
2022-03-18 16:14:20 +01:00
Frédéric FRANCE
7291bbf710
tooltip order date is date not datetime
...
from sql table
date_commande date, -- date de la commande
2022-03-10 13:52:05 +01:00
Gauthier PC portable 024
5b715978e4
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop
2022-03-10 10:02:57 +01:00
Marc de Lima Lucio
4efcbe8799
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms
2022-03-08 15:23:52 +01:00
Marc de Lima Lucio
1993a8d7b1
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms
2022-03-08 15:07:37 +01:00
Laurent Destailleur
88b9123a93
Merge pull request #19989 from iouston/patch-2
...
add target attribute on getNomUrl
2022-03-07 17:10:39 +01:00
Laurent Destailleur
d0ca8af6ee
Update commande.class.php
2022-03-07 17:10:28 +01:00
Laurent Destailleur
660aa7b282
Update commande.class.php
2022-03-07 17:10:00 +01:00
Laurent Destailleur
84b951c2f9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2022-03-07 15:27:07 +01:00
Laurent Destailleur
54ecf1f98c
# WARNING: head commit changed in the meantime
...
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-03-07 15:24:08 +01:00
Frédéric FRANCE
9d1bcbe55a
Fix wrong upload dir
...
introduced here https://github.com/Dolibarr/dolibarr/pull/19165
2022-03-04 18:17:23 +01:00
Noé Cendrier
e4f4a07fc6
correct mass action "classify delivered"
2022-03-04 17:31:04 +01:00
John Livingston
1ece554c92
Fix: typo in template name
...
There was a typo in generated HTML comment.
2022-03-01 17:39:38 +01:00
Laurent Destailleur
358f21f06e
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formother.class.php
htdocs/core/customreports.php
2022-03-01 16:48:29 +01:00
Laurent Destailleur
bd288f980d
FIX On large proposal or invoice, fix n(n+1) sql into a n sql.
2022-03-01 14:52:47 +01:00
Frédéric FRANCE
018fc53554
Merge remote-tracking branch 'upstream/develop' into productmerge
2022-02-27 08:40:01 +01:00
Laurent Destailleur
409da7f091
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-25 19:17:41 +01:00
Laurent Destailleur
f8a5749fc4
# WARNING: head commit changed in the meantime
...
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-02-25 19:00:10 +01:00
stickler-ci
fa4e6bd93a
Fixing style errors.
2022-02-24 10:10:41 +00:00
Adrien Raze
146b432acf
FIX: PR returns
2022-02-24 11:07:31 +01:00
Laurent Destailleur
73b04deb19
Fix error management.
2022-02-23 00:17:49 +01:00
Laurent Destailleur
e96061dd18
Fix phpunit SecurityTest
2022-02-22 23:46:57 +01:00
Frédéric FRANCE
b277ab9ee3
Merge remote-tracking branch 'upstream/develop' into productmerge
2022-02-22 21:49:17 +01:00
Laurent Destailleur
cebada1966
Merge pull request #20071 from frederic34/patch-1
...
NEW Hook getNomUrl available everywhere in tooltip of ref links
2022-02-16 20:36:02 +01:00
Laurent Destailleur
aad292b41b
Merge pull request #20074 from altairisfr/fix_parentline_13.0
...
More generic management of parentline
2022-02-16 20:25:04 +01:00
lvessiller
7e17167faf
NEW total mark rate in list
2022-02-16 11:45:29 +01:00
Frédéric FRANCE
eb77f10d7b
Merge remote-tracking branch 'upstream/develop' into productmerge
2022-02-15 19:11:24 +01:00
Frédéric FRANCE
935482ee22
uniformize
2022-02-15 19:04:18 +01:00
Frédéric FRANCE
0ba912b1e5
add missing global
2022-02-15 18:14:44 +01:00
Frédéric FRANCE
09c9b28b57
Update commande.class.php
2022-02-15 11:02:22 +01:00
Frédéric FRANCE
c90f9b5681
add hook in order tooltip
2022-02-15 10:51:06 +01:00
Christophe Battarel
01ef9b64ee
fix parent line on create with no originid
2022-02-15 10:34:10 +01:00
Christophe Battarel
6c6c854eae
fix parent line on create with origin
2022-02-15 10:23:43 +01:00
iouston
4808442bc8
keep the default value for target in getnomurl to ''
2022-02-15 09:34:51 +01:00
Laurent Destailleur
3b18462a62
# WARNING: head commit changed in the meantime
...
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-07 15:51:01 +01:00
Laurent Destailleur
53bac7ae0f
Fix menu
2022-02-07 15:16:11 +01:00
iouston
993e0d852c
fix parameter name
2022-02-04 15:01:32 +01:00
stickler-ci
e8801bd7fc
Fixing style errors.
2022-02-04 13:42:07 +00:00
iouston
95aabd6ae3
add target attribute on getNomUrl
2022-02-04 14:38:34 +01:00
lvessiller
241a65e2ae
NEW add margin info in proposal and order list
2022-02-03 10:39:03 +01:00
Laurent Destailleur
adf8f3886b
Merge
2022-01-28 18:07:56 +01:00
Laurent Destailleur
2686541156
Fix late picto
2022-01-28 17:59:58 +01:00
Gauthier PC portable 024
3abe391f65
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop
2022-01-28 15:08:02 +01:00
ptibogxiv
928075bbf6
fix error in commande.class.php
2022-01-26 20:13:10 +01:00
Laurent Destailleur
8dbadc0aa8
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-24 14:12:06 +01:00
Laurent Destailleur
6b5c0769b8
FIX #19786
2022-01-24 14:09:53 +01:00
ptibogxiv
b89947ff7c
Update commande.class.php
2022-01-20 19:58:31 +01:00
ptibogxiv
56dd41324c
Update commande.class.php
2022-01-20 19:57:48 +01:00
ptibogxiv
accb0deb29
New support user_modif in order
2022-01-16 00:13:14 +01:00
Laurent Destailleur
91b2d59458
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-01-14 10:37:41 +01:00
Laurent Destailleur
53e65095a7
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/commande/card.php
htdocs/expedition/card.php
htdocs/fourn/commande/card.php
htdocs/fourn/commande/list.php
htdocs/fourn/facture/card.php
2022-01-14 10:36:46 +01:00
Laurent Destailleur
9dde80dd52
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/expedition/card.php
htdocs/fourn/commande/list.php
2022-01-14 10:30:39 +01:00
Laurent Destailleur
13510b9929
Clean sortfield, sortorder
2022-01-13 11:17:25 +01:00
Gauthier PC portable 024
6799d48944
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop
2022-01-11 09:59:25 +01:00
Laurent Destailleur
0387b9922e
FIX error message on sqlfilter in API
2021-12-20 20:49:32 +01:00
Laurent Destailleur
19efa37e4b
Fix default value #19562
2021-12-19 20:55:24 +01:00
Laurent Destailleur
bb1d5daa82
css
2021-12-12 23:47:40 +01:00
Laurent Destailleur
d80f83caf4
Clean code
2021-12-09 17:19:31 +01:00
Laurent Destailleur
69cd7ae2ab
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/don/card.php
htdocs/public/test/badges.php
htdocs/public/test/test_exec.php
2021-12-08 18:27:03 +01:00
Laurent Destailleur
6886cca1fa
CSS
2021-12-07 02:35:46 +01:00
atm-greg
db06de0ac2
add printFieldListHaving hook
2021-11-30 16:28:21 +01:00
Laurent Destailleur
8bace4c64e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-11-30 16:24:42 +01:00
Laurent Destailleur
a298a845f1
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/list.php
htdocs/core/actions_massactions.inc.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/memory.lib.php
htdocs/langs/en_US/holiday.lang
htdocs/ticket/card.php
2021-11-30 16:24:18 +01:00
Laurent Destailleur
4189229b84
Merge pull request #19165 from Hystepik/develop#5
...
Fix: php 8.0 warning commercial part
2021-11-30 15:31:51 +01:00
atm-greg
71d4b3f082
add hook // Add from hooks
2021-11-29 17:02:57 +01:00
atm-greg
1dffc1c0fa
add hook to uniformize printFieldListFrom hook
2021-11-29 16:54:26 +01:00
Christian Foellmann
819a76e16a
remove some deprecated html attributes
...
https://developer.mozilla.org/en-US/docs/web/html/element/td#attr-align
2021-11-29 15:07:07 +01:00
Adrien Raze
4246cd80f9
FIX : Travis + Update dev
2021-11-24 16:27:01 +01:00
Frédéric FRANCE
d601f62194
can merge products but experimental
2021-11-23 21:38:29 +01:00
Laurent Destailleur
ee14aa2597
Fix: Do not loose data on error when editing a line
2021-11-23 12:11:27 +01:00
Gauthier PC portable 024
2c2f456827
Merge branch 'NEW/addline_with_position_choice' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop
2021-11-23 11:10:01 +01:00
Gauthier PC portable 024
74f5c092dc
FIX : use $linecount = count($this->lines);
2021-11-23 10:44:43 +01:00
Gauthier PC portable 024
9840c1e0fa
Merge branch 'NEW/addline_with_position_choice' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop
2021-11-22 16:17:55 +01:00
Gauthier PC portable 024
e75b6ae0b4
FIX : it's better with an input number
2021-11-22 16:13:46 +01:00
lmarcouiller
d1f5cb9184
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#5
2021-11-19 14:01:52 +01:00
lmarcouiller
3bcafb548a
fix errors
2021-11-19 14:01:37 +01:00
Adrien Raze
dc23c7f6a3
FIX : Travis
2021-11-19 10:29:27 +01:00
stickler-ci
c5f6c617c9
Fixing style errors.
2021-11-19 08:34:45 +00:00
Adrien Raze
958be422e2
Merge branch '14.0' of github.com:Dolibarr/dolibarr into FIX_commandeFourn_Stats
2021-11-19 09:26:48 +01:00
Adrien Raze
ea8280af98
FIX : status filter on supplierOrder stats doesn't work
2021-11-17 17:32:17 +01:00
Gauthier PC portable 024
23249751d5
FIX : reorder all lines when delete document line everywhere
2021-11-17 12:10:12 +01:00
Gauthier PC portable 024
72614ecc0d
Merge branch 'NEW/addline_with_position_choice_develop' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop
2021-11-16 16:43:01 +01:00
Gauthier PC portable 024
375dcf7028
FIX : dev name
2021-11-16 16:42:48 +01:00
stickler-ci
19171d4f8e
Fixing style errors.
2021-11-16 15:15:55 +00:00
Gauthier PC portable 024
9d41c1390d
Merge branch 'NEW/addline_with_position_choice' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop
2021-11-16 14:20:24 +01:00
Gauthier PC portable 024
1e0d7d92a9
NEW : addline with position choice when MAIN_VIEW_LINE_NUMBER is enabled
2021-11-16 14:09:18 +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
fe7e1d4118
Look and feel v15
2021-10-29 09:40:38 +02:00
Marc de Lima Lucio
5057ba29b2
FIX: deposit payment terms: removed bad copy/paste
2021-10-28 16:53:53 +02:00
Marc de Lima Lucio
7e059c0a22
NEW: deposit payment terms: futureproof evolutions by storing field as a string
2021-10-28 16:53:28 +02:00
Marc de Lima Lucio
03c24b2274
FIX: deposit payment terms: getDictvalue() renamed to getDictionaryValue()
2021-10-28 16:51:59 +02:00
Marc de Lima Lucio
668088a63f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms
2021-10-28 15:54:18 +02:00
Frédéric FRANCE
8db7989aa7
fix warnings in commande list
2021-10-24 14:18:43 +02:00
Lucas Marcouiller
051f6ca717
Fix: php 8.0 warning commercial part
2021-10-23 23:12:42 +02:00
Laurent Destailleur
8604f9b153
Clean DOM (remove ficheaddleft div)
2021-10-23 17:18:35 +02:00
Laurent Destailleur
06bc357409
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-10-23 14:49:50 +02:00
Laurent Destailleur
3f60cbbedc
Remove the div class="ficheaddleft"
2021-10-23 14:49:35 +02:00
Laurent Destailleur
6ec19bca9d
Merge pull request #19128 from frederic34/warnfixes
...
fix warnings
2021-10-23 11:38:03 +02:00
Lucas Marcouiller
d1ec71197a
Fix : scrutinizer errors
2021-10-23 11:10:58 +02:00
Frédéric FRANCE
9bd31d2b85
fix warnings
2021-10-23 07:13:08 +02:00
Frédéric FRANCE
46c4f28478
fix multiple warnings
2021-10-22 22:15:59 +02:00
Laurent Destailleur
6c870bb3d1
Merge pull request #19059 from FHenry/fix_introduced_scrutinizer
...
fix: scrutinizer
2021-10-21 22:52:20 +02:00
Florian HENRY
258d0c3a69
fix: scrutinizer
2021-10-21 16:05:37 +02:00
Laurent Destailleur
12d211815b
Debug v15
2021-10-19 21:38:36 +02:00
Laurent Destailleur
c40a73162e
Look and feel v15
2021-10-18 21:20:58 +02:00
Laurent Destailleur
f8010dfcbc
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/reception/list.php
htdocs/takepos/pay.php
2021-10-16 13:01:03 +02:00
Marc de Lima Lucio
9a963da77c
FIX: deposit payment terms: adapt Form::form_conditions_reglement() calls to new parameter added in between PRs
2021-10-13 11:39:09 +02:00
lvessiller
be4a00213c
FIX optional visibility on create card
2021-10-08 15:58:08 +02:00
Marc de Lima Lucio
9d92260ec1
FIX: deposit payment terms: fatal error for lack of inclusion on class Facture
2021-10-05 14:57:14 +02:00
Marc de Lima Lucio
47deb64f09
FIX: deposit payment terms: sql syntax error
2021-10-05 14:19:47 +02:00
Marc de Lima Lucio
4059b64288
FIX: deposit payment terms: langs
2021-10-05 13:00:25 +02:00
Marc de Lima Lucio
47b9941203
FIX: deposit payment terms: show correct percentage is proposal/order lists
2021-10-05 11:18:49 +02:00
Marc de Lima Lucio
337531f832
FIX: deposit payment terms: correctly restrict them to objet other than invoices and template invoices
2021-10-05 10:54:22 +02:00
Marc de Lima Lucio
f5aebc8efd
NEW: deposit payment terms: generate deposit from orders
2021-10-04 18:31:32 +02:00
Marc de Lima Lucio
b0aa502ed4
NEW: deposit payment terms: set deposit percentage in proposals/orders + get from origin document or company
2021-09-29 14:51:30 +02:00
Marc de Lima Lucio
004b52f590
NEW: deposit payment terms: add field into CRUD methods
2021-09-29 12:05:38 +02:00
Laurent Destailleur
e15277bb6c
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-09-28 17:23:07 +02:00
Laurent Destailleur
fc56b88a1f
FIX select list of orders not complete when field type of company is on
2021-09-28 13:44:42 +02:00
Laurent Destailleur
0176ab6057
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/list.php
2021-09-27 11:40:47 +02:00
lmarcouiller
f88d12f55d
Fix #18809 : error on client tooltip
2021-09-24 11:16:34 +02:00
Laurent Destailleur
27c41946b7
Merge pull request #18182 from atm-jpb/NEW_field_in_service_object
...
NEW : field and behavior in product object
2021-09-23 12:14:09 +02:00
Laurent Destailleur
d38c3028eb
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/expensereport/class/expensereport.class.php
2021-09-23 02:41:53 +02:00
Laurent Destailleur
2824c8b8ab
FIX support of localtax on expense report
2021-09-22 15:11:18 +02:00
Laurent Destailleur
5c8fb38426
Fix add del* action into list of sensitive actions
2021-09-19 14:41:46 +02:00
Laurent Destailleur
89e8f24e15
Fix CSRF protection for all massactions
2021-09-18 22:38:25 +02:00
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
11b6259130
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/holiday/class/holiday.class.php
htdocs/langs/en_US/admin.lang
2021-09-10 11:40:45 +02:00
lainwir3d
63abe2f1ff
FIX #18666 Order / Shipment list: Don't SQL JOIN category table when not necessary.
2021-09-09 19:56:28 +04: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
jpb
65a2486f94
merge conflict
2021-09-06 09:43:52 +02:00
Laurent Destailleur
de8db34f43
Fix filter on status of order
2021-09-05 01:42:15 +02:00
Laurent Destailleur
ee066ad725
Cast sql var
2021-09-03 21:25:43 +02:00
Laurent Destailleur
77e9f15360
Work on #18448
2021-09-02 22:52:17 +02:00
Laurent Destailleur
8600d8d00d
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-09-01 22:50:06 +02:00
stickler-ci
01a44760a8
Fixing style errors.
2021-08-29 20:14:19 +00:00
lainwir3d
4381f67a64
FIX #18544 Shipment REST API: load thirdparty object into the shipment before validating.
2021-08-30 00:08:43 +04: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
0a468e4ba9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-28 17:36:00 +02:00
Laurent Destailleur
4ba6b0059d
Fix travis
2021-08-28 17:35:42 +02:00
Laurent Destailleur
0db67b40a0
Merge pull request #18525 from cfoellmann/PR/thirdparty-links
...
change links for thirdparty to target the type customer|supplier tab
2021-08-28 15:27:13 +02:00
Laurent Destailleur
2aa3eb3857
Merge pull request #18521 from Hystepik/develop#2
...
Close #18074 : REST API New /order/{id}/shipment get & post
2021-08-28 14:44:31 +02:00
Laurent Destailleur
049992aed4
Update api_orders.class.php
2021-08-28 14:44:13 +02:00
Laurent Destailleur
3585259b55
Update api_orders.class.php
2021-08-28 14:43:17 +02:00
Laurent Destailleur
d98390e675
Update api_orders.class.php
2021-08-28 14:42:31 +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
Christian Foellmann
9752501ef6
change links for thirdparty to target the type customer|supplier tab
2021-08-27 15:32:53 +02:00
lmarcouiller
b9039eea14
FIx warehouse limit testing
2021-08-27 10:45:04 +02:00
lmarcouiller
eb48566798
Close #18074 : New /order/{id}/shipment get & post
2021-08-27 10:40:33 +02:00
lmarcouiller
c70813d718
New : rest api POST orders shipment
2021-08-26 17:03:00 +02:00
lmarcouiller
f482be84bf
New : rest api GET orders shipements
2021-08-26 12:35:31 +02:00
Christian Foellmann
f094b4c70c
fix up most of the remaining submit inputs
2021-08-24 17:04:17 +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
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
Christian Foellmann
d706c3b1ec
use Forms::buttonsSaveCreate() to generate most of the Save|Cancel forms combination
2021-08-20 14:41:30 +02: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
f9f1440226
Merge branch 'develop' into salesrepresentativeinorderandinvoicelist
2021-08-11 22:22:26 +02:00
Laurent Destailleur
0d07135027
Update list.php
2021-08-11 22:19:53 +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
0de10cea39
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-04 15:21:31 +02:00
Laurent Destailleur
58ca982e55
Fix trans
2021-08-04 14:01:57 +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
Laurent Destailleur
d91051488c
Merge pull request #18125 from fr69400/develop
...
NEW add hookmanager on note pages
2021-07-11 20:25:16 +02:00
stickler-ci
a8752bf097
Fixing style errors.
2021-07-11 07:46:34 +00:00
fr69400
a27b0cd797
Update note.php
2021-07-11 09:45:22 +02:00
stickler-ci
4272f93aa4
Fixing style errors.
2021-07-09 16:41:41 +00:00
fr69400
e45d5c1d0d
NEW add hookmanager on note pages
2021-07-09 18:36:21 +02:00
stickler-ci
327481dc78
Fixing style errors.
2021-07-08 14:47:38 +00:00
jpb
4df29292ab
update comment
2021-07-08 16:44:24 +02:00
jpb
2e44acbc81
update comment
2021-07-08 16:43:05 +02:00
stickler-ci
89ffa85290
Fixing style errors.
2021-07-07 06:40:12 +00:00
jpb
73bfeee4e7
fix comment
2021-07-07 08:37:49 +02:00
jpb
1a919c9f2b
change comment
2021-07-07 08:35:31 +02:00
stickler-ci
bcb06d5c90
Fixing style errors.
2021-07-05 07:40:44 +00:00
jpb
ad62062cd5
add filter
2021-07-05 08:55:03 +02:00
Laurent Destailleur
7013f01a41
Fix look and feel v14
2021-07-04 21:14:46 +02:00
Laurent Destailleur
f6efe51032
Fix trouble with product id = -1
2021-07-04 21:02:02 +02:00
Francis Appels
1b7b45d72a
Merge remote-tracking branch 'Dolibarr/14.0' into 14_fix_php8_part2
2021-06-29 16:56:48 +02:00
Francis Appels
b8f5dc74d7
Some order php 8 warning
2021-06-29 16:30:36 +02:00
Laurent Destailleur
25c6b64b1e
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/core/modules/delivery/doc/pdf_storm.modules.php
htdocs/core/modules/reception/doc/pdf_squille.modules.php
htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
2021-06-29 15:58:26 +02:00
Laurent Destailleur
1cf3408f5b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/contact/class/contact.class.php
2021-06-29 15:52:39 +02:00
Francis Appels
69affc5df5
Fix php 8 warnings
2021-06-28 16:25:16 +02:00
Maxime Kohlhaas
c3cbd29542
Fix #17836 : order delay warning in list was wrong, date_commande is deprecated
2021-06-27 09:04:47 +02:00
stickler-ci
26f72b7fff
Fixing style errors.
2021-06-19 12:58:08 +00:00
Laurent Destailleur
3669600242
Update commande.class.php
2021-06-19 14:55:41 +02:00
Laurent Destailleur
194637cfda
Merge branch 'develop' into oldline
2021-06-19 14:54:44 +02:00
Laurent Destailleur
dfa5c419b3
Update commande.class.php
2021-06-19 14:52:06 +02:00
Laurent Destailleur
f8f951977c
Debug v14
2021-06-14 01:33:01 +02:00
Laurent Destailleur
34cebe6aa3
Look and feel v14
2021-06-14 01:11:39 +02:00
Laurent Destailleur
fb46ece906
Fix yogosha 6347
2021-06-09 15:36:47 +02:00
Laurent Destailleur
fa4786a3f6
Fix permission
2021-06-08 16:19:21 +02:00
Laurent Destailleur
2586fcd1a3
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/commandestats.class.php
htdocs/core/actions_massactions.inc.php
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
htdocs/holiday/month_report.php
htdocs/product/class/product.class.php
htdocs/product/stock/class/mouvementstock.class.php
htdocs/societe/list.php
2021-06-04 11:20:38 +02:00
Laurent Destailleur
6f1c49abcc
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
htdocs/commande/class/commandestats.class.php
htdocs/user/class/usergroup.class.php
2021-06-04 11:04:18 +02:00
Florian HENRY
c91b9d613a
FIX: order supplier stats by category now display figures
2021-06-01 15:30:17 +02:00
Laurent Destailleur
91f85abb7e
Fix only comment to understand code are allowed
2021-05-20 14:55:37 +02:00
Sylvain Legrand
a3d1b49c65
Error in list when using alias name of thirdparty
2021-05-19 19:08:58 +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
Anthony Berton
c02e3eed6b
checked
2021-05-18 18:45:07 +02:00
Laurent Destailleur
8e39eff180
Look and feel v14
2021-05-18 18:18:00 +02:00
Laurent Destailleur
2ef713bd5f
Merge branch 'develop' into look_feel_user_author_list
2021-05-18 12:27:30 +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
b6dbe45242
Fix permissions on page to move position of file
2021-05-18 01:58:54 +02:00
Anthony Berton
70a062e2c1
change position
2021-05-17 23:59:42 +02:00
Anthony Berton
6fe9fe330d
delete fetch
2021-05-17 23:54:31 +02:00
Anthony Berton
58db723502
thirdparty info popup list
2021-05-17 23:27:33 +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
68130ec637
Merge branches 'develop' and 'develop' of https://github.com/Dolibarr/dolibarr into salesrepresentativeinorderandinvoicelist
2021-05-17 18:34:20 +02:00
Anthony Berton
09ab930806
sale_representative_order_invoice_list
2021-05-17 18:31:19 +02:00
Anthony Berton
0b7f474dd3
look_feel user author in list
2021-05-17 18:04:21 +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
Laurent Destailleur
6bf66adff0
Fix remove some $_REQUEST
2021-05-17 07:27:02 +02:00
Ferran Marcet
ce6df0ee4a
FIX: Filter of the dates in the lists is lost
2021-05-14 13:50:12 +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
f87f80b004
Merge pull request #17554 from aspangaro/14b4
...
Fix Title customer order
2021-05-11 18:19:11 +02:00
Laurent Destailleur
200c36836b
v14
2021-05-11 10:44:53 +02:00
Alexandre SPANGARO
e5d0999073
Fix Title customer order info card
2021-05-09 22:37:05 +02:00
Alexandre SPANGARO
7ad4f13036
Fix Title customer order documents card
2021-05-09 22:36:02 +02:00
Alexandre SPANGARO
a908d302b2
Fix Title customer order note card
2021-05-09 22:33:37 +02:00
Alexandre SPANGARO
222c1d9b89
Fix Title customer order contact card
2021-05-09 22:31:46 +02:00
Alexandre SPANGARO
c8e30203f8
Fix Title customer order card
2021-05-09 22:31:33 +02:00
Anthony Berton
d84b0bae9d
init
2021-05-06 23:23:50 +02:00
Laurent Destailleur
1c95e2b7c7
FIX #17453
2021-05-03 14:58:29 +02:00
Laurent Destailleur
d1f11d2e65
Merge pull request #17429 from fr69400/develop
...
FIX formAddObjectLine cant be overloaded by hook
2021-05-03 13:16:45 +02:00
Laurent Destailleur
b45ac52311
Clean sql
2021-04-30 12:07:26 +02:00
fr69400
96baa1ef49
wrong variable name
2021-04-29 17:36:45 +02:00
Florian HENRY
fd6eacf022
NEW: add Channel column into order list
2021-04-29 16:15:46 +02:00
fr69400
d9e25c61bb
formAddObjectLine cant be overloaded by hook
2021-04-29 15:32:15 +02:00
Laurent Destailleur
655056ed31
Debug v14
2021-04-29 12:10:55 +02:00
Laurent Destailleur
7b29b283a2
Merge pull request #17260 from bb2a/mass_action_order
...
NEW Add Mass action order validate and set to billed
2021-04-28 19:13:09 +02:00
Laurent Destailleur
1e7a778ecc
Debug v14
2021-04-27 22:28:28 +02:00
Laurent Destailleur
d138e7410b
Clean code
2021-04-26 19:12:23 +02:00
Laurent Destailleur
87393cee98
Clean code
2021-04-26 11:59:47 +02:00
Laurent Destailleur
389b71bc7e
Clean API
2021-04-25 19:21:48 +02:00
Laurent Destailleur
fd2d317b4a
Fix #yogosha5881
2021-04-25 15:55:36 +02:00
Laurent Destailleur
d0cc64479d
Fix protect sql
2021-04-24 20:18:11 +02:00
Anthony Berton
d294bd544d
Update list.php
2021-04-19 22:42:38 +02:00
Laurent Destailleur
fbf7b21c29
Update contact.php
2021-04-16 20:15:00 +02:00
fr69400
65b55a79a5
Update contact.php
...
action 'deletecontact' may have beeen cancelled by triggers. this is not system error
2021-04-16 10:31:18 +02:00
Laurent Destailleur
db5dcd3e52
NEW When a doc file is shared, link is visible from main page of doc.
2021-04-15 17:56:55 +02:00
stickler-ci
6324879215
Fixing style errors.
2021-04-14 00:25:05 +00:00
Anthony Berton
92ca59d20b
Update list.php
2021-04-14 02:23:23 +02:00
Anthony Berton
25ac8bed68
Update list.php
2021-04-14 01:54:30 +02:00
Anthony Berton
6814488d86
Update list.php
2021-04-14 00:51:19 +02:00
Laurent Destailleur
358bb87ae2
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/index.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/payments.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
htdocs/projet/card.php
htdocs/public/payment/newpayment.php
htdocs/societe/list.php
htdocs/ticket/document.php
2021-04-13 20:19:05 +02:00
Laurent Destailleur
8c9cacba4d
Merge branch 'develop' into 14a36
2021-04-13 16:05:57 +02:00
Laurent Destailleur
add6853581
Merge branch 'develop' into filter_warehouse
2021-04-13 15:58:13 +02:00
Laurent Destailleur
91b8ccafbb
Fix empty label
2021-04-13 15:53:05 +02:00
Laurent Destailleur
97336ad417
Fix label of empty value in select of warehouse
2021-04-13 15:51:34 +02:00
Anthony Berton
1b995226b7
add_filter_warehouse_propal
2021-04-13 10:43:36 +02:00
Alexandre SPANGARO
44133166de
Merge remote-tracking branch 'upstream/develop' into 14a36
2021-04-12 21:35:03 +02:00
Alexandre SPANGARO
4b9bf40a8f
move include_once to include when it's a tpl
2021-04-12 21:25:58 +02:00
Laurent Destailleur
8a62d97b89
Remove one thousand of useless files
2021-04-12 15:57:16 +02:00
Laurent Destailleur
81487d76b2
Clean code of ol deprecated option
2021-04-12 15:37:26 +02:00
Alexandre SPANGARO
8d72448f43
Add right supplier_order
2021-04-12 09:47:16 +02:00
Alexandre SPANGARO
80c6458faa
Work on split module fournisseur
2021-04-11 22:25:45 +02:00
Alexandre SPANGARO
ce7c5a0c7b
Work on split module fournisseur
2021-04-11 04:24:21 +02:00
Laurent Destailleur
667481acd5
Fix #yogosha5832 - Missin test on permission for /index routes on APIs
2021-04-08 19:05:28 +02:00
Laurent Destailleur
12e847ade1
Fix color of reports. Fix include_once into include.
2021-04-06 22:18:32 +02:00
Laurent Destailleur
3744bc6a7a
FIX #yogosha5746 - next step (work in progress)
2021-03-30 18:17:13 +02:00
Laurent Destailleur
6e422d26f3
FIX #yogosha5746 - next step (wip)
2021-03-30 16:20:18 +02:00
Laurent Destailleur
fb84608586
Clean sql
2021-03-30 03:37:54 +02:00
Laurent Destailleur
b702d2b534
Fix CSRF for more GET
2021-03-29 22:58:44 +02:00
Laurent Destailleur
3a4bb69c05
FIX #yogosha5749
2021-03-29 15:32:09 +02:00
Laurent Destailleur
ce1f8289a4
FIX #yogosha5746
2021-03-29 15:07:23 +02:00
Laurent Destailleur
85f6a15678
Fix position of users in combo list
2021-03-29 11:58:51 +02:00
Laurent Destailleur
01c1101b29
Look and feel v14
2021-03-26 18:16:12 +01:00
Laurent Destailleur
ca1715df96
Add some protection for SQL injection
2021-03-22 13:31:06 +01:00
Laurent Destailleur
6a0e0f4c06
Fix #ygosha5698
2021-03-22 12:10:51 +01:00
Laurent Destailleur
15440917b1
Fix #ygosha5698
2021-03-22 11:30:18 +01:00
Laurent Destailleur
0e645aefbd
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-16 15:15:50 +01:00
Laurent Destailleur
59174315ae
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-03-16 15:15:12 +01:00
Laurent Destailleur
a29a9e5435
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-03-16 15:14:46 +01:00
Laurent Destailleur
66bbc7f54f
Merge pull request #16734 from AlexisLaurier/11.0
...
correct nb_expedition count
2021-03-16 15:12:18 +01:00
Alexis LAURIER
971b97d78f
correct nb_expedition count
2021-03-16 15:00:46 +01:00
Laurent Destailleur
3c3bb67e51
Merge pull request #16704 from dolibit-ut/patch-85
...
Update card.php
2021-03-16 10:36:39 +01:00
UT from dolibit
94802346cf
Update card.php
...
add DE:Modul_Kundenaufträge
2021-03-15 19:44:00 +01:00
Florian HENRY
cdf5d2399a
fix warning
2021-03-15 19:07:40 +01:00
Frédéric FRANCE
d6f6097f4a
fix php8 warning
2021-03-15 11:54:16 +01:00
Laurent Destailleur
cc10106a21
Fix protection on int
2021-03-14 12:20:23 +01:00
Laurent Destailleur
12f50a76d7
Fix yogosha #5627
2021-03-14 11:48:39 +01:00
Laurent Destailleur
f11a85a3e3
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/card.php
htdocs/compta/facture/card.php
htdocs/contrat/card.php
htdocs/fichinter/card.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
htdocs/supplier_proposal/card.php
2021-03-03 11:37:34 +01:00
Laurent Destailleur
7eb3e324c7
FIX #16503
2021-03-02 23:09:55 +01:00
Laurent Destailleur
1756d2833c
Merge pull request #16513 from AlexisLaurier/develop
...
Avoid loss of data on RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED
2021-03-02 19:15:22 +01:00
Alexis LAURIER
516e7a3955
Merge branch 'develop' of https://github.com/AlexisLaurier/dolibarr into develop
2021-03-02 16:04:37 +01:00
Alexis LAURIER
e219972936
avoid lost of data for RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED
2021-03-02 16:04:26 +01:00
Laurent Destailleur
42329b10c9
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
build/generate_filelist_xml.php
htdocs/comm/propal/card.php
htdocs/commande/card.php
htdocs/compta/facture/card.php
htdocs/core/class/commonobject.class.php
htdocs/core/lib/modulebuilder.lib.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
htdocs/supplier_proposal/card.php
htdocs/ticket/list.php
2021-03-02 15:27:20 +01:00
Laurent Destailleur
7f209f7cc7
Clean code
2021-03-02 02:55:24 +01:00
Laurent Destailleur
cffea1889f
FIX #16325
2021-03-02 01:17:28 +01:00
Laurent Destailleur
886cbc61c8
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/card.php
htdocs/core/boxes/box_factures_fourn.php
htdocs/core/boxes/box_factures_fourn_imp.php
htdocs/core/boxes/box_ficheinter.php
htdocs/core/boxes/box_members.php
htdocs/core/boxes/box_propales.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.formmail.class.php
htdocs/core/lib/functions.lib.php
htdocs/fourn/class/fournisseur.facture.class.php
2021-02-28 13:37:45 +01:00
Laurent Destailleur
2ce76133f4
FIX #16487
2021-02-28 12:59:58 +01:00
Laurent Destailleur
5c0ea476e1
Look and feel v14
2021-02-27 12:45:07 +01:00
Frédéric FRANCE
6dfca9f1f5
code syntax commande directory
2021-02-23 20:46:19 +01:00
Alexandre SPANGARO
3dcfe40e71
Code enhanced - Standardize field name #14697
2021-02-20 08:00:27 +01:00
Laurent Destailleur
2be6992916
Fix include_once into include for inc.php file. See comment in #16338
2021-02-19 16:10:19 +01:00
Frédéric FRANCE
75b378edd3
remove unused code
2021-02-18 22:47:41 +01:00
Laurent Destailleur
bfe71e8509
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-02-17 14:28:19 +01:00
ptibogxiv
39b29a7d68
Fix set date delivery on create order form
2021-02-16 17:40:00 +01:00
Laurent Destailleur
026259ebd7
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/ajax.lib.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/product/fournisseurs.php
2021-02-15 13:12:27 +01:00
Laurent Destailleur
6dfc6c7edf
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/filefunc.inc.php
2021-02-11 18:33:03 +01:00
Laurent Destailleur
c306e8ebe9
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-02-11 18:23:47 +01:00
Laurent Destailleur
c2df267858
Merge pull request #16242 from frederic34/patch-4
...
remove deprecated
2021-02-10 01:29:47 +01:00
Frédéric FRANCE
097ff0d7b6
Update commande.class.php
2021-02-09 22:14:46 +01:00
ptibogxiv
e5f6a64846
FIX update order by api
...
fix update shipping method and shipping date by API (no change with code or functionality juste fix this pb with updating)
2021-02-09 19:24:36 +01:00
Laurent Destailleur
92a19c0caa
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
2021-02-09 18:34:50 +01:00
Frédéric FRANCE
2c6656b2ad
Update card.php
2021-02-09 18:07:21 +01:00
Laurent Destailleur
1f441deb5d
Merge pull request #16237 from AlexisLaurier/13.0
...
13.0 - Fix db begin() not closed into commande.class.php
2021-02-09 18:06:36 +01:00
Frédéric FRANCE
fb4aea8223
Update card.php
2021-02-09 18:02:41 +01:00
LAURIER Alexis
abf2875eba
commande.class.php - move db->begin() into cloture
...
A DB begin request was sent before executing the status guard. If the guard fails, we exited the method without closing it. And it will occur a bug to any further database operation.
2021-02-09 14:25:45 +01:00
Laurent Destailleur
1b129831a9
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-02-09 14:09:46 +01:00
Laurent Destailleur
48a4ed656b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/expensereport/class/expensereport.class.php
htdocs/projet/element.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
2021-02-09 14:08:49 +01:00
Laurent Destailleur
a84bc05f01
Merge pull request #16146 from FHenry/12_fix_pricemin_PRODUIT_CUSTOMER_PRICES
...
FIX: manage price min for PRODUIT_CUSTOMER_PRICES
2021-02-09 13:39:25 +01:00
Laurent Destailleur
89bda722bf
Merge pull request #16232 from frederic34/paymentvat
...
use camelCaps name
2021-02-09 13:29:40 +01:00
Frédéric FRANCE
e2d2048522
deprecate non camelCaps functions
2021-02-09 13:25:55 +01:00
Laurent Destailleur
a5386246cd
Merge pull request #16225 from frederic34/facturerec
...
clean deprecated modelpdf to model_pdf
2021-02-09 13:23:25 +01:00
Laurent Destailleur
401b4f641d
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/card.php
2021-02-08 22:13:50 +01:00
Florian HENRY
dbbebba497
this->errors is set on triggers action must be set by callers
2021-02-08 20:44:40 +01:00
Frédéric FRANCE
898bf55202
Merge remote-tracking branch 'upstream/develop' into facturerec
2021-02-08 20:21:46 +01:00
Frédéric FRANCE
815f3602e3
clean deprecated modelpdf to model_pdf
2021-02-08 18:30:09 +01:00
Laurent Destailleur
6e6b5973b8
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-02-08 17:35:44 +01:00
Laurent Destailleur
8b3c872f2a
Fix warning
2021-02-08 17:35:21 +01:00
Laurent Destailleur
3b1143df91
Merge pull request #16223 from ATM-Consulting/fix/12.0_order_addline_remove_warning
...
FIX: warning when adding a line if $remise_percent is an empty string
2021-02-08 17:34:29 +01:00
Florian Mortgat
ff3707b650
FIX: warning when adding a line if $remise_percent is an empty string
2021-02-08 17:24:40 +01:00
Laurent Destailleur
f0e1c02caa
Look and feel v14 - Use placeholder on combolists
2021-02-06 00:05:24 +01:00
Florian HENRY
ec41bf58e5
always ajax now
2021-02-04 09:48:17 +01:00
Laurent Destailleur
2e7de1d137
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/card.php
test/phpunit/ExportTest.php
2021-02-02 16:17:53 +01:00
Laurent Destailleur
c5201b95bb
FIX Must not be able to edit vat of all lines if not draft
2021-02-02 16:12:03 +01:00
Florian HENRY
d3d0617996
fix: manage price min for PRODUIT_CUSTOMER_PRICES
2021-02-02 13:43:33 +01:00