Laurent Destailleur
|
a143635f53
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
|
2021-02-08 17:20:17 +01:00 |
|
Laurent Destailleur
|
c0aa7e7db5
|
Merge pull request #16020 from atm-gauthier/NEW/add_real_payments_on_vat_objects
NEW VAT payment request and VAT payment are 2 different steps in workflow on VAT payment recording
|
2021-02-08 17:19:40 +01:00 |
|
Florian HENRY
|
1121c3ffc1
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_fix_continue
|
2021-02-08 17:17:47 +01:00 |
|
Laurent Destailleur
|
25823d7b90
|
Merge pull request #16158 from atm-lena/FIX_12.0_SUPPLIER_OBJECTLINE_CONF_DISPLAY
Add hidden conf to display supplier in object lines
|
2021-02-08 16:58:28 +01:00 |
|
Laurent Destailleur
|
c33fb4badc
|
Merge pull request #16219 from FHenry/dev_fix_continue
Add extrafileld value into return ajax
|
2021-02-08 16:57:03 +01:00 |
|
Florian HENRY
|
fd15992ddf
|
fix spelling
|
2021-02-08 16:54:51 +01:00 |
|
Adrien Jussak
|
ee1a4ee54f
|
FIX #16143
Remove the function update_modified_column_date_m is required because old triggers can throw errors during PDF generation
|
2021-02-08 16:47:46 +01:00 |
|
Florian HENRY
|
4bdff598be
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_fix_continue
|
2021-02-08 15:48:32 +01:00 |
|
Florian HENRY
|
cb152b22df
|
fix ajax
|
2021-02-08 15:47:37 +01:00 |
|
Laurent Destailleur
|
b59f0071ea
|
Merge pull request #16164 from FHenry/dev_typent_jax_workcorrectly
NEW : Normalyse Type company field with ajax combobox
|
2021-02-08 15:35:42 +01:00 |
|
Laurent Destailleur
|
ea7a0f86f7
|
Update 13.0.0-14.0.0.sql
|
2021-02-08 15:34:55 +01:00 |
|
Laurent Destailleur
|
8041ef641a
|
Merge branch 'develop' into dev_typent_jax_workcorrectly
|
2021-02-08 15:29:36 +01:00 |
|
Laurent Destailleur
|
2440c11eec
|
Merge pull request #16214 from FHenry/dev_fix_continue
Various fix in dev branch
|
2021-02-08 15:11:32 +01:00 |
|
Laurent Destailleur
|
fe9d23e90b
|
Update functions.lib.php
|
2021-02-08 15:10:14 +01:00 |
|
Frédéric FRANCE
|
e15e8bcd05
|
Update functions.lib.php
|
2021-02-08 15:10:07 +01:00 |
|
Laurent Destailleur
|
7526bef3f8
|
Merge pull request #16211 from frederic34/patch-2
Update functions.lib.php
|
2021-02-08 15:08:46 +01:00 |
|
Laurent Destailleur
|
d0bbf5bf35
|
Update functions.lib.php
|
2021-02-08 15:08:24 +01:00 |
|
Laurent Destailleur
|
5c64173bfa
|
Merge pull request #16209 from frederic34/barcodepicto
add barcode picto in left menu
|
2021-02-08 15:04:56 +01:00 |
|
Laurent Destailleur
|
026e454825
|
Merge pull request #16208 from frederic34/ecmpicto
add ecm picto in left menu
|
2021-02-08 15:04:42 +01:00 |
|
Laurent Destailleur
|
ff9070ff9c
|
Merge pull request #16206 from atm-maxime/fix_supp_inv_backtolistlink
Fix links to go back on supplier invoice list
|
2021-02-08 15:04:23 +01:00 |
|
lmarcouiller
|
a140625a8a
|
Fix search by statut in list of holiday module
|
2021-02-08 15:03:58 +01:00 |
|
Laurent Destailleur
|
7acbaad8cf
|
Merge pull request #16212 from Hystepik/develop#3
Fix search by statut in list of holiday module
|
2021-02-08 15:03:31 +01:00 |
|
Laurent Destailleur
|
b04c342939
|
FIX #16215
|
2021-02-08 15:00:57 +01:00 |
|
Florian HENRY
|
c0c6047538
|
fix ajax product missing condigtion
|
2021-02-08 11:54:29 +01:00 |
|
Florian HENRY
|
1e8117dc8a
|
fix js
|
2021-02-08 11:49:30 +01:00 |
|
Florian HENRY
|
31ca17c619
|
fix require once
|
2021-02-08 11:06:21 +01:00 |
|
Gauthier PC portable 024
|
41af1a59f4
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
|
2021-02-08 10:37:01 +01:00 |
|
Gauthier PC portable 024
|
4aab970e87
|
FIX : sql migration
|
2021-02-08 10:36:10 +01:00 |
|
lmarcouiller
|
13b83e3150
|
Fix search by statut in list of holiday module
|
2021-02-08 09:47:43 +01:00 |
|
Gauthier PC portable 024
|
e2a73e6c88
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_vat_objects
|
2021-02-08 09:46:48 +01:00 |
|
Alexandre SPANGARO
|
b8ea96ba57
|
Fix module asset in development
|
2021-02-08 05:39:07 +01:00 |
|
Frédéric FRANCE
|
c83ccb1e0f
|
Update functions.lib.php
|
2021-02-08 00:46:46 +01:00 |
|
Frédéric FRANCE
|
f47584ed32
|
Update api_setup.class.php
|
2021-02-07 22:49:25 +01:00 |
|
Frédéric FRANCE
|
e1a22b7209
|
add blockedlog picto in left menu
|
2021-02-07 22:18:34 +01:00 |
|
Laurent Destailleur
|
9f9ace0565
|
FIX Localtax must be converted with price2num
|
2021-02-07 22:15:21 +01:00 |
|
Frédéric FRANCE
|
3c8ddf917f
|
add barcode picto in left menu
|
2021-02-07 22:15:20 +01:00 |
|
Frédéric FRANCE
|
b43dfe1139
|
add ecm picto in left menu
|
2021-02-07 22:04:46 +01:00 |
|
Laurent Destailleur
|
fc30b91960
|
Fix warning
|
2021-02-07 21:56:57 +01:00 |
|
Laurent Destailleur
|
8f4bd10a8d
|
Merge pull request #16190 from FHenry/13_fix_checkdeposit_pdf_folder
FIX: #16189, fix download/see check deposit PDF
|
2021-02-07 21:34:18 +01:00 |
|
Laurent Destailleur
|
e474ee4d16
|
Fix add missing field
|
2021-02-07 21:30:46 +01:00 |
|
Laurent Destailleur
|
1f32d4a815
|
Avoid warning
|
2021-02-07 21:21:21 +01:00 |
|
Laurent Destailleur
|
dbabd12745
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-02-07 20:16:56 +01:00 |
|
Laurent Destailleur
|
8bda726619
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/company.lib.php
htdocs/societe/notify/card.php
|
2021-02-07 20:16:13 +01:00 |
|
Laurent Destailleur
|
21d3519d42
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
|
2021-02-07 20:13:38 +01:00 |
|
Laurent Destailleur
|
899ae37f42
|
Merge pull request #16197 from CaringDev/noAutocompleteCaptcha
prevent browsers from storing / suggesting old captchas
|
2021-02-07 20:04:32 +01:00 |
|
Laurent Destailleur
|
92e67b2c54
|
Merge pull request #16195 from frederic34/morepictomodule
add more picto for module
|
2021-02-07 20:01:36 +01:00 |
|
Laurent Destailleur
|
92d40d065a
|
Merge pull request #16207 from frederic34/patch-4
fix html
|
2021-02-07 20:01:03 +01:00 |
|
Laurent Destailleur
|
ec394a93f6
|
Merge pull request #16191 from grandoc/develop
fix typo
|
2021-02-07 19:59:54 +01:00 |
|
Laurent Destailleur
|
14241148f4
|
Merge pull request #16193 from frederic34/phpmin
update phpmin version
|
2021-02-07 19:59:35 +01:00 |
|
Laurent Destailleur
|
cb94216098
|
Merge pull request #16205 from atm-maxime/fix_supp_inv_list_leftjoin
Fix #15940 mixing different joins
|
2021-02-07 19:58:33 +01:00 |
|