Commit Graph

94562 Commits

Author SHA1 Message Date
Laurent Destailleur
d33de3ebc1
Merge pull request #16234 from davidNDU/clone/develop
Module builder: Don't delete hidden .tx-folder
2021-02-09 13:21:55 +01:00
David Bensel
a0bbe210a3 Module builder: Don't delete hidden .tx-folder 2021-02-09 14:45:06 +03:00
Laurent Destailleur
c9f34cc0d4 Prepare button to the bank conciliation pages 2021-02-08 22:42:21 +01:00
Laurent Destailleur
401b4f641d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/commande/card.php
2021-02-08 22:13:50 +01:00
Laurent Destailleur
9453caa5be Avoid message when not required 2021-02-08 22:12:12 +01:00
Laurent Destailleur
5966e63120 Fix css 2021-02-08 20:01:10 +01:00
Laurent Destailleur
af4d3767ea css 2021-02-08 19:56:38 +01:00
Laurent Destailleur
d41edfc812 Fix responsive. Clean code 2021-02-08 19:52:29 +01:00
Laurent Destailleur
8f7c35a221 Enhance autofill of amount to pay for VAT 2021-02-08 19:35:04 +01:00
Laurent Destailleur
6df6286688 Fix IMAP_FORCE_NORSH and option for imap without ssl 2021-02-08 19:21:32 +01:00
Laurent Destailleur
925d81d1b3
Merge pull request #16002 from Hystepik/develop#1
New update of funnel of prospection
2021-02-08 18:05:48 +01:00
Laurent Destailleur
6e6b5973b8 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-02-08 17:35:44 +01:00
Laurent Destailleur
8b3c872f2a Fix warning 2021-02-08 17:35:21 +01:00
Laurent Destailleur
3b1143df91
Merge pull request #16223 from ATM-Consulting/fix/12.0_order_addline_remove_warning
FIX: warning when adding a line if $remise_percent is an empty string
2021-02-08 17:34:29 +01:00
Laurent Destailleur
d073e809e7 FIX removed no more used proc update_modified_column_date_m on pgsql 2021-02-08 17:32:36 +01:00
Laurent Destailleur
9a9686ed6c
Merge pull request #16222 from WascarDev/13.0
FIX #16143
2021-02-08 17:31:27 +01:00
Laurent Destailleur
6892ad9630 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/admin/dict.php
2021-02-08 17:25:05 +01:00
Florian Mortgat
ff3707b650 FIX: warning when adding a line if $remise_percent is an empty string 2021-02-08 17:24:40 +01:00
Laurent Destailleur
78052e3239 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-02-08 17:20:24 +01:00
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
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
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
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
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
Frédéric FRANCE
c83ccb1e0f
Update functions.lib.php 2021-02-08 00:46:46 +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