Commit Graph

99909 Commits

Author SHA1 Message Date
Alexandre SPANGARO
f24ffe5b91 Supplier proposal - List - SQL error on total_ht 2023-02-16 10:20:37 +01:00
Eric Seigne
6163f84d25 move log after variable updates to get good informations in logs 2023-02-15 22:10:03 +01:00
Laurent Destailleur
94002bf85c Fix sql 2023-02-15 20:38:38 +01:00
Laurent Destailleur
c259ca09b8 Enhance script to repair database when stock by lot differ from stock 2023-02-15 20:14:48 +01:00
Laurent Destailleur
6db1c1cd2f Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-02-15 18:22:06 +01:00
Laurent Destailleur
89817c8ead Fix message for profit calculation 2023-02-15 18:17:06 +01:00
Laurent Destailleur
b57d1ed263 FIX Profit calculation on project preview tab. 2023-02-15 18:16:54 +01:00
Laurent Destailleur
32d27887b1 Fix message for profit calculation 2023-02-15 18:11:25 +01:00
Laurent Destailleur
d04043f3d8 FIX Profit calculation on project preview tab. 2023-02-15 18:04:23 +01:00
Laurent Destailleur
1b925ec53f FIX Profit calculation on project preview tab. 2023-02-15 17:59:27 +01:00
Regis Houssin
7653a7126b FIX wrong url param name action 2023-02-15 13:50:24 +01:00
Juanjo Menent
670ae506e3 Fix: Bad assignation for external users access 2023-02-15 10:47:25 +01:00
Laurent Destailleur
7db2c9706d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-02-14 10:59:23 +01:00
Regis Houssin
89a2f7a0c1 FIX multicompany compatibility 2023-02-14 10:53:59 +01:00
Laurent Destailleur
3278b7bc86 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2023-02-13 23:38:07 +01:00
Laurent Destailleur
6eda0f4c2e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2023-02-13 21:58:26 +01:00
Laurent Destailleur
5217ae28f8 Fix load of margin infos 2023-02-13 21:35:48 +01:00
Laurent Destailleur
b8aad7d760
Merge pull request #23894 from altairis-benjamin/isArray
FIX bad check on if in get_all_ways
2023-02-13 18:10:11 +01:00
Laurent Destailleur
b40cd67fa8
Merge pull request #23878 from hregis/fix_can_not_set_prospect_status
FIX Object of class LDAP\Connection could not be converted to string
2023-02-13 18:05:37 +01:00
Eric Seigne
cac9a00bac fix loi de finance 525 2023-02-13 16:19:00 +01:00
Benjamin Falière
c3fc14a45a FIX bad check on if in get_all_ways 2023-02-13 16:05:12 +01:00
Laurent Destailleur
e9c5f515ce Fix #huntrb1412070-740e-4119-8e4b-61bdc3af42aa 2023-02-13 14:35:02 +01:00
Laurent Destailleur
239f7a1eb0 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-02-13 13:58:03 +01:00
Laurent Destailleur
927a87851d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-02-13 13:57:02 +01:00
Laurent Destailleur
f569048eb2 Fix #hunter7a048bb7-bfdd-4299-931e-9bc283e92bc8 2023-02-13 13:54:28 +01:00
Regis Houssin
9c706061be FIX Object of class LDAP\Connection could not be converted to string 2023-02-11 08:48:09 +01:00
Laurent Destailleur
23b4e999fb Better sql for unique index 2023-02-10 19:44:34 +01:00
Laurent Destailleur
1e2a3ffa5d
Merge pull request #23858 from elcf/16.0-uk
Merge pull request #23817 from elcf/develop
2023-02-10 19:42:35 +01:00
Alexandre SPANGARO
c61326cdae Merge branch '14.0' into 14p42 2023-02-10 15:01:29 +01:00
Alexandre SPANGARO
1bc16f47c0 FIX : Missing right to edit service note when module product is disabled 2023-02-10 15:00:27 +01:00
Laurent Destailleur
7358dfa20f Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-02-09 23:20:09 +01:00
Laurent Destailleur
73b894dca3 Fix the qty in stock when product has no lot 2023-02-09 23:19:58 +01:00
Laurent Destailleur
802ee770c3 FIX #23860 2023-02-09 19:25:55 +01:00
Laurent Destailleur
6362e3612b
Merge pull request #23856 from atm-quentin/FIX_16.0_strato_pdf
FIX strato pdf
2023-02-09 18:18:25 +01:00
Florian HENRY
8bd6f070aa FIX: product ref fourn same size in supplier order/invoice as in product price fourn 2023-02-09 17:22:45 +01:00
Laurent Destailleur
69b690c45e Merge pull request #23817 from elcf/develop
Added key name to unique constraint
2023-02-09 11:36:41 -04:00
Laurent Destailleur
393f3a9480
Merge pull request #23811 from evarisk-theo/FIX-clicktodial-backtopage
FIX: fatal error on clicktodial backtopage
2023-02-09 15:40:28 +01:00
Laurent Destailleur
365c442f70 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-02-09 15:30:09 +01:00
Laurent Destailleur
ec8aacaddb Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-02-09 15:30:05 +01:00
stickler-ci
78e1fad6bd Fixing style errors. 2023-02-09 14:27:50 +00:00
Laurent Destailleur
6cb6098d3c
Merge pull request #23818 from altairis-benjamin/discountOnBom
FIX discount wasn't taken into account when adding a line in BOM
2023-02-09 15:27:46 +01:00
Quentin VIAL-GOUTEYRON
e83559afb0 FIX strato pdf 2023-02-09 15:20:07 +01:00
Laurent Destailleur
cbbbd640d3 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-02-09 15:15:36 +01:00
Laurent Destailleur
f8efc35531 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-02-09 15:15:20 +01:00
Laurent Destailleur
d221aa3f95
Merge pull request #23826 from Easya-Solutions/14.0_fix_prelevement_line_facture_fourn_link
Fix prelevement line : the link to the facture was to a customer fac, not fourn fac
2023-02-09 15:11:00 +01:00
Laurent Destailleur
698693ee8b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-02-09 15:04:06 +01:00
Laurent Destailleur
ac27f5ef74 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-02-09 14:46:45 +01:00
VESSILLER
01e0503b0f FIX several email sent to the same recipient when adding message from ticket 2023-02-09 11:52:41 +01:00
stickler-ci
637603731a Fixing style errors. 2023-02-08 15:26:10 +00:00
avolani
98bfba1f46
Add missing table_element
This allow usage of extrafields logic (still missing table and setup pages)
2023-02-08 16:20:47 +01:00
Noé Cendrier
b880029ac0 typos in getAttchments() $arrayobject 2023-02-08 09:58:30 +01:00
tnegre
55d6e2ead0 Fix prelevement line : the link to the facture was to a customer facture, even when it was a facturefourn. 2023-02-07 17:32:35 +01:00
Laurent Destailleur
3dc8937ad3 Provide an object for computed extrafields 2023-02-07 00:11:33 +01:00
Laurent Destailleur
f66501dcdf Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-02-06 22:26:27 +01:00
Laurent Destailleur
eb5f1b6649 Fix filter on supplier categories 2023-02-06 22:26:09 +01:00
Benjamin Falière
016d1117a6 added my name to the file 2023-02-06 18:02:28 +01:00
Benjamin Falière
fc767cbfbe FIX discount wasn't taken into account when adding a line in BOM 2023-02-06 17:56:21 +01:00
Théo David
394c3f847c FIX clicktodial backtopage 2023-02-06 17:03:51 +01:00
Guenter Lukas
3a8fbd3aa8 update 2023-02-06 10:32:54 +01:00
Guenter Lukas
2e7371eee6 Fix #23795 2023-02-06 08:45:44 +01:00
Laurent Destailleur
e04a44e4ce
Merge pull request #23786 from glu000/16.0-issue-23785
Fix #23785 Box "Last changed vendors": External users can see all suppliers on htdocs/comm/index.php
2023-02-06 00:18:21 +01:00
Laurent Destailleur
60c750885f
Merge pull request #23789 from glu000/16.0-issue-23787
Fix #23787 External user can see users from other companies in agenda view per user
2023-02-06 00:05:16 +01:00
Laurent Destailleur
b52203b4e0
Update peruser.php 2023-02-06 00:05:06 +01:00
Laurent Destailleur
a0f8a2454b
Update peruser.php 2023-02-06 00:04:19 +01:00
Laurent Destailleur
48026b038e Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-02-05 20:18:15 +01:00
stickler-ci
d2a6d89fca Fixing style errors. 2023-02-05 10:48:29 +00:00
Guenter Lukas
edb81d1955 update 2023-02-05 11:43:09 +01:00
Guenter Lukas
31984b8f2e update 2023-02-05 09:33:54 +01:00
Günter Lukas
f5600fdffc
Update index.php 2023-02-05 08:38:46 +01:00
Günter Lukas
d8ff9468af
Update index.php 2023-02-05 08:35:45 +01:00
Günter Lukas
17397d635c
#23783 2023-02-05 08:24:09 +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
kkhelifa
2c826a4fcc FIX: Remove orphelan $this->db->rollback() in the function insertExtrafields() 2023-02-04 16:15:18 +01:00
Laurent Destailleur
100b572aa3 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-02-04 16:11:28 +01:00
Laurent Destailleur
ff4ea81429 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-02-04 16:11:16 +01:00
Laurent Destailleur
d3a26efb0e
Merge pull request #23755 from frederic34/patch-4
fix #23753
2023-02-04 15:39:01 +01:00
Laurent Destailleur
2560a543b1
Merge pull request #23767 from Easya-Solutions/14.0_fix-ticket-join-file
FIX attach file and send by mail in ticket
2023-02-04 15:24:33 +01:00
Laurent Destailleur
86c2f2fcde Fix phpcs 2023-02-03 17:08:24 +01:00
Noé Courtier
9cf71e7d1c FIX: Cannot import find type_fees with cgenericdic.class because its have id and not rowid 2023-02-03 16:34:36 +01:00
VESSILLER
c2f91b2e15 FIX attach file and send by mail in ticket 2023-02-03 14:02:46 +01:00
Mélina JOUM
e10a7de3e0 stickler-ci error 2023-02-02 17:52:07 +01:00
Mélina JOUM
f46d9f1a15 Fix GETPOST 2023-02-02 15:54:24 +01:00
Laurent Destailleur
45dd6c8f0b Prepare option PDF_SWISS_QRCODE_USE_OWNER_OF_ACCOUNT_AS_CREDITOR 2023-02-02 15:06:19 +01:00
Mélina JOUM
4b61ef946a Fix 2023-02-02 11:44:10 +01:00
Frédéric FRANCE
eb6c25f64d
fix https://github.com/Dolibarr/dolibarr/issues/23753 2023-02-01 22:06:22 +01:00
Mélina JOUM
afa1fd3e8a Get data back on product update 2023-02-01 16:51:13 +01:00
Rémi Champlon
b1a7c23daa fix updateExtrafield option key empty set null 2023-02-01 11:20:44 +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
c4d8268ea5 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-30 02:27:28 +01:00
Laurent Destailleur
af649d0abd Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-01-30 02:26:25 +01:00
Laurent Destailleur
194f803dbd Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-01-30 02:26:13 +01:00
Laurent Destailleur
5395a4ab4b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2023-01-30 02:23:53 +01:00
Laurent Destailleur
10d822896d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2023-01-30 02:23:45 +01:00
Laurent Destailleur
84934046b9
Merge pull request #23670 from Daviid-P/fix_database_backtick
Encase database name in backticks
2023-01-29 20:49:47 +01:00
Eric Seigne
d3b1ee367a fix #23716 : handle hookmanagers returns 2023-01-28 14:27:45 +01:00
Alexandre SPANGARO
791a69dd09 FIX Accountancy - Quadra export 2023-01-28 04:48:55 +01:00
Laurent Destailleur
ba21d9ff83 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-26 02:16:47 +01:00
Laurent Destailleur
f6004d1b01 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-26 02:16:32 +01:00
Laurent Destailleur
59f163f699 Fix regression 2023-01-26 02:12:42 +01:00
Laurent Destailleur
3c9ba08369 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-01-26 02:10:54 +01:00
Laurent Destailleur
1a4cb5b4e2 FIX #22964 #23012 2023-01-26 02:06:40 +01:00
Laurent Destailleur
00d9aa2378
Merge pull request #23296 from IC-Florian/FIX#23087
FIX : Product list in setup.php in new Module
2023-01-26 01:30:30 +01:00
Laurent Destailleur
8ae80cec86
Merge pull request #23671 from Daviid-P/fix_undefined_facidnext
Fix wrong variable used to fetch replaced invoice
2023-01-26 00:06:13 +01:00
Laurent Destailleur
98e94b9901
Merge pull request #23672 from Easya-Solutions/14.0_fix-massaction-builddoc-simple-quote
FIX simple quote in generated file name from build doc mass action
2023-01-26 00:04:05 +01:00
Laurent Destailleur
3aec1289f8
Merge pull request #23618 from ATM-Consulting/FIX_16.0_fieldvalue_emailtemplate
FIX : Empty FormSetup emailTemplate type IF empty fieldvalue
2023-01-25 18:28:26 +01:00
GregM
934bcc72c4 update space 2023-01-25 17:34:57 +01:00
stickler-ci
08bd8caaf2 Fixing style errors. 2023-01-24 13:28:59 +00:00
Noé Courtier
b964f1a476 FIX: page was not reloaded after addline causing a new lline creation was page was reloaded 2023-01-24 14:21:14 +01:00
VESSILLER
b2ac7a72be FIX simple quote in generated file name from build doc mass action 2023-01-24 11:21:59 +01:00
David Pareja Rodriguez
01e90a4854 Fix wrong variable used to fetch replaced invoice 2023-01-24 11:04:26 +01:00
David Pareja Rodriguez
7f6d993040 Encase database name in backticks 2023-01-24 10:54:48 +01:00
Laurent Destailleur
dac3acd71f
Merge pull request #23634 from piernov/14.0-fix-donPaid
Fix: don setPaid sets paid field
2023-01-23 02:23:03 +01:00
Laurent Destailleur
56f0efa2fc Fix greek language 2023-01-20 19:09:56 +01:00
Thomas Negre
51f1871dd6 FIX on public ticket list, only the page 1 was accessible. Other pages were 404 error. 2023-01-19 17:22:31 +01:00
piernov
9a40c966bd
Fix: don setPaid sets paid field
When donation is classified as paid, paid field also needs to be set to 1 so that accounting reports show the correct information.
2023-01-19 16:31:32 +01:00
Laurent Destailleur
17b6cb2724 Fix warning 2023-01-19 13:23:08 +01:00
Thomas Negre
c8d0226613 Harmonize CSS for tables in fichehalfleft/fichehalfright 2023-01-19 11:24:53 +01:00
Laurent Destailleur
e78f59c8b6 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-19 10:44:28 +01:00
Laurent Destailleur
c3ebda359d Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-19 10:39:19 +01:00
Frédéric FRANCE
ff7a666c2b
Update bonprelevement.class.php 2023-01-18 23:43:54 +01:00
Laurent Destailleur
6d8851d1e4
Merge pull request #23468 from FHenry/16_fix_reminder_type_label
fix: reminder type label on Actioncomm Card
2023-01-18 23:41:18 +01:00
Laurent Destailleur
055cecc4e2
Merge pull request #23519 from comaiteseb/16.0
correction bug sur le filtre des langues module Emailing
2023-01-18 23:34:54 +01:00
Laurent Destailleur
6ce20e3bae
Merge pull request #23541 from FHenry/16_fix_token
fix: token for scan inventory
2023-01-18 23:33:00 +01:00
Laurent Destailleur
ddc9a0487a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-18 22:58:24 +01:00
Laurent Destailleur
f084c306b2 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-01-18 22:55:58 +01:00
Laurent Destailleur
4001101f59 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2023-01-18 22:50:29 +01:00
Laurent Destailleur
20956e9b7d Fix data truncated 2023-01-18 22:50:13 +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
33e21c2e2b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-01-18 20:45:58 +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
Laurent Destailleur
f49a14f8d9
Merge pull request #23574 from atm-maxime/fix_ecm_keywords
Fix missing keywords in dol_dir_list_in_database
2023-01-18 20:19:36 +01:00
Laurent Destailleur
a849496050
Merge pull request #23612 from noec764/14_Fix_missingTokenDeletingTemplate
FIX: Add missing token when deleting template inn order_supplier admin menu
2023-01-18 20:12:07 +01:00
Laurent Destailleur
3e7b16e8ca
Merge pull request #23620 from FHenry/14_fix_mod_builder
fix: module builder, backport working solution form 15.0
2023-01-18 20:11:26 +01:00
Laurent Destailleur
aa273d2155
Update index.php 2023-01-18 20:11:12 +01:00
Laurent Destailleur
c4ebc721dd
Merge pull request #23622 from ATM-Consulting/FIX_16.0_contact_firstname_lastname_extrafields
FIX : Extrafields list socpeople, display firstname and lastname together
2023-01-18 20:09:11 +01:00
Laurent Destailleur
0fd085d5bb
Merge pull request #23613 from noec764/14_FIX_Errors_handling_CreateFrom_Hooks
FIX: Errors Handling for CreateFrom Hooks
2023-01-18 20:04:15 +01:00
GregM
a3d4eb404d Fix contact firstname lastname extrafields 2023-01-18 17:36:05 +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
Florian HENRY
6d8f80d46e fix: module builder, backport workgin solution form 15.0 2023-01-18 16:10:21 +01:00
GregM
1d50acb3cf Fix fieldvalue emailtemplate 2023-01-18 12:10:58 +01:00
Ferran Marcet
8c969c7765 Merge branch '14.0up' into 14.0 2023-01-18 10:52:40 +01:00
Ferran Marcet
cb96378031 FIX: API access for deactivated users 2023-01-18 10:48:18 +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
Noé Courtier
29966d8499 FIX: Add missing token when deleting template inn order_supplier admin menu 2023-01-18 09:29:11 +01:00
Laurent Destailleur
af7570a2cd Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-18 00:16:03 +01:00
Laurent Destailleur
24bc8d022f Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-18 00:14:24 +01:00
Laurent Destailleur
708e284381 Enhance backward compatibility 2023-01-18 00:13:21 +01:00
Regis Houssin
e5d4ea1b7c FIX error with dol_banner_tab, ref is needed 2023-01-17 18:30:06 +01:00
Florian HENRY
dbc9ca9816 FIX: missing token on Supplier proposal links 2023-01-16 22:17:22 +01:00
Florian HENRY
90137268a1 FIX: missing tokan on Supplier proposal links 2023-01-16 22:15:02 +01:00
Maxime Kohlhaas
b54a15f504 Fix missing keywords in dol_dir_list_in_database 2023-01-15 09:11:29 +01:00
Laurent Destailleur
ebaae53335
Merge pull request #23526 from FHenry/16_fix_volume_pdf
Fix: make PDF custom volume work as it work on expedition/card.php
2023-01-13 21:04:18 +01:00
Laurent Destailleur
a67fe03aed
Merge pull request #23551 from Hystepik/develop_v16#1
Fix #23531 : fix update bom line
2023-01-13 20:45:09 +01:00
Laurent Destailleur
dd0f885765
Merge pull request #23217 from atm-lena/16.0_FIXBOM_CalculatePrice
16.0 FIX Bom Calculate Price
2023-01-13 20:43:55 +01:00
Laurent Destailleur
40e956646d
Merge pull request #23523 from altairis-noe/status_for_inventory_update
FIX: do not let closed inventories reset stock with URL
2023-01-13 13:22:47 +01:00
hystepik
04ce79191f Fix #23531 : fix update bom line 2023-01-13 12:18:58 +01:00
Laurent Destailleur
efa9b4da33
Merge pull request #21528 from atm-GregM/FIX_dolibarr_15.0_disabled_contacts_not_returned_create_invoice
FIX contacts disabled are not returned on create invoice
2023-01-13 12:17:40 +01:00
Florian HENRY
534cb8f0a0 fix: token for scan inventory 2023-01-13 09:55:57 +01:00
Florian HENRY
4fdf930269 make PDF custom volume work as it work on expedition/card.php 2023-01-12 12:49:45 +01:00
Laurent Destailleur
24651aaa6c FIX #22731 #23524 2023-01-12 12:41:02 +01:00
Laurent Destailleur
ce934a813b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-12 11:48:58 +01:00
Laurent Destailleur
684716e15b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-01-12 11:43:43 +01:00
Noé Cendrier
272f131b07 do not let closed inventories reset stock with URL 2023-01-12 10:18:47 +01:00
Regis Houssin
968c50d6f9 FIX wrong stock list with multicompany and without stock sharing 2023-01-12 09:49:12 +01:00
Laurent Destailleur
2ec9d9d409 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-11 21:21:15 +01:00
Laurent Destailleur
e1ea849701 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-01-11 21:20:10 +01:00
Laurent Destailleur
367987e2f3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-01-11 21:19:39 +01:00
Laurent Destailleur
e27875142c
Merge pull request #23465 from Easya-Solutions/14.0_fix-muscadet-hide-details
FIX hide details option in supplier order PDF model
2023-01-11 21:15:40 +01:00
Sébastien NASSIET
2bce74d2e2
Merge branch 'Dolibarr:16.0' into 16.0 2023-01-11 21:07:31 +01:00
Sébastien NASSIET
4a40039f56 correction bug selection contact dans emailing 2023-01-11 21:06:55 +01:00
Laurent Destailleur
a0e723a05b Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-11 21:05:19 +01:00
Laurent Destailleur
356accd6ee Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-11 21:05:09 +01:00
Laurent Destailleur
ed6a46eb20
Merge pull request #23504 from atm-maxime/fix_invoicesupprec_pdfmodel
Fix supplier reccurent invoice if no pdf model
2023-01-11 19:25:22 +01:00
Florian HENRY
45725a1e97 fix: display True volume in PDF 2023-01-11 17:58:26 +01:00
Noé Courtier
cfb16cc9cd FIX: ref not available after ecmFile create() 2023-01-11 16:49:59 +01:00
Maxime Kohlhaas
c0a7bca04e Fix supplier reccurent invoice if no pdf model 2023-01-11 10:50:58 +01:00
Laurent Destailleur
2da8c1d9bc Fix rounding 2023-01-10 11:33:17 +01:00
Florian HENRY
403f5a33ee Merge branch '16.0' of github.com:Dolibarr/dolibarr into 16_fix_reminder_type_label 2023-01-09 16:15:39 +01:00
Laurent Destailleur
ccf231bc44 Fix sql error 2023-01-09 16:01:20 +01:00
Florian HENRY
6c373c9381 fix: reminder type label 2023-01-09 15:50:55 +01:00
hystepik
4e0ea65c43 Fix #23466 : fix public payement pages ko and ok 2023-01-09 15:37:10 +01:00
VESSILLER
4c9d6b5e51 FIX hide details option in supplier order PDF model 2023-01-09 13:57:20 +01:00
Laurent Destailleur
98e61dc40d Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-07 17:29:24 +01:00
Laurent Destailleur
b2e51a5ef4
Merge pull request #23419 from atm-jpb/fix_border_left_photo
FIX : add border left on image product when conf activated
2023-01-07 10:28:47 +01:00
Laurent Destailleur
7218d8419f
Merge pull request #23434 from altairis-noe/too_much_br
FIX: do not add <br> when dol_concatdesc already does it
2023-01-07 03:38:57 +01:00
Laurent Destailleur
0eb0ee5bb1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-01-06 16:52:06 +01:00
Laurent Destailleur
2755e3dad7 Fix typo 2023-01-06 15:53:25 +01:00
Laurent Destailleur
099a9e5253
Merge pull request #23425 from marcusdeangabriel/16.0
Added &$arrayfields to $parameters so that hooks can manipulate list columns.
2023-01-06 15:52:19 +01:00
Laurent Destailleur
b8c8a5d487 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-06 12:09:33 +01:00
Laurent Destailleur
68e4e71005 FIX: Amount of localtax1 and 2 not correctly save on purchase order (the
rate was saved instead)
2023-01-06 12:08:40 +01:00
Noé Cendrier
10018d48a9 do not add <br> when dol_concatdesc already does it 2023-01-06 11:46:59 +01:00
Gauthier PC portable 024
e7d31a821c FIX : hierarchyme and not hierachyme 2023-01-05 15:41:57 +01:00
Laurent Destailleur
a892ef56ab
Merge pull request #23422 from Dolibarr/fix_fatal_error_on_task_list_time_to_bill
FIX #23420 : wrong check on $search_categ value causing FATAL ERROR
2023-01-05 14:47:43 +01:00
mgabriel
a7de5e4c72 Added &$arrayfields to $parameters so that hooks can manipulate list columns. 2023-01-05 11:59:43 +01:00
Théo David
665fd9cc0e FIX : wrong check on $search_categ value causing fatal error 2023-01-05 10:46:08 +01:00
jpb
9a755d8d50 add border left on image product when conf activated 2023-01-05 10:24:17 +01:00
Laurent Destailleur
25eac607eb
Merge pull request #23407 from daraelmin/daraelmin-patch-2
Fix v14 fatal error undefined fct lenght_accounta
2023-01-04 17:48:08 +01:00
Laurent Destailleur
cbfbb88a84 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-04 15:18:28 +01:00
Laurent Destailleur
2378f8067b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-04 15:18:13 +01:00
Laurent Destailleur
539d4936aa Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-01-04 15:17:00 +01:00
Laurent Destailleur
7197085126 FIX saving of numbering module for jobs 2023-01-04 15:16:40 +01:00
stickler-ci
1d29400cdf Fixing style errors. 2023-01-04 08:15:39 +00:00
daraelmin
23d535197d
Fix v14 fatal error undefined fct lenght_accounta
Following #23403
See https://www.dolibarr.fr/forum/t/erreur-fatal-paiements-divers-v15-0-3/41914
2023-01-04 09:13:40 +01:00
ptibogxiv
70f9e7881b
Fix error when no category selected
empty pages when searching with no category of producted selected
2023-01-03 19:46:05 +01:00
Florian HENRY
797b9c9054 dfelete cem data on product deletion 2023-01-03 11:42:39 +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
ba5cc3870e Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-03 02:35:01 +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
94fb344bd6 FIX #22271 2023-01-03 02:03:23 +01:00
Laurent Destailleur
af45ef8799
Merge pull request #23294 from atm-gauthier/fix_multicurrency_when_create_order_from_propal
FIX : get multicurrency infos of propal when create order from propal…
2023-01-03 01:36:57 +01:00
atm-lena
6dbffb5398 Add price() to pricetonum() on bomline view 2023-01-02 09:48:34 +01:00
Francis Appels
cef9a8e8d4 Fix Price by qty for multiprices 2022-12-31 13:42:18 +01:00
Laurent Destailleur
534db40d87 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-30 04:15:10 +01:00
Laurent Destailleur
dfa13ea255 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-30 03:11:10 +01:00
Laurent Destailleur
9319f56599 Fix css 2022-12-30 03:10:37 +01:00
Eric Seigne
2aa271d96e avoid editretainedwarranty if invoice is not draft 2022-12-28 17:50:16 +01:00
Laurent Destailleur
6cb364faf8
Merge pull request #23312 from ksar-ksar/patch-19
FIX #23281
2022-12-28 02:39:01 +01:00
Laurent Destailleur
d0ea4760d9
Update perms.php 2022-12-28 02:38:40 +01:00
Laurent Destailleur
8d4faf3530 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-27 11:19:11 +01:00
Laurent Destailleur
912428f5a1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-12-27 11:14:40 +01:00
Laurent Destailleur
a17c417205
Merge pull request #23018 from Easya-Solutions/14.0_fix-22837
FIX #22837
2022-12-27 00:26:52 +01:00
Laurent Destailleur
1d7c550adb Fix add BARCODE_INIT_MAX to solve timeout in barcode generation 2022-12-26 16:09:05 +01:00
Laurent Destailleur
6551b8afcc Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-26 15:28:11 +01:00
Laurent Destailleur
bbb775bd11 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-26 15:27:46 +01:00
Laurent Destailleur
04b38997c6 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-12-26 15:21:22 +01:00
Laurent Destailleur
76b7f80443 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-12-26 15:20:28 +01:00
Laurent Destailleur
11c86416a9 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-12-26 15:15:13 +01:00
Laurent Destailleur
f6149903dc FIX bad selection of barcode numbering module 2022-12-26 15:08:51 +01:00
ksar
1b03c423b9
FIX #23281 2022-12-22 17:13:11 +01:00
stickler-ci
56d05c09b2 Fixing style errors. 2022-12-22 13:52:39 +00:00
IC-Florian
2a68836375
New require for product in generateOutputField 2022-12-22 14:52:03 +01:00
Laurent Destailleur
e12ef6735f
Merge pull request #23250 from daraelmin/patch-7
Fix #23077 - Cannot update subscription note
2022-12-22 14:40:57 +01:00
Laurent Destailleur
2b106519e2
Merge pull request #23269 from inovea-conseil/FIX#23072
FIX#23072
2022-12-22 14:28:16 +01:00
Laurent Destailleur
5e7a8012f5
Merge pull request #23262 from inovea-conseil/FIX23238
When no language selected, value is 0 so it enters in the condition f…
2022-12-22 13:53:35 +01:00
Laurent Destailleur
17efd55af4
Merge branch '16.0' into FIX#23087 2022-12-22 13:46:36 +01:00
Laurent Destailleur
dc1c31c948 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-21 21:00:57 +01:00
Laurent Destailleur
8d2dde99ae Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-21 20:57:13 +01:00
Laurent Destailleur
8e914b2423 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-12-21 20:47:09 +01:00
Laurent Destailleur
c3ada976e1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-12-21 20:46:56 +01:00
Laurent Destailleur
f87b6d7ede
Merge pull request #23260 from braito4/patch-2
php 8 warning
2022-12-21 20:45:38 +01:00
Laurent Destailleur
1681674cdf
Update card.php 2022-12-21 20:45:11 +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
Gauthier PC portable 024
b38f163b02 Merge branch 'fix_multicurrency_when_create_order_from_propal' of github.com:atm-gauthier/dolibarr into fix_multicurrency_when_create_order_from_propal 2022-12-21 12:31:48 +01:00
Gauthier PC portable 024
a48d1ae8e3 FIX : multicurrency_tx and not currency_tx 2022-12-21 12:31:24 +01:00
IC-Florian
471260738a
FIX : Product list in setup.php in new Module 2022-12-21 12:03:32 +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
Mathieu
a4d5a7ed1f FIX#23072 2022-12-20 12:36:50 +01:00
Florian
2f64eaff05 FIX : CI 2022-12-20 12:25:20 +01:00
Florian
ec32d284eb FIX : Product list in setup.php in new Module 2022-12-20 11:31:44 +01:00
Iliès BENYAHIA
a08c468a5e When no language selected, value is 0 so it enters in the condition filter_lang != '' anyway 2022-12-20 11:00:41 +01:00
Braito
55b51b94f1
php 8 warning 2022-12-20 10:13:47 +01:00
stickler-ci
48b4caaa70 Fixing style errors. 2022-12-19 09:41:39 +00:00
atm-lena
654b75de9f Merge branch '16.0_FIXBOM_CalculatePrice' of github.com:atm-lena/dolibarr into 16.0_FIXBOM_CalculatePrice 2022-12-19 10:40:17 +01:00
daraelmin
6a658499e7
Fix #23077 - Cannot update subscription note 2022-12-17 21:16:03 +01:00
Laurent Destailleur
f1d83b695a
Merge pull request #23166 from atm-lena/16.0_FIX_DeleteMOAndLinks
Delete MO :  object's links must be deleted
2022-12-17 01:46:42 +01:00
hystepik
c0a0b977bf Fix #19485 : add of missing tickets trad key for menu 2022-12-16 16:20:43 +01:00
atm-lena
eff01374b1 Change place of deleteobjectlinked in deletecommon function 2022-12-15 15:09:50 +01:00
atm-lena
1ebd2135e0 Fix stickler error 2022-12-15 15:00:27 +01:00
Laurent Destailleur
dac8d5c952
Merge pull request #23219 from sebastien-prudhomme/fix-23019
FIX #23019 Impossible to add task times to an existing draft invoice
2022-12-14 18:38:53 +01:00
Laurent Destailleur
80ac95a158
Merge pull request #23218 from atm-gauthier/fix_missing_method_declarations
FIX : methods declaration (backport fix 67b9a7dc07d708231d12b5e588003…
2022-12-14 18:33:18 +01:00
stickler-ci
70b6b3d82d Fixing style errors. 2022-12-14 15:21:42 +00:00
Gauthier PC portable 024
1a16e41ce3 FIX : Can't see all time spent by all user 2022-12-14 16:04:35 +01:00
hystepik
4c43d81872 Fix #23064 : diplays total at end of inter list 2022-12-14 15:39:02 +01:00
Sébastien Prud'homme
ed89005941 Fix #23019 Impossible to add task times to an existing draft invoice 2022-12-14 11:45:40 +01:00
Laurent Destailleur
66d4edb222 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-14 11:02:37 +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
stickler-ci
d679a32155 Fixing style errors. 2022-12-14 09:36:25 +00:00
Gauthier PC portable 024
b906619ce1 FIX : methods declaration (backport fix 67b9a7dc07) 2022-12-14 10:31:11 +01:00
Laurent Destailleur
348c54680e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-12-14 10:21:43 +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
b597a43b21 Fixing style errors. 2022-12-14 08:37:30 +00:00
stickler-ci
24585cf61b Fixing style errors. 2022-12-14 02:45:20 +00:00
Henry
c4dbc5e6d6
Create invoice from Shipment - fix error of multicurrency code 2022-12-14 10:39:15 +08:00
Laurent Destailleur
402ff37465
Merge pull request #23159 from milenmk/v16-Wrong-invoice-amount-when-billing-Project-task-spent-time
FIX|Fix [#23075]
2022-12-14 01:57:53 +01:00
Laurent Destailleur
16fee3f8d8
Merge pull request #23190 from frederic34/parametersoreder
fix parameters order
2022-12-14 00:24:12 +01:00
Laurent Destailleur
df19840663
Merge pull request #23208 from Quentin-Seekness/patch-4
Adding filter parameters
2022-12-14 00:01:24 +01:00
Laurent Destailleur
fe1fafa816 Fix edition of product notes 2022-12-13 11:47:06 +01:00
Quentin-Seekness
1d8cf1b44f
Add filter params 2022-12-13 11:29:28 +01:00
Quentin-Seekness
d98c998b8e
Adding filter parameters
Adding filter parameters in addMoreActionsButtonsList Hook
2022-12-13 11:26:53 +01:00
Aloïs Micard
8a1df1df92 Give order to inventory lines 2022-12-12 17:36:00 +01:00
Laurent Destailleur
76d5309c17 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-12 11:55:56 +01:00
Laurent Destailleur
38e58d9633 Fix link to set all perms has disappeared 2022-12-12 11:55:43 +01:00
atm-lena
92bff0fcfb Missing Unit TD for sub-bom lines 2022-12-12 11:41:54 +01:00
Frédéric FRANCE
c134090321 fix parameters order 2022-12-12 10:44:34 +01:00
Frédéric FRANCE
b8755bcf65 fix parameters order 2022-12-12 10:39:24 +01:00
atm-lena
95f437b45c deleteObjectLinked() in deleteCommon() function 2022-12-12 10:05:44 +01:00
Milen Karaganski
811e24fd7c Change to define unit price from timespent data instead from the user hourly rate 2022-12-10 21:15:00 +02:00
Juanjo Menent
9b3f6cfa5a Fix #23142 2022-12-09 20:38:44 +01:00
atm-lena
7c352c9cef BOM : calculate total cost of lines 2022-12-09 17:00:11 +01:00
Aloïs Micard
285731200a Add confirm_cancel action 2022-12-09 13:45:15 +01:00
atm-lena
93ee9a7496 Delete links when MO is deleted 2022-12-09 12:56:35 +01:00
Aloïs Micard
381b998413 Display blank td when action is confirm_valid 2022-12-09 11:45:09 +01:00
Milen Karaganski
ee7e394ebf FIX|Fix [#23075]
Wrong invoice unit price when billing Project task spent time
2022-12-08 20:22:41 +02:00
Laurent Destailleur
5573b88df8
Merge pull request #23133 from milenmk/16-holidays-list-error-message
FIX|Fix[#23117]
2022-12-07 17:14:06 +01:00
Milen Karaganski
2a16198981 Put back error counter $nbignored++; 2022-12-07 17:09:54 +02:00
Laurent Destailleur
28e56de8fd Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-07 12:38:10 +01:00
Laurent Destailleur
4d06e88f19 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-12-07 12:36:51 +01:00
Laurent Destailleur
f6289297da FIX #21280 FIX #23008 2022-12-07 12:35:54 +01:00
Milen Karaganski
9b8940ac15 FIX|Fix[#23117]
Error message not displayed, when trying to mass-delete validated OR approved holiday requests
2022-12-07 00:13:11 +02:00
Laurent Destailleur
7dd0c6646d
Merge pull request #23114 from aspangaro/14p42
Fix CSS
2022-12-06 21:06:53 +01:00
Laurent Destailleur
37e91fa6bf
Merge pull request #23066 from FHenry/14_fix_stats_propal_order
FIX: propal and order stats broken on Tag+User(retricted customer list)
2022-12-06 21:04:55 +01:00
Laurent Destailleur
ba582963d6 Fix typo 2022-12-06 19:56:49 +01:00
Laurent Destailleur
ac8914eb19 FIX #23115 FIX #23116 2022-12-06 19:25:56 +01:00
Alexandre SPANGARO
a107c81bf1 Merge branch '14.0' into 14p42 2022-12-06 04:53:10 +01:00
Alexandre SPANGARO
89b10b0dfb Fix css 2022-12-06 04:48:04 +01:00
Florian HENRY
f405f859ca ineer join is better than coma and where 2022-12-02 22:49:52 +01:00
Frédéric FRANCE
9f4182c924
fetch entity contact to take the right directory 2022-12-02 11:00:52 +01:00
Laurent Destailleur
8236ad34fa Fix revert a new feature that must be in develop 2022-12-01 18:34:20 +01:00
Laurent Destailleur
e8e9086c15
Merge pull request #22999 from inovea-conseil/FIX#20415
FIX#20415
2022-12-01 17:52:55 +01:00
Laurent Destailleur
9b5fc20308 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-01 17:46:13 +01:00
Laurent Destailleur
8a8f6e0c16 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-12-01 17:42:13 +01:00
Laurent Destailleur
cc982adc2f Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-12-01 17:42:02 +01:00
Noé Courtier
a4ac90a316 FIX: PGSQL Int type does not have a free lenght 2022-12-01 15:15:31 +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
40a387898a Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-01 11:49:32 +01:00
Laurent Destailleur
88aadae934 Fix barcode choice lost if error 2022-12-01 11:48:47 +01:00
Laurent Destailleur
804b806d02 Fix responsive 2022-12-01 11:37:56 +01:00
Laurent Destailleur
ad8546038f
Merge pull request #23043 from ibuiv/patch-4
Fix #22494 Bad error message and trans missing (radio button)
2022-12-01 11:09:30 +01:00
Eric Seigne
9a2ce53517 add stamp and signature in pictowithouttext list 2022-11-30 23:41:32 +01:00
Laurent Destailleur
f08870d91e Fix label of some fields in dictionaries 2022-11-30 16:57:26 +01:00
antonin_tdj
ef065967ed
Add $langs->load('errors') before radioError
Add $langs->load('errors') before radioError
2022-11-30 10:44:10 +01:00
antonin_tdj
f1132ef8ba
Revert add 'errors' on $langs->load
Revert add 'errors' on $langs->load
2022-11-30 10:42:44 +01:00
stickler-ci
87526194c5 Fixing style errors. 2022-11-29 19:44:44 +00:00
antonin_tdj
1394208de3
Update card.php add errors on langs
errors added to langs object to improve error messages
2022-11-29 20:39:40 +01:00
antonin_tdj
b713f645d4
Update extrafields.class.php error message
adapt error message for radio buttons
2022-11-29 20:35:43 +01:00
Laurent Destailleur
b15fda8d9a Debug edit actioncomm 2022-11-29 14:38:25 +01:00
VESSILLER
ad07fdfd79 FIX #22837 2022-11-27 01:06:40 +01:00
Laurent Destailleur
19c4258e2d
Merge pull request #23004 from nicolas-eoxia/fix_default_value_setSaveQuery
FIX: #22509 default value on integer fields don't retrieve by setSaveQuery
2022-11-26 16:37:17 +01:00
Laurent Destailleur
b522517c75
Merge pull request #22994 from ibuiv/patch-1
Fix #20685 User Id not transmitted on Api addTimeSpent
2022-11-26 11:30:47 +01:00
Laurent Destailleur
fa34ea3dc5
Merge pull request #22997 from SylvainLegrand/fix_#21357
Fix #21357
2022-11-26 10:57:18 +01:00
Laurent Destailleur
7884216197
Merge pull request #23003 from rycks/14_fix_api_status_on_delete
fix #22766: better API response HTTP code
2022-11-26 10:26:21 +01:00
Laurent Destailleur
37f4c846cb
Merge pull request #22996 from ATM-Nicolas/fix_api_documents_inconsistency
FIX : Documents API inconsistency
2022-11-26 10:22:58 +01:00
Laurent Destailleur
c8e5ca9691 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-11-26 01:54:53 +01:00
Laurent Destailleur
096bd39ae7 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-11-26 01:54:17 +01:00
Laurent Destailleur
860f2414c4 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-11-26 01:46:37 +01:00
Laurent Destailleur
63541d1515 Fix phpcs 2022-11-26 01:45:58 +01:00
Laurent Destailleur
b231bcb64a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/bookkeeping/listbyaccount.php
	htdocs/accountancy/bookkeeping/listbysubaccount.php
2022-11-26 01:21:51 +01:00
Laurent Destailleur
1921d427e9 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-11-26 01:14:09 +01:00
Laurent Destailleur
85e9ac1e40 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-11-26 01:13:58 +01:00
Nicolas Domenech
b98eaa4d45 #FIX: #22509 default value on integer fields don't retrieve by setSaveQuery 2022-11-26 01:01:22 +01:00
stickler-ci
3fd81293a3 Fixing style errors. 2022-11-25 23:57:35 +00:00
Eric Seigne
616e2b79ef fix #22766: better API response HTTP code 2022-11-26 00:50:45 +01:00
ATM-Nicolas
e767c9b4a9 FIX : Stickler 2022-11-26 00:42:50 +01:00