Commit Graph

92835 Commits

Author SHA1 Message Date
andreubisquerra
2b5bcda8d8
FIX Avoid move line to the same place in TakePOS 2021-12-02 23:08:22 +01:00
andreubisquerra
c23914f367
FIX load css file 2021-12-02 23:05:18 +01:00
Laurent Destailleur
ac17378972 revert 2021-12-02 20:41:13 +01:00
Laurent Destailleur
2300f17101 test 2021-12-02 20:40:41 +01:00
Laurent Destailleur
9c083071b8 Better test 2021-12-02 20:39:53 +01:00
Laurent Destailleur
39ad96c230 css 2021-12-02 17:47:03 +01:00
Laurent Destailleur
c171ba3a45 Fix regression in cron jobs 2021-12-02 16:07:33 +01:00
Laurent Destailleur
a3493d0132 Clean code 2021-12-02 11:33:51 +01:00
Laurent Destailleur
bd0208b595 css 2021-12-02 11:30:56 +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
Laurent Destailleur
3cb07fd1ec Doc 2021-12-01 15:37:31 +01:00
Laurent Destailleur
c6a071622a Avoid a useless select 2021-12-01 15:26:53 +01:00
Laurent Destailleur
f8a55362f6 Typo 2021-12-01 14:46:48 +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
d84d09556c Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-11-30 15:55:57 +01:00
Laurent Destailleur
feabb34a42 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-11-30 15:54:46 +01:00
Laurent Destailleur
5d7f8d3831 Fix fatal error 2021-11-30 15:54:28 +01:00
Laurent Destailleur
4189229b84
Merge pull request #19165 from Hystepik/develop#5
Fix: php 8.0 warning commercial part
2021-11-30 15:31:51 +01:00
Laurent Destailleur
31393802ff
Update card.php 2021-11-30 15:29:19 +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
7937a798b7
Merge pull request #18331 from marc-dll/12.0_FIX_invoice_multicurrency_discount
FIX: multicurrency: fields in discount unitialized when creating deposit
2021-11-30 14:23:37 +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
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
Laurent Destailleur
31842ddb1e
Merge pull request #19427 from mrtnnbr/develop
Fix check for non-custom modules
2021-11-30 12:28:23 +01:00
Laurent Destailleur
0b4409a087
Merge pull request #19442 from andreubisquerra/14.0
TakePOS Direct Payment (Cash) Button doesn't work
2021-11-30 12:25:21 +01:00
Laurent Destailleur
429c4406c4
Merge pull request #19441 from andreubisquerra/develop
TakePOS Direct Payment (Cash) Button doesn't work
2021-11-30 12:24:58 +01:00
Laurent Destailleur
f43fb18287
Merge pull request #19452 from bomuux/patch-3
FIX contact/note.php always restricted for external users
2021-11-30 12:21:34 +01:00
Laurent Destailleur
5e55bb20e3
Update note.php 2021-11-30 12:21:21 +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
dffc3eaefb
Merge pull request #19447 from inovea-conseil/NEW_return_url_sendpassword
New return url sendpassword
2021-11-30 12:07:17 +01:00
Laurent Destailleur
cf165835bf
Merge pull request #19462 from KlaasOl/patch-5
Update main.lang
2021-11-30 12:00:35 +01:00
Laurent Destailleur
06cda2ce35
Merge pull request #19453 from aspangaro/14p27
FIX Accountancy - SQL error on subledger account search in journal
2021-11-30 11:59:07 +01:00
Laurent Destailleur
aa677ec290
Merge pull request #19460 from frederic34/patch-4
fix undefined variable $result
2021-11-30 11:57:36 +01:00
Laurent Destailleur
f9b347c61c
Merge pull request #19481 from ksar-ksar/patch-11
FIX #19476
2021-11-30 11:56:12 +01:00
Laurent Destailleur
2b1fab2181 Clean code 2021-11-30 11:50:27 +01:00
Laurent Destailleur
db4871846e
Merge pull request #19463 from code-chicken/patch-13
Better wording
2021-11-30 11:46:51 +01:00
Laurent Destailleur
e65ab75ddf
Merge pull request #19466 from st31ny/sumup_holidays
NEW: Show sum of holidays in holiday list
2021-11-30 11:44:32 +01:00
Laurent Destailleur
5b2e48ba9e
Merge pull request #19469 from frederic34/testclass
enable societe.class.php in coding test
2021-11-30 11:42:03 +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