BB2A Anthony Berton
cef9cf8670
int
2022-03-08 18:34:56 +01:00
BB2A Anthony Berton
eae3fe78f1
init
2022-03-08 18:06:26 +01:00
Ferran Marcet
a14bf4b621
Fix: New hidden option MAIN_LINK_BY_REF_IN_LINKTO don't work
2022-03-08 18:02:55 +01:00
Ferran Marcet
8e944b8b6d
Fix: Error whem generating supplier payment pdf
2022-03-08 17:34:51 +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
161edea6f3
FIX: deposit payment terms: adapt to v16
2022-03-08 15:22:19 +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
66f21fc1d0
Fix phpunit
2022-03-07 20:46:09 +01:00
Laurent Destailleur
b339e1a883
Enhance phpunit on sql code testing
2022-03-07 19:37:53 +01:00
Laurent Destailleur
d6852c31b8
Clean code
2022-03-07 19:31:06 +01:00
Laurent Destailleur
6e298a2cb4
Fix phpunit
2022-03-07 19:18:32 +01:00
Laurent Destailleur
492c198e46
Make conditions of some corn tasks dynamic.
2022-03-07 18:01:07 +01:00
Laurent Destailleur
7defe26e56
Debug cron to send backup by email.
2022-03-07 17:55:10 +01:00
Laurent Destailleur
82244afb94
Merge pull request #20136 from bb2a/Send-Local-Database-Dump
...
NEW - Add util function send backup by mail
2022-03-07 17:37:44 +01:00
Laurent Destailleur
29e278ed36
Update modCron.class.php
2022-03-07 17:33:50 +01:00
Laurent Destailleur
32711e5f1f
Merge pull request #20145 from atm-GregM/Fix_dolGetButtonAction
...
FIX: function dolGetButtonAction change title if html not set
2022-03-07 17:14:33 +01:00
Laurent Destailleur
5bde2b3489
Merge
2022-03-07 16:42:47 +01:00
Laurent Destailleur
c4036345b8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2022-03-07 16:42:28 +01:00
Laurent Destailleur
b1de986fb7
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2022-03-07 16:41:44 +01:00
Laurent Destailleur
dd9f10b1b6
Merge pull request #20186 from atm-kevin/FIX_Add_Id_In_Formproject
...
FIX : Add ID into formproject method
2022-03-07 16:34:04 +01:00
Laurent Destailleur
1ecdc7bc20
css
2022-03-07 16:30:39 +01:00
Laurent Destailleur
0020f4e48a
Merge pull request #20222 from thomas-Ngr/develop_new_ticket_notify_at_closing
...
New - Ticket: notify contacts at closing
2022-03-07 16:23:27 +01:00
Laurent Destailleur
fb2fb46d17
FIX Drag and drop line of files on join files tab
2022-03-07 16:04:55 +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
Laurent Destailleur
7d374dc4f6
Merge pull request #20264 from fmarcet/15.0
...
Fix : #20161 Can't import thirds. Column Skype doesn't exist
2022-03-07 14:21:42 +01:00
Laurent Destailleur
403db246bb
Merge pull request #20280 from Achicken7301/develop
...
Add unit price for {DOL_PRINT_OBJECT_LINES}
2022-03-07 13:44:03 +01:00
Laurent Destailleur
edaf740e78
Update dolreceiptprinter.class.php
2022-03-07 13:43:16 +01:00
Laurent Destailleur
2142440b6c
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/index.php
htdocs/langs/en_US/errors.lang
2022-03-07 13:23:47 +01:00
Laurent Destailleur
378dab69a6
FIX #19777 #20281
2022-03-07 13:21:32 +01:00
Laurent Destailleur
f4cb5810a7
FIX list of visible type of event was not correctly filtered
...
FIX Error management on mass action "Approve holiday"
2022-03-07 12:01:34 +01:00
Khang
9cada04261
Add unit price for "free-text product" receipt
2022-03-05 16:58:37 +07:00
Khang
d326fe02cf
Feature: unit price for {DOL_PRINT_OBJECT_LINES}
...
Module "Receipt printers":
add unit price for {DOL_PRINT_OBJECT_LINES} in tabs "template setup"
2022-03-05 07:02:36 +07:00
Ferran Marcet
8c2c3bf3fb
Fix: Can't import thirds. Column Skype doesn't exist
2022-03-04 10:06:24 +01:00
steve
436b8fa5b5
apply feedbacks
2022-03-03 16:18:09 +01:00
wdammak
cf43024d5d
Update eldy.lib.php
2022-03-03 11:29:47 +01:00
Laurent Destailleur
aed4d69568
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-03-03 09:49:26 +01:00
Laurent Destailleur
2837c938e6
Fix help easier to understand to avoid lethal situations.
...
Fix reponsive
2022-03-03 09:41:15 +01:00
Laurent Destailleur
88944656be
Doc
2022-03-03 02:05:13 +01:00
Laurent Destailleur
0fed4dae13
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/functions.lib.php
2022-03-03 01:59:31 +01:00
Laurent Destailleur
3c3d6ab0da
Fix regression. Add unit test to detect it.
2022-03-03 01:17:44 +01:00
Laurent Destailleur
9bda7ba8c7
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/doleditor.class.php
2022-03-03 00:16:55 +01:00
wdammak
dd9a350136
Simplification of the code by separating the part given to menu processing
...
The goal:
- A simplification of the code for easier maintenance is targeted
- Separation of data to left menu display processing
- Plan in the future to put the left menu data directly in the folders of the modules concerned and which will be loaded automatically by eldy.lib.php or eldy_menus.php (for example add a folder "menus/leftmenu.php" in the module "bank" => "bank/menus/leftmenu.php")... This greatly cleans up the code and makes the modules easier to maintain while also avoiding the massive use of hooks for external modules.
- A reuse of the left menus in other corners of the ERP just by calling the function of the desired menu.
- The code is much lighter! is more readable with easier display order modification!
2022-03-02 22:41:00 +01:00
Laurent Destailleur
f0e95a2d20
Fix a default value is creating a letal blocking situation
2022-03-02 22:05:35 +01:00
kevin
ad5a18996d
Replace id by class
2022-03-02 21:00:07 +01:00
Steve
8f07c22d70
Merge branch 'dolibarrdevelop' into WIP_Employee_management_improvement
2022-03-02 14:51:46 +01:00
Laurent Destailleur
a7cb3fa492
Clean log
2022-03-02 14:44:14 +01:00
Laurent Destailleur
66b0f253b6
Clean code
2022-03-02 12:41:21 +01:00
Laurent Destailleur
5ffac5f3ee
Fix typo
2022-03-02 11:38:32 +01:00
Laurent Destailleur
72965fdb2e
# WARNING: head commit changed in the meantime
...
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-03-01 19:13:28 +01:00
Laurent Destailleur
3e1580475c
Fix phpunit
2022-03-01 19:05:33 +01:00
Laurent Destailleur
7c253c7e28
Clean code
2022-03-01 19:05:00 +01:00
Laurent Destailleur
762de973eb
Fix sql injection
2022-03-01 18:43:16 +01:00
Laurent Destailleur
e5fd841fe3
Make verifCond more robust against RCE
2022-03-01 18:21:30 +01:00
Laurent Destailleur
12b2a10865
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-03-01 18:15:13 +01:00
Laurent Destailleur
883f13b388
Fix regression verifCond
2022-03-01 18:14:24 +01:00
Laurent Destailleur
b79ad197ec
FIX Missing the field date start/end in export supplier invoice/order
2022-03-01 17:29:22 +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
2a48dd349e
Fix #hunterb03d4415-d4f9-48c8-9ae2-d3aa248027b5
2022-03-01 16:38:06 +01:00
Steve
5bf186c8ce
Merge branch 'dolibarrdevelop' into WIP_Employee_management_improvement
2022-03-01 11:42:57 +01:00
Marc de Lima Lucio
e3aae6d2e1
FIX: object cloning: set unique extrafield values to null to prevent duplicates
2022-03-01 10:50:22 +01:00
Laurent Destailleur
8c94c2f98c
Fix collapse icon
2022-03-01 04:10:50 +01:00
Laurent Destailleur
e4e08c9903
Code simpler to manage collapse of separators.
2022-03-01 04:02:06 +01:00
Laurent Destailleur
54bef2e34f
Fix phpcs
2022-03-01 01:57:38 +01:00
Laurent Destailleur
0d024147bf
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-28 22:36:31 +01:00
Laurent Destailleur
dfba29b3c6
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
...
Conflicts:
htdocs/api/class/api.class.php
htdocs/compta/facture/card.php
htdocs/reception/list.php
2022-02-28 22:30:17 +01:00
Laurent Destailleur
67881a7932
Merge branch 'develop' into 16a12_assets_code
2022-02-28 22:03:26 +01:00
Laurent Destailleur
a89fd3c818
Merge pull request #20198 from gdsoftdev/develop
...
NEW : accoutancy : subleger label input automatic filling when selecting subleger account in select2 list
2022-02-28 21:56:01 +01:00
Laurent Destailleur
8e1fd877f2
Update html.formaccounting.class.php
2022-02-28 21:55:30 +01:00
Laurent Destailleur
50602b1fbe
Update html.formaccounting.class.php
2022-02-28 21:53:05 +01:00
Laurent Destailleur
6447c1e394
Merge pull request #20076 from vincentjdc/html-field-moreparam-morecss
...
Allow to add more CSS and more params on html fields
2022-02-28 21:50:40 +01:00
Laurent Destailleur
835b0f5f19
Update doleditor.class.php
2022-02-28 21:45:04 +01:00
Laurent Destailleur
253622acf6
Merge pull request #20206 from fappels/15_fix_product_photo_on_cornas_model
...
FIX: Show product photo on Supplier order Cornas model.
2022-02-28 21:03:20 +01:00
Laurent Destailleur
6a81ae1099
Merge pull request #20220 from hregis/fix_remove_duplicate_code
...
FIX remove duplicated code
2022-02-28 20:58:24 +01:00
Laurent Destailleur
c2fb5d577c
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/mysql/migration/14.0.0-15.0.0.sql
htdocs/langs/en_US/banks.lang
htdocs/projet/list.php
2022-02-28 20:12:28 +01:00
Thomas Negre
b9e0fc7b02
stickler corrections
2022-02-28 19:02:07 +01:00
stickler-ci
c2047f1f5d
Fixing style errors.
2022-02-28 17:46:20 +00:00
atm-greg
bc8ea7571b
perms can be an expression and must be evaluated
2022-02-28 18:38:37 +01:00
atm-greg
5eef80750a
fiw visibility can be an expression and can return 0
2022-02-28 18:37:47 +01:00
Thomas Negre
dcc41d0ab7
Ticket triggers: allow to automatically send messages on TICKET_CLOSE event
2022-02-28 17:10:45 +01:00
Thomas Negre
5b1b862687
reformat trigger/interface_50_modTicket_TicketEmail.class.php to create methods for email composition and sending
2022-02-28 17:10:45 +01:00
Thomas Negre
e1e643efba
Ticket : add option TICKET_NOTIFY_AT_CLOSING to ticket config panel
2022-02-28 17:10:45 +01:00
steve
91ee90ebeb
fix: read employee and write employee
2022-02-28 16:48:08 +01:00
steve
08fa2dfadd
wip: add read employee and write employee
2022-02-28 15:58:23 +01:00
Regis Houssin
e63e53e081
FIX remove duplicated code
2022-02-28 14:10:35 +01:00
Laurent Destailleur
b598671484
NEW ACE Editor is restored at same cursor position after a save
2022-02-27 14:46:40 +01:00
Frédéric FRANCE
018fc53554
Merge remote-tracking branch 'upstream/develop' into productmerge
2022-02-27 08:40:01 +01:00
Francis Appels
3e41c9cb97
FIX: Show product photo on Supplier order Cornas model.
2022-02-26 11:13:02 +01:00
Laurent Destailleur
fb0e2f9c6c
FIX #yogosha9095
2022-02-26 01:00:22 +01:00
Laurent Destailleur
eba20957f3
Fix CSS
...
Conflicts:
htdocs/projet/list.php
2022-02-25 21:47:25 +01:00
Laurent Destailleur
acf6d19500
Fix CSS
2022-02-25 21:45:29 +01:00
Laurent Destailleur
488049c6a6
FIX bad position of extrafields for interventions
2022-02-25 20:36:40 +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
722b1de2b7
Fixing style errors.
2022-02-25 15:10:10 +00:00
Jé GDSOFT
073431543d
accoutancy : subleger label input automatic filling when selecting subleger account in select2 list
2022-02-25 16:07:44 +01:00
Laurent Destailleur
ac67a5a2bb
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2022-02-25 14:34:25 +01:00
Sylvain Legrand
cb86224613
new : allow to show all logos on a table
2022-02-25 13:17:05 +01:00
Jé GDSOFT
1040555baf
accoutancy : subleger label input automatic filling when selecting subleger account in select2 list
2022-02-25 11:26:56 +01:00
Sylvain Legrand
e8ef2a8d8c
new : allow to show all logos on a table
2022-02-25 09:33:08 +01:00
kevin
aabfdfa212
Format code
2022-02-25 09:20:36 +01:00
kevin
d2cbead203
Add an ID into formproject method to be able to target
2022-02-25 09:17:18 +01:00
Laurent Destailleur
c097ee5331
FIX #yogosha9089
2022-02-25 01:49:38 +01:00
Laurent Destailleur
98da84f9b2
FIX #yogosha9086
2022-02-24 18:15:04 +01:00
Laurent Destailleur
ba3856f9e9
Fix regression
2022-02-24 14:21:28 +01:00
Laurent Destailleur
a6e7a41e98
FIX Reduce flash effect on collapse extrafield
...
FIX Reduce flash effect on edit inline feature.
2022-02-24 12:54:33 +01:00
Laurent Destailleur
118b211807
Fix error on null
2022-02-24 12:37:20 +01:00
Laurent Destailleur
2f0040e9c1
Fix phpunit
2022-02-23 19:24:17 +01:00
GregM
cf470c2306
Add auto tooltip
2022-02-23 16:01:07 +01:00
GregM
3edd478a46
Fix empty url : dont add token
2022-02-23 15:36:43 +01:00
Laurent Destailleur
64ce13e273
Clean setup page
2022-02-23 13:20:14 +01:00
lmarcouiller
57ed890b73
NEW : dol_uncompress new extensions
2022-02-23 12:28:37 +01:00
Laurent Destailleur
e96061dd18
Fix phpunit SecurityTest
2022-02-22 23:46:57 +01:00
Laurent Destailleur
77e2969411
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-22 22:27:32 +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
209ab708d4
FIX #hunterb812ea22-0c02-46fe-b89f-04519dfb1ebd
2022-02-22 21:24:34 +01:00
Laurent Destailleur
c63e2c2981
Website tables are created only if module enabled.
2022-02-22 19:15:37 +01:00
Laurent Destailleur
8cc0f3bb58
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2022-02-22 18:47:26 +01:00
Laurent Destailleur
8a99bc3b04
Try a more complete sanitization
2022-02-22 18:41:14 +01:00
Marc de Lima Lucio
0e0dd1ec6c
FIX: invoice pdf: lines originating from deposits were not detailed anymore
2022-02-22 17:42:11 +01:00
Laurent Destailleur
f544219d92
FIX permission to download files of expense report with readall.
2022-02-22 16:44:17 +01:00
lmarcouiller
edbf1bb34b
update to fix PR
2022-02-22 16:35:10 +01:00
GregM
e107423c21
fix : change title if html not set
2022-02-22 12:25:30 +01:00
atm-lena
e5ba5b208e
Correct Stickler
2022-02-22 11:36:41 +01:00
atm-lena
45fe83289f
MoChild category
2022-02-22 11:32:33 +01:00
Laurent Destailleur
aa8932a3a4
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2022-02-22 10:59:02 +01:00
Laurent Destailleur
6b29b2d9dc
Add preg_quote
2022-02-22 10:51:51 +01:00
Laurent Destailleur
ff0c4ef635
Merge pull request #19952 from thomas-Ngr/develop_new_ticket_display_statut_warning
...
NEW : optional display warning icons on ticket list
2022-02-22 01:35:33 +01:00
Laurent Destailleur
741fabb983
Merge pull request #20133 from atm-lena/NEW_InventoryExtrafields
...
New inventory extrafields
2022-02-22 00:58:42 +01:00
Laurent Destailleur
eede3aaf17
Fix #yogosha9033
2022-02-21 22:50:32 +01:00
Laurent Destailleur
82250fae62
Fix #yogosha8963
2022-02-21 21:45:28 +01:00
Laurent Destailleur
28ac6a7b55
NEW on redirect of page in website module, GET parameters are kept.
2022-02-21 19:46:11 +01:00
Laurent Destailleur
9dfdce03aa
Work on generic reporting tool.
2022-02-21 19:09:26 +01:00
Laurent Destailleur
97ed94fbda
NEW Support html content for multiselect component.
2022-02-21 16:54:07 +01:00
BB2A Anthony Berton
d28ba84cb3
Mail sendto default and add filter
2022-02-21 16:15:40 +01:00
BB2A Anthony Berton
2595f1f9ee
sens dump
2022-02-21 15:56:09 +01:00
lmarcouiller
192e62fa5c
Fix : fix bug class and sql regeneration in modulebuilder
2022-02-21 15:41:41 +01:00
atm-lena
8bbbc843eb
Ajout onglet paramètres "Inventaire extrafields"
2022-02-21 15:20:22 +01:00
Laurent Destailleur
00e6d2786d
Do not use dol_hash anymore for the name of cookies.
2022-02-21 12:21:43 +01:00
Thomas Negre
ad3f7b531e
add constants declarations in the module class
2022-02-21 11:50:28 +01:00
Thomas Negre
e8c48a06c0
Correct typos in ticket.lib
2022-02-21 11:42:09 +01:00
Laurent Destailleur
9e6f782907
Clean code
2022-02-21 11:26:10 +01:00
atm-lena
e5039a67b0
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_OF_Child
2022-02-21 10:22:22 +01:00
Laurent Destailleur
9a3d8022f3
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-18 21:53:38 +01:00
Laurent Destailleur
b0f538387e
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
...
Conflicts:
htdocs/accountancy/class/bookkeeping.class.php
htdocs/core/modules/import/import_csv.modules.php
htdocs/core/modules/import/import_xlsx.modules.php
2022-02-18 21:50:08 +01:00
Laurent Destailleur
19f51347ea
Merge pull request #20111 from atm-greg/Fix_14.0_price_extrafields_rounding_and_currency
...
fix rounding for price and display currency
2022-02-18 20:19:02 +01:00
lvessiller
1107a60b58
FIX compute rule in FEC import
2022-02-18 16:53:55 +01:00
Laurent Destailleur
3b6f7bff66
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-18 16:32:51 +01:00
Laurent Destailleur
3d9cdbf136
FIX Debug v15
2022-02-18 16:24:11 +01:00
Laurent Destailleur
f4f03d03f2
Fix link
2022-02-18 15:23:13 +01:00
Laurent Destailleur
e41e0f069a
Fix creator in PDF. Add log to help to find strange bug
2022-02-18 15:09:52 +01:00
Laurent Destailleur
61e91656e0
FIX setup of member module
...
FIX generation of business cards
2022-02-18 14:14:34 +01:00
Laurent Destailleur
694ea8830b
Fix missing name and type into template
2022-02-18 13:46:12 +01:00
Laurent Destailleur
dee5d8f9e8
Standardize name of button
2022-02-18 13:45:28 +01:00
stickler-ci
b5afa27774
Fixing style errors.
2022-02-18 10:09:38 +00:00
atm-greg
12c825ba84
fix rounding for price and display currency
2022-02-18 10:50:00 +01:00
Laurent Destailleur
6b8312aab0
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-17 20:51:25 +01:00
Laurent Destailleur
b013c9a15f
Fix duplicate div
2022-02-17 20:37:39 +01:00
Laurent Destailleur
ec71eb410e
Merge pull request #20040 from thomas-Ngr/develop_ticket_config_auto_read
...
ticket config: auto read ticket
2022-02-17 19:58:01 +01:00
Laurent Destailleur
c20d824999
Tables of module ticket are create only when module is enabled.
2022-02-17 19:30:18 +01:00
Laurent Destailleur
cbf15af853
Merge pull request #20095 from Hystepik/develop#3
...
Fix : fix php 8.0 warnings
2022-02-17 19:12:39 +01:00
Laurent Destailleur
85327f28b0
Update login.tpl.php
2022-02-17 19:12:24 +01:00
Laurent Destailleur
3697cb9ca4
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/reception/class/reception.class.php
2022-02-17 11:34:54 +01:00
lmarcouiller
aea9c2e427
Fix : fix php 8.0 warnings
2022-02-17 10:22:58 +01:00
Alexandre SPANGARO
0f51fadf38
Merge branch 'develop' into 16a12_assets_code
2022-02-17 04:15:03 +01:00
Laurent Destailleur
c16e013b99
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
2022-02-16 21:13:49 +01:00
Laurent Destailleur
131ae92cc6
FIX #20063
2022-02-16 21:05:23 +01:00
Laurent Destailleur
a7fab01059
Merge pull request #20069 from vincentjdc/expensse-report-download-fix
...
Fixes expensereport downloads
2022-02-16 20:37:32 +01:00
BB2A Anthony Berton
fd478ba3fa
add param for md theme
2022-02-16 15:13:50 +01:00
Laurent Destailleur
60ada5fe72
Can filter on status purchase on list of products
2022-02-16 14:06:16 +01:00
Vincent Dieltiens
392f468a13
allow to add more CSS and more params on html fields
2022-02-16 10:01:55 +01:00
Alexandre SPANGARO
948f20c2b6
Add a graphical option to define duration per year for depreciation
2022-02-16 05:18:29 +01:00
Laurent Destailleur
453871bf38
css
2022-02-15 23:01:14 +01:00
Frédéric FRANCE
eb77f10d7b
Merge remote-tracking branch 'upstream/develop' into productmerge
2022-02-15 19:11:24 +01:00
Laurent Destailleur
50853205bb
Support placeholder on multiselect components
2022-02-15 16:43:47 +01:00
atm-lena
498d56319d
Clean Code
2022-02-15 16:08:18 +01:00
atm-lena
1931ad3bab
Merge branch 'NEW_OF_Child' of github.com:atm-lena/dolibarr into NEW_OF_Child
2022-02-15 12:43:42 +01:00
atm-lena
0f4b1e1d7a
WIP
2022-02-15 11:46:30 +01:00
Laurent Destailleur
1b53ed09f9
Work on custom report feature
2022-02-15 11:03:48 +01:00
Vincent Dieltiens
af0000d568
Fixes expensereport downloads
2022-02-15 10:13:28 +01:00
atm-greg
96c7a9f77c
fix pdf_cornas
2022-02-14 15:16:36 +01:00
atm-greg
3ebdb89133
fix pdf_mucadet
2022-02-14 15:11:26 +01:00
Laurent Destailleur
5d90a00728
Debug v15
2022-02-14 12:27:35 +01:00
Laurent Destailleur
f2d5e43381
Fix showempty for select_salesrepresentatives
2022-02-14 12:25:48 +01:00
stickler-ci
526157dfcb
Fixing style errors.
2022-02-14 03:56:45 +00:00
Alexandre SPANGARO
6734a3575e
Core
2022-02-14 04:52:39 +01:00
Laurent Destailleur
27b94ceea1
Debug v15
2022-02-13 19:26:16 +01:00
Laurent Destailleur
d5e5e8d436
Debug v15
2022-02-13 17:09:40 +01:00
Laurent Destailleur
8000adb694
Fix test
2022-02-11 18:50:12 +01:00
Laurent Destailleur
eff2fc1e9e
Complete option MAIN_FREE_PRODUCT_CHECKED_BY_DEFAULT
2022-02-11 18:19:50 +01:00
Laurent Destailleur
89ffe5baba
Clean code for param of dol_stringtotime()
2022-02-11 14:07:10 +01:00
Laurent Destailleur
32af067e1e
Code comment
2022-02-11 13:01:29 +01:00
Laurent Destailleur
b84fd3ec3d
Clean code
2022-02-11 12:46:45 +01:00
Laurent Destailleur
27df3cc02c
FIX events on several days may missing the last day in calendar view.
...
FIX the drag and drop was not available on some events
2022-02-11 11:27:50 +01:00
Laurent Destailleur
52bacbd914
Tables for emailing and asset modules are loaded on module activation
2022-02-10 19:21:15 +01:00
Thomas Negre
4c5ddcf030
ticket config: add constant TICKET_AUTO_READ_WHEN_CREATED_FROM_BACKEND to admin panel
2022-02-10 17:57:28 +01:00
Laurent Destailleur
e0377d788c
Send position x,y of cursor into an ACE editors on POST form
2022-02-10 14:34:04 +01:00
Laurent Destailleur
d69f9eca40
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/pdf.lib.php
2022-02-10 11:25:15 +01:00
Laurent Destailleur
e901949531
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-02-10 10:23:52 +01:00
Laurent Destailleur
06fe8c391e
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
...
Conflicts:
htdocs/core/lib/pdf.lib.php
htdocs/install/mysql/tables/llx_propaldet.sql
2022-02-10 10:23:42 +01:00
Laurent Destailleur
11bef4e681
Merge branch 'develop' into 14_fix_sql_extrafields
2022-02-10 10:13:24 +01:00
Laurent Destailleur
e210952f74
Update extrafields.class.php
2022-02-10 10:11:46 +01:00
Laurent Destailleur
77f1649adf
Merge pull request #20012 from atm-adrien/NEW_rec_invoices_15.0_newPR
...
NEW Recurring vendor invoices
2022-02-10 10:09:47 +01:00
Regis Houssin
cc8af7b1d0
FIX not active value are not hidden (missing filter of field) ( #20032 )
...
* FIX not active value are not hidden (missing filter of field)
* FIX wrong category table and wrong object id
2022-02-10 09:19:14 +01:00
Laurent Destailleur
558db1b935
Fix #yogosha8845
2022-02-09 15:29:21 +01:00
Laurent Destailleur
47800aebfa
Fix phpunit and mode save after opening a ref
2022-02-09 15:21:25 +01:00
Laurent Destailleur
6e6c57d0e5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-09 13:22:53 +01:00
Laurent Destailleur
3653e8244b
NEW Implement the generic method for Kaban views
2022-02-09 13:22:23 +01:00
Adrien Raze
194959c61c
FIX : Fixing PR returns
2022-02-09 10:03:30 +01:00
Christian Foellmann
e0a3820b9c
fix double VAT line in commande PDF template
2022-02-09 08:01:24 +01:00
stickler-ci
b80e9a9bdc
Fixing style errors.
2022-02-08 15:37:23 +00:00
atm-lena
27cbd16bb9
Clean code
2022-02-08 16:01:18 +01:00
atm-lena
8db75f0d04
WIP
2022-02-08 15:54:31 +01:00
Florian HENRY
316cb9e4e3
Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14_fix_sql_extrafields
2022-02-08 08:46:21 +01:00
Florian HENRY
3f2c04a53c
fix sql error return
2022-02-08 08:46:15 +01:00
Laurent Destailleur
bfa9986736
Merge pull request #20013 from thomas-Ngr/develop_db_ticket_last_message_date
...
New : ticket add last_msg_sent field
2022-02-07 20:54:26 +01:00
Laurent Destailleur
c496e6eb51
doc
2022-02-07 20:53:13 +01:00
Thomas Negre
b6b5eb633b
only update last_msg_date if a message is really sent.
2022-02-07 17:38:32 +01:00
Florian HENRY
e672b6f6e0
fix: in some case index do not exists and return an error
2022-02-07 16:41:45 +01:00
Florian HENRY
30779be77e
fix: if capital is not numeric just display input value
2022-02-07 16:36:47 +01:00
Florian HENRY
228142684b
fix: if capital is not numeric just display input value
2022-02-07 16:33:27 +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
Thomas Negre
26648e4f12
ticket : update date_last_msg_sent on message sending from backend or public interface
2022-02-07 15:19:13 +01:00
Laurent Destailleur
53bac7ae0f
Fix menu
2022-02-07 15:16:11 +01:00
Laurent Destailleur
02ec11ff64
css
2022-02-07 15:07:03 +01:00
Adrien Raze
ee52cac3ba
NEW : Template supplier invoices
2022-02-07 14:34:27 +01:00
Laurent Destailleur
19fdf3dc18
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-07 10:07:30 +01:00
Laurent Destailleur
e8acb551f9
Fix section of attached files for salaries
2022-02-07 09:50:07 +01:00
Laurent Destailleur
856b83a202
CSS
2022-02-07 09:26:03 +01:00
Laurent Destailleur
9b1f04209d
NEW Change in theme colors does not need to use the refresh button
2022-02-06 22:11:44 +01:00
Laurent Destailleur
3fa3cd28cd
clean code
2022-02-06 15:21:49 +01:00
Laurent Destailleur
3e6d922cc0
Merge pull request #19938 from bb2a/border-table-2
...
NEW - Border table
2022-02-06 14:59:31 +01:00
Laurent Destailleur
6562b24e41
NEW Some core tables are created only at module activation
2022-02-06 13:31:44 +01:00
Laurent Destailleur
2991f992dc
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-06 13:28:30 +01:00
Laurent Destailleur
cd491280cf
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-02-06 13:06:27 +01:00
Laurent Destailleur
bd3218b460
Fix remove dead code
2022-02-06 13:06:12 +01:00
Laurent Destailleur
f2120a6463
Merge pull request #19994 from defrance/patch-177
...
fix : duration in hour and min (not in second)
2022-02-06 12:35:59 +01:00
Laurent Destailleur
d1f3411bac
Update list_print_total.tpl.php
2022-02-06 12:35:33 +01:00
Laurent Destailleur
9c0fc59166
Fix #yogosha8791
2022-02-05 19:42:43 +01:00
habot-it
97850a6fbf
Add options in function pdf_pagefoot of pdf.lib.php
2022-02-05 12:22:18 +00:00
BENKE Charlene
9977761846
print the good format of totalisation
2022-02-05 12:12:37 +01:00
ATM john
ba46d04d6e
Fix logic for form setup
2022-02-04 21:51:33 +01:00
Laurent Destailleur
c53bac831d
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-04 20:33:32 +01:00
Laurent Destailleur
ba795310b5
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-02-04 20:32:39 +01:00
Laurent Destailleur
7ade138590
Fix phpcs
2022-02-04 20:30:45 +01:00
Laurent Destailleur
c9a685e09d
Better error message
2022-02-04 19:21:47 +01:00
Anthony Berton
07c7209c0c
Update pdf.lib.php
2022-02-04 19:05:22 +01:00
BB2A Anthony Berton
0e1e65e180
only one option
2022-02-04 17:29:13 +01:00
Laurent Destailleur
7cc06a0ef9
# WARNING: head commit changed in the meantime
...
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-02-04 15:40:28 +01:00
BB2A Anthony Berton
b4fffc6a23
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into add_option_pdf_global_thirdparty_alias
2022-02-04 15:38:46 +01:00
Laurent Destailleur
5249840402
FIX #yogosha8628
2022-02-04 15:14:10 +01:00
Laurent Destailleur
85e198283b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-04 13:18:26 +01:00
Laurent Destailleur
66430f6087
FIX #19939
2022-02-04 13:18:07 +01:00
Laurent Destailleur
a81b437d04
Merge pull request #19971 from atm-quentin/NEW_exclude_natural_search
...
NEW Can use ! to make a search that exclude a string
2022-02-04 12:51:26 +01:00
Laurent Destailleur
4324558d67
FIX backup fails
2022-02-04 12:34:42 +01:00
Laurent Destailleur
a7021008ba
Update pdf.lib.php
...
Conflicts:
htdocs/core/lib/pdf.lib.php
2022-02-04 12:27:13 +01:00
Laurent Destailleur
bfea5cd69d
Merge pull request #19966 from habot-it/develop
...
Fix "Warning: This option make TCPDF library being crazy sometime and…
2022-02-04 12:14:26 +01:00
Laurent Destailleur
6894cb3925
Update pdf.lib.php
2022-02-04 12:14:11 +01:00
Laurent Destailleur
5294a9ae2f
Merge pull request #19949 from hregis/fix_works_to_add_prefix_db_function
...
Works on replace MAIN_DB_PREFIX by $db->prefix()
2022-02-04 11:09:51 +01:00
Laurent Destailleur
3a9564ed88
Merge pull request #19976 from bb2a/patch-1
...
FIX - Trigger in setPaymentMethods for order
2022-02-04 09:23:11 +01:00
Laurent Destailleur
a5bdd62268
Merge pull request #19981 from aspangaro/14p30
...
FIX Accountancy - Wrong name rule on FEC import
2022-02-04 09:12:11 +01:00
Alexandre SPANGARO
6d350f9a75
FIX Accountancy - Wrong name rule on import
2022-02-03 05:53:05 +01:00
Laurent Destailleur
3db0a98594
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-02 18:26:15 +01:00
Laurent Destailleur
ef62cd0b18
css
2022-02-02 18:24:30 +01:00
Laurent Destailleur
0259f094bd
Fix trans
2022-02-02 18:04:11 +01:00
Laurent Destailleur
ba77700619
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-02 17:58:09 +01:00
Laurent Destailleur
73474a1cea
Fix css
2022-02-02 17:57:20 +01:00
Anthony Berton
da91c5f5ef
Update commonobject.class.php
2022-02-02 12:38:22 +01:00
Quentin VIAL-GOUTEYRON
f36a513a10
fix sticler
2022-02-01 16:18:02 +01:00
Laurent Destailleur
35ac8923dd
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-01 16:14:12 +01:00
Laurent Destailleur
1ca1f111b3
Fix warnings
2022-02-01 16:12:51 +01:00
Laurent Destailleur
89a06014da
Fix warnings
2022-02-01 15:55:04 +01:00
Laurent Destailleur
44bc197d03
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-01 13:25:45 +01:00
Laurent Destailleur
6ddc4ba3a0
Fix bad value for total VAT on PDF
2022-02-01 13:23:52 +01:00
Quentin VIAL-GOUTEYRON
e17d3b029e
FIX delete criteria
2022-02-01 12:24:04 +01:00
Quentin VIAL-GOUTEYRON
e086d5a5f2
NEW Exclude filter
2022-02-01 12:21:06 +01:00
Laurent Destailleur
d167e022eb
Debug v15
2022-01-31 12:08:51 +01:00
Laurent Destailleur
91be7b279e
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-30 17:28:23 +01:00
Laurent Destailleur
723b9d101a
FIX #yogosha8604
2022-01-30 17:24:10 +01:00
Laurent Destailleur
a9737a91e7
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-30 16:31:42 +01:00
Laurent Destailleur
87de9a8a23
Fix #yogosha8590
2022-01-30 16:30:19 +01:00
habot-it
93ae62431c
Fix "Warning: This option make TCPDF library being crazy sometime and content on image disappeared!"
2022-01-30 13:09:42 +00:00
Regis Houssin
b2384b624a
FIX regression
2022-01-30 11:40:12 +01:00
Regis Houssin
5f376685c3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_works_to_add_prefix_db_function
2022-01-30 11:28:29 +01:00
Laurent Destailleur
7f13561158
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-30 02:06:08 +01:00
Laurent Destailleur
9e86e5ce93
Fix creation of page
2022-01-30 01:46:14 +01:00
Laurent Destailleur
5942bc57e6
Add DDOS protection
2022-01-30 01:03:07 +01:00
Laurent Destailleur
2fea78c90a
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/mysql/data/llx_c_action_trigger.sql
2022-01-29 16:48:40 +01:00
Laurent Destailleur
728df13238
Optimize files loaded on login and passwordforgotten page
2022-01-29 16:22:55 +01:00
Laurent Destailleur
d75dd51bb7
Clean code to debug fulldayevent
2022-01-29 00:39:20 +01:00
Laurent Destailleur
d9691e16d5
Merge pull request #18081 from lmag/fix_ticket_substitution
...
fix : #19428 ticket substitution
2022-01-28 20:01:10 +01:00
Laurent Destailleur
289ce87f6d
Fix fatal error
2022-01-28 19:06:41 +01:00
Laurent Destailleur
d72538506f
Merge pull request #19935 from atm-adrien/NEW_SUB_BOM_develop
...
NEW : Sub-bom
2022-01-28 19:01:30 +01:00
Laurent Destailleur
9dd44c6d5c
Merge pull request #19958 from SylvainLegrand/New_improve_the_reading_of_profIDs
...
New - Improve the reading of profIDs
2022-01-28 18:08:59 +01:00
Laurent Destailleur
adf8f3886b
Merge
2022-01-28 18:07:56 +01:00
Laurent Destailleur
a113231e7b
Merge pull request #19961 from chiariello/develop
...
NEW #17123 added ExtraFields for Stock Mouvement
2022-01-28 18:04:22 +01:00
Laurent Destailleur
2686541156
Fix late picto
2022-01-28 17:59:58 +01:00
Laurent Destailleur
d545ba5049
Merge pull request #19948 from OPEN-DSI/fix_vat_report_by_month_and_rate_with_vat_src_code
...
NEW VAT Report by month - Show detail by rate and also by code
2022-01-28 17:21:14 +01:00
Laurent Destailleur
c01e942a1c
Merge pull request #19960 from fappels/15_reception_missing_translation_key
...
Fix missing reception module description translation key.
2022-01-28 17:08:17 +01:00
Francis Appels
8d75f575e5
Fix missing reception module description translation key.
2022-01-28 16:35:14 +01:00
Laurent Destailleur
7c9b97d035
css
2022-01-28 16:29:27 +01:00
Laurent Destailleur
a631c94193
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-28 15:58:15 +01:00
Laurent Destailleur
ef70777cf1
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
...
Conflicts:
htdocs/reception/card.php
2022-01-28 15:57:09 +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
Salvatore Chiariello
e70604c485
NEW|New #17123 added ExtraFields for Stock Mouvement
2022-01-28 14:57:36 +01:00
Laurent Destailleur
bd2d7792f4
css
2022-01-28 13:52:42 +01:00
Laurent Destailleur
da744f5cb9
Fix link
2022-01-28 13:44:15 +01:00
Sylvain Legrand
66b6b5e91a
stickler-ci
2022-01-28 11:31:17 +01:00
Sylvain Legrand
b65f849c5d
New - Improve the reading of profIDs
2022-01-28 11:22:12 +01:00
Laurent Destailleur
34f3ec8a39
Try a fix with php that return a fatal error on some mysql
2022-01-28 11:11:36 +01:00
Regis Houssin
8196134345
FIX not use $this in static function
2022-01-27 14:17:14 +01:00
Regis Houssin
b07fff5754
FIX Travis avoid error "you should use $this->db-> inside a class file"
2022-01-27 13:06:43 +01:00
Regis Houssin
a1dc6e7e9b
FIX travis error - use double quote instead simple quote
2022-01-27 12:52:13 +01:00
Regis Houssin
b6f9500d46
FIX uniformize code and remove unused global
2022-01-27 12:00:55 +01:00
Regis Houssin
153cd38c78
FIX uniformize and fix code
2022-01-27 10:57:20 +01:00
Regis Houssin
d78bcaa419
FIX avoid stickler Line exceeds 500 characters
2022-01-27 10:26:39 +01:00
Regis Houssin
399fffa81e
FIX convert core class
2022-01-27 10:19:35 +01:00
Alexandre SPANGARO
2d0427a5b1
Update tax.lib.php
2022-01-27 06:21:07 +01:00
Alexandre SPANGARO
1ed096316a
Merge branch 'Dolibarr:develop' into fix_vat_report_by_month_and_rate_with_vat_src_code
2022-01-27 06:11:20 +01:00
Laurent Destailleur
32b2b6e788
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-26 19:57:00 +01:00
Laurent Destailleur
932096f332
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-26 19:56:50 +01:00
Laurent Destailleur
538c5f14d3
Fix phpcs
2022-01-26 19:56:02 +01:00
BB2A Anthony Berton
e8f27ca058
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into add_option_pdf_global_thirdparty_alias
2022-01-26 18:57:01 +01:00
BB2A Anthony Berton
fea897f323
Fix lang and erreur
2022-01-26 18:46:51 +01:00
BB2A Anthony Berton
b9cd22c60a
Add fonction invert and traduc
2022-01-26 18:36:04 +01:00
BB2A Anthony Berton
285e1d0f84
ok
2022-01-26 17:25:24 +01:00
BB2A Anthony Berton
d0942117df
1
2022-01-26 17:20:12 +01:00
Laurent Destailleur
33d67e74c2
Merge pull request #19934 from bb2a/Add_param_color_button_action
...
NEW - ADD config text color of button action
2022-01-26 16:46:12 +01:00
Adrien Raze
e52fb89182
FIX : Fixing stickler returns
2022-01-26 16:36:58 +01:00
Adrien Raze
d38ff3ad9b
FIX : Fixing stickler returns
2022-01-26 15:53:30 +01:00
Laurent Destailleur
512df3c580
Try to address a better solution for #19776
2022-01-26 15:12:42 +01:00
Anthony Berton
49efba7ded
Merge branch 'develop' into Add_param_color_button_action
2022-01-26 15:12:16 +01:00
BB2A Anthony Berton
28b9ead688
ADD config text color
2022-01-26 15:06:51 +01:00
Laurent Destailleur
0d66646052
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-26 14:08:20 +01:00
Laurent Destailleur
7ce6f13933
Fix php8
2022-01-26 14:07:13 +01:00
Laurent Destailleur
38408f916b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2022-01-26 13:51:25 +01:00
Laurent Destailleur
416543a5f5
Standardize code to allow deletion of an odt template
2022-01-26 13:49:46 +01:00
Laurent Destailleur
ae0f428acc
Merge pull request #19923 from bb2a/Add_param_color_button_action
...
NEW - Add param color button action
2022-01-26 13:48:23 +01:00
Laurent Destailleur
f94d84e395
Merge pull request #19655 from cfoellmann/wus/hotfix/fontawesome-PR
...
use any available fontawesome icon in picto
2022-01-26 13:44:38 +01:00
BB2A Anthony Berton
656dc02e7d
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into Add_param_color_button_action
2022-01-26 13:03:01 +01:00
Laurent Destailleur
3b4c7ceb3b
Code comment
2022-01-26 13:00:48 +01:00
Laurent Destailleur
60fff852ab
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2022-01-26 12:53:06 +01:00
Laurent Destailleur
30fba23326
Merge pull request #19931 from Easya-Solutions/new-stock-add-limit-stock-csv
...
NEW stock limit in stock export CSV
2022-01-26 11:36:53 +01:00
Laurent Destailleur
7b990a1a7f
Fix phpcs
2022-01-26 11:30:19 +01:00
pandreani
95df5bebe6
NEW stock limit in stock export CSV
2022-01-26 10:35:08 +01:00
Anthony Berton
4f54149555
Update commonobject.class.php
2022-01-25 22:28:47 +01:00
BB2A Anthony Berton
54b5fed67b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into Add_param_color_button_action
2022-01-25 16:45:30 +01:00
Laurent Destailleur
243999d223
Merge pull request #19746 from atm-quentin/NEW_contact_pj_filter_list
...
NEW : Contact filter project list
2022-01-25 16:06:31 +01:00
Laurent Destailleur
f773872dd1
Merge branch 'develop' into NEW_contact_project_tab
2022-01-25 15:58:54 +01:00
Laurent Destailleur
13f66df975
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-25 15:43:57 +01:00
Laurent Destailleur
c3a58ae303
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-25 15:43:42 +01:00
Laurent Destailleur
34d3fdad02
Merge pull request #19699 from atm-john/new_convert_setup_to_new_setup
...
NEW : convert situation setup to new setup system
2022-01-25 15:17:14 +01:00
Laurent Destailleur
bb49dd195e
Merge pull request #19722 from bjoern86/patch-2
...
Adds possibility to add senders name to $formmail->fromname
2022-01-25 14:58:27 +01:00
Laurent Destailleur
b7b88865e6
Update card_presend.tpl.php
2022-01-25 14:58:00 +01:00
Laurent Destailleur
54e5b5d369
Fix reponsive
2022-01-25 13:40:22 +01:00
Adrien Raze
a5903abb5b
FIX : Change display of the bom's select
2022-01-25 11:28:36 +01:00
Adrien Raze
4edbd5c4e3
NEW : Creation of the function select_bom() used to display bom select list
2022-01-25 10:31:45 +01:00
kamel
7ca333f4d7
Fix the vat report by month and rate (with also the vat src code)
2022-01-24 17:04:46 +01:00
Laurent Destailleur
0e8b7ef656
Clean code
2022-01-24 16:38:25 +01:00
Laurent Destailleur
0e5907e220
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-24 12:50:35 +01:00
Laurent Destailleur
8ceec043e8
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-24 12:50:10 +01:00
Laurent Destailleur
00eabded6d
Fix phpunit
2022-01-24 12:43:42 +01:00
Laurent Destailleur
307338e3f4
Merge pull request #19836 from atm-john/15.0_fix_validate_lang_and_test
...
FIX : lang load in validate class and fix test for numeric values
2022-01-23 18:24:11 +01:00
BB2A Anthony Berton
0552381e39
1
2022-01-23 16:36:47 +01:00
Laurent Destailleur
0ee0bfed85
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
...
Conflicts:
htdocs/fourn/commande/card.php
test/phpunit/testvirus.txt
2022-01-23 13:04:37 +01:00
Laurent Destailleur
ba404493a2
Merge pull request #19865 from hregis/fix_avoid_warning
...
FIX avoid warning
2022-01-23 12:33:52 +01:00
Laurent Destailleur
9dd3d970bf
Update commonobject.class.php
2022-01-23 12:31:30 +01:00
Laurent Destailleur
5abe6c0eb5
Merge pull request #19878 from bb2a/patch-1
...
NEW - Add substitutions "user numbers"
2022-01-23 12:23:28 +01:00
Laurent Destailleur
3bea78726a
Merge pull request #19888 from bb2a/patch-2
...
Update formated substitution
2022-01-23 12:22:32 +01:00
Laurent Destailleur
9424cebf0c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-23 12:07:19 +01:00
Laurent Destailleur
9049134556
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-23 12:07:11 +01:00
Laurent Destailleur
4981f418e8
Merge pull request #19899 from atm-jpb/fix_15.0_modelMailWidth
...
FIX : 15.0 add minwidth to selectArray mail model
2022-01-23 11:58:09 +01:00
Laurent Destailleur
66d7271c94
Merge pull request #19904 from hregis/fix_use_new_function_prefix
...
NEW add modifications for new function "$db->prefix()"
2022-01-23 11:57:42 +01:00
Laurent Destailleur
a16293f9b7
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-22 17:27:57 +01:00
Laurent Destailleur
2f1805beb8
Fix #yogosha8532
2022-01-22 17:14:45 +01:00
Laurent Destailleur
e0956c1765
Fix missing token, missing reposition, missing modulepart
2022-01-22 15:33:47 +01:00
Laurent Destailleur
14af64d143
NEW Can removed doc templates from setup page of thirdparty
2022-01-22 15:09:14 +01:00
Laurent Destailleur
caf7e7d7d5
FIX action must be protected with a permission check
2022-01-22 15:07:53 +01:00
Laurent Destailleur
1790ba2820
NEW Can removed doc templates from setup page of thirdparty
2022-01-22 15:06:05 +01:00
Laurent Destailleur
4750f6bbc6
FIX action must be protected with a permission check
2022-01-22 15:05:41 +01:00
Laurent Destailleur
6baa0939ce
NEW Can add a tooltip after the combo list of doc templates
2022-01-22 14:03:39 +01:00
Laurent Destailleur
284fcf3ad5
FIX Company logo not found in some cases on some templates
2022-01-22 13:19:29 +01:00
Laurent Destailleur
38fcfd38f8
Fix trans
2022-01-21 19:16:29 +01:00
Regis Houssin
a3a856d0be
NEW add modifications for new function "$db->prefix()"
2022-01-21 16:57:57 +01:00
Laurent Destailleur
482efec536
Fix missing column
2022-01-21 15:40:37 +01:00
Laurent Destailleur
1dcfb88ad4
Debug v15
2022-01-21 13:44:40 +01:00
stickler-ci
3e84a99965
Fixing style errors.
2022-01-21 08:58:06 +00:00
jpb
15c39db35c
add minwidth to selectArray
2022-01-21 09:55:14 +01:00
jpb
015cd543d6
add minwidth to selectArray
2022-01-21 09:52:52 +01:00
Laurent Destailleur
9276224422
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-20 21:49:33 +01:00
Laurent Destailleur
beee7fc5d3
Fix #yogosha8484
2022-01-20 20:03:58 +01:00
Laurent Destailleur
050b531403
Fix troubles in select_language when selected is array
2022-01-20 19:01:04 +01:00
Laurent Destailleur
d9b0af616e
Fix the localtax were not saved on price when no code was set
2022-01-20 18:51:14 +01:00
Laurent Destailleur
8c3b28b0d0
Introduce method for future
2022-01-20 18:50:18 +01:00
Laurent Destailleur
b2f6de06d5
Fix the localtax were not saved on price when no code was set
2022-01-20 18:09:30 +01:00
Laurent Destailleur
de30b68f9e
Code comment
2022-01-20 17:10:30 +01:00
Anthony Berton
687c8e2082
Update functions.lib.php
2022-01-20 13:49:23 +01:00
Anthony Berton
871e707185
Update functions.lib.php
2022-01-20 13:45:51 +01:00
Laurent Destailleur
a5de93cf44
Validate the oauthstateanticsrf value.
2022-01-19 23:03:24 +01:00
Laurent Destailleur
3ae63cb111
Clean code
2022-01-19 22:49:53 +01:00
Laurent Destailleur
b09cb42e25
Decode extra params of id_token
2022-01-19 22:26:31 +01:00
Laurent Destailleur
d38784f45a
WIP Login with Google
2022-01-19 20:33:20 +01:00
Laurent Destailleur
ff1037634b
Clean OAuth feature
2022-01-19 18:23:31 +01:00
Laurent Destailleur
4f533c3f9d
Merge
2022-01-19 16:54:00 +01:00
Laurent Destailleur
d06f570c23
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-19 16:50:11 +01:00
Laurent Destailleur
db903ad64d
Fix #yogosha8457
2022-01-19 16:40:48 +01:00
Laurent Destailleur
60b90056c4
Fix #yogosha8450
2022-01-19 15:20:10 +01:00
Anthony Berton
5f4c53f824
Update functions.lib.php
2022-01-19 11:37:38 +01:00
Anthony Berton
0a99e7c82a
Update functions.lib.php
2022-01-19 10:51:31 +01:00
Laurent Destailleur
63d6ef1ba0
Merge pull request #19647 from OPEN-DSI/new-exports-entity-filters
...
NEW add entity filter in exports
2022-01-19 02:26:18 +01:00
Laurent Destailleur
c2c74f4849
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-19 02:02:52 +01:00
Laurent Destailleur
c469634101
Fix hook for emailcollector
2022-01-19 02:01:52 +01:00
Laurent Destailleur
3757d7e952
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
2022-01-18 16:11:48 +01:00
Laurent Destailleur
200f796232
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-01-18 16:08:54 +01:00
Laurent Destailleur
09eb051bcc
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-18 12:25:20 +01:00
Laurent Destailleur
874bbca881
Doc
2022-01-18 12:24:19 +01:00
Laurent Destailleur
f91504b9c1
Add property
2022-01-18 12:16:13 +01:00
Regis Houssin
08009bcec5
FIX avoid warning
2022-01-18 10:06:11 +01:00
Laurent Destailleur
70e4705149
Clean code
2022-01-17 22:52:56 +01:00
Laurent Destailleur
642f77e8f5
FIX Widget of stock alert does not report on purchase products.
2022-01-17 22:07:18 +01:00
Laurent Destailleur
2f7832ee44
css
2022-01-17 19:18:48 +01:00
Laurent Destailleur
812f12ccc4
Fix tz message
2022-01-17 19:09:18 +01:00
Laurent Destailleur
a072c8911a
Fix tz of message on popup
2022-01-17 19:07:02 +01:00
Laurent Destailleur
9d067d74ab
Fix responsive
2022-01-17 17:51:03 +01:00
Laurent Destailleur
2462700975
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-17 13:57:59 +01:00
Laurent Destailleur
22ab3c03a1
Fix another way to write the preg_replace_callback
2022-01-17 09:12:09 +01:00
Laurent Destailleur
cfc39ebf0a
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-01-17 08:59:34 +01:00
Laurent Destailleur
5fd2d00936
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-17 08:57:48 +01:00
Laurent Destailleur
24de82859e
Debug v15
2022-01-16 20:22:09 +01:00
Laurent Destailleur
372b583e50
Debug template of warehouse
2022-01-16 19:21:59 +01:00
Laurent Destailleur
3aedf6434b
css
2022-01-16 13:11:12 +01:00
Laurent Destailleur
5070a40fa4
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/project.lib.php
htdocs/projet/list.php
2022-01-15 20:28:04 +01:00
Laurent Destailleur
2b19bcef54
Fix responsive
2022-01-15 13:08:15 +01:00
Laurent Destailleur
8cb5264928
Fix css
2022-01-15 12:56:19 +01:00
Laurent Destailleur
b3b1e82100
Change on column Assigned to on projet and task.
2022-01-15 12:30:41 +01:00
Laurent Destailleur
fe79218571
Change on column Assigned to on projet and task.
2022-01-15 12:26:08 +01:00
Laurent Destailleur
ecde594a15
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/card.php
2022-01-14 20:28:44 +01:00
Laurent Destailleur
3d97888bc5
Comment
2022-01-14 17:46:06 +01:00
Laurent Destailleur
744296a43a
FIX Permission on holiday and expensereport.
2022-01-14 13:52:08 +01:00
ATM john
a394713f1b
Fix doc comment
2022-01-14 11:51:07 +01:00
ATM john
8ace96f495
Fix validate class lang load and test for numeric values
2022-01-14 11:46:31 +01:00
Laurent Destailleur
02fc420c2a
FIX #19817
2022-01-14 11:37:13 +01:00
Laurent Destailleur
1ae01ba2fc
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-14 10:38:38 +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
stickler-ci
2b64f69def
Fixing style errors.
2022-01-14 09:12:30 +00:00
dolibarr95
5b3fcc5e43
Update extrafields.class.php
2022-01-14 10:10:10 +01:00
Laurent Destailleur
7d5c36ad02
Merge pull request #19823 from harrywinner/15.0
...
FIX Solving non-blocking bug in user login
2022-01-14 10:03:10 +01:00
Laurent Destailleur
71e470eb6c
Merge pull request #19826 from atm-gauthier/FIX_hrm
...
FIX : several adaptations rank => rankorder and langs correction for HRM
2022-01-14 10:01:14 +01:00
dolibarr95
e53d9d4320
Update extrafields.class.php
...
fix #19739
2022-01-14 08:52:04 +01:00
Laurent Destailleur
52493b60fb
Fix #yogosha8316
2022-01-13 15:52:41 +01:00
Gauthier PC portable 024
55389036d9
FIX : perms
2022-01-13 12:02:05 +01:00
Laurent Destailleur
13510b9929
Clean sortfield, sortorder
2022-01-13 11:17:25 +01:00
Harry Winner KF
67ab70f37d
FIX Solving non-blocking bug in user login
...
When using the function check_user_password_dolibarr to authenticate a user, a call is made to the function dol_verifyHash which requires a pre-calculated hash. This hash is not available with programmatically-created never-used accounts. Hence, in suce cases we have the following warning:
Notice: Trying to access array offset on value of type null in .../htdocs/core/lib/security.lib.php on line 156
This fix solves that bug by avoiding that unnecessary call
2022-01-12 15:05:11 -05:00
Frédéric FRANCE
297d2ecfbd
fix warning
2022-01-12 16:09:31 +01:00
Laurent Destailleur
8e2f76ca66
Merge pull request #17577 from OGPayet/feature/addThirdpartyCustomerCodeToEmailingSubstitutionArray
...
add thirdparty customer code to substitutionarray
2022-01-11 13:31:32 +01:00
Laurent Destailleur
b824912473
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-11 13:28:07 +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
Gauthier PC portable 024
1910423684
FIX : conf name is MAIN_ADD_LINE_AT_POSITION
2022-01-11 09:54:27 +01:00
Laurent Destailleur
00108589fd
Fix creation of fields tms into sql scripts
2022-01-11 01:00:31 +01:00
Laurent Destailleur
d8a0dfad10
Merge pull request #19557 from yaslama/unaccent
...
Unaccent
2022-01-10 21:19:54 +01:00
Laurent Destailleur
865b05aad2
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-10 19:29:37 +01:00
Laurent Destailleur
5d5a219b95
FIX #19770
2022-01-10 19:23:46 +01:00
Laurent Destailleur
da83d101db
Merge pull request #19778 from atm-john/fix_stuff_on_setup_class
...
FIX : Setup helper class
2022-01-10 18:32:12 +01:00
Gauthier PC portable 024
04cc0a0480
NEW : Add column "Total HT" to products array on document creation card
2022-01-10 17:02:15 +01:00
Laurent Destailleur
cfec02aaae
Debug v15
2022-01-10 14:27:43 +01:00
Laurent Destailleur
c81f46842b
Fix too many load of objects
2022-01-10 13:36:28 +01:00
Laurent Destailleur
12044fa67a
Debug v15
2022-01-10 03:24:01 +01:00
Laurent Destailleur
4af80507cb
Fix #yogosha8282
2022-01-09 20:25:10 +01:00
Laurent Destailleur
4ce77e62c6
Debug v15
2022-01-09 14:19:55 +01:00
ATM john
29e5fb0250
Merge branch 'fix_stuff_on_setup_class' into new_convert_setup_to_new_setup
2022-01-09 10:27:34 +01:00
ATM john
bb1ec5940d
Fix setup class
2022-01-09 10:24:28 +01:00
Laurent Destailleur
c3a42162d9
FIX The vat code was not correctly managed on PDF templates
2022-01-08 14:43:24 +01:00
Laurent Destailleur
3a6b5199ec
Debug module intracomm
2022-01-08 01:19:04 +01:00
Laurent Destailleur
60b2479389
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/list.php
2022-01-07 16:00:19 +01:00
Laurent Destailleur
7618966f81
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/comm/action/list.php
htdocs/core/class/utils.class.php
htdocs/install/mysql/data/llx_20_c_departements.sql
2022-01-07 15:56:21 +01:00
Laurent Destailleur
ff31d660c6
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2022-01-07 15:50:40 +01:00
Laurent Destailleur
451fa396aa
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/expensereport/class/expensereport.class.php
2022-01-07 15:50:30 +01:00
Laurent Destailleur
b23b82bd6f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2022-01-07 15:49:09 +01:00
Laurent Destailleur
265aeb76e6
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/core/class/utils.class.php
htdocs/expensereport/class/expensereport.class.php
2022-01-07 15:48:13 +01:00
Laurent Destailleur
5ee74d7c07
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2022-01-07 15:45:51 +01:00
Laurent Destailleur
1541e20870
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/class/utils.class.php
2022-01-07 15:43:28 +01:00
Laurent Destailleur
53709cf509
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/class/utils.class.php
2022-01-07 15:40:05 +01:00
Laurent Destailleur
10e32c056e
FIX avoid infinite loop on dump with popen
2022-01-07 15:35:33 +01:00
Laurent Destailleur
6aeae8fe7f
Debug v15
2022-01-07 12:27:07 +01:00
Quentin VIAL-GOUTEYRON
f78a9ea6f5
missing column
2022-01-07 10:19:44 +01:00
Quentin VIAL-GOUTEYRON
137371cae5
Merge branch 'NEW_contact_project_tab' of github.com:atm-quentin/dolibarr into NEW_contact_project_tab
2022-01-07 10:18:57 +01:00
Quentin VIAL-GOUTEYRON
5fc0f18b0b
add column contact type
2022-01-07 10:17:00 +01:00
Laurent Destailleur
144a56d073
Clean code
2022-01-06 18:12:02 +01:00
Laurent Destailleur
6cb0374784
Fix responsive
2022-01-06 18:02:44 +01:00
Laurent Destailleur
26e8496c46
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/card.php
2022-01-06 16:15:58 +01:00
Laurent Destailleur
132d393d23
Code comment
2022-01-06 16:06:17 +01:00
Laurent Destailleur
aee61cb470
Update ldap.class.php
2022-01-06 16:02:47 +01:00
Laurent Destailleur
718771fcf5
Merge pull request #19743 from andreubisquerra/develop
...
Add dol_value_currentdate tag to TakePOS printer template
2022-01-06 10:41:45 +01:00
Laurent Destailleur
d9715729c8
Fix var
2022-01-05 22:44:12 +01:00
Laurent Destailleur
1f36a31fe9
Fix css
2022-01-05 16:21:44 +01:00
Quentin VIAL-GOUTEYRON
446ba2a416
FIX stickler
2022-01-05 15:33:05 +01:00
Quentin VIAL-GOUTEYRON
7a4b0e38cd
NEW : Contact filter project list
2022-01-05 14:35:11 +01:00
Laurent Destailleur
2aa3d60997
Debug v15
2022-01-05 14:04:02 +01:00
Laurent Destailleur
3581dda876
Fix trans
2022-01-05 09:43:51 +01:00
andreubisquerra
0c86ca6081
Add dol_value_currentdate tag to TakePOS template
2022-01-04 22:14:02 +01:00
Laurent Destailleur
0189d92139
Some country need qr code for legal issues. Add a hook to allow this.
2022-01-04 20:44:17 +01:00
Laurent Destailleur
0046cbbece
Fix phpunit
2022-01-04 15:13:04 +01:00
Laurent Destailleur
f0660b3c99
Fix db transaction
2022-01-04 13:27:26 +01:00
Laurent Destailleur
b19a148f4c
Fix ip used to sing not saved
2022-01-04 13:25:02 +01:00
Laurent Destailleur
1d80b8394a
Debug v15
2022-01-04 12:56:08 +01:00
stickler-ci
f0677ed665
Fixing style errors.
2022-01-04 09:42:24 +00:00
Quentin VIAL-GOUTEYRON
b1f750ac2f
NEW: Project contact tab
2022-01-04 10:35:44 +01:00
John BOTELLA
70a1975ad2
Merge branch 'develop' into new_convert_setup_to_new_setup
2022-01-03 21:53:45 +01:00
Laurent Destailleur
f8a97ef928
FIX a lot of problem with rules for password validation
2022-01-03 16:09:08 +01:00
Ferran Marcet
ff2388ceaf
Fix: correctly display the products of a warehouse in the pdf
2022-01-03 13:08:20 +01:00
Laurent Destailleur
cecb11bb1c
Debug v15
2022-01-03 12:28:42 +01:00
Laurent Destailleur
72998cd8fe
Debug v15
2022-01-03 12:26:57 +01:00
Laurent Destailleur
a49af456ce
Debug page customreports.php
2022-01-03 04:47:17 +01:00
Laurent Destailleur
f7871be6cd
Debug v15
2022-01-03 03:06:18 +01:00
Vincent de Grandpré
6a52b967f4
Permettre de sortir de la fonction de connexion après authentification.
2022-01-02 16:37:07 -05:00
Laurent Destailleur
0d8cf96f8f
FIX croping function
2022-01-02 20:54:35 +01:00
Laurent Destailleur
0c82577fc5
Look and feel v15
2022-01-02 19:04:12 +01:00
Laurent Destailleur
507f91acf8
Fix tooltip
2022-01-02 18:36:18 +01:00
Laurent Destailleur
084a404870
Debug v15
2022-01-02 18:33:57 +01:00
Laurent Destailleur
3d8de7790c
Fix restore color if we cancel color selection
2022-01-02 16:34:46 +01:00
Laurent Destailleur
adec35d4b1
Debug v15
2022-01-02 15:46:28 +01:00
Laurent Destailleur
3774eae510
Responsive
2022-01-02 15:08:46 +01:00
Laurent Destailleur
bdb03c8bd0
Fix responsive
2022-01-02 13:51:30 +01:00
Laurent Destailleur
b41fdb6ec9
Fix tool for generic to sql filters. Must not be saved into api files.
2022-01-01 21:46:16 +01:00
bjoern86
cab4b762d3
Adds possibility to add senders name to $formmail->fromname
...
If INVOICE_EMAIL_SENDER_NAME, SHIPPING_EMAIL_SENDER_NAME, COMMANDE_EMAIL_SENDER_NAME or ORDER_SUPPLIER_EMAIL_SENDER_NAME is beeing set, use it as sender name. If not, keep $formmail->fromname blank
2022-01-01 20:24:30 +01:00
Laurent Destailleur
0037ee2254
Fix ckeditor plugins
2022-01-01 19:37:53 +01:00
Laurent Destailleur
49dae0aed2
Look and feel v15
2022-01-01 18:41:26 +01:00
Laurent Destailleur
ee5ea123ed
Revert "Update functions.lib.php"
...
This reverts commit 2676427ec4
2021-12-31 16:13:05 +01:00
Laurent Destailleur
7e11677117
Fix: Add token to the url logout
2021-12-31 14:33:12 +01:00
Laurent Destailleur
9c50cfeb62
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/modBom.class.php
htdocs/core/modules/modCommande.class.php
htdocs/core/modules/modFournisseur.class.php
htdocs/core/modules/modPropale.class.php
2021-12-30 19:18:41 +01:00
Laurent Destailleur
809c8f993b
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/modules/modCommande.class.php
htdocs/core/modules/modFournisseur.class.php
htdocs/core/modules/modPropale.class.php
htdocs/filefunc.inc.php
htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
2021-12-30 19:03:46 +01:00
Laurent Destailleur
108df3726a
Fix php syntax
2021-12-30 18:46:26 +01:00
Laurent Destailleur
62a74ed428
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
htdocs/societe/list.php
2021-12-30 17:57:45 +01:00
Laurent Destailleur
ebb7aa7494
Merge pull request #19693 from grandoc/new_branch_27_12_2021
...
fix : units were not displayed
2021-12-30 13:19:25 +01:00
Laurent Destailleur
cd8613e9db
Merge pull request #19704 from atm-john/fix_validate_methode_call
...
Fix wrong method call
2021-12-30 12:46:12 +01:00
Laurent Destailleur
706581a227
Merge pull request #19706 from atm-john/fix_scrutinizer_comments
...
Fix : scrutinizer comments
2021-12-30 12:42:08 +01:00
Laurent Destailleur
c288b0d02a
Merge pull request #19711 from dolibarr95/patch-58
...
Update functions.lib.php
2021-12-30 12:40:52 +01:00
Laurent Destailleur
2435ef4f66
Merge pull request #19712 from atm-maxime/fix_boxes_css_amount
...
Fix missing amount css class on boxes
2021-12-30 12:39:34 +01:00
Anthony Berton
78861c1743
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into Add_param_color_button_action
2021-12-29 19:21:03 +01:00
Maxime Kohlhaas
873adb3cb1
Fix : add missing resource stats on stat box
2021-12-29 13:57:22 +01:00
Maxime Kohlhaas
ac7fb65d04
Fix missing amount css class on boxes
2021-12-29 13:43:18 +01:00
dolibarr95
2676427ec4
Update functions.lib.php
...
#19709
2021-12-29 13:24:23 +01:00
John BOTELLA
0f587a37e2
fix missing var definition
2021-12-28 19:36:44 +01:00
John BOTELLA
5449d57d26
fix variable does not seem to be defined for all execution
2021-12-28 19:19:51 +01:00
John BOTELLA
e20d669e34
Fix : prevent fatal error
2021-12-28 19:08:47 +01:00
John BOTELLA
9af621c6f8
Fix scrutinizerh
2021-12-28 18:43:04 +01:00
John BOTELLA
019b10c9eb
Fix wrong method call
2021-12-28 18:27:29 +01:00
Maxime Kohlhaas
706ee8ce62
Fix #19662 : mysql8 user creation in 2 steps
2021-12-28 16:26:21 +01:00
John BOTELLA
e9e100410a
Fix empty value
2021-12-28 14:51:19 +01:00
John BOTELLA
817a9594ae
Convert setup of situation invoice to new setup system + fix size
2021-12-28 14:32:57 +01:00
Maxime Kohlhaas
0e9b707801
Fix #19249 : wrong payment cond and mode on mass order billing
2021-12-28 11:57:26 +01:00
Philippe GRAND
f8884d2c86
fix : units were not displayed
2021-12-27 15:00:05 +01:00
Laurent Destailleur
27134a1f91
Fix position of menu
2021-12-26 15:44:04 +01:00
Laurent Destailleur
2e2e1b90e5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-12-26 15:41:25 +01:00
Laurent Destailleur
a7ef4991fd
Fix position of menu
2021-12-26 15:41:09 +01:00
Laurent Destailleur
7edba34107
Debug and secure the signature feature
2021-12-25 17:08:40 +01:00
Laurent Destailleur
3fc0205d0b
Fix responsive
2021-12-25 12:44:46 +01:00
Laurent Destailleur
4eb9a7625a
Fix notification setup page.
2021-12-23 15:12:35 +01:00
Laurent Destailleur
3490dc3228
Update functions.lib.php
2021-12-21 16:31:28 +01:00
Laurent Destailleur
d3b429bef6
Merge pull request #19663 from frederic34/patch-1
...
add url in receipt printer options
2021-12-21 15:52:25 +01:00
Laurent Destailleur
e2ee74f8e0
Clean code
2021-12-21 15:46:42 +01:00
Laurent Destailleur
bb436e556d
Fix warnings
2021-12-21 15:23:56 +01:00
Laurent Destailleur
e3bb837313
Fix doxygen
2021-12-21 14:58:34 +01:00
Laurent Destailleur
2de5db83a9
Fix iban_prefix
2021-12-21 14:51:57 +01:00
Laurent Destailleur
55562eb1d8
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formadmin.class.php
2021-12-21 14:36:38 +01:00
Laurent Destailleur
084f298836
Fix regression. The entity for bank is in table itself not into a parent
2021-12-21 14:34:47 +01:00
Laurent Destailleur
bb6bf2f743
Fix replacement of ICS on sepa mandate
2021-12-21 11:45:42 +01:00
Laurent Destailleur
8e4077eedf
Fix ics on sepa mandate template
2021-12-21 11:25:19 +01:00
Frédéric FRANCE
214feeb1f3
Update dolreceiptprinter.class.php
2021-12-21 10:05:06 +01:00
Laurent Destailleur
af8d022b92
Fix link of module bookmarks
2021-12-21 02:49:10 +01:00
Frédéric FRANCE
520c296626
add url in receipt printer options
2021-12-20 16:04:32 +01:00
Ferran Marcet
2b7c3be511
Replace sql operator
2021-12-20 12:34:46 +01:00
Ferran Marcet
aa3f473ebc
Merge branch '13.0up' into 13.0
2021-12-20 12:32:43 +01:00
Christian Foellmann
03d4317302
add hook 'menuDropdownQuickaddItems' to manipulate dropdown menu
2021-12-20 10:20:14 +01:00
Christian Foellmann
6bbbd99be9
use any available fontawesome icon in picto
2021-12-20 08:06:05 +01:00
Laurent Destailleur
13b17fa0da
FIX #19564
2021-12-19 20:28:27 +01:00
Laurent Destailleur
626cd24305
Clean code for #19639
2021-12-19 17:05:57 +01:00
Laurent Destailleur
ee3246bf65
Trans
2021-12-19 16:02:28 +01:00
Laurent Destailleur
19afcbbc40
css
2021-12-19 15:59:34 +01:00
Laurent Destailleur
015bc9ebca
Fix mode
2021-12-19 03:45:36 +01:00
Laurent Destailleur
771805cd83
More complete error management.
2021-12-19 03:36:25 +01:00
Laurent Destailleur
5c4fad3cc0
phpcs
2021-12-19 00:37:43 +01:00
Laurent Destailleur
fbce09f21b
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/customer/index.php
htdocs/compta/facture/card.php
htdocs/reception/card.php
2021-12-19 00:36:22 +01:00
Laurent Destailleur
98ddfbf792
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/compta/facture/info.php
htdocs/compta/facture/list.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/pdf.lib.php
htdocs/fourn/facture/list.php
htdocs/mrp/mo_movements.php
htdocs/product/stock/movement_card.php
htdocs/product/stock/movement_list.php
htdocs/product/stock/replenishorders.php
htdocs/reception/card.php
htdocs/supplier_proposal/list.php
2021-12-19 00:17:37 +01:00
Laurent Destailleur
baa9585f85
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/core/lib/functions.lib.php
htdocs/holiday/month_report.php
2021-12-19 00:01:11 +01:00
Laurent Destailleur
d46ef9c42a
css
2021-12-18 23:51:14 +01:00
Laurent Destailleur
7266c78162
Clean/Debug code for v15
2021-12-17 17:40:30 +01:00
lvessiller
68174cf440
FIX check stickler
2021-12-17 12:41:44 +01:00
lvessiller
5a2a6a07ea
NEW add entity filter in exports
2021-12-17 12:38:13 +01:00
Laurent Destailleur
654cd8bd1c
Fix for dol_string_onlythesehtmlattributes()
2021-12-17 12:01:25 +01:00
Laurent Destailleur
eb3eef9a61
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-12-17 09:54:19 +01:00
Laurent Destailleur
3895438b85
Fix responsive
2021-12-16 23:53:05 +01:00
Laurent Destailleur
fd404c0438
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-12-16 19:01:28 +01:00
Laurent Destailleur
517355972a
Fix duplicate table for online signature
2021-12-16 19:01:11 +01:00
Laurent Destailleur
fdf7749a54
Merge pull request #19508 from atm-john/fix_missing_formsetup_elements
...
Fix missing formsetup elements
2021-12-16 18:42:55 +01:00
Laurent Destailleur
2e68505fd1
Merge pull request #19594 from fr69400/develop
...
FIX - unasigned variable $action given to hook printOriginObjectLine
2021-12-16 17:59:27 +01:00
Laurent Destailleur
9b9cb6842e
Merge pull request #19599 from Je2fb/develop
...
Fix #19418
2021-12-16 17:38:38 +01:00
Laurent Destailleur
e4dede7aba
Merge pull request #19605 from atm-jpb/14_fix_bank_restrictedArea
...
Fix : add info for acces right on compta/ bank / info
2021-12-16 17:35:31 +01:00
Laurent Destailleur
9d6ddced56
Merge pull request #19607 from fbosman/patch-1
...
Update functions.lib.php
2021-12-16 17:33:13 +01:00
Laurent Destailleur
726fa41650
Merge pull request #19616 from atm-gauthier/fix_param_used_by_reference
...
FIX : marginInfos array should be used by reference to allow to updat…
2021-12-16 17:31:00 +01:00
Laurent Destailleur
c5bdb7b4d8
Revert "Update card_presend.tpl.php"
2021-12-16 17:29:04 +01:00
Laurent Destailleur
0e593d9e8b
Merge branch 'develop' into patch-2
2021-12-16 17:28:07 +01:00
Laurent Destailleur
930ac3e928
Merge pull request #19613 from hregis/fix_avoid_blank_page_with_error
...
FIX avoid blank page with error
2021-12-16 17:19:16 +01:00
Laurent Destailleur
b604199d0e
Merge pull request #19635 from AlainRnet/patch-9
...
Update notes.tpl.php
2021-12-16 17:01:44 +01:00
Laurent Destailleur
bef1afc7b8
Clean code
2021-12-16 17:01:15 +01:00
Laurent Destailleur
36ba158a8b
Merge pull request #19637 from atm-john/12.0_fix_get_prev_progress
...
FIX : test of method exist on wrong object
2021-12-16 16:49:59 +01:00
Laurent Destailleur
8c73ef4bbf
Fix menu perm
2021-12-16 16:30:42 +01:00
Laurent Destailleur
84400cf1d3
Fix backto page
2021-12-16 13:35:17 +01:00
Laurent Destailleur
43e682b56f
Fix several pb with down payments
2021-12-16 12:33:45 +01:00
John BOTELLA
d149596043
fix test of method exist on wrong object
2021-12-16 10:33:53 +01:00
Alain Rihs
32ef42d163
Update notes.tpl.php
...
See https://github.com/Dolibarr/dolibarr/issues/19580
The options of the advanced editor were not taken into account when editing public and private notes. I propose this code to fix this bug.
2021-12-16 10:22:43 +01:00
Laurent Destailleur
53be92fac3
FIX #19626
2021-12-15 17:32:15 +01:00
Laurent Destailleur
f9e4266007
FIX debug inventory feature (missing link to mvt, bad label of mvt)
2021-12-14 19:37:44 +01:00
Gauthier PC portable 024
b971efb062
FIX : marginInfos array should be used by reference to allow to update it with a hook without draw again margin table
2021-12-14 12:25:43 +01:00
stickler-ci
66c486c878
Fixing style errors.
2021-12-14 11:12:54 +00:00
John BOTELLA
1d8cf297de
Update html.formsetup.class.php
2021-12-14 12:10:09 +01:00
Regis Houssin
3b65d46b53
FIX avoid blank page with error
2021-12-14 11:19:41 +01:00
Anthony Berton
9bc2a561bc
ok
2021-12-14 10:52:16 +01:00
Frans Bosman
8c844c96df
Update card_presend.tpl.php
...
Add hidden feature ORDER_SUPPLIER_EMAIL_SENDER as sender address for purchase order emails
2021-12-13 20:33:42 +01:00
Frans Bosman
cf05f38e54
Update functions.lib.php
...
Change exists to isset in price2num
2021-12-13 19:56:06 +01:00
fr69400
2419784bdb
Update commonobject.class.php
2021-12-13 16:54:42 +01:00
jpb
ac8538a812
add info for acces right
2021-12-13 16:53:34 +01:00
Je2fb
df9b337a57
Fix #19418
2021-12-13 09:44:00 +01:00
Laurent Destailleur
49853adf82
Fix pb with cache
2021-12-13 09:35:27 +01:00
Laurent Destailleur
388500794b
Fix for ckeditor
2021-12-13 01:19:48 +01:00
Laurent Destailleur
bb1d5daa82
css
2021-12-12 23:47:40 +01:00
Laurent Destailleur
0a976ad1be
Fix bad permission test on bookmark page
2021-12-12 01:56:31 +01:00
Laurent Destailleur
689f5dd1fe
Fix use of reposition when nojs for confirmation popup
2021-12-11 18:13:03 +01:00
Laurent Destailleur
2bc417fcf7
FIX parameter $action replaced with $mode. $action reserved for action
2021-12-11 13:22:43 +01:00
Laurent Destailleur
dce555f53f
Fix missing document tab on receptions
2021-12-10 18:57:25 +01:00
Laurent Destailleur
5bca7cf5f1
css
2021-12-10 15:57:10 +01:00
Laurent Destailleur
f3da457b2b
Clean comment
2021-12-10 14:26:28 +01:00
fr69400
611bae4c3a
FIX - unasigned variable $action given to hook printOriginObjectSubLine
2021-12-10 14:20:04 +01:00
Laurent Destailleur
b2611e4cdb
CSS
2021-12-10 13:56:51 +01:00
Laurent Destailleur
9fbe0dee9b
Fix trans
2021-12-10 12:36:51 +01:00
Gauthier PC portable 024
b609c579b6
FIX : postgresql compatibility, "" as is not authorized
2021-12-10 11:40:25 +01:00
Laurent Destailleur
8cdc5726a0
Fix column length
2021-12-10 10:26:20 +01:00
Laurent Destailleur
0027335e3b
Fix regression
2021-12-10 03:25:07 +01:00
Laurent Destailleur
20a3fab437
Fix pb when several output hooks
2021-12-09 20:58:23 +01:00
Laurent Destailleur
c37377626e
Revert change
2021-12-09 19:43:23 +01:00
Laurent Destailleur
9624b9aa59
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-12-09 18:03:38 +01:00
Laurent Destailleur
eacc5f0f0a
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/repair.php
2021-12-09 18:03:27 +01:00
Laurent Destailleur
c4ef3ec116
Merge pull request #19578 from fr69400/patch4
...
FIX - Missing one html conversion
2021-12-09 17:31:03 +01:00
Laurent Destailleur
baabfd380f
Update pdf.lib.php
2021-12-09 17:25:06 +01:00
Laurent Destailleur
30107837a5
Merge pull request #19588 from Hystepik/develop#2
...
Fix php 8.0 warnings of modulebuilder
2021-12-09 17:19:42 +01:00
lmarcouiller
8b2002fbfb
Fix php 8.0 warnings of modulebuilder
2021-12-09 15:17:18 +01:00
Laurent Destailleur
6b9636c3b8
FIX deletion of direct debit or credit transfer
2021-12-09 12:54:18 +01:00
Laurent Destailleur
b5d1ea4629
FIX select too large into addrights (pb of missing parenthesis)
2021-12-09 11:07:38 +01:00
Regis Houssin
1098426005
FIX wrong syntax of sql request
2021-12-09 10:31:02 +01:00
fr69400
abd984bc14
Update pdf.lib.php
2021-12-09 09:39:22 +01:00
stickler-ci
f74077a2e7
Fixing style errors.
2021-12-09 08:35:12 +00:00
fr69400
d0413f423f
FIX - Missing one html conversion
2021-12-09 09:33:00 +01:00
Laurent Destailleur
f0cac384c5
Merge pull request #19553 from habot-it/patch-1
...
Add hookmanager in function pdf_pagefoot of pdf.lib.php
2021-12-08 19:18:09 +01:00
Laurent Destailleur
646ba34f89
Update functions.lib.php
2021-12-08 19:15:35 +01:00
Laurent Destailleur
ea45fdce5c
Merge pull request #19535 from Hystepik/develop#4
...
Fix : php 8.0 warnings
2021-12-08 18:44:16 +01:00
Laurent Destailleur
8f7b222764
Fix phpcs
2021-12-08 18:37:07 +01:00
Laurent Destailleur
72dc560ce8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-12-08 18:27:28 +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
c3bfd5caa4
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/adherents/type.php
htdocs/asset/type.php
htdocs/categories/edit.php
htdocs/comm/action/card.php
htdocs/compta/bank/card.php
htdocs/contact/card.php
htdocs/contact/list.php
htdocs/core/class/extrafields.class.php
htdocs/don/card.php
htdocs/product/stock/card.php
htdocs/projet/card.php
htdocs/projet/tasks/task.php
htdocs/user/group/card.php
2021-12-08 18:21:20 +01:00
Laurent Destailleur
f1dac82a53
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/adherents/card.php
htdocs/categories/edit.php
htdocs/contact/card.php
htdocs/core/class/extrafields.class.php
htdocs/product/stock/card.php
2021-12-08 17:56:05 +01:00
Laurent Destailleur
af6e21910d
FIX #19536
2021-12-08 16:47:46 +01:00
habot-it
6501bb7cbf
Update pdf.lib.php
2021-12-08 16:43:11 +01:00
Laurent Destailleur
449cbcdf46
Merge pull request #19546 from javieralapps4up/develop
...
FIX When you pay an invoice, you can send the payment multiple times.
2021-12-08 16:31:40 +01:00
Laurent Destailleur
8ff0d1f366
Update functions.lib.php
2021-12-08 15:49:52 +01:00
Laurent Destailleur
0fa82fbb4e
Merge pull request #19559 from fappels/debug_15_part2
...
Extrafield showOutputField parameter 4 'extrafieldsobjectkey' is now required
2021-12-08 15:43:01 +01:00
Laurent Destailleur
597ab407f8
Merge pull request #19568 from Hystepik/develop#2
...
Fix inventory scanning function
2021-12-08 15:30:55 +01:00
Laurent Destailleur
106b8ceec5
Merge pull request #19574 from Hystepik/develop#5
...
Fix php8.0 warnings
2021-12-08 14:36:42 +01:00
Laurent Destailleur
20f4b5389b
Fix the experimental feature to manage session in database
2021-12-07 17:39:46 +01:00
Laurent Destailleur
0e7d23e169
Fix constraint and loading on module activation.
2021-12-07 14:14:13 +01:00
lmarcouiller
c6c7abbf1d
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#2
2021-12-07 10:48:17 +01:00
Vincent Dieltiens
9ef2735520
Adds import for customer invoices and invoices lines
2021-12-07 09:33:18 +01:00
Laurent Destailleur
5efa31204b
FIX ECM module was mixing contributions and vat and not showing salaries
2021-12-07 02:00:34 +01:00
Francis Appels
fe40668f43
Parameter 4 extrafieldsobjectkey seems to be required now.
2021-12-06 20:32:44 +01:00
Francis Appels
f1524372ad
Fix extrafield showOutputField old syntax always hidden.
2021-12-06 16:34:50 +01:00
Yaacov Akiba Slama
04d4c06a43
Use intl extension when available
2021-12-06 15:34:20 +02:00
Yaacov Akiba Slama
8f91086e83
Add some missing characters
2021-12-06 15:33:51 +02:00
stickler-ci
39117e8089
Fixing style errors.
2021-12-06 11:06:50 +00:00
habot-it
9ee3903fc4
Update pdf.lib.php
2021-12-06 12:06:32 +01:00
Quentin VIAL-GOUTEYRON
826bde0656
FIX set optional from post
2021-12-06 11:19:12 +01:00
habot-it
2ad9761040
Add hookmanager in function pdf_pagefoot of pdf.lib.php
...
Customize PDF footers with HTML.
(Only on the last page with free text)
2021-12-06 07:47:24 +01:00
Laurent Destailleur
259b7dfe5a
NEW: Add massaction to switch status on sale / on purchase of a product.
2021-12-06 02:48:34 +01:00
Laurent Destailleur
2b505ec9b8
Fix can read category if can run takepos.
2021-12-05 13:01:05 +01:00
ATM john
5dc620b728
Merge branch 'fix_missing_formsetup_elements' of github.com:atm-john/dolibarr into fix_missing_formsetup_elements
2021-12-04 14:00:12 +01:00
ATM john
f640a9fbad
Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_missing_formsetup_elements
2021-12-04 13:59:27 +01:00
Laurent Destailleur
87e221d6dd
Fix create new page
2021-12-04 00:24:59 +01:00
javieralapps4up
b024bf20ed
Update html.form.class.php
...
When you pay an invoice, you can send the payment multiple times.
2021-12-03 13:57:34 +01:00
lmarcouiller
83ea868c9a
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#5
2021-12-03 10:19:28 +01:00
Laurent Destailleur
c171ba3a45
Fix regression in cron jobs
2021-12-02 16:07:33 +01:00
lmarcouiller
b732d80ca5
Fix php 8.0 warnings
2021-12-02 15:56:34 +01:00
Laurent Destailleur
a3493d0132
Clean code
2021-12-02 11:33:51 +01:00
Laurent Destailleur
ca6f222662
Fix notification (pb static var unknown)
2021-12-02 11:19:44 +01:00
Laurent Destailleur
10e126eb69
Clean code on pdf templates
2021-12-02 10:43:44 +01:00
John BOTELLA
c0d00a859f
use dol_escape_htmltag
2021-12-01 16:59:30 +01:00
lmarcouiller
ed7bfb333b
fix php8.0 errors
2021-12-01 16:24:57 +01:00
Laurent Destailleur
3cb07fd1ec
Doc
2021-12-01 15:37:31 +01:00
Laurent Destailleur
259418d1dd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2021-12-01 12:10:14 +01:00
Laurent Destailleur
4575bbae82
Clean code for browser notifications
2021-12-01 12:00:19 +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
3de3adad74
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/core/ajax/objectonoff.php
2021-11-30 16:11:12 +01:00
Laurent Destailleur
87a66c7bf0
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-11-30 15:57:14 +01:00
Laurent Destailleur
5d7f8d3831
Fix fatal error
2021-11-30 15:54:28 +01:00
Laurent Destailleur
055cb5c0c9
Merge pull request #18526 from cfoellmann/PR/deprecated-html
...
deprecated html attributes
2021-11-30 14:27:12 +01:00
Laurent Destailleur
1122cd1e5e
Merge pull request #19163 from Hystepik/develop#4
...
Fix: php 8.0 warnings project
2021-11-30 14:18:23 +01:00
Laurent Destailleur
07506b523f
Clean code
2021-11-30 14:09:46 +01:00
Laurent Destailleur
f66f9082e7
Merge pull request #19509 from fr69400/patch3
...
FIX Html conversion check with PDF_BOLD_PRODUCT_LABEL
2021-11-30 14:04:10 +01:00
Ferran Marcet
ac975ecc61
Undo changes
2021-11-30 13:30:17 +01:00
Laurent Destailleur
40491ca04e
Merge pull request #19419 from FHenry/dev_new_enhance_trad_select_dictionnary
...
NEW : for developpers allow translation label in select_dictionnary
2021-11-30 12:38:18 +01:00
stickler-ci
c807286f0b
Fixing style errors.
2021-11-30 11:17:48 +00:00
fr69400
19fc862a7e
Merge branch 'patch3' of https://github.com/fr69400/dolibarr into patch3
2021-11-30 12:17:21 +01:00
Laurent Destailleur
a7f9ffd5d0
Merge pull request #19461 from frederic34/lastactivationversion
...
keep info on latest activation version of module
2021-11-30 12:16:39 +01:00
fr69400
078a040078
Update pdf.lib.php
2021-11-30 12:13:21 +01:00
Laurent Destailleur
cf4beafb68
Merge pull request #19484 from aspangaro/12p23
...
FIX Option MAIN_DIRECT_STATUS_UPDATE broken. Ajax on/off not saving value in DB after updating to version >=12
2021-11-30 11:39:44 +01:00
Laurent Destailleur
c6fb026b75
Merge pull request #19504 from fappels/14_fix_fatal_eval
...
FIX 14.0.4 fatal error on cron list.
2021-11-30 11:31:02 +01:00
Laurent Destailleur
ecdae02062
Merge pull request #19510 from frederic34/contractdirectprint
...
add direct print for contracts
2021-11-30 11:20:51 +01:00
Christian Foellmann
6608f5f0d8
update all script tags to be uniform. language="javascript" removed
...
https://developer.mozilla.org/en-US/docs/web/html/element/script#attr-language
2021-11-29 15:09:18 +01:00
John BOTELLA
5bdaab8dcb
Fix duplicated code
2021-11-29 14:30:04 +01:00
lmarcouiller
0d65fdad23
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#2
2021-11-29 10:38:11 +01:00
Laurent Destailleur
e3e4b154e7
Fix partnership
2021-11-29 01:04:32 +01:00
Laurent Destailleur
186185267e
Clean code for v15
2021-11-29 00:49:18 +01:00
Frédéric FRANCE
308998e21c
Merge remote-tracking branch 'upstream/develop' into productmerge
2021-11-28 21:14:12 +01:00
Frédéric FRANCE
5473dbd3f0
add direct print for contracts
2021-11-28 20:55:17 +01:00
Laurent Destailleur
2d92130c1e
External backups can be downloaded from the "About info page".
2021-11-28 19:25:58 +01:00
Laurent Destailleur
c41578a3c3
Fix php compatibility
2021-11-28 15:43:22 +01:00
Laurent Destailleur
ca11dcae22
Fix php compatibility
2021-11-28 15:41:19 +01:00
Laurent Destailleur
ce651fae58
Fix php compatibility
2021-11-28 15:35:03 +01:00
Laurent Destailleur
5d31bd441e
Fix php compatibility
2021-11-28 15:34:08 +01:00
stickler-ci
a933793b8a
Fixing style errors.
2021-11-28 13:42:25 +00:00
fr69400
5a165ae2bf
FIX PDF_NOLD_PRODUCT_LABEL
2021-11-28 14:40:15 +01:00
ATM john
e97e0e4f17
Fix remove not used propertie
2021-11-28 12:18:09 +01:00
ATM john
29437a22b9
Fix comment and remove not use global
2021-11-28 12:15:31 +01:00
ATM john
a75ae6a8cf
Fix missing formsetup elements
2021-11-28 12:11:03 +01:00
Laurent Destailleur
af1baf057b
FIX #yogosha7789
2021-11-28 12:01:42 +01:00
Francis Appels
5bb21a93a1
FIX fatal error on cron list.
2021-11-27 18:25:38 +01:00
Laurent Destailleur
962ac263ba
Fix look and feel v15
2021-11-27 15:29:48 +01:00
Laurent Destailleur
6e273e47e5
css
2021-11-27 12:35:30 +01:00
Laurent Destailleur
734c9871ad
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2021-11-27 01:07:32 +01:00
Marc de Lima Lucio
f5343c55c3
FIX: holiday mass deletion: correct return of record deleted
2021-11-26 18:23:31 +01:00
Marc de Lima Lucio
1361abffe5
FIX: holiday list: only mass delete if leave request is not in draft, canceled or refused, like in card
2021-11-26 18:22:31 +01:00
Ferran Marcet
5265cd8084
Fix: correctly display the products of a warehouse in the pdf
2021-11-26 12:49:07 +01:00
Ferran Marcet
419eaa217f
dejar igual que 13
2021-11-26 12:38:09 +01:00
Ferran Marcet
ad1d553d11
Merge branch '13.0up' into 13.0
...
# Conflicts:
# htdocs/core/modules/modAdherent.class.php
# htdocs/core/modules/modProduct.class.php
# htdocs/core/modules/modProjet.class.php
# htdocs/core/modules/modResource.class.php
# htdocs/core/modules/modService.class.php
# htdocs/core/modules/modSociete.class.php
# htdocs/core/modules/modUser.class.php
2021-11-26 12:29:38 +01:00
Laurent Destailleur
bf1dfac629
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/errors.lang
htdocs/product/stock/movement_list.php
2021-11-25 21:54:06 +01:00
Alexandre SPANGARO
9d2fb782fa
FIX Option MAIN_DIRECT_STATUS_UPDATE broken. Ajax on/off not saving value in DB after updating to version >=12
2021-11-25 15:41:28 +01:00
Laurent Destailleur
78f94b1c76
Fix css and label for recurring invoices
2021-11-25 14:17:20 +01:00
Laurent Destailleur
e07008f6e9
Fix tooltip
2021-11-25 09:40:54 +01:00
Gauthier PC portable 024
641002ae96
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers
2021-11-24 09:05:24 +01:00
Frédéric FRANCE
3301790647
clean code
2021-11-23 23:56:52 +01:00
Frédéric FRANCE
21a3a6cc7a
clean code
2021-11-23 23:55:01 +01:00
Frédéric FRANCE
e6af0facdd
keep info on latest activation version of module
2021-11-23 23:27:07 +01:00
Frédéric FRANCE
d9bcd27764
can merge products but experimental
2021-11-23 21:55:48 +01:00
Frédéric FRANCE
d601f62194
can merge products but experimental
2021-11-23 21:38:29 +01:00
Laurent Destailleur
0dcbd458b8
FIX default_vat_code was not returned in some Ajax services of products
2021-11-23 13:08:00 +01:00
Laurent Destailleur
ee14aa2597
Fix: Do not loose data on error when editing a line
2021-11-23 12:11:27 +01:00
Laurent Destailleur
da897d9374
CSScss
2021-11-23 11:10:16 +01:00
Giovanni Vella
f7abf59a07
Merge branch 'Dolibarr:develop' into develop
2021-11-23 08:48:52 +01:00
Laurent Destailleur
949bc9f9bd
Make setup page of widget easier
2021-11-22 18:15:54 +01:00
stickler-ci
9975587cd5
Fixing style errors.
2021-11-22 15:26:46 +00:00
Gauthier PC portable 024
e02405edc9
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop
2021-11-22 16:23:26 +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
Laurent Destailleur
441af6b6fb
Fix add rel="noopener noreferrer"
2021-11-22 02:35:55 +01:00
Laurent Destailleur
63cd06394f
Debug permission on supplier order.
...
Fix #huntr58ddbd8a-0faf-4b3f-aec9-5850bb19ab67
2021-11-20 15:41:31 +01:00
Laurent Destailleur
001507f54e
Fix css on disabled menu
2021-11-20 14:24:51 +01:00
Laurent Destailleur
59de140366
css
2021-11-19 23:39:25 +01:00
Laurent Destailleur
48d7378282
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/comm/action/card.php
htdocs/core/lib/functions.lib.php
htdocs/filefunc.inc.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/langs/ar_IQ/bills.lang
htdocs/langs/ar_IQ/cashdesk.lang
htdocs/langs/ar_IQ/modulebuilder.lang
htdocs/langs/ar_IQ/partnership.lang
htdocs/langs/ar_IQ/propal.lang
htdocs/langs/ar_IQ/stocks.lang
htdocs/langs/ar_IQ/ticket.lang
htdocs/langs/en_AE/admin.lang
htdocs/langs/en_US/receptions.lang
htdocs/langs/en_ZA/admin.lang
htdocs/product/stock/class/mouvementstock.class.php
htdocs/reception/class/reception.class.php
2021-11-19 23:14:39 +01:00
Laurent Destailleur
c79fa4d3d0
NEW Add workflow action close purchase order on reception validation
...
NEW Add workflow action close purchase order on reception closing
2021-11-19 23:03:12 +01:00
Laurent Destailleur
071042b449
Code comment
2021-11-19 22:28:35 +01:00
Laurent Magnin
c8c6d5c1d2
Update functions.lib.php
2021-11-19 17:09:51 +01:00
Laurent Magnin
5f40c2e9dd
Update functions.lib.php
2021-11-19 17:08:07 +01:00
Laurent Magnin
00c7114c0b
Merge branch 'Dolibarr:develop' into fix_ticket_substitution
2021-11-19 16:52:57 +01:00
lmarcouiller
00369a5269
fix errors
2021-11-19 14:32:40 +01:00
Florian HENRY
c90082925c
fix
2021-11-19 14:30:33 +01:00
Florian HENRY
9685081967
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_enhance_trad_select_dictionnary
2021-11-19 14:27:46 +01:00
Florian HENRY
be44e5b0ca
NEW: for developper select_dictionnry can now deal with label translated
2021-11-19 14:27:29 +01:00
Hystepik
63773bf36d
Merge branch 'develop' into develop#4
2021-11-19 14:22:39 +01:00
Laurent Destailleur
cdc160b9a9
FIX column alignement on valid confirm page of shipment
2021-11-19 11:12:53 +01:00
Laurent Destailleur
f525045c44
Merge pull request #19281 from aspangaro/15a29
...
NEW Thirdparty - Add advanced right to add / edit payment information
2021-11-18 20:32:55 +01:00
Laurent Destailleur
8b1c45d0fe
Merge pull request #19413 from FHenry/dev_add_hook_marginDisplay
...
new: add hook for displayMarginInfos
2021-11-18 20:05:32 +01:00
Laurent Destailleur
e81c118a27
FIX Use the SQL standard for the if confition
2021-11-18 19:38:56 +01:00
Laurent Destailleur
d24120d6f9
Clean code
2021-11-18 19:27:40 +01:00
Laurent Destailleur
0649dc598d
Clean code
2021-11-18 19:25:07 +01:00
Laurent Destailleur
8477c0a3f1
Merge pull request #17998 from OPEN-DSI/fix_00008
...
FIX: Reload values of the specified entity when change entity in the execution of cron jobs
2021-11-18 18:41:06 +01:00
Laurent Destailleur
e609622f2b
Fix test on verifCond for value 0
2021-11-18 13:17:48 +01:00
Laurent Destailleur
2d4f971508
Fix verifCond must return false if string is '0'
...
Hide a not used property.
2021-11-18 13:10:52 +01:00
Laurent Destailleur
e652b93878
Autoswitch on inventory tab on validation of inventory
...
Fix disabled button when some data are available.
2021-11-18 12:58:31 +01:00
Florian HENRY
0f402897a4
add add_replace
2021-11-18 10:55:05 +01:00
Florian HENRY
d48df1d2c3
new: add hook for displayMarginInfos
2021-11-18 10:50:03 +01:00
Laurent Destailleur
649bf38c05
Responsive
2021-11-17 11:14: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
Alexandre SPANGARO
1107c6a208
Modify name of advance right
2021-11-16 04:32:09 +01:00
Alexandre SPANGARO
2ebdc6a430
Merge remote-tracking branch 'upstream/develop' into 15a29
2021-11-16 04:27:53 +01:00
Laurent Destailleur
75b6e241ce
Clean code
2021-11-15 14:06:50 +01:00
Laurent Destailleur
f2bfa8b2a1
Merge pull request #18940 from PyroShape/develop2
...
NEW : info of number of product still to dispatched in a supplier order
2021-11-15 13:58:43 +01:00
Laurent Destailleur
5af241371a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2021-11-15 12:32:09 +01:00
Laurent Destailleur
7b9c492798
Manage formSetup
2021-11-15 12:12:36 +01:00
Laurent Destailleur
cd2a09de42
Merge pull request #19170 from atm-john/new_setup_form_help_class
...
NEW : setup form class to help setup page creation
2021-11-15 12:12:25 +01:00
Laurent Destailleur
b87f3208ef
Merge pull request #19275 from frederic34/patch-5
...
fix error
2021-11-15 11:36:47 +01:00
Laurent Destailleur
7a6d84f0d5
Merge pull request #19365 from hregis/fix_add_ldap_hash_type_select
...
NEW add ldap password hash type select
2021-11-15 11:16:33 +01:00
Laurent Destailleur
ec7eebcf4a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-11-15 11:10:39 +01:00
Laurent Destailleur
16c28b505b
Add comment on a bugged option
2021-11-15 11:10:18 +01:00
Laurent Destailleur
50aee2377f
Merge pull request #19356 from frederic34/addtranslations
...
add load langs
2021-11-15 11:01:08 +01:00
Laurent Destailleur
a5d49a7850
Merge pull request #19363 from yaslama/develop
...
Import bank accounts improvements
2021-11-15 10:56:37 +01:00
lmarcouiller
238996b351
Merge branch 'develop#2' of github.com:Hystepik/dolibarr into develop#2
2021-11-15 10:13:27 +01:00
Laurent Destailleur
5b5f41606a
NEW PDF generation support format PDF/A-1b and PDF/A-3b
2021-11-15 09:02:01 +01:00
Laurent Destailleur
a368200036
Add MAIN_MEMORY_LIMIT_ARCHIVE_DATAROOT and MAIN_MEMORY_LIMIT_DUMP
2021-11-13 01:45:38 +01:00
Regis Houssin
415ee6669a
FIX missing php8 warning
2021-11-12 17:23:17 +01:00
Regis Houssin
e839d9da02
FIX syntax error
2021-11-12 16:56:26 +01:00
Regis Houssin
317060d915
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_add_ldap_hash_type_select
2021-11-12 16:53:39 +01:00
Regis Houssin
c5d70477c3
FIX compatibility with php8
2021-11-12 16:53:00 +01:00
Laurent Destailleur
715a65eab2
Clean code for md theme
2021-11-12 13:33:59 +01:00
Regis Houssin
9e5a20545d
FIX dolGetLdapPasswordHash use your own random salt
2021-11-12 13:23:11 +01:00
Regis Houssin
1169ae551f
FIX remove debug
2021-11-12 13:12:49 +01:00
Regis Houssin
968ffbcef0
FIX add ldap hash algo
2021-11-12 13:06:41 +01:00
Yaacov Akiba Slama
de435576a9
Allow WithdrawMode to be imported
2021-11-12 12:46:37 +02:00
Yaacov Akiba Slama
5c8d91ba6c
BankAccountNumber is not required.
...
The IBAN can contain all the needed information. So there is no reason for
the account number to be required
2021-11-12 12:46:18 +02:00
Regis Houssin
084a3f48c1
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
fix_add_ldap_hash_type_select
2021-11-12 10:10:04 +01:00
Frédéric FRANCE
67d6ada23c
Merge branch 'Dolibarr:develop' into patch-5
2021-11-11 20:12:56 +01:00
Frédéric FRANCE
cde4e48849
Merge branch 'Dolibarr:develop' into addtranslations
2021-11-11 20:12:20 +01:00
Frédéric FRANCE
fd1585eda0
add load langs
2021-11-11 18:23:34 +01:00
Laurent Destailleur
aab9c2e6ca
Fix #yogosha7605
2021-11-11 18:20:31 +01:00
Frédéric FRANCE
c245e4b388
Merge remote-tracking branch 'upstream/develop' into patch-5
2021-11-11 17:18:50 +01:00
Laurent Destailleur
0021381201
Fix #yogosha7605
2021-11-11 17:08:35 +01:00
Frédéric FRANCE
38d3b9ca71
fix regex
2021-11-11 16:54:20 +01:00
Laurent Destailleur
06f378db18
FIX Bad use of dol_concatdesc()
2021-11-11 15:31:19 +01:00
Laurent Destailleur
c5f3f42867
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-11-11 15:13:39 +01:00
Laurent Destailleur
66f1dd8545
Fix avoid too large PDF
2021-11-11 15:12:31 +01:00
Laurent Destailleur
e46e622049
Merge pull request #19349 from BitKFu/total_discount
...
Added -Propal- as a missing class name to the commondocgenerator.class.php
2021-11-11 15:03:02 +01:00
Laurent Destailleur
c6ecf87a8a
Update commondocgenerator.class.php
2021-11-11 15:02:51 +01:00
Laurent Destailleur
da2f3e7b40
Code comment
2021-11-11 14:55:59 +01:00
Laurent Destailleur
0665dac594
Merge pull request #19348 from ptibogxiv/patch-449
...
FIX bug if multicompany disabled
2021-11-11 14:38:28 +01:00
Laurent Destailleur
9cb094b466
Fix error method not defined
2021-11-11 14:37:25 +01:00
Laurent Destailleur
a3d2dcb97f
Merge pull request #19351 from cfoellmann/PR/block-massaction-delete
...
block deletion of items not free to delete (is_deletable)
2021-11-11 14:33:23 +01:00
Laurent Destailleur
28aa17e4fd
FIX calculation of balance in conciliation page on desc sorting.
2021-11-11 14:27:17 +01:00
Laurent Destailleur
0443302c3d
FIX calculation of balance in conciliation page on desc sorting.
2021-11-11 13:49:21 +01:00
Laurent Destailleur
bbd97c6e16
Code comment
2021-11-11 13:36:04 +01:00
Christian Foellmann
6a216e520f
block deletion of items not free to delete (is_deletable)
2021-11-11 11:06:05 +01:00
Laurent Destailleur
47dd7335a9
Debug v15
2021-11-10 21:34:41 +01:00
stickler-ci
7c5810dee6
Fixing style errors.
2021-11-10 14:19:14 +00:00
Gerhard Stephan
285bd67d90
Added -Propal- as a missing class name to the commondocgenerator.class.php
2021-11-10 15:16:36 +01:00
ptibogxiv
0afaf080ee
FIX bug if multicompany disabled
...
avoid bad constantes
2021-11-10 14:53:17 +01:00
Giovanni Vella
78df3f54c4
Merge branch 'Dolibarr:develop' into develop
2021-11-10 13:55:18 +01:00
Laurent Destailleur
13e8e3d33c
Look and feel v15
2021-11-08 19:15:02 +01:00
Laurent Destailleur
8636527125
Clean code
2021-11-08 17:53:18 +01:00
Laurent Destailleur
f4b2a6ec92
Fix negative colors for bars
2021-11-08 14:51:14 +01:00
Laurent Destailleur
c464a1cfd2
Fix colors
2021-11-08 14:37:21 +01:00
Gerhard Stephan
b34fb95f4f
Load product data optional fields to the line -> enables to use "line_options_{extrafield}"
2021-11-08 10:59:04 +01:00
Laurent Destailleur
e8e0768eec
Fix phpcs
2021-11-08 03:47:16 +01:00
Laurent Destailleur
28dcdb0708
Merge pull request #19283 from bb2a/NEW_SUBSTITUTION_ONLINE_SIGN_PROPAL
...
NEW - Substitution proposal online sign
2021-11-08 03:46:09 +01:00
Laurent Destailleur
43406e7d61
Merge pull request #19321 from nicolas-eoxia/new_redirect_after_login
...
NEW : redirect after connection in login page #19320
2021-11-08 03:27:48 +01:00
Laurent Destailleur
d026c721cf
Update security2.lib.php
2021-11-08 03:27:27 +01:00
Laurent Destailleur
a94b2b4f7e
Clean code
2021-11-08 03:22:49 +01:00
Laurent Destailleur
be1ca6ebab
Clean code
2021-11-08 03:21:15 +01:00
Giovanni Vella
e36d2b5398
Merge branch 'Dolibarr:develop' into develop
2021-11-07 21:53:52 +01:00
Laurent Destailleur
eaf2c6e89c
Fix $action not defined
2021-11-07 17:49:31 +01:00
Laurent Destailleur
2e499c2d17
Fix unknown property
2021-11-07 17:46:08 +01:00
Laurent Destailleur
6829507372
Fix missing $db
2021-11-07 17:44:34 +01:00
Laurent Destailleur
66f85d674d
Fix warning scrutinizer
2021-11-07 17:43:17 +01:00
Laurent Destailleur
1934a37676
Escape to avoid false positive, even if it should be useless.
2021-11-07 17:35:43 +01:00
Laurent Destailleur
969fe16442
Debug mass actions of partnership module
2021-11-07 16:51:18 +01:00
Laurent Destailleur
552d32ccd6
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-11-07 13:54:07 +01:00
Laurent Destailleur
3b7c385c6c
Fix syntax error
2021-11-07 13:53:30 +01:00
Laurent Destailleur
2234522519
Debug module parnership. Add the type of partnership.
2021-11-07 13:51:31 +01:00
Laurent Destailleur
713db0e613
Removed function pdf_getTotalQty (duplicate with pdf_getlineqty)
2021-11-07 12:26:44 +01:00
Laurent Destailleur
ccc1d4d1fa
Fix warning
2021-11-07 12:24:25 +01:00
Laurent Destailleur
dd2207d6c5
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/customer/list.php
htdocs/core/db/DoliDB.class.php
htdocs/resource/list.php
2021-11-06 21:11:05 +01:00
Laurent Destailleur
7e68f9e013
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/core/db/DoliDB.class.php
htdocs/resource/list.php
2021-11-06 21:04:17 +01:00
Laurent Destailleur
edbcf78495
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-11-06 20:39:05 +01:00
Laurent Destailleur
0bc5ec8c78
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2021-11-06 20:38:29 +01:00
Laurent Destailleur
65105a3e05
Better log
2021-11-06 19:27:50 +01:00
Laurent Destailleur
77864f2c2c
NEW Can set value for EHLO smtp command in MAIL_SMTP_USE_FROM_FOR_HELO
2021-11-06 19:11:47 +01:00
Alexandre SPANGARO
1cd864e395
Merge remote-tracking branch 'upstream/develop' into 15a29
2021-11-06 05:06:21 +01:00
Nicolas Domenech
61d97ccd22
NEW : redirect after connection in login page
2021-11-05 16:02:24 +01:00
Laurent Destailleur
897b00faf0
Clean code
2021-11-05 14:23:19 +01:00
Laurent Destailleur
e8a550cb21
Merge pull request #19273 from frederic34/patch-1
...
fix warning (bad const)
2021-11-05 14:02:41 +01:00
Laurent Destailleur
b9d5f77937
Merge pull request #19276 from frederic34/patch-7
...
fix warnings
2021-11-05 14:01:14 +01:00
Laurent Destailleur
e430fe5f94
Merge pull request #19302 from FHenry/dev_addhook_dolbanner
...
NEW: for developpers add hook for moreHTMLRef in dol_banner_tab
2021-11-05 13:28:39 +01:00
Laurent Destailleur
01b1ce5fb5
Merge pull request #19313 from cfoellmann/PR/fix-holiday-docpreview
...
fix DocumentPreview on holiday documents
2021-11-05 13:03:22 +01:00
Laurent Destailleur
19b9412c13
FIX #19305
2021-11-05 12:49:33 +01:00
Laurent Destailleur
3959d12a39
Update DoliDB.class.php
2021-11-05 12:42:42 +01:00
Christian Foellmann
58ae45a88b
fix DocumentPreview on holiday documents
2021-11-04 13:58:38 +01:00
ATM john
dd8d4e9e98
Fix missing return status
2021-11-04 12:10:19 +01:00
Ferran Marcet
3f426abc29
Qual: If hidden option BANK_CAN_RECONCILIATE_CASHACCOUNT is activated, show Account Statements tab on Cash Accounts
2021-11-04 10:56:55 +01:00
Regis Houssin
3fb0e3c5ad
NEW add html.formldap.class.php
2021-11-03 22:56:15 +01:00
Florian HENRY
054d98b942
fix ref
2021-11-03 16:31:35 +01:00
Florian HENRY
a4c4732d5d
NEW: for developpers add hook for moreHTMLRef in dol_banner_tab
2021-11-03 16:18:03 +01:00
daraelmin
d334fe1292
Fix Bad count of subscription by year
...
If
2021-11-03 13:12:33 +01:00
John BOTELLA
12b046cb68
Fix class name
2021-11-02 14:11:36 +01:00
John BOTELLA
bbe71c9c32
Rename var
2021-11-02 14:07:36 +01:00
John BOTELLA
b98efd7e44
Add rank item management and add Hook
2021-11-02 13:55:12 +01:00
Anthony Berton
5bb6185e64
add_substitution
2021-11-02 12:37:39 +01:00
Alexandre SPANGARO
dd7ee9e5f4
Merge remote-tracking branch 'upstream/develop' into 15a29
2021-11-02 04:52:50 +01:00
Alexandre SPANGARO
155eae1772
Add advanced right to add / update thirdparty payment information
2021-11-02 04:52:16 +01:00
Alexandre SPANGARO
f73f3cd55f
typo
2021-11-02 04:50:29 +01:00
Benjamin Chantalat
85776f7529
Avoid function calls in a FOR loop test part
2021-11-01 20:08:00 +01:00
stickler-ci
85372a7083
Fixing style errors.
2021-11-01 18:57:35 +00:00
Benjamin Chantalat
7b88f1da3f
Change to have number of item dispached on number of total item
2021-11-01 19:56:55 +01:00
Frédéric FRANCE
d7c0d87aeb
Update mod_facture_fournisseur_tulip.php
2021-11-01 13:35:25 +01:00
Frédéric FRANCE
18918d4e9d
Update actions_addupdatedelete.inc.php
2021-11-01 13:34:13 +01:00
Frédéric FRANCE
55243dedb6
fix typo
2021-11-01 13:32:19 +01:00
Regis Houssin
c5e6893289
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
fix_add_ldap_hash_type_select
Conflicts:
htdocs/core/class/ldap.class.php
2021-11-01 11:16:33 +01:00
Regis Houssin
772c3eb43a
Works on ldap password hash type
2021-11-01 11:13:44 +01:00
John BOTELLA
ea641b707d
Factoring
2021-11-01 10:32:37 +01:00
John BOTELLA
4c016cc3be
integrate fix from V14
2021-11-01 10:11:43 +01:00
John BOTELLA
c28e9f5f7c
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_setup_form_help_class
2021-11-01 10:08:37 +01:00
Frédéric FRANCE
b992deb084
fix warnings
2021-11-01 09:44:43 +01:00
Frédéric FRANCE
39777d4cc5
fix error
2021-11-01 09:37:07 +01:00
Frédéric FRANCE
cb8e1ce8f0
fix warning
2021-11-01 09:20:22 +01:00
Laurent Destailleur
7d07da527d
Debug v15
2021-11-01 03:30:22 +01:00
Laurent Destailleur
3e1fa44657
Fix phpdoc
2021-11-01 03:23:38 +01:00
Laurent Destailleur
6acc8a6582
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/class/ldap.class.php
2021-11-01 03:17:51 +01:00
Laurent Destailleur
7dcd98b9bb
Merge pull request #19234 from hregis/fix_see_ldap_connected_server
...
FIX show connected server if we have a primary and secondary ldap server
2021-11-01 02:46:28 +01:00
Laurent Destailleur
1b336456ce
Code comment
2021-11-01 02:44:14 +01:00
Laurent Destailleur
d4348b8e53
Merge pull request #19264 from frederic34/patch-1
...
fix warning
2021-11-01 02:35:48 +01:00
Laurent Destailleur
6480425130
Merge pull request #19269 from frederic34/patch-8
...
fix unknown function
2021-11-01 02:31:59 +01:00
Frédéric FRANCE
75eff571d9
fix unknown function
2021-10-31 22:27:39 +01:00
Frédéric FRANCE
270ddfda1f
fix scrutinizer
2021-10-31 22:24:25 +01:00
Frédéric FRANCE
7d60cddaac
fix warning
...
same test at line 65
2021-10-31 19:36:31 +01:00
Laurent Destailleur
d21278b0ef
Merge branch 'develop' into fix_php8
2021-10-31 17:54:32 +01:00
Laurent Destailleur
40683720a3
Merge pull request #19182 from frederic34/propallist
...
fix warnings in propal list
2021-10-31 17:51:52 +01:00
Laurent Destailleur
6a4344af8a
Merge pull request #19187 from frederic34/patch-8
...
fix warning
2021-10-31 17:51:16 +01:00
Laurent Destailleur
ae103f20ca
Merge pull request #19204 from FHenry/fix_introduced_scrutinizer
...
Fix introduced scrutinizer
2021-10-31 17:37:31 +01:00
Laurent Destailleur
efa8b7943e
Merge
2021-10-31 17:22:40 +01:00
Laurent Destailleur
bea85db413
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-10-31 17:20:09 +01:00
Laurent Destailleur
0e4c113e7f
Fix phpcs
2021-10-31 17:11:23 +01:00
Laurent Destailleur
42b043feef
Merge pull request #19213 from atm-greg/FIX_restrictedArea_for_payment_delete
...
FIX restrictedArea for payment delete
2021-10-31 17:06:47 +01:00
Laurent Destailleur
682ad98918
Update security.lib.php
2021-10-31 17:06:37 +01:00
Laurent Destailleur
e79dd52c9c
Merge pull request #19212 from fr69400/develop
...
[minor] Fix some warning
2021-10-31 17:04:47 +01:00
Laurent Destailleur
fb6a1d1f51
FIX #19210
2021-10-31 16:59:48 +01:00
Laurent Destailleur
a635dc6df3
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/bookmarks/card.php
2021-10-31 16:50:34 +01:00
Laurent Destailleur
51b0758263
Merge pull request #19219 from FHenry/14_fix_warning
...
fix: warning dol_print_date setTimeStamp when time empty
2021-10-31 16:49:13 +01:00
Laurent Destailleur
d891dd8ddc
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/stocks.lang
htdocs/product/stats/card.php
htdocs/projet/element.php
htdocs/salaries/card.php
2021-10-31 16:19:10 +01:00
Laurent Destailleur
f989b145af
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-10-31 15:59:23 +01:00
Laurent Destailleur
4f2cd2ba18
FIx #19227
2021-10-31 15:59:03 +01:00
Laurent Destailleur
82e7c4b237
Merge pull request #19244 from hregis/fix_missing_access_right
...
FIX missing service access right
2021-10-31 15:15:33 +01:00
Laurent Destailleur
e6e440e573
Fix #19257 error in the page Overview of a project
2021-10-31 15:14:15 +01:00
Laurent Destailleur
da4fe03be7
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/core/class/html.formticket.class.php
htdocs/ticket/card.php
2021-10-31 14:37:33 +01:00
Laurent Destailleur
ca8dab36a3
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/class/html.formticket.class.php
htdocs/core/modules/modAdherent.class.php
htdocs/core/modules/modProjet.class.php
2021-10-31 14:33:44 +01:00
Laurent Destailleur
27d9ee9fc0
Merge pull request #19240 from frederic34/patch-15
...
fix warnings
2021-10-31 13:56:54 +01:00
Laurent Destailleur
7232e38dbe
Merge pull request #19248 from fmarcet/12.0
...
Fix: Import don't work if extrafield is separator
2021-10-31 13:54:31 +01:00
Laurent Destailleur
ed9f0c4ad9
Fix labels
2021-10-31 13:42:08 +01:00
John BOTELLA
ca766c2e71
Factoring
2021-10-31 09:29:20 +01:00
Alexandre SPANGARO
70ed633171
Update label perms
2021-10-31 07:23:34 +01:00
Alexandre SPANGARO
3242400855
Clean module HRM
2021-10-31 06:26:41 +01:00
Alexandre SPANGARO
54b81312b5
FIX Ticket - Duplicate field project when we create ticket from project
2021-10-30 22:49:32 +02:00
Laurent Destailleur
0017c15974
Debug v15
2021-10-30 17:19:46 +02:00
John BOTELLA
cdf1538ffa
fix save using template
2021-10-30 16:36:51 +02:00
John BOTELLA
41beffccde
Merge branch 'new_setup_form_help_class' of github.com:atm-john/dolibarr into new_setup_form_help_class
2021-10-30 12:55:26 +02:00
John BOTELLA
3a86221290
add more customisation
2021-10-30 12:54:13 +02:00
Giovanni Vella
badf52b295
Merge branch 'Dolibarr:develop' into develop
2021-10-29 15:35:56 +02:00
Laurent Destailleur
be6b1e29ad
Add logs
2021-10-29 13:32:32 +02:00
Ferran Marcet
9f23528ccd
Fix: Import don't work if extrafield is separator
2021-10-29 12:39:22 +02:00
Ferran Marcet
1336d3e791
Fix: Import don't work if extrafield is separator
2021-10-29 12:25:50 +02:00
Laurent Destailleur
fe7e1d4118
Look and feel v15
2021-10-29 09:40:38 +02:00
Regis Houssin
8df90a1f54
FIX missing service access right
2021-10-29 08:28:41 +02:00
Frédéric FRANCE
787cef4440
fix warnings
2021-10-28 20:34:05 +02:00
Marc de Lima Lucio
15455ed470
FIX: deposit payment terms: correctly store default deposit percent value if not defined
2021-10-28 16:54:47 +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
668088a63f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms
2021-10-28 15:54:18 +02:00
stickler-ci
134e5cb5e6
Fixing style errors.
2021-10-28 13:52:29 +00:00
Regis Houssin
390d5eccaf
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_see_ldap_connected_server
2021-10-28 15:47:31 +02:00
Regis Houssin
f497492e62
FIX compatibility with php8
2021-10-28 15:40:05 +02:00
Laurent Destailleur
ffc07efb64
Look and feel v15
2021-10-28 14:28:24 +02:00
Regis Houssin
ae6d16c830
FIX mhash function is deprecated since php 8.1.0
2021-10-28 13:36:53 +02:00
Regis Houssin
72484961ab
FIX show connected server if we have a primary and secondary ldap server
2021-10-28 12:13:28 +02:00
Laurent Destailleur
d1794d7948
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/modAdherent.class.php
2021-10-28 11:05:38 +02:00
Laurent Destailleur
f033e91cb0
phpcs
2021-10-28 11:03:27 +02:00
Laurent Destailleur
41bba0e879
Fix import of members
2021-10-28 00:12:41 +02:00
Laurent Destailleur
97d97af932
Clean: Remove fields for social networks (merged into "socialnetworks")
2021-10-27 16:39:34 +02:00
Florian HENRY
46119c99a2
fix: warning dol_print_date setTimeStamp when time empty
2021-10-27 09:23:54 +02:00
Laurent Destailleur
4bde20dd8d
Can make update during import of members
2021-10-27 09:23:03 +02:00
Laurent Destailleur
f12c709ec1
Fix checkbox
2021-10-27 03:09:12 +02:00
Laurent Destailleur
e85548d470
Fix look and feel v14
2021-10-27 03:06:50 +02:00
stickler-ci
6fd08bc5ef
Fixing style errors.
2021-10-26 14:56:56 +00:00
atm-greg
406089ef0c
FIX restrictedArea for payment delete
2021-10-26 16:47:16 +02:00
fr69400
761ec7b790
Update functions.lib.php
2021-10-26 16:45:40 +02:00
fr69400
e4b3dda7f0
Update functions.lib.php
...
FIX : Duplicate entry in array
FIX : Unasigned variable
FIX : Type mismatch
FIX : Wrong variable
2021-10-26 15:27:12 +02:00
Laurent Destailleur
7393abea8f
Fix phpcs
2021-10-26 14:42:26 +02:00
Laurent Destailleur
2436f0967b
Fix translation of Nature of member in import.
2021-10-26 14:37:15 +02:00
Laurent Destailleur
e9ba9fc103
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contact/list.php
htdocs/core/modules/mailings/modules_mailings.php
2021-10-26 13:52:00 +02:00
Laurent Destailleur
da2ce063b3
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/contact/card.php
htdocs/contact/list.php
htdocs/core/modules/mailings/modules_mailings.php
htdocs/product/card.php
htdocs/public/emailing/mailing-unsubscribe.php
2021-10-26 13:42:30 +02:00
Laurent Destailleur
fde44f2792
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/contact/list.php
htdocs/core/modules/mailings/modules_mailings.php
2021-10-26 13:29:47 +02:00
Scrutinizer Auto-Fixer
5567310e44
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2021-10-25 20:07:31 +00:00
Florian HENRY
cfd88cb6e5
fix scrutinizer error
2021-10-25 21:50:27 +02:00
Laurent Destailleur
f64cd9d859
Fix bookmarks page
2021-10-25 21:28:52 +02:00
Laurent Destailleur
20c874d441
Fix escape sql params.
2021-10-25 18:48:44 +02:00
Laurent Destailleur
dc1226b116
Fix #yogosha7508
2021-10-25 18:40:19 +02:00
Florian HENRY
52a4f4869d
Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_php8
2021-10-25 16:54:30 +02:00
Laurent Destailleur
02632e9e88
Fix need write permission on object to link/remove resource
2021-10-25 16:32:37 +02:00
Laurent Destailleur
7533d4495d
Fix bug huntr.dev
2021-10-25 15:39:02 +02:00
Laurent Destailleur
d916fe121a
css
2021-10-25 13:57:02 +02:00
Laurent Destailleur
15c80327b1
data-key for extrafielsds has prefix of element
2021-10-25 13:29:08 +02:00
Laurent Destailleur
f5562177e7
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-10-25 13:06:33 +02:00
Laurent Destailleur
940c69b46d
Clean code
2021-10-25 12:09:17 +02:00
Laurent Destailleur
98f4f0b1c9
Merge
2021-10-25 11:52:24 +02:00
Florian HENRY
b282673f61
fix php8 warning
2021-10-25 09:01:05 +02:00
Frédéric FRANCE
03a8c5f0cb
Update commonfields_edit.tpl.php
2021-10-24 19:21:58 +02:00
Frédéric FRANCE
72a665b901
fix warning
2021-10-24 19:19:32 +02:00
Laurent Destailleur
b8250be237
css for toolitp
2021-10-24 16:35:42 +02:00
Frédéric FRANCE
677ac4635d
fix warnings in propal list
2021-10-24 14:34:47 +02:00
Laurent Destailleur
55d30884b8
Remove strange code
2021-10-24 13:15:01 +02:00
Laurent Destailleur
d3f630e4b5
Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14.0
2021-10-24 13:06:41 +02:00
Laurent Destailleur
dc32350ee7
Code comment
2021-10-24 13:02:45 +02:00
Laurent Destailleur
8076357f93
Merge pull request #17185 from bb2a/formconfirm_notification
...
[NEW] Add option for notification in message form
2021-10-24 13:00:39 +02:00
Laurent Destailleur
a26539c3e4
Merge pull request #19173 from frederic34/patch-1
...
Fix Undefined array key
2021-10-24 12:33:44 +02:00
Laurent Destailleur
dcb433756d
Merge pull request #19174 from frederic34/fixticketlist
...
fix warnings in ticket list
2021-10-24 12:31:57 +02:00
Giovanni Vella
a855ef1329
current date default format string
...
Added a default format for date/time tag DOL_PRINT_CURR_DATE
2021-10-24 12:07:23 +02:00
Giovanni Vella
037c36abf0
Merge branch 'Dolibarr:develop' into develop
2021-10-24 11:54:48 +02:00
Maxime Kohlhaas
6abd4cc120
Fix #8716 : tasks were not shown in ecm auto tree
2021-10-24 11:38:45 +02:00
Frédéric FRANCE
cc374e9eb1
fix warnings in ticket list
2021-10-24 10:02:12 +02:00
Frédéric FRANCE
6d2cedb439
Fix Undefined array key
...
Fix Undefined array key 1 in htdocs/core/lib/project.lib.php on line 314
2021-10-24 09:33:54 +02:00
stickler-ci
61576dad53
Fixing style errors.
2021-10-24 00:17:18 +00:00
John BOTELLA
fdcb9674d8
Remove prints
2021-10-24 02:09:49 +02:00
John BOTELLA
aaa7fd5b3a
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_setup_form_help_class
2021-10-24 01:38:42 +02:00
John BOTELLA
d3d3a87ce9
Add new class to help setup generation
2021-10-24 01:38:13 +02:00
Laurent Destailleur
6ad9eb8ef1
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/class/api_products.class.php
htdocs/recruitment/recruitmentcandidature_list.php
htdocs/recruitment/recruitmentjobposition_list.php
2021-10-24 00:02:15 +02:00
Laurent Destailleur
fc29aa7d3b
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2021-10-23 23:58:00 +02:00
Laurent Destailleur
44b030e23e
Merge branch 'develop' into NEW_stockstransfers
2021-10-23 22:57:35 +02:00
Laurent Destailleur
e12d9ee979
Merge pull request #19156 from frederic34/defaultvaluegetglobal
...
can specify default in getDolGlobalString and getDolGlobalInt
2021-10-23 22:42:40 +02:00
Laurent Destailleur
5078e3d863
Merge pull request #19161 from Dolibarr/scrutinizer-patch-3
...
Scrutinizer Auto-Fixes
2021-10-23 22:38:15 +02:00
Laurent Destailleur
06c1d79c05
Update html.form.class.php
2021-10-23 22:36:55 +02:00
Lucas Marcouiller
58b28d3d7d
Fix: fix php 8.0 warnings project
2021-10-23 22:32:03 +02:00
Maxime Kohlhaas
29950a6afa
Replace != by <> in SQL requests
2021-10-23 22:27:29 +02:00
Maxime Kohlhaas
00b617d17f
Fix #18961 : no_email field has been replaced by mailing_unsubscribe table
2021-10-23 22:22:45 +02:00
Scrutinizer Auto-Fixer
f7a41f1848
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2021-10-23 20:22:10 +00:00
Frédéric FRANCE
635cb34606
fix warning
2021-10-23 21:10:43 +02:00
Frédéric FRANCE
08e5b55d16
can specify default in getDolGlobalString and getDolGlobalInt
2021-10-23 21:06:37 +02:00
Lucas Marcouiller
aec5e41656
Fix : fix php 8.0 warnings
2021-10-23 19:09:23 +02:00
Lucas Marcouiller
385d2c8d72
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#3
2021-10-23 16:13:42 +02:00
Lucas Marcouiller
b3e9aeef7a
Fix : PHP 8.0 warnings
2021-10-23 16:12:44 +02:00
Lucas Marcouiller
bc4373a5de
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#4
2021-10-23 11:47:06 +02:00
Lucas Marcouiller
6ccd8ce83a
Fix : PHP errors 8.0
2021-10-23 11:45:06 +02:00
Laurent Destailleur
f5aebbf6b8
Merge pull request #19127 from frederic34/usermyactions
...
fix warnings
2021-10-23 11:38:18 +02:00
Laurent Destailleur
6ec19bca9d
Merge pull request #19128 from frederic34/warnfixes
...
fix warnings
2021-10-23 11:38:03 +02:00
Laurent Destailleur
a9bba23ef5
Merge pull request #19138 from Hystepik/scrutinizerfix
...
Fix : scrutinizer errors
2021-10-23 11:23:13 +02:00
Laurent Destailleur
7b496add01
Merge pull request #19137 from Hystepik/develop#3
...
Fix: PHP 8.0 Warnings
2021-10-23 11:22:04 +02:00
Laurent Destailleur
98f1637e0f
Merge pull request #19116 from evarisk-theo/fix-link-object-to-categories
...
Fix link object to categories
2021-10-23 11:21:41 +02:00
Lucas Marcouiller
d1ec71197a
Fix : scrutinizer errors
2021-10-23 11:10:58 +02:00
Hystepik
67711bdea9
Merge branch 'develop' into develop#3
2021-10-23 10:59:36 +02:00
Lucas Marcouiller
953a56b08c
Fix: PHP 8.0 Warnings
2021-10-23 10:57:03 +02:00
Giovanni Vella
d624928a5d
Merge branch 'Dolibarr:develop' into develop
2021-10-23 10:56:54 +02:00
Frédéric FRANCE
cad2cf9b6f
fix warnings
2021-10-23 07:20:30 +02:00
Frédéric FRANCE
9bd31d2b85
fix warnings
2021-10-23 07:13:08 +02:00
Frédéric FRANCE
2d92e6006c
fix warnings
2021-10-23 07:04:13 +02:00
John BOTELLA
55cdb8ac6f
Fix numeric value
2021-10-23 01:00:24 +02:00
Florian HENRY
bb4eb2feea
Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_php8
2021-10-22 23:38:44 +02:00
Laurent Destailleur
81882f8243
Merge pull request #19065 from javieralapps4up/develop
...
Access forbidden when the password of other users is changed
2021-10-22 22:52:55 +02:00
Laurent Destailleur
900d7512f2
Merge pull request #19121 from frederic34/fixrightswarning
...
fix multiple warnings
2021-10-22 22:47:28 +02:00
Frédéric FRANCE
fafabe3be2
fix multiple warnings
2021-10-22 22:22:55 +02:00
Frédéric FRANCE
46c4f28478
fix multiple warnings
2021-10-22 22:15:59 +02:00
Theo
a36c966f15
add: quick link categories to adherent
2021-10-22 16:13:54 +02:00
Laurent Destailleur
ef0b527379
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-10-22 15:57:16 +02:00
Laurent Destailleur
c81bf68578
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/dict.php
htdocs/compta/cashcontrol/cashcontrol_list.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/modulebuilder/index.php
htdocs/modulebuilder/template/myobject_list.php
htdocs/product/class/api_products.class.php
2021-10-22 15:56:44 +02:00
Theo
29f847c13a
add: quick link categories to project
2021-10-22 15:48:39 +02:00
Laurent Destailleur
d54423990d
Merge pull request #19077 from polkiko/email_contentlines
...
FIX Content line substitution in email
2021-10-22 15:37:45 +02:00
Laurent Destailleur
808e9e030a
Merge pull request #19094 from Hystepik/scrutinizerfix
...
Fix: scrutinizer errors + boxes activation
2021-10-22 15:37:17 +02:00
Florian HENRY
87ac58efb6
fix php 8
2021-10-22 15:27:36 +02:00
polkiko
fd64f8966b
Fixed in-line substitution if there is no object
2021-10-22 15:19:11 +02:00
Florian HENRY
b94d74f194
fix php8 warning
2021-10-22 14:58:09 +02:00
Giovanni Vella
c77d1206d3
NEW: receipt beep alternative and current date/time
...
I have added the alternative command for the beep (when that does not work) and the possibility to print the current date and time on the receipt.
2021-10-22 14:45:28 +02:00
Lucas Marcouiller
daafe652b9
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#2
2021-10-22 14:39:18 +02:00
Laurent Destailleur
a55497561f
Merge pull request #19096 from Hystepik/develop#4
...
Fix : french labels of box_graph_new_vs_close
2021-10-22 14:31:39 +02:00
Laurent Destailleur
c1b2778ffc
Merge pull request #19093 from Hystepik/develop#3
...
Fix : Error on fetchAll on line
2021-10-22 14:23:05 +02:00
Lucas Marcouiller
1ecd0a2be7
Fix : french labels of box_graph_new_vs_close
2021-10-22 14:17:47 +02:00
Florian HENRY
3f211417c2
review
2021-10-22 12:19:16 +02:00
Lucas Marcouiller
75b1518611
Merge branch 'develop' of github.com:Dolibarr/dolibarr into scrutinizerfix
2021-10-22 12:02:33 +02:00
Lucas Marcouiller
33e4d750d7
Fix: scrutinizer errors + boxes activation
2021-10-22 12:01:46 +02:00
Laurent Destailleur
42dceeafd4
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-10-22 11:58:17 +02:00
Laurent Destailleur
f354427b3c
Fix warning
2021-10-22 11:58:00 +02:00
Lucas Marcouiller
b3f15167dc
Fix : Error on fetchAll on line
2021-10-22 11:55:21 +02:00
Laurent Destailleur
e4a757ff9e
Merge pull request #19086 from FHenry/14_fix_various_warning
...
fix: fix various php warning
2021-10-22 11:39:48 +02:00
Florian HENRY
0c770b8810
fix various warning
2021-10-22 10:54:33 +02:00
Florian HENRY
64bb2e6ece
fix various warning
2021-10-22 10:49:47 +02:00
Frédéric FRANCE
d1c9877c41
fix missing code comment
2021-10-22 07:02:44 +02:00
Laurent Destailleur
f7b12208d1
Merge pull request #18802 from javieralapps4up/14.0
...
Close : #18801 Jan-30 + 1m IS NOT Mar-2
2021-10-22 00:01:42 +02:00
Polkiko
0c47a88098
FIX Content line substitution in email
2021-10-21 23:53:37 +02:00
Laurent Destailleur
18e421448c
Merge pull request #19041 from frederic34/patch-5
...
doxygen
2021-10-21 23:34:42 +02:00
Laurent Destailleur
556a6eaaf3
Merge pull request #19040 from frederic34/patch-4
...
doxygen
2021-10-21 23:22:06 +02:00
Laurent Destailleur
0b5d63aabe
Merge pull request #19043 from frederic34/patch-7
...
doxygen
2021-10-21 23:21:55 +02:00
Laurent Destailleur
9a989ca308
Merge pull request #19044 from frederic34/patch-8
...
doxygen
2021-10-21 23:20:32 +02:00
Laurent Destailleur
16d2a9c1bd
Merge pull request #19046 from frederic34/patch-10
...
doxygen
2021-10-21 23:20:17 +02:00
Laurent Destailleur
988f208dff
Merge pull request #19042 from frederic34/patch-6
...
doxygen
2021-10-21 23:20:03 +02:00
Laurent Destailleur
82be96e254
Merge pull request #19039 from frederic34/patch-2
...
doxygen
2021-10-21 23:07:13 +02:00
Laurent Destailleur
7ea993e448
Merge pull request #19045 from frederic34/patch-9
...
doxygen
2021-10-21 23:03:55 +02:00
Laurent Destailleur
ffd954b454
Merge pull request #19053 from frederic34/patch-17
...
fix doxygen nested comment
2021-10-21 23:02:54 +02:00
Laurent Destailleur
232616fc77
Merge pull request #19052 from frederic34/patch-16
...
fix doxygen nested comment
2021-10-21 23:02:20 +02:00
Laurent Destailleur
c126c48a92
Merge pull request #19072 from atm-maxime/fix_expense_report_rules
...
Fix MAIN_USE_EXPENSE_RULE is now stable
2021-10-21 23:02:05 +02:00
Maxime Kohlhaas
ae6cae0313
Fix MAIN_USE_EXPENSE_RULE is now stable
2021-10-21 22:57:50 +02:00
Laurent Destailleur
6c870bb3d1
Merge pull request #19059 from FHenry/fix_introduced_scrutinizer
...
fix: scrutinizer
2021-10-21 22:52:20 +02:00
Laurent Destailleur
88f870c6e3
Merge pull request #19060 from vincentjdc/original-file-hook-checkSecureAccess
...
Allow hook 'checkSecureAccess' to change original_file
2021-10-21 22:39:29 +02:00
Laurent Destailleur
da4ecb46b3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-10-21 22:32:10 +02:00
Laurent Destailleur
db6c793044
Text in english
2021-10-21 22:31:51 +02:00
Florian HENRY
96722d55ef
fix scrutinzer
2021-10-21 19:13:05 +02:00
atm-lena
bdc8854baa
Clean
2021-10-21 18:54:07 +02:00
atm-lena
03765528e1
Contract line : update boolean
2021-10-21 18:42:06 +02:00
javieralapps4up
f50dfe8571
Update security.lib.php
2021-10-21 18:20:06 +02:00
javieralapps4up
5d854dcce1
FIX #19064
...
Access forbidden when the password of other users is changed
Steps to reproduce the behavior
User with lire and password (user) perms, but no creer.
When this user saves or cancels the edition of the password of another user, he is sent to the prohibited page
2021-10-21 18:17:43 +02:00
Florian HENRY
85ec2c408c
fix scrutinizer
2021-10-21 18:15:15 +02:00
Lucas Marcouiller
4d2b96d029
fix inventory scan
2021-10-21 18:08:20 +02:00
Lucas Marcouiller
1f64b09430
WIP : fix inventory scan
2021-10-21 18:07:54 +02:00
Florian HENRY
f66f5cbfb8
fix: scrutinizer
2021-10-21 17:10:39 +02:00
Florian HENRY
4795190a75
fix: scrutinizer
2021-10-21 17:09:48 +02:00
Florian HENRY
e9fe668725
fix: scrutinizer
2021-10-21 16:48:04 +02:00
Vincent Dieltiens
3a48fe2d66
Allow hook 'checkSecureAccess' to change original_file
2021-10-21 16:06:18 +02:00
Florian HENRY
f68c3c17aa
fix php warning
2021-10-21 15:50:04 +02:00
Frédéric FRANCE
2eb524cc31
fix doxygen nested comment
2021-10-21 12:31:08 +02:00
Frédéric FRANCE
8778296784
fix doxygen nested comment
2021-10-21 12:29:27 +02:00
Frédéric FRANCE
89f4066ead
doxygen
2021-10-21 11:57:02 +02:00
Frédéric FRANCE
d83485cc7b
doxygen
2021-10-21 11:55:24 +02:00
Frédéric FRANCE
a082dc6504
doxygen
2021-10-21 11:54:15 +02:00
Frédéric FRANCE
a4555d6304
doxygen
2021-10-21 11:53:17 +02:00
Frédéric FRANCE
a528f8e98b
doxygen
2021-10-21 11:52:18 +02:00
Frédéric FRANCE
82b9dc6c87
doxygen
2021-10-21 11:50:48 +02:00
Frédéric FRANCE
bca3bcf8c9
doxygen
2021-10-21 11:49:24 +02:00
Frédéric FRANCE
d41c1393ba
Update box_graph_new_vs_close_ticket.php
2021-10-21 11:48:20 +02:00
Frédéric FRANCE
197818684b
doxygen
2021-10-21 11:47:32 +02:00
atm-lena
806c53d4c4
FIX Ret PR
2021-10-21 09:49:14 +02:00
Laurent Destailleur
a3d81f0ddd
Move module as stable
2021-10-20 16:05:13 +02:00
Laurent Destailleur
e43b33028c
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
2021-10-20 15:06:10 +02:00
Laurent Destailleur
4a5293fc9c
Rewrite getDictionaryValue (Use a cache file and consistent return code)
2021-10-20 14:41:40 +02:00
Laurent Destailleur
e4d0bf7a91
Merge pull request #18967 from aspangaro/15a23
...
NEW Add sortorder on units list
2021-10-20 12:50:32 +02:00
Alexandre SPANGARO
632751cebc
Use getDolGlobalInt()
2021-10-20 12:37:49 +02:00
kamel
7b41d1d87f
Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into fix_00008
2021-10-20 09:35:30 +02:00
Gauthier PC portable 024
4614b0dd65
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers
2021-10-20 09:13:58 +02:00
Gauthier PC portable 024
61a34829c1
FIX : this is a development version
2021-10-20 09:11:08 +02:00
Alexandre SPANGARO
bee6abd6fc
Merge branch '14.0' into 14p24
2021-10-20 07:38:54 +02:00
javieralapps4up
2ca0a1facf
Update date.lib.php
2021-10-20 00:36:24 +02:00
Laurent Destailleur
421b692942
Clean last br for wysiwyg
2021-10-19 21:48:25 +02:00
Laurent Destailleur
12d211815b
Debug v15
2021-10-19 21:38:36 +02:00
Laurent Destailleur
4764075cc7
Merge pull request #19016 from hregis/fix_possibility_to_bypass_main_antivirus_constants
...
FIX add possibility to bypass MAIN_ANTIVIRUS_* constants
2021-10-19 19:04:09 +02:00
Laurent Destailleur
121cb8f708
Merge pull request #19019 from Hystepik/develop#2
...
Fix: selectGroupTickets multilevel
2021-10-19 19:02:35 +02:00
kamel
f328bb32f6
Corrections
2021-10-19 17:34:03 +02:00
Laurent Destailleur
bfdf88ca6c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-10-19 16:48:00 +02:00
Laurent Destailleur
0cae464bfa
Debug v15
2021-10-19 16:47:43 +02:00
lmarcouiller
f5942300e0
fix CI bot error
2021-10-19 16:09:06 +02:00
lmarcouiller
d8cd6b6f55
Fix autoselect multilevel
2021-10-19 15:54:25 +02:00
Regis Houssin
db01fed447
FIX error when defining an already existing constant
2021-10-19 12:36:33 +02:00
Laurent Destailleur
6193e31eb4
Merge pull request #18999 from polkiko/payment_receipt
...
NEW Added linked files page and send mail possibility in payments
2021-10-19 12:25:37 +02:00
Regis Houssin
acbae5cafb
FIX add possibility to bypass MAIN_ANTIVIRUS_* constants
2021-10-19 12:14:42 +02:00
lmarcouiller
dd6457b259
FIX: boxes php 8.0 errors and warnings
2021-10-19 10:24:59 +02:00
Laurent Destailleur
c40a73162e
Look and feel v15
2021-10-18 21:20:58 +02:00
Laurent Destailleur
252c910962
Debug feature for proposal signature
2021-10-18 20:46:28 +02:00
Jesús Jerez
43ac3230c3
Merge branch 'develop' into payment_receipt
2021-10-18 19:53:36 +02:00
Laurent Destailleur
297580ed11
Merge pull request #19011 from Hystepik/develop#2
...
NEW: Online proposal signature
2021-10-18 19:41:58 +02:00
Laurent Destailleur
a81d6ef405
Debug v15
2021-10-18 19:13:36 +02:00
Laurent Destailleur
b0230ad42b
Look and feel v15
2021-10-18 16:45:14 +02:00
lvessiller
98a613edec
FIX show end hours in events linked to objects
2021-10-18 14:31:37 +02:00
lmarcouiller
0c2cf9980d
NEW: online propal signature
2021-10-18 14:28:30 +02:00
Alexandre SPANGARO
053740792f
Update accounting.lib.php
2021-10-18 10:19:50 +02:00
kamel
152aab4903
Add test if actual entity is different to the entity provided
2021-10-18 10:10:31 +02:00
lmarcouiller
c3a45dabad
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#2
2021-10-18 09:51:45 +02:00
stickler-ci
4c5e959911
Fixing style errors.
2021-10-17 23:52:24 +00:00
Polkiko
074b5589bd
NEW Added documents page and send mail possibility in payments
...
- Documents page has been added to the payments page so that documents can be linked and see the generated pdf documents.
- The possibility of sending payments by email has been added, attaching the payment receipts in pdf.
- In pdf standard model of payment, the possibility of seeing the active iban of a third party has been added if it exists.
2021-10-18 01:15:12 +02:00
Laurent Destailleur
7bcc76c1aa
Fix margin rates and mark rates are 2 different columns
2021-10-17 19:41:02 +02:00
Laurent Destailleur
b318ccb2af
Fix margin rates and mark rates are 2 different columns
2021-10-17 19:39:56 +02:00
Laurent Destailleur
099b2da2dc
FIX #18974
2021-10-17 18:58:34 +02:00
Laurent Destailleur
0aa90e82ea
Clean code
2021-10-17 15:47:29 +02:00
Laurent Destailleur
79177b0a11
Rename method into selectLotDataList
2021-10-17 14:38:12 +02:00
Laurent Destailleur
0727e182ac
Merge pull request #18997 from hregis/fix_add_zstd_compression
...
NEW add support for zstd compression
2021-10-17 13:49:06 +02:00
Laurent Destailleur
b66155de4b
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/list.php
htdocs/filefunc.inc.php
2021-10-17 13:30:13 +02:00
Laurent Destailleur
b30d7371a4
Fix allow ' - ' into file name
2021-10-17 12:21:22 +02:00
stickler-ci
9fa6a8daa7
Fixing style errors.
2021-10-17 10:05:58 +00:00
Regis Houssin
84e4bd8820
NEW add zstd compression
2021-10-17 11:59:25 +02:00
Laurent Destailleur
c896c05464
Merge pull request #18989 from FHenry/dev_18986
...
NEW: Add budget field into task #18986
2021-10-16 21:16:01 +02:00
Laurent Destailleur
830e067eff
Fix for tzuser
2021-10-16 21:03:47 +02:00
Laurent Destailleur
94c48d3573
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2021-10-16 19:40:22 +02:00
Laurent Destailleur
dd0809b528
Fix trans labels status
2021-10-16 19:37:57 +02:00
Laurent Destailleur
25967da832
Merge pull request #18970 from hregis/fix_avoid_warning_non_numeric
...
FIX avoid non-numeric warning
2021-10-16 19:22:16 +02:00
Laurent Destailleur
1bee543eef
Merge pull request #18987 from atm-gauthier/NEW_more_param_on_function_deleteByParentField
...
NEW : we need to be able to put more filters on deleteByParentField() function
2021-10-16 19:11:52 +02:00
Laurent Destailleur
9469c0dc2b
Update commonobject.class.php
2021-10-16 19:10:50 +02:00
Laurent Destailleur
bbe867a7a9
Update commonobject.class.php
2021-10-16 19:06:50 +02:00
Laurent Destailleur
a28d01ca83
Use PDF/A format instead of PDF
2021-10-16 18:59:01 +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
lmarcouiller
9eb8dadfd9
WIP : signature of propal
2021-10-15 16:58:59 +02:00
Florian HENRY
ab9ba4e0a2
NEW: feature #18986
2021-10-15 10:53:17 +02:00
Gauthier PC portable 024
5ef681ef91
FIX : stickler
2021-10-15 10:36:47 +02:00
Florian HENRY
5f4410468d
add filed budget in task
2021-10-15 10:24:56 +02:00
Gauthier PC portable 024
412746ec8f
NEW : we need to be able to put more filters on deleteByParentField() function
2021-10-15 10:18:32 +02:00
atm-lena
ff7727466a
Function updateExtrafield : replace empty value to null
2021-10-14 17:13:44 +02:00
lvessiller
5d22eeeff2
FIX user date timezone offset
2021-10-14 16:06:22 +02:00
Regis Houssin
f14de50bd7
FIX check if numeric value
2021-10-13 14:26:43 +02:00
Regis Houssin
ce37323f69
FIX avoid non-numeric warning
2021-10-13 14:14:30 +02:00
Marc de Lima Lucio
29768a1c6e
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms
2021-10-13 11:33:04 +02:00
Alexandre SPANGARO
41d6a96342
Merge remote-tracking branch 'upstream/develop' into 15a23
2021-10-13 03:29:57 +02:00
Laurent Destailleur
4fc93ca7fa
Fix css
2021-10-13 02:36:23 +02:00
Laurent Destailleur
e6c451cdae
Fix responsive
2021-10-12 23:50:23 +02:00
Laurent Destailleur
f3ea05b701
Merge pull request #17873 from atm-quentin/FIX_multiple_order_linked_to_facture
...
NEW when multiple order linked to facture, show list into note.
2021-10-12 14:30:34 +02:00
Laurent Destailleur
faf3700dcc
Merge pull request #18947 from altairisfr/TICKETS_MESSAGE_FORCE_MAIL
...
NEW : add constant TICKETS_MESSAGE_FORCE_MAIL
2021-10-12 12:38:20 +02:00
Laurent Destailleur
791a7206ee
Fix var not defined
2021-10-12 11:48:51 +02:00
Laurent Destailleur
6168e844bd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2021-10-12 01:43:20 +02:00
Laurent Destailleur
2e32254574
Fix rul to shipment files
2021-10-11 20:36:10 +02:00
Laurent Destailleur
c4ca9e92a6
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2021-10-11 20:18:46 +02:00
Laurent Destailleur
4e9c7c9efb
FIX Attachment of pdf into shipment when sending email
2021-10-11 20:04:45 +02:00
Christophe Battarel
96bdd61684
NEW : add constant TICKETS_MESSAGE_FORCE_MAIL
2021-10-11 17:36:31 +02:00
Laurent Destailleur
3a32787f15
Fix for backward compatibility
2021-10-11 16:14:34 +02:00
Laurent Destailleur
5fc0802eb1
Fix for backward compatibility
2021-10-11 16:13:55 +02:00
Gauthier PC portable 024
ca18db8f50
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers
2021-10-11 16:01:47 +02:00
Laurent Destailleur
5666c63de2
Merge pull request #18850 from atm-gauthier/NEW/integration_GPEC_code
...
New : integration gpec, source code
2021-10-11 15:39:54 +02:00
Laurent Destailleur
f3c16ba490
Merge pull request #18905 from indelog/fix_origin_invoice_custom
...
Fix creataing invoice originating for custom module object
2021-10-11 15:26:07 +02:00
Laurent Destailleur
e3045f24cd
Merge pull request #18923 from aspangaro/15a24
...
NEW Societe - Add perentity functionality on customer/supplier accountancy auxiliary account
2021-10-11 15:20:27 +02:00
Indelog
94875cdc77
Fix : Re-add bloc to set $withtargettype and $withsourcetype
2021-10-11 13:37:37 +02:00
Laurent Destailleur
33e811ee96
Merge pull request #18926 from FHenry/fix_get_thirdparties_option_select
...
fix: option COMPANY_SHOW_ADDRESS_SELECTLIST and SOCIETE_ADD_REF_IN_LIST work in ajaxcompanies
2021-10-11 11:50:35 +02:00
Laurent Destailleur
05ddcf5132
Merge pull request #18927 from vincentjdc/supplier-order-export-validation-date-user
...
NEW Allow exporting supplier order validation date + validation user
2021-10-11 11:09:31 +02:00
Alexandre SPANGARO
754b13a83f
NEW Add sortorder on units list
2021-10-11 08:58:00 +02:00
Laurent Destailleur
a57925b0b7
FIX edition of fields on credit transfer tab
2021-10-11 01:43:36 +02:00
Laurent Destailleur
7180f5eeff
css
2021-10-10 21:25:46 +02:00
Laurent Destailleur
874731af84
The 'action=delete&file=...' has been replaced with
...
'action=deletefile&file=...' to avoid confusion with deletion of object
lines.
2021-10-10 21:11:48 +02:00
Benjamin Chantalat
65c0167d07
ADD : info of number of product still to dispatched in a supplier order
2021-10-10 20:50:51 +02:00
Gauthier PC portable 024
1a11135aa4
FIX : travis and stickler
2021-10-08 14:00:47 +02:00
Florian HENRY
5d393f201c
fix sql
2021-10-08 13:17:09 +02:00
Vincent Dieltiens
592fff1cfa
Allow exporting supplier order validation date + validation user
2021-10-08 13:09:16 +02:00
Laurent Destailleur
1b504b3e2c
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-10-08 12:15:18 +02:00
Laurent Destailleur
806d832549
Fix canonical url for open graph
2021-10-08 12:00:13 +02:00
Laurent Destailleur
a057c7c2a7
Add og graph
2021-10-08 11:49:28 +02:00
Laurent Destailleur
da0a9e13f5
Fix twitter tag
2021-10-08 11:41:45 +02:00
Laurent Destailleur
cb490c0eac
Allow twitter cards per page.
2021-10-08 11:06:28 +02:00
Laurent Destailleur
816e4cdde6
Comment
2021-10-08 10:59:11 +02:00
Alexandre SPANGARO
c7fd9328cd
NEW Societe - Add perentity functionality on customer/supplier accountancy auxiliary account
2021-10-08 06:29:22 +02:00
Alexandre SPANGARO
e68d9dc73c
NEW Societe - Add perentity functionality on customer/supplier accountancy auxiliary account
2021-10-07 22:02:56 +02:00
Gauthier PC portable 024
ca3899dbf1
FIX : travis + several fixes
2021-10-07 14:00:31 +02:00
Gauthier PC portable 024
de48c1bdde
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/integration_GPEC_code
2021-10-07 11:23:37 +02:00
Gauthier PC portable 024
409c19a582
FIX : useless code
2021-10-07 11:19:04 +02:00
Gauthier PC portable 024
59f5f9b0c6
FIX : travis feedback
2021-10-07 10:37:47 +02:00
Gauthier PC portable 024
70648477a7
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers
2021-10-07 10:37:09 +02:00
Alexandre SPANGARO
adfae30112
NEW Societe - Add perentity functionality on customer/supplier accountancy auxiliary account
2021-10-07 06:18:39 +02:00
Laurent Destailleur
9cf46eaf25
Fix stats graphs
2021-10-06 20:29:48 +02:00
Laurent Destailleur
34187d53f6
Fix missing invoice in stats when due date is unknown/null
2021-10-06 20:10:36 +02:00
Laurent Destailleur
88a482c615
Fix phpcs
2021-10-06 18:40:32 +02:00
Laurent Destailleur
520a4f55f8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2021-10-06 18:34:03 +02:00
Laurent Destailleur
96b617cb4d
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/eventorganization/conferenceorboothattendee_card.php
htdocs/mrp/mo_list.php
2021-10-06 18:30:26 +02:00
Gauthier PC portable 024
231f809106
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/integration_GPEC_code
2021-10-06 17:55:36 +02:00
Indelog
18fb3a352b
Add hook to overide sourcetype and targettype for linked object
...
This add hook `setLinkedObjectSourceTargetType` in
`CommonObject::showLinkToObjectBlock()` and in
`CommonObject::fetchObjectLinked()` to allow overiding sourcetype and
targettype by custom modules.
2021-10-06 17:18:45 +02:00
Laurent Destailleur
4208964153
Merge branch 'develop' into patch-10
2021-10-06 16:09:54 +02:00
Laurent Destailleur
7e0ec949c0
Merge pull request #18915 from vincentjdc/vat-number-societe-list
...
NEW Add `SOCIETE_SHOW_VAT_IN_LIST` to display VAT number in combo list of thirdparties
2021-10-06 15:33:46 +02:00
Vincent Dieltiens
2889af9fae
Add SOCIETE_SHOW_VAT_IN_LIST option to let the possibility to display (and search) VAT number in list of 'societe'
2021-10-06 15:23:23 +02:00
Laurent Destailleur
4be2d1414e
Fix regression
2021-10-06 14:03:10 +02:00
Francis Appels
dceb2b5341
Fix fatal error
2021-10-06 13:36:11 +02:00
Laurent Destailleur
329bc331db
Merge pull request #18899 from fappels/14_fix_espadon
...
FIX fatal error on expedition espadon model
2021-10-06 13:29:47 +02:00
Laurent Destailleur
ea3e3b133d
Debug eventorganization modules
2021-10-06 12:55:07 +02:00
Indelog
45e6ea45dc
Fix stickler
2021-10-06 12:19:10 +02:00
Indelog
fb775e2c6e
Fix Add module part in llx_element_element on CommonObject::add_object_linked()
...
Add module part to target type if object has $module property and is'nt
in core modules.
2021-10-06 12:14:46 +02:00
Laurent Destailleur
93b4853f8e
Fix var_dump
2021-10-06 11:52:12 +02:00
Laurent Destailleur
ff56415c00
Merge pull request #18903 from aspangaro/15a21
...
HTML5 - <font> tag is deprecated, replace by <span>
2021-10-05 16:51:41 +02:00
Gauthier PC portable 024
1d4d4dfe18
FIX : ihm
2021-10-05 15:43:57 +02:00
Marc de Lima Lucio
fb13b666b8
FIX: deposit payment terms: susbstitute percentage in payment term label with bespoke substitution key
2021-10-05 15:26:43 +02:00
Marc de Lima Lucio
0d174ebd71
cMerge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms
2021-10-05 14:57:21 +02:00
Laurent Destailleur
413164f5c0
NEW can upload the odt file for product doc template
2021-10-05 13:48:13 +02:00
Laurent Destailleur
b4cfe35138
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-10-05 13:39:46 +02:00
Marc de Lima Lucio
6ed9e00b4d
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms
2021-10-05 13:35:50 +02:00
Laurent Destailleur
b11dbf069e
FIX Bad use of a forced contact of another company on PDF/ODT documents
2021-10-05 13:11:54 +02:00
Marc de Lima Lucio
f4c22c0ae7
FIX: deposit payment terms: PHPDoc
2021-10-05 13:02:12 +02:00
Laurent Destailleur
379dd9ccbb
Fix position of text
2021-10-05 12:09:03 +02:00
Indelog
6c82b1d0e1
Fix creataing invoice originating for custom module
...
This fix the invoice create form when we provide `origin` element in
url. The actual create form overide the value for origin field with
`$objectsrc->element`. This make creation of invoice originating from a custom
module module impossible because we need the module part to instantiate
the class for the custom module object.
This also modify Common Object::fetch Object Linked() to append the
module part for `$sourcetype` and `$targettype` if it not set and object
have module property and it not in core module.
2021-10-05 11:35:43 +02:00
Marc de Lima Lucio
b06857136a
NEW: deposit payment terms: show percentage on proposal/order PDFs
2021-10-05 11:31:03 +02:00
Marc de Lima Lucio
54782f5d4c
FIX: deposit payment terms: don't show percentage input on lists
2021-10-05 11:11:27 +02:00
Laurent Destailleur
50470f84c4
Look and feel v15. Stay at same position on doc generation
2021-10-05 11:03:51 +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
Laurent Destailleur
f0703b414a
css
2021-10-05 10:24:31 +02:00
Alexandre SPANGARO
3f26ab195b
HTML5 - <font> tag is deprecated, replace by <span>
2021-10-05 09:46:48 +02:00
Alexandre SPANGARO
edf91ce77c
HTML5 - <font> tag is deprecated, replace by <span>
2021-10-05 09:41:03 +02:00
Laurent Destailleur
355f17be3d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-10-05 09:11:37 +02:00
Laurent Destailleur
5ad02ccc32
MAIN_EMAIL_ADD_TRACK_ID removed, MAIN_FIX_FOR_BUGGED_MTA 1 by defaut
2021-10-05 09:11:20 +02:00
Alexandre SPANGARO
d10ec688c7
HTML5 - <font> tag is deprecated, replace by <span>
2021-10-05 09:03:13 +02:00
Alexandre SPANGARO
463efd3802
Missing language key
2021-10-05 06:26:19 +02:00
Francis Appels
d3cbda08dc
Fix fatal error
2021-10-04 22:12:50 +02:00
Laurent Destailleur
9617bbb463
Merge pull request #18788 from fr69400/develop
...
New : Add showdocument hook
2021-10-04 20:13:50 +02:00
Laurent Destailleur
2f6a4fa04a
Update html.formfile.class.php
2021-10-04 19:20:37 +02:00
Laurent Destailleur
950fccc186
Merge branch 'develop' into NEW_deposit_payment_terms
2021-10-04 19:06:42 +02:00
Marc de Lima Lucio
1b2494855d
NEW: deposit payment terms: set required invoice fields + filter payment terms with deposits in select + UI
2021-10-04 18:09:24 +02:00
Laurent Destailleur
86c8a53f24
Merge pull request #18892 from aspangaro/15a23
...
FIX Remove Isle of Man of ECC's countries compatible with VAT Rules
2021-10-04 15:32:40 +02:00
Laurent Destailleur
6060f0bfb0
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/productaccount.php
htdocs/core/class/html.form.class.php
htdocs/langs/en_US/main.lang
2021-10-04 14:53:44 +02:00
Gauthier PC portable 024
0dd3681e50
FIX : several debug
2021-10-04 14:08:11 +02:00
Gauthier PC portable 024
73e741ca74
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers
2021-10-04 11:10:38 +02:00
Laurent Destailleur
66310b14d7
Better way to present open invoice graph
2021-10-04 05:34:14 +02:00
Laurent Destailleur
7b02560c4f
Better way to present open invoice graph
2021-10-04 05:27:07 +02:00
Laurent Destailleur
b3cb56f2ef
Clean css
2021-10-04 04:14:31 +02:00
Laurent Destailleur
d6e1a6be93
Look and feel v14
2021-10-03 18:20:01 +02:00
Alexandre SPANGARO
42bb9ac6d2
Better URL
2021-10-03 05:49:54 +02:00
Alexandre SPANGARO
042d520061
Change Url
2021-10-03 05:30:49 +02:00
Laurent Destailleur
8ba18f4d73
Merge pull request #18884 from frederic34/patch-9
...
doxygen
2021-10-02 20:38:27 +02:00
Laurent Destailleur
7e48d6d31b
Merge pull request #18886 from frederic34/patch-11
...
doxygen
2021-10-02 20:38:20 +02:00
Laurent Destailleur
bcb7d8c07a
Merge pull request #18887 from frederic34/patch-12
...
doxygen
2021-10-02 20:38:13 +02:00
Laurent Destailleur
1451e95e79
Merge pull request #18888 from frederic34/patch-13
...
doxygen
2021-10-02 20:37:53 +02:00
Laurent Destailleur
902fed1f0d
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/ecm/index.php
2021-10-02 20:09:06 +02:00
Frédéric FRANCE
828c1d41e7
doxygen
...
https://doxygen.dolibarr.org/develop/doxygen-warnings.log
2021-10-02 13:49:33 +02:00
Frédéric FRANCE
0ebe4de80a
doxygen
...
https://doxygen.dolibarr.org/develop/doxygen-warnings.log
2021-10-02 13:48:27 +02:00
Frédéric FRANCE
1ba0369f01
doxygen
...
https://doxygen.dolibarr.org/develop/doxygen-warnings.log
2021-10-02 13:47:30 +02:00
Frédéric FRANCE
c33d8ac49b
doxygen
...
https://doxygen.dolibarr.org/develop/doxygen-warnings.log
2021-10-02 13:40:33 +02:00
Laurent Destailleur
d064ab2b17
Add more action to GET action to check
2021-10-02 12:58:15 +02:00
Laurent Destailleur
c664b78800
MAIN_SECURITY_CSRF_WITH_TOKEN now has 3 levels (1, 2, 3)
2021-10-01 12:37:32 +02:00
Laurent Destailleur
c244d7375c
MAIN_SECURITY_CSRF_WITH_TOKEN now has 3 levels (1, 2, 3)
2021-10-01 12:30:24 +02:00
Laurent Destailleur
166d3b08d6
Add LIBXML_NONET to simplexml_load_string
2021-09-30 20:12:01 +02:00
Laurent Destailleur
673a2982a5
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/opensurvey/card.php
2021-09-30 16:32:40 +02:00
Laurent Destailleur
0bf1db2fd4
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2021-09-30 16:29:10 +02:00
Laurent Destailleur
ed264182c6
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/admin/dict.php
htdocs/comm/action/class/actioncomm.class.php
htdocs/product/card.php
htdocs/takepos/receipt.php
2021-09-30 16:28:42 +02:00
Laurent Destailleur
44bb5ebf34
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/comm/action/class/actioncomm.class.php
2021-09-30 16:23:34 +02:00
Laurent Destailleur
bb6399e12a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/admin/dict.php
htdocs/comm/action/class/actioncomm.class.php
htdocs/product/card.php
2021-09-30 16:21:36 +02:00
Laurent Destailleur
fc4a16b356
Fix avoid error when trigger run on downgraded version.
2021-09-30 16:18:07 +02:00
Laurent Destailleur
3d4bb66853
Clean code
2021-09-30 15:59:47 +02:00
Laurent Destailleur
608b6f5fa3
Clean code
2021-09-30 15:24:57 +02:00
Laurent Destailleur
9460ad152e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-09-30 14:46:39 +02:00
Laurent Destailleur
d764080636
Add tag data-ignoreidfordnd=1 to ignor lines for drage and drop lines
2021-09-30 14:43:19 +02:00
stickler-ci
c5ad75c7c1
Fixing style errors.
2021-09-30 12:27:01 +00:00
Laurent Destailleur
3565a47954
Merge branch 'develop' into NEW_develop_virtual_product_DragAndDrop
2021-09-30 14:24:30 +02:00
Laurent Destailleur
ee79df9bc7
Merge pull request #18839 from indelog/fix_list_of_autoecmfiles
...
Fix FormFile::list_of_autoecmfiles object_instance classname after hook
2021-09-30 13:39:16 +02:00
Laurent Destailleur
ae9643bbef
Update html.formfile.class.php
2021-09-30 13:38:38 +02:00
Laurent Destailleur
3deb424b4f
Merge pull request #18845 from indelog/fix_doc_prev_ecm
...
Fix show for external module in ecm index auto page
2021-09-30 13:36:49 +02:00
Laurent Destailleur
98d8bad955
Merge pull request #18843 from indelog/fix_ecm_deletion
...
Fix append module suffix on src_object_type when create ecm file
2021-09-30 13:32:42 +02:00
Laurent Destailleur
4fe9a4fd30
Merge pull request #18846 from hregis/fix_avoid_warning_if_not_an_array
...
FIX avoid warning if $categories is an id
2021-09-30 13:30:37 +02:00
Laurent Destailleur
1595b38498
Fix param $morecss on img_mime
2021-09-30 00:28:47 +02:00
Laurent Destailleur
a9805fbfc1
NEW The protection MAIN_SECURITY_CSRF_WITH_TOKEN=1 is on by default
2021-09-29 17:34:31 +02:00
Laurent Destailleur
34dacca77c
Css
2021-09-29 16:31:40 +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
Laurent Destailleur
0f55eea276
css
2021-09-29 14:48:50 +02:00
Marc de Lima Lucio
4d6c1d892b
NEW: deposit payment terms: set deposit percentage in company card
2021-09-29 14:03:35 +02:00
Marc de Lima Lucio
4b3fc4d7f3
NEW: deposit payment terms: add input in payment conditions form
2021-09-29 13:02:32 +02:00
Laurent Destailleur
9fe72597ab
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-09-29 12:43:27 +02:00
Regis Houssin
6e08ecde04
FIX indentation
2021-09-29 08:47:22 +02:00
Laurent Destailleur
baadf2dc6c
Fix reposition
2021-09-29 01:51:34 +02:00
Laurent Destailleur
1e840fe7ed
Code comment
2021-09-28 18:07:04 +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
Regis Houssin
43a47999d7
FIX avoid warning if $categories is an id
2021-09-28 16:35:01 +02:00
Indelog
fae0337b3e
Fix show for external module in ecm index auto page
...
This set the correct `modulepart` parameter for link generated to
`document.php` of ecm auto index page if `src_object_type` for
ecm document has a module suffix (`@modulename`).
2021-09-28 16:22:28 +02:00
Indelog
5b8b55cfba
Fix append module suffix on src_object_type when create ecm file
...
Files added to `llx_ecm_files` for externals modules never be removed on
object deletion.
When `CommonObject::deleteEcmFiles()` is called with `mode=1`, it use
this sql filter to find the file related to the object which is removed
:
```
$sql .= " WHERE fk_object IN (SELECT rowid FROM ".MAIN_DB_PREFIX."ecm_files WHERE src_object_type = '".$this->db->escape($this->table_element.(empty($this->module) ? '' : '@'.$this->module))."' AND src_object_id = ".((int) $this->id).")";
```
We see it append `'@'.$this->module` to `$this->table_element` but when
file is add to the `llx_ecm_files` by
`CommonObject::commonGenerateDocument()` , it added whiteout the
`'@'.$this->module` suffix. So the file is never remove from
`llx_ecm_files` when object is deleted.
This fix it by appending module suffix on `src_object_type` if object
has `module` property when add document to the `llx_ecm_files`.
2021-09-28 15:26:08 +02:00
Alexandre SPANGARO
9426af8f6a
NEW #18820 Accountancy - Add product account in import/export of thirdparty (level 3)
2021-09-28 13:16:44 +02:00
Laurent Destailleur
0c52817426
Merge pull request #18821 from aspangaro/15a20
...
NEW #18820 Accountancy - Add product account in import/export of thirdparty (level 3)
2021-09-28 13:14:16 +02:00
Laurent Destailleur
43637c936c
Merge pull request #18825 from grandoc/new_branch_25_09_2021
...
fix : warning: Undefined property: stdClass:: in C:\wamp64\www\doliba…
2021-09-28 12:56:43 +02:00
Laurent Destailleur
8f4fb9fd3c
Update barcode.lib.php
2021-09-28 12:56:33 +02:00
Laurent Destailleur
a70f5dd90e
Doc
2021-09-28 12:12:11 +02:00
Indelog
2472dff67b
Fix FormFile::list_of_autoecmfiles object_instance classname after hook
...
FormFile::list_of_autoecmfiles() can instantiate object with parameters
resulting of hook `addSectionECMAuto` but for do this,
it use `${$hookmanager->resArray['classname']}` which return a
`null`. Instead we should do this
`$hookmanager->resArray['classname']`.
2021-09-28 12:08:45 +02:00
Laurent Destailleur
0e3ec3ea2d
Trans
2021-09-28 11:56:43 +02:00
Laurent Destailleur
80165811e0
Clean code
2021-09-27 15:50:19 +02:00
Laurent Destailleur
d4cc60640b
Clean code
2021-09-27 15:41:58 +02:00
javieralapps4up
11723c2cd0
Update date.lib.php
...
Without words, sorry
2021-09-27 14:49:22 +02:00
javieralapps4up
c4f1eb0c46
Update date.lib.php
...
Fix my error
2021-09-27 14:32:03 +02:00
Laurent Destailleur
37603b451a
Fix token in url
2021-09-27 12:24:01 +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
Gauthier PC portable 024
fde0f1ac25
NEW : HRM integration, source code
2021-09-27 11:20:38 +02:00
Laurent Destailleur
4f6586d6a8
Fix token
2021-09-26 20:35:54 +02:00
Laurent Destailleur
d5d4b8d8e0
Fix escape the undescore on search in website module
2021-09-26 14:21:23 +02:00
Laurent Destailleur
567334318a
Fix sql eventorganization
2021-09-25 21:13:55 +02:00
Philippe Grand
f7041ef1fc
Update box_members_last_subscriptions.php
2021-09-25 19:03:08 +02:00
Philippe Grand
2edad621b8
Update box_members_last_modified.php
2021-09-25 19:02:28 +02:00
Philippe Grand
694754267c
Update box_members_by_type.php
2021-09-25 19:01:54 +02:00
Philippe Grand
dbe459bc3f
Update box_members_subscriptions_by_year.php
2021-09-25 18:59:39 +02:00
Philippe GRAND
67cc5155b1
fix :Warning: Undefined property: stdClass:: in C:\wamp64\www\dolibarr-dev\htdocs\core\lib\barcode.lib.php on line 62
2021-09-25 18:15:44 +02:00
Philippe GRAND
1feb6e676c
fix : warning: Undefined property: stdClass:: in C:\wamp64\www\dolibarr-dev\htdocs\core\boxes\box_members_by_type.php on line 70
2021-09-25 16:17:24 +02:00
Philippe GRAND
6b3cf5d482
fix : warning: Undefined property: stdClass:: in C:\wamp64\www\dolibarr-dev\htdocs\core\boxes\box_members_last_subscriptions_by_year.php on line 70
2021-09-25 16:15:31 +02:00
Philippe GRAND
d9110a8114
fix : warning: Undefined property: stdClass:: in C:\wamp64\www\dolibarr-dev\htdocs\core\boxes\box_members_last_subscriptions.php on line 70
2021-09-25 16:13:35 +02:00
Philippe GRAND
f8609a4619
fix : warning: Undefined property: stdClass:: in C:\wamp64\www\dolibarr-dev\htdocs\core\boxes\box_members_last_modified.php on line 70
2021-09-25 16:09:34 +02:00
Alexandre SPANGARO
372ba6cf0b
NEW #18820 Accountancy - Add product account in import/export of thirdparty (level 3)
2021-09-25 07:49:08 +02:00
Laurent Destailleur
9a3d6679f0
Merge pull request #18778 from Hystepik/develop#1
...
Fix : KM articles in public/ticket/create_ticket.php
2021-09-24 13:35:17 +02:00
lmarcouiller
68c9f4064b
Fix sql in fetchKnowledgeRecord
2021-09-24 10:43:52 +02:00
Laurent Destailleur
4706ebe004
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2021-09-24 02:34:59 +02:00
Laurent Destailleur
70d255740b
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/projet/class/task.class.php
2021-09-24 02:33:48 +02:00
Laurent Destailleur
cd46ccdb66
Code comment
2021-09-24 02:31:15 +02:00
Laurent Destailleur
b09c4166b3
Fix set position of lines in tasks of a project
2021-09-24 02:24:04 +02:00
Laurent Destailleur
4c80e0425b
Fix date for tasks created during project creation
2021-09-24 02:10:42 +02:00
Laurent Destailleur
38b8ed9092
Merge pull request #18792 from cfoellmann/PR/minor-button-fixes
...
another set of cleanup for action buttons
2021-09-24 01:55:25 +02:00
Laurent Destailleur
f98d425064
Merge branch 'develop' into Link-to-MO
2021-09-24 01:54:21 +02:00
Quentin VIAL-GOUTEYRON
72bb1062cc
FIX proforma pdf name
2021-09-23 15:15:35 +02:00
lmarcouiller
ef70cd680c
fix to match sql syntax
2021-09-23 15:00:55 +02:00
Quentin VIAL-GOUTEYRON
9d5f288ca3
FIX Totalttc into total
2021-09-23 14:30:00 +02:00
Laurent Destailleur
9d5f6fbc1b
Code comment
2021-09-23 13:39:48 +02:00
Laurent Destailleur
b08b7d2f68
NEW Can show progression of task into combo list of tasks
2021-09-23 13:20:42 +02:00
Laurent Destailleur
c39c823b66
Debug Date of line of services mandatory
2021-09-23 13:01:04 +02:00
Laurent Destailleur
545b4c56d5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-09-23 12:14:54 +02:00
Laurent Destailleur
d39ab4c288
Clean code
2021-09-23 12:14:32 +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
4a43ed2852
Fix scrutinizer
2021-09-23 12:05:55 +02:00
Laurent Destailleur
2538ebec03
Better test
2021-09-23 11:40:29 +02:00
Ilias Patsiaouras
977db0a2ba
add MO to the list of possible object to link
2021-09-23 11:38:50 +02:00
Laurent Destailleur
a48a8231a1
Fix scrutinizer
2021-09-23 11:33:58 +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
51b6318f88
FIX Test when date of invoie is in future (pb with TZ and offset)
2021-09-23 02:14:01 +02:00
Laurent Destailleur
60c11725ae
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-09-23 02:11:11 +02:00
Laurent Destailleur
1e0a7e4342
FIX Test when date of invoie is in future (pb with TZ and offset)
2021-09-23 02:10:39 +02:00
stickler-ci
e5cff0ede1
Fixing style errors.
2021-09-22 16:07:36 +00:00
javieralapps4up
e74043d48e
Close : #18801 Jan-30 + 1m IS NOT Mar-2
...
Close : #18801 related to avoid this behaviour https://bugs.php.net/bug.php?id=74013
2021-09-22 17:56:31 +02:00
Laurent Destailleur
87da490b58
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2021-09-22 15:26:35 +02:00
Laurent Destailleur
6f9fc205ef
Merge pull request #18796 from altairis-noe/warehouse_project_elements
...
FIX: add warehouse in projects' overview count
2021-09-22 15:24:05 +02:00
Noé Cendrier
066013c31f
typo stickler
2021-09-22 15:15:39 +02:00
Laurent Destailleur
2824c8b8ab
FIX support of localtax on expense report
2021-09-22 15:11:18 +02:00
Laurent Destailleur
6c7c6c9efd
FIX legal issue on expense report pdf (must also show price without tax)
2021-09-22 12:47:06 +02:00
Christian Foellmann
08b395e127
another set of cleanup for action buttons
2021-09-22 08:43:30 +02:00
stickler-ci
49fd1b761c
Fixing style errors.
2021-09-21 20:27:33 +00:00
fr69400
73b0d8079c
Update html.formfile.class.php
2021-09-21 22:23:14 +02:00
Laurent Destailleur
c433d6ef4f
Merge pull request #18785 from hregis/fix_warning_php8
...
FIX check if method exists instead in class
2021-09-21 19:20:14 +02:00
Laurent Destailleur
7420234494
Merge pull request #18769 from ywarnier/turnover
...
Add turnover homepage box
2021-09-21 19:13:56 +02:00
Laurent Destailleur
b7fadd0307
Merge pull request #18773 from aspangaro/15a18
...
Missing language key
2021-09-21 19:08:32 +02:00
stickler-ci
12be914d04
Fixing style errors.
2021-09-21 16:49:00 +00:00
fr69400
c4dd6be9f8
Add showdocument hook
2021-09-21 18:47:34 +02:00
stickler-ci
d6632757f9
Fixing style errors.
2021-09-21 16:06:03 +00:00
Regis Houssin
e227bdb22b
FIX check if method exists instead
2021-09-21 17:58:00 +02:00
Noé Cendrier
c89468428e
add warehouse in projects elements count
2021-09-21 17:22:55 +02:00
Regis Houssin
48ce3ea4d3
FIX check if $categories is not empty
2021-09-21 16:31:07 +02:00
ksar
f2b39b3eeb
FIX #18767 : Adherent delete
...
Adherent Delete was not working due to the fact that
$features = 'adherent';
$feature2 = 'cotisation';
And $user->rights->$feature->$subfeature->supprimer does not exist
Also I used the double declaration of salaries.
2021-09-21 11:27:41 +02:00
lmarcouiller
a7ff9d4889
Fix : KM articles in public/ticket/create_ticket.php
2021-09-21 11:26:49 +02:00
Alexandre SPANGARO
76f7efc193
Missing language key
2021-09-21 03:08:43 +02:00
Yannick Warnier
35e70e7936
Fix method visibility
2021-09-20 23:58:38 +02:00
Yannick Warnier
348c1c4caa
Fix empty assignation line
2021-09-20 23:57:49 +02:00
stickler-ci
d919ef9c4c
Fixing style errors.
2021-09-20 17:57:10 +00:00
Yannick Warnier
c40b22facd
Add turnover homepage box
2021-09-20 19:41:13 +02:00
Laurent Destailleur
deb1965cd5
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/card.php
htdocs/compta/paiement/list.php
htdocs/core/class/commonobject.class.php
htdocs/mrp/mo_list.php
htdocs/projet/tasks/task.php
htdocs/public/payment/newpayment.php
2021-09-20 17:15:12 +02:00
Laurent Destailleur
c75fbb7642
FIX fetch of product with modulebuilder load too much data
2021-09-20 16:00:11 +02:00
Laurent Destailleur
0eff2fa15b
FIX default language defined for IN country
2021-09-20 13:20:54 +02:00
Laurent Destailleur
360e3290b5
typo
2021-09-20 04:20:20 +02:00
Laurent Destailleur
14c8bdce1a
Better desciption of option
2021-09-19 19:25:38 +02:00
Laurent Destailleur
a747c71cf5
css
2021-09-19 19:19:28 +02:00
Laurent Destailleur
1d597e8a72
Fix add unset* action as sensible GET actions
2021-09-19 18:03:38 +02:00
Laurent Destailleur
96436cac3d
FIX unprivileged user can attach agenda with leave.
2021-09-19 00:50:23 +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
62b721a904
Add deletecontact as sentitive action
...
Replace dol_buildpath with DOL_URL_ROOT
2021-09-18 19:34:46 +02:00
Laurent Destailleur
30fb0d65bd
Merge pull request #18745 from Hystepik/develop#1
...
Fix actions_addupdatedelete.inc.php on lang
2021-09-18 16:09:04 +02:00
Laurent Destailleur
061cbc4266
Merge pull request #18750 from maksimstojkovic/develop
...
Fix Warehouse PDF Generation Error
2021-09-18 16:08:16 +02:00
Laurent Destailleur
39d55b11b4
Merge pull request #18753 from maksimstojkovic/fix-movement-typo
...
Fix typo in pdf_standard.modules.php
2021-09-18 16:07:41 +02:00
Laurent Destailleur
052511d081
Fix sql error
2021-09-18 15:05:31 +02:00
Laurent Destailleur
5fa62f25fa
Fix registration of attendee
2021-09-18 12:39:26 +02:00
Laurent Destailleur
b1c6a6e8d1
Fix show/hide combo when next combo has no item inside.
2021-09-17 19:38:55 +02:00
Laurent Destailleur
68a391b395
Fix not empty second level combo if first one not yet defined
2021-09-17 19:19:41 +02:00
Laurent Destailleur
7ed9e21266
Fix sql error
2021-09-17 19:16:46 +02:00
Maksim Stojkovic
d69ef7c134
Fix typo in pdf_standard.modules.php
2021-09-18 03:12:13 +10:00
Laurent Destailleur
91cd991828
Simplify the selectgroupTicket.
2021-09-17 16:52:42 +02:00
Maksim Stojkovic
44ff73f5de
Remove unused $nblines assignment
...
Fixes the following warning received when attempting to generate a warehouse stock document using the default template:
`count(): Parameter must be an array or an object that implements Countable in /var/www/html/core/modules/stock/doc/pdf_standard.modules.php on line 211`.
$nblines is subsequently assigned on line 326, after which it is then used.
2021-09-17 23:50:00 +10:00
Gauthier PC portable 024
e6c9627195
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers
2021-09-17 15:47:23 +02:00
Lucas Marcouiller
e7a32834b7
Fix actions_addupdatedelete.inc.php on lang
2021-09-17 12:55:09 +02:00
Laurent Destailleur
0ae8403fb4
Merge pull request #18690 from lainwir3d/add_rest_api_key_modify_right
...
CLOSE #18689 REST API module: add api key generate / modify right.
2021-09-17 12:10:03 +02:00
Laurent Destailleur
fdcd523c55
Merge branch 'develop' into develop#1
2021-09-17 11:59:20 +02:00
Lucas Marcouiller
20e8dd4c54
Fix error on html.for.class on ismultientitymanaged test
...
Conflicts:
htdocs/core/class/html.form.class.php
2021-09-17 11:30:45 +02:00
Lucas Marcouiller
0191e3b6ea
Fix error on html.for.class on ismultientitymanaged test
2021-09-17 11:23:16 +02:00
stickler-ci
46e8f1bebf
Fixing style errors.
2021-09-17 10:59:42 +02:00
antonin_tdj
5f19291285
Avoir Error 19 Constraint Violation (in case of password unchanged)
2021-09-17 10:59:35 +02:00
antonin_tdj
8f3ff32c82
fix ldap passw bug with activedirectory
...
Fix to avoid LDAP Error: 53 (Unwilling to perform) on Samba4 AD
2021-09-17 10:59:09 +02:00
Laurent Destailleur
20b50993bb
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2021-09-17 10:57:15 +02:00
Laurent Destailleur
6a73fc6e44
Merge pull request #18724 from ibuiv/patch-1
...
Fix ldap passw bug with activedirectory
2021-09-17 10:54:05 +02:00
Laurent Destailleur
1a705adf6e
Merge pull request #18726 from cfoellmann/PR/button-classes
...
add missing css classes to buttons
2021-09-17 10:52:13 +02:00
Laurent Destailleur
775544d47d
Merge pull request #18727 from Hystepik/develop#4
...
Close #18677 : new show articles of KM
2021-09-17 10:51:38 +02:00
Laurent Destailleur
3a8a813c4e
Merge pull request #18730 from esion-net/patch-2
...
NEW Expose bank account holder, label and number
2021-09-17 10:50:11 +02:00
Laurent Destailleur
bed697c98d
Merge pull request #18732 from esion-net/patch-2
...
NEW Expose bank account holder, label and number
2021-09-17 10:49:51 +02:00
Laurent Destailleur
7cbb7d7f44
Merge pull request #18733 from esion-net/patch-3
...
NEW Expose bank account holder, label and number
2021-09-17 10:48:52 +02:00
Laurent Destailleur
02bed7ce01
Fix sanitize
2021-09-17 10:45:59 +02:00
Florian HENRY
47efccad75
remove debug
2021-09-16 17:13:34 +02:00
Florian HENRY
820a007731
NEW: add MRP into Object Linked Box
2021-09-16 17:10:06 +02:00
Florian
b9e637a2b2
Expose bank account holder, label and number
...
NEW Expose bank account holder, label and number
2021-09-16 15:52:19 +02:00
Florian
3091448d1a
Expose bank account holder, label and number
...
Useful for automated texts on invoices to have those values available as well.
2021-09-16 15:40:25 +02:00
Laurent Destailleur
49ef24edcb
Fix trans
2021-09-16 15:16:18 +02:00
Laurent Destailleur
b70764af88
Fix translation of ticket categories
2021-09-16 15:08:04 +02:00
Laurent Destailleur
e9a3cca609
Fix lang file
2021-09-16 14:50:38 +02:00
Laurent Destailleur
1177e86f2e
Fix language of group of tickets
2021-09-16 14:46:14 +02:00
Laurent Destailleur
d9751704c8
Fix ambiguous field
2021-09-16 14:37:38 +02:00
Laurent Destailleur
086754e149
Fix translation of category codes
2021-09-16 14:31:20 +02:00
Laurent Destailleur
8909702619
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/bom/class/bom.class.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/eventorganization.lang
htdocs/product/class/productfournisseurprice.class.php
2021-09-16 13:40:05 +02:00
lmarcouiller
04a024570c
update fetchKnowledge and html.formticket
2021-09-16 13:19:43 +02:00
Laurent Destailleur
9918873719
Better log
2021-09-16 13:07:02 +02:00
Christian Foellmann
fd1d4d9073
add missing css classes to buttons
2021-09-16 11:33:42 +02:00
stickler-ci
9d3b680259
Fixing style errors.
2021-09-16 07:31:23 +00:00
antonin_tdj
8c1b3efc47
Avoir Error 19 Constraint Violation (in case of password unchanged)
2021-09-16 09:31:00 +02:00
Laurent Destailleur
aab8d4a628
css
2021-09-16 02:24:25 +02:00
Laurent Destailleur
b1cb32c743
Fix some sql
2021-09-15 20:03:38 +02:00
antonin_tdj
2c73c19bd5
fix ldap passw bug with activedirectory
...
Fix to avoid LDAP Error: 53 (Unwilling to perform) on Samba4 AD
2021-09-15 18:26:32 +02:00
lmarcouiller
b26e9be36f
Close #18677 : new show articles of KM
2021-09-15 15:36:57 +02:00
Laurent Destailleur
6dbf316e66
Fix links
2021-09-14 17:56:06 +02:00
Laurent Destailleur
21462d0b82
Fix can reset filter in setup
2021-09-14 17:24:53 +02:00
lmarcouiller
4762fd9c2e
Close #18678 : Implemention of tags/categories KM
2021-09-13 11:22:55 +02:00
Laurent Destailleur
ce9a10bd90
Fix description of some options
2021-09-13 03:43:25 +02:00
Laurent Destailleur
bbacb4e740
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-09-13 02:45:00 +02:00
stickler-ci
e424df6447
Fixing style errors.
2021-09-12 12:15:33 +00:00
lainwir3d
2fe85f2a86
CLOSE #18689 REST API module: add api key generate / modify right.
2021-09-12 15:47:56 +04:00
Laurent Destailleur
ce33f39bb0
Clean code. Menu must be greyed in get_menudiv
2021-09-11 15:43:26 +02:00
Laurent Destailleur
c005a20cc0
Fix ldap with ssl
2021-09-11 03:27:59 +02:00
Laurent Destailleur
f8b1e4d482
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-09-10 20:56:15 +02:00
Laurent Destailleur
edb1f31a19
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/customer/index.php
htdocs/accountancy/expensereport/index.php
htdocs/accountancy/supplier/index.php
2021-09-10 20:55:52 +02:00
Laurent Destailleur
9dcf3e49d0
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/core/class/extrafields.class.php
2021-09-10 20:50:34 +02:00
Laurent Destailleur
2f4463c983
FIX Collapsing of extrafields has disappeared.
2021-09-10 20:49:22 +02:00
Laurent Destailleur
5d512243b8
Merge pull request #18683 from FHenry/14_fix_search_evt_tab
...
fix: on Event tabs, if no evt type use in filter, filter on label and state not apply
2021-09-10 19:57:12 +02:00
Laurent Destailleur
4bbda0115c
Merge pull request #18682 from vincentjdc/product-price-in-product-select
...
Add product-id and price-id in dataset of product select
2021-09-10 19:51:24 +02:00
Laurent Destailleur
3980e4a32b
Merge pull request #18681 from FHenry/14_fix_extrafield_separator_type
...
fix: show display/hide icon on extrafield type separator
2021-09-10 19:49:26 +02:00
Laurent Destailleur
d50c518b70
Merge pull request #18676 from FHenry/14_fix_ajax_company_ambious_column
...
fix: when COMPANY_SHOW_ADDRESS_SELECTLIST is 1 ajax call to company.php is broken
2021-09-10 19:49:12 +02:00
Laurent Destailleur
ae5b5defd5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-09-10 17:17:07 +02:00
Laurent Destailleur
a1e51e212e
Array of fields accept 'tdcss' property
2021-09-10 17:16:42 +02:00
Florian HENRY
257686c2fe
fix: on Event tabs, if no evt type use in filter, filter on label and state not apply
2021-09-10 15:45:03 +02:00
Vincent Dieltiens
b3984798ba
Add product-id and price-id in dataset of product select
2021-09-10 15:32:16 +02:00
Florian HENRY
f3a555ec69
fix: show display/hide icon on extrafield type separator
2021-09-10 15:17:09 +02:00
Christian Foellmann
29820f446d
fix import of product desc without wrong linebreaks
2021-09-10 13:37:42 +02:00
Laurent Destailleur
6f3170494f
Merge pull request #18673 from cfoellmann/PR/input-desc
...
fix import of product desc without wrong linebreaks
2021-09-10 13:36:45 +02:00
Florian HENRY
ef888d5fca
Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14_fix_ajax_company_ambious_column
2021-09-10 13:26:05 +02:00
Florian HENRY
c66181a00e
fix: when COMPANY_SHOW_ADDRESS_SELECTLIST is 1 ajax call to company.php is broken
2021-09-10 13:25:40 +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
Christian Foellmann
e5192de9f2
fix import of product desc without wrong linebreaks
2021-09-10 11:36:08 +02:00
Laurent Destailleur
6a296bf6c2
Debug setup
2021-09-10 10:18:46 +02:00
Laurent Destailleur
d382e8d8c9
Clean setup and translation
2021-09-10 09:21:37 +02:00
Laurent Destailleur
875b93aff2
Merge branch 'develop' into 15a8
2021-09-09 19:26:01 +02:00
Laurent Destailleur
ffd7f60830
FIX #18589 #18617
2021-09-09 19:21:32 +02:00
Laurent Destailleur
fa28621709
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/reception/list.php
2021-09-09 16:11:29 +02:00
Laurent Destailleur
4d5621ea6f
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2021-09-09 14:59:12 +02:00
Laurent Destailleur
f1758b6f0c
Merge pull request #18623 from atm-gauthier/14.0_fix_salary_extrafields
...
14.0 fix salary extrafields are no more available
2021-09-09 14:58:54 +02:00
fr69400
ad0c4c518f
Update row.php
...
right write doesn't exist for supplier_proposal
->line order dont works
2021-09-09 14:42:43 +02:00
Laurent Destailleur
402757bdfe
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-09-09 14:41:51 +02:00
Laurent Destailleur
3581c37b83
Merge pull request #18626 from fr69400/develop
...
FIX : line reorder dont work on supplier_proposal
2021-09-09 14:41:30 +02:00
Laurent Destailleur
cbe08183ac
Merge pull request #18648 from atm-gauthier/NEW_mass_delete_objects
...
NEW : mass action delete, no more break if at least one object has child
2021-09-09 14:38:49 +02:00
Laurent Destailleur
d9cdddd688
Update actions_massactions.inc.php
2021-09-09 14:35:19 +02:00
Laurent Destailleur
7eba2f6f39
Code comment
2021-09-09 14:32:59 +02:00
stickler-ci
1e8870eb95
Fixing style errors.
2021-09-09 09:30:29 +00:00
Gauthier PC portable 024
4e78a24a13
FIX : if delete return < 0, we break and rollback, if == 0, we set event message warning and we test other objects of list
2021-09-09 11:25:46 +02:00
stickler-ci
dd7f6b6a5c
Fixing style errors.
2021-09-09 08:17:52 +00:00
jpb
91e624fd5d
change test
2021-09-09 10:14:39 +02:00
Laurent Destailleur
9fe9d0e9bf
Merge pull request #18630 from hregis/fix_wrong_table_element_line
...
FIX wrong table_element_line
2021-09-09 04:59:27 +02:00
Laurent Destailleur
ac8dfb2dd5
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2021-09-09 04:41:55 +02:00
Laurent Destailleur
d42492c67b
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/core/class/dolreceiptprinter.class.php
2021-09-09 04:41:39 +02:00
Laurent Destailleur
6d7cb01951
Merge pull request #18645 from atm-adrien/FIX_add_token
...
FIX : Add token to remove error when removing widget
2021-09-09 04:31:03 +02:00
Laurent Destailleur
e4a7903700
Merge pull request #18657 from moreauftheobald/14.0_fiix_knowledgemanagement_menu
...
Fix: Enable Knowledge Management Menu
2021-09-09 03:23:26 +02:00
Laurent Destailleur
61d5152209
Update eldy.lib.php
2021-09-09 03:23:04 +02:00
Laurent Destailleur
348fe00ffb
Merge pull request #18653 from Hystepik/develop_v14#2
...
Fix permission for salaries module
2021-09-09 03:02:34 +02:00
Laurent Destailleur
ad9bf27bea
Clean code
2021-09-09 02:26:49 +02:00
Laurent Destailleur
034c5651c8
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/eventorganization/class/conferenceorbooth.class.php
htdocs/langs/en_US/eventorganization.lang
htdocs/public/eventorganization/attendee_subscription.php
2021-09-08 22:13:35 +02:00
Laurent Destailleur
e0fa4e4b5c
Fix phpcs
2021-09-08 21:19:01 +02:00
MOREAU FRANCK
04026dd0b0
fix Stickler CI review
2021-09-08 19:51:34 +02:00
Laurent Destailleur
57a2ea3a53
Fix sql error
2021-09-08 19:49:24 +02:00
Laurent Destailleur
405beb77f5
Fix sql error
2021-09-08 19:45:55 +02:00
MOREAU FRANCK
e9505c1109
Update V14
2021-09-08 18:23:44 +02:00
lmarcouiller
a5e670291e
Fix permission for salaries module
2021-09-08 15:36:51 +02:00
Laurent Destailleur
0b68da4e9e
Debug organizedeventregistration module
2021-09-08 02:27:52 +02:00
Laurent Destailleur
b92784c04b
Fix autoselect of thirdparty
2021-09-07 23:38:33 +02:00
Laurent Destailleur
3cc888f4df
Debug event module
2021-09-07 23:19:36 +02:00
Laurent Destailleur
3df005778c
Debug event module
2021-09-07 19:48:32 +02:00
Laurent Destailleur
32a09e9494
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/admin.lang
htdocs/salaries/paiement_salary.php
2021-09-07 17:47:00 +02:00
Laurent Destailleur
4e0ae972f1
Fix css
2021-09-07 17:26:31 +02:00
Gauthier PC portable 024
938092d67c
NEW : when we delete several objects with massaction, if somes object has child we must see which objects are concerned and nevertheless delete objects which can be deleted
2021-09-07 16:46:48 +02:00
ksar
e26e6288c2
FIX #18591 : Remove double quotes of SQL Queries
...
FIX #18591 : Remove double quotes of SQL Queries for postgresql compatibility
2021-09-07 15:22:02 +02:00
Adrien Raze
5f58eefc79
Merge branch '14.0' of https://github.com/Dolibarr/dolibarr into FIX_add_token
2021-09-07 14:48:23 +02:00
Adrien Raze
948d2bc4e9
FIX : Add token when remove the last widget on home page
2021-09-07 14:43:37 +02:00
Laurent Destailleur
586e5c8b5b
Can set sort order in the ->fields description array for foreign key
2021-09-07 14:10:26 +02:00
Laurent Destailleur
51a751f088
Fix option MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT
2021-09-06 19:00:01 +02:00
Regis Houssin
7d8023fea7
FIX wrong table_element_line
2021-09-06 16:21:30 +02:00
Gauthier PC portable 024
d121544810
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers
2021-09-06 16:08:39 +02:00
fr69400
5c9100986d
Update row.php
...
right write doesn't exist for supplier_proposal
->line order dont works
2021-09-06 15:19:35 +02:00
stickler-ci
1043bc964d
Fixing style errors.
2021-09-06 12:58:06 +00:00
Gauthier PC portable 024
be1c08ddfe
FIX : salary extrafields don't work and table is not well named
2021-09-06 12:30:39 +02:00
jpb
06b9f90383
merge conflict
2021-09-06 09:52:28 +02:00
jpb
65a2486f94
merge conflict
2021-09-06 09:43:52 +02:00
Laurent Destailleur
2d6b9a2a0a
CSS
2021-09-06 03:26:27 +02:00
Laurent Destailleur
8e90a374e0
Responsive
2021-09-06 01:47:18 +02:00
Laurent Destailleur
f288f36b71
NEW Can use textarea field into confirm popup.
...
Reponsive
2021-09-06 01:42:54 +02:00
Laurent Destailleur
ed3919da13
Look and feel
2021-09-05 02:25:32 +02:00
Laurent Destailleur
2928c3dc9b
NEW Add a PDF document template for Manufacturing Orders
2021-09-05 02:18:53 +02:00
Laurent Destailleur
d0bbd33bb2
Merge pull request #18602 from mschamp/develop
...
Manufacturing order pdf template
2021-09-05 02:03:09 +02:00
Laurent Destailleur
138af805b3
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-09-04 14:11:38 +02:00
Laurent Destailleur
4e7549ab7d
css
2021-09-04 13:53:31 +02:00
stickler-ci
35f3742d08
Fixing style errors.
2021-09-04 11:05:50 +00:00
mschamp
db6a2844ad
Add files via upload
2021-09-04 12:36:54 +02:00
Laurent Destailleur
ee066ad725
Cast sql var
2021-09-03 21:25:43 +02:00
Laurent Destailleur
a7d9889c40
Merge pull request #18592 from fr69400/develop
...
FIX : delete image from card.php page dont remove the thumbs
2021-09-03 15:12:04 +02:00
fr69400
a89a6b6343
bug image delete
...
Remove linked image from card.php (section builddoc) dont remove the thumbs of image file
2021-09-03 14:18:44 +02:00
Laurent Destailleur
e965d6d6f2
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/pdf.php
htdocs/api/class/api_access.class.php
2021-09-03 11:02:21 +02:00
Laurent Destailleur
dc81f1de68
Fix var_dump
2021-09-03 11:00:14 +02:00
Laurent Destailleur
35e5480f2f
Fix var init
2021-09-03 10:58:43 +02:00
Laurent Destailleur
77e9f15360
Work on #18448
2021-09-02 22:52:17 +02:00
Laurent Destailleur
dd6647e6cb
Fix label import fields
2021-09-02 21:03:49 +02:00
Laurent Destailleur
8ea1a9602b
NEW Add import / export of MO and BOMLines - Close #18499
2021-09-02 21:00:31 +02:00
Laurent Destailleur
67db0f1bdb
Add link "Now" on date selection when cloning social contribution
2021-09-02 19:15:21 +02:00
Laurent Destailleur
51b1cd583b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2021-09-02 18:48:20 +02:00
Laurent Destailleur
7017a98071
Merge pull request #18446 from henrynopo/patch-6
...
Added function - using list of location_incoterms
2021-09-02 18:47:15 +02:00
Laurent Destailleur
147583d58b
Remove useless parameters
2021-09-02 17:25:11 +02:00
Laurent Destailleur
fd2bfc82f2
Fix #18581 Fix #18582
2021-09-02 17:20:14 +02:00
Laurent Destailleur
b04ea59a51
More sql sanitizing
2021-09-02 13:58:42 +02:00
Laurent Destailleur
cac1a7ba5f
Fix sql request when using encrypt
2021-09-02 13:45:44 +02:00
Laurent Destailleur
e22bd5c048
Fix better format address for jp in romaji
2021-09-02 10:39:56 +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
Laurent Destailleur
076bfd82a3
FIX option "Default value for field 'Refuse bulk emailings'"
2021-09-01 22:38:47 +02:00
Laurent Destailleur
c762840dec
FIX option "Default value for field 'Refuse bulk emailings'"
2021-09-01 22:37:15 +02:00
Laurent Destailleur
7c7e89cc3b
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
2021-09-01 18:41:44 +02:00
Laurent Destailleur
4810db3dbf
Merge pull request #18498 from GurvanKervern/undefVars2
...
Undef vars2
2021-09-01 18:36:26 +02:00
Laurent Destailleur
c4acfe5fc0
Merge pull request #18577 from Givriz/dev_2
...
Compatibility phpv8
2021-09-01 18:06:06 +02:00
Laurent Destailleur
82d878dd7a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
2021-09-01 17:59:07 +02:00
Laurent Destailleur
79a25248cd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
2021-09-01 17:55:32 +02:00
Laurent Destailleur
74f3b98ea9
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
2021-09-01 17:54:21 +02:00
Laurent Destailleur
38c0e93285
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
htdocs/core/class/commonobjectline.class.php
htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
htdocs/public/project/index.php
2021-09-01 17:52:04 +02:00
stickler-ci
1457afb9b9
Fixing style errors.
2021-09-01 15:35:23 +00:00
Laurent Destailleur
60e4e23870
Update object_discounts.tpl.php
2021-09-01 17:33:18 +02:00
Laurent Destailleur
65c92f176c
Merge pull request #18553 from Hystepik/develop#1
...
Fix : KnowledgeManagement menu permission
2021-09-01 16:43:01 +02:00
Givriz
688d217bed
Compatibility phpv8
2021-09-01 16:39:28 +02:00
Laurent Destailleur
ef2bb99476
Update commonobject.class.php
2021-09-01 16:29:08 +02:00
Laurent Destailleur
b66bd781a4
Clean code
2021-09-01 16:26:59 +02:00
Laurent Destailleur
1027f1059e
Merge pull request #18574 from FHenry/14_eventorg
...
fix: disabled module Event Org when project disabled
2021-09-01 16:17:55 +02:00
Laurent Destailleur
14ca7db5d7
Typo in log
2021-09-01 16:17:31 +02:00
Vincent Dieltiens
59e917cd5f
regroup BILL_SUPPLIER_VALIDATE actions
...
Conflicts:
htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
2021-09-01 16:14:44 +02:00
Vincent Dieltiens
65ccbb6249
Regroup BILL_SUPPLIER_VALIDATE triggers under the same condition
2021-09-01 16:06:36 +02:00
Laurent Destailleur
46a38506a5
Merge pull request #18562 from vincentjdc/bill-supplier-validate
...
Bill supplier validate
2021-09-01 16:04:50 +02:00
Florian HENRY
bb6dda087c
Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14_eventorg
2021-09-01 15:23:04 +02:00
Florian HENRY
bae73b9a52
disabled module on inactive
2021-09-01 15:16:11 +02:00
Laurent Destailleur
375557e092
FIX Menu List of project was not visible.
2021-09-01 15:10:02 +02:00
Alexandre SPANGARO
dbe6861f79
Merge remote-tracking branch 'upstream/develop' into 15a8
2021-09-01 14:09:02 +02:00
Laurent Destailleur
9da82af74f
Merge pull request #18566 from Dolibarr/scrutinizer-patch-2
...
Scrutinizer Auto-Fixes
2021-09-01 13:36:20 +02:00
Laurent Destailleur
19f0db23df
Fix scrutinizer bugs
2021-08-31 20:31:05 +02:00
Scrutinizer Auto-Fixer
312ca95feb
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2021-08-31 18:18:28 +00:00
