Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
106,821 Commits 36 Branches 189 Tags
6447c1e3940407c5dc7529a6bfb96d1d44dc7f91
Commit Graph

106821 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
280be9b29f Merge pull request #20163 from SteveATM/FIX_replace_divbutaction_by_dolgetbuttonaction 
FIX: Replace User divbutaction by dolgetbuttonaction
 2022-02-28 21:25:25 +01:00
Laurent Destailleur
19389ca018 Merge pull request #20200 from ymollard/default-type4tickets 
Set default ticket type to OTHER if no default exists
 2022-02-28 21:03:59 +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
Laurent Destailleur
5a24552930 Fix doc 2022-02-28 20:03:21 +01:00
Laurent Destailleur
ca236c556a FIX Blocking situation when a payment was deleted in bank. 
FIX Missing or bad permissions
 2022-02-28 19:45:53 +01:00
Laurent Destailleur
aff7148ed8 Fix missing error management 2022-02-28 16:39:42 +01:00
Laurent Destailleur
8866d447c7 Fix error message 2022-02-28 16:01:07 +01:00
Regis Houssin
e63e53e081 FIX remove duplicated code 2022-02-28 14:10:35 +01:00
Laurent Destailleur
40d67d70d2 Fix module partnership 2022-02-28 12:37:56 +01:00
Laurent Destailleur
32f2eb8c94 Debug v15 2022-02-28 12:13:06 +01:00
Laurent Destailleur
b9649632fa Fix update 2022-02-28 11:53:29 +01:00
Laurent Destailleur
99ddef0530 NEW Add API to get a tempalte invoice 2022-02-28 10:37:03 +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
Laurent Destailleur
2ce50b6c00 CSS 2022-02-26 19:30:46 +01:00
Laurent Destailleur
5d0408f7af Fix filter on member list 2022-02-26 19:15:40 +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
adb4af7099 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-25 19:39:34 +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
Laurent Destailleur
b989c257ad Fix report on salaries 2022-02-25 18:53:21 +01:00
Yoan Mollard
4082de422f Set default ticket type to OTHER if no default exists 2022-02-25 16:27:55 +01:00
Laurent Destailleur
a6a6c588db Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-02-25 14:37:28 +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
Laurent Destailleur
def0c76ec6 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-25 14:31:37 +01:00
Laurent Destailleur
971c0fc764 Merge pull request #20147 from Hystepik/develop_safe_v14 
Fix : fix error of permission in holiday
 2022-02-25 14:30:05 +01:00
Laurent Destailleur
6dadfc9d0d Merge pull request #20149 from marc-dll/13.0_FIX_pdf_deposit_detail 
FIX: invoice pdf: lines originating from deposits were not detailed anymore
 2022-02-25 14:29:33 +01:00
Laurent Destailleur
a0baea1e6b Merge branch 'develop' into FIX_replace_divbutaction_by_dolgetbuttonaction 2022-02-25 14:20:24 +01:00
Laurent Destailleur
d2a336d0a1 Merge pull request #20152 from aspangaro/16a12 
Increase the length of the ref_supplier field
 2022-02-25 14:17:20 +01:00
Laurent Destailleur
4f054481d9 Merge branch 'develop' into 16a12 2022-02-25 14:15:08 +01:00
Laurent Destailleur
84db3437bd Add missing ' in command 2022-02-25 14:13:42 +01:00
Laurent Destailleur
eb6383ff1d Merge pull request #20165 from atm-lena/FIX_SalaryPaiement_RapportCompta 
Display Salary Paiement on compta report
 2022-02-25 14:02:32 +01:00
Laurent Destailleur
a2dea71b4d Merge pull request #20172 from Dolibarr/atm-maxime-patch-1 
Fix #20171 permissiontoadd
 2022-02-25 14:00:13 +01:00
Laurent Destailleur
b46719c26b Merge pull request #20168 from Dolibarr/snyk-fix-52e27fe6b47979b6bc328326a6d93d4c 
[Snyk] Security upgrade zapier-platform-core from 11.0.1 to 11.3.1
 2022-02-25 13:59:41 +01:00
Laurent Destailleur
7d6cbe0800 Merge pull request #20173 from thomas-Ngr/develop_new_SEPA_PmtTpInf_CdtTrfTxInf 
NEW: SEPA XML - option to place payment Type Info at Credit transfer Transaction level
 2022-02-25 13:48:32 +01:00
Laurent Destailleur
f4f75e1d0e Merge pull request #20175 from bloxera/15.0 
Fix #20141 generation of intervention
 2022-02-25 13:44:03 +01:00
Laurent Destailleur
92daeeb5c9 Merge pull request #20179 from atm-gauthier/NEW/solde_until_date 
NEW : solde() function evolution to be able to get solde until a chosen date
 2022-02-25 13:35:33 +01:00
Laurent Destailleur
3eca04e85b Merge pull request #20178 from thomas-Ngr/14.0_fix_bookmark_info_bubble 
fix bookmarks info bubble
 2022-02-25 13:34:01 +01:00
Laurent Destailleur
e5805f401a Merge pull request #20185 from SylvainLegrand/new_ficheinter_keep_extrafield_format_from_origin 
keep extrafield format from origine
 2022-02-25 13:33:12 +01:00
Laurent Destailleur
a92a21b65b Merge pull request #20184 from aspangaro/16a3 
NEW Accountancy - Add date from/to on expense report binding & uniformize
 2022-02-25 13:29:16 +01:00
Laurent Destailleur
8c6f005ea1 Merge pull request #20195 from Dolibarr/revert-20193-14.0 
Revert "NEW : accoutancy : subleger label input automatic filling when selecting subleger account in select2 list"
 2022-02-25 13:22:10 +01:00
Laurent Destailleur
28d91bfcf4 Merge pull request #20187 from SylvainLegrand/Debug_TCPDF_file_name 
Debug TCPDF file name with spaces
 2022-02-25 13:21:41 +01:00
Laurent Destailleur
be95662ece Revert "NEW : accoutancy : subleger label input automatic filling when selecting subleger account in select2 list" 2022-02-25 13:19:01 +01:00
Laurent Destailleur
1b72b27f75 Merge pull request #20193 from gdsoftdev/14.0 
NEW : accoutancy : subleger label input automatic filling when selecting subleger account in select2 list
 2022-02-25 13:18:56 +01:00
Sylvain Legrand
cb86224613 new : allow to show all logos on a table 2022-02-25 13:17:05 +01:00