2
0
forked from Wavyzz/dolibarr
Commit Graph

91098 Commits

Author SHA1 Message Date
Laurent Destailleur
901bab2ca2 Update holiday.class.php 2021-10-20 14:33:22 +02:00
Marc de Lima Lucio
7c8fb4a5fb FIX: leave request blocking when balance negative: don't check when creating, check only when updating not in draft 2021-09-30 17:48:20 +02:00
Marc de Lima Lucio
78b593c067 FIX: leave request block moved to v15 2021-09-30 17:42:59 +02:00
Marc de Lima Lucio
5f826f78a1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_NEW_block_leave_if_negative_balance 2021-09-30 17:41:38 +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
aaf170313f Clean code 2021-09-30 14:51:38 +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
827639f28d Try to solve pb of unique id 2021-09-30 14:45:22 +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
Laurent Destailleur
63218d5d5c Update product.class.php 2021-09-30 14:30:50 +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
17c89a478c Merge pull request #17819 from FHenry/dev_new_splitcalc_suggestd_code_compta
NEW : rewrite bind accountancy code finding on sales invoice
2021-09-30 14:13:20 +02:00
Laurent Destailleur
620d7109b5 Update dict.php 2021-09-30 14:04:56 +02:00
Florian HENRY
332fa77d90 fix: search code on tva dict 2021-09-30 13:49:02 +02:00
Laurent Destailleur
95e1ec87dc Merge branch 'develop' into patch-445 2021-09-30 13:40:23 +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
Norbert Penel
4e86f872ca it was impossible to update a task
after some investigation i saw those errors but they are maybe some more around here
2021-09-30 13:35:23 +02:00
Laurent Destailleur
89b24f1690 Merge pull request #18840 from homer8173/patch-23
it was impossible to update a task
2021-09-30 13:34:46 +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
8ab9524d0d Merge pull request #18849 from javieralapps4up/develop
FIX: #18848 Add Andorra (AD) in the public function useDetailedBBAN () Feature request
2021-09-30 13:30:02 +02:00
Norbert Penel
2205073f25 load_stats_reception is not loaded 2021-09-30 12:09:17 +02:00
Laurent Destailleur
04fa5ff70b css 2021-09-30 01:50:11 +02:00
Laurent Destailleur
fca39d9179 css 2021-09-30 01:15:36 +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
3d239e7528 Trans 2021-09-29 17:28:06 +02:00
Laurent Destailleur
11c48a53a5 Fix name of file 2021-09-29 17:20:59 +02:00
Laurent Destailleur
a495d5e982 Fix translation 2021-09-29 17:14:37 +02:00
Laurent Destailleur
2dd55301de Fix duplicate field and look and feel 2021-09-29 17:06:51 +02:00
Laurent Destailleur
52fb627a64 Look and feel v14 2021-09-29 16:45:48 +02:00
Laurent Destailleur
1d35d8fd2d CSS popup company 2021-09-29 16:42:52 +02:00
Laurent Destailleur
34dacca77c Css 2021-09-29 16:31:40 +02:00
Laurent Destailleur
670a80c74c Trans 2021-09-29 16:26:10 +02:00
Laurent Destailleur
a395ff5ee3 Css 2021-09-29 16:19:47 +02:00
Laurent Destailleur
0f55eea276 css 2021-09-29 14:48:50 +02:00
Laurent Destailleur
c5d683a8bc Fix link param 2021-09-29 12:46:30 +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
Laurent Destailleur
10ea7ddeef Fix link param 2021-09-29 12:31:25 +02:00
Regis Houssin
6e08ecde04 FIX indentation 2021-09-29 08:47:22 +02:00