lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
111,702 Commits 43 Branches 150 Tags 886 MiB
533e4f2424
Commit Graph

111702 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
533e4f2424 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/fr_FR/accountancy.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cashdesk.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/fr_FR/members.lang
	htdocs/langs/fr_FR/products.lang
 2022-08-12 16:03:09 +02:00
Laurent Destailleur
5fa110ce74 Fix trans 2022-08-12 15:58:29 +02:00
Laurent Destailleur
85fb7c1d5a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-08-12 15:56:15 +02:00
Laurent Destailleur
059d0073ff FIX Maxi debug v16 2022-08-12 15:54:50 +02:00
Laurent Destailleur
75fa3cf643 Debug v16 2022-08-12 15:45:27 +02:00
Laurent Destailleur
0d68c0ba14 Debug v16 2022-08-12 15:07:15 +02:00
Laurent Destailleur
3c65841e19 Debug v16 2022-08-12 14:41:44 +02:00
Laurent Destailleur
d01d04f704 FIX .jpeg extension was no more supported by dol_imageResizeOrCrop() 2022-08-12 14:31:58 +02:00
Laurent Destailleur
79a5a2b3ab Transifex sync 2022-08-12 14:02:18 +02:00
Laurent Destailleur
3f8b67e619 Doc 2022-08-12 12:56:03 +02:00
Laurent Destailleur
0b3f781618 Complete ignore file 2022-08-12 12:49:53 +02:00
Laurent Destailleur
6ed053e0d0 Clean v16 2022-08-12 12:48:49 +02:00
Laurent Destailleur
98b5247b27 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-08-12 12:20:23 +02:00
Laurent Destailleur
2d8b544ace Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
 2022-08-12 12:19:20 +02:00
Laurent Destailleur
110f7a4736 Debug v16 2022-08-12 12:17:49 +02:00
Laurent Destailleur
bdd9c16401 Fix trans 2022-08-12 12:17:21 +02:00
Laurent Destailleur
01484757aa Debug v16 2022-08-12 11:31:40 +02:00
Laurent Destailleur
15c0d1e3f0 doc 2022-08-12 00:38:10 +02:00
Laurent Destailleur
239008b67d
Merge pull request #21574 from ymollard/create3rdpartyV14 
FIX: Create a 3rd party from the self-subscription membership form
 2022-08-12 00:16:54 +02:00
Laurent Destailleur
8f81e20bf6
Merge pull request #21712 from defrance/patch-223 
NEW  if we select another view list mode, we keep it
 2022-08-12 00:14:16 +02:00
Laurent Destailleur
8557257a37
Merge pull request #21720 from altairisfr/takepospay 
NEW : TakePOS - add hook to complete payment
 2022-08-12 00:12:33 +02:00
Laurent Destailleur
e190ab9864
Merge pull request #21719 from altairisfr/takeposmargin 
NEW : add margin infos to takepos invoice lines
 2022-08-12 00:11:53 +02:00
Laurent Destailleur
26b28419fb
Merge pull request #21714 from frederic34/outh2forswiftmailer 
token was not refreshing
 2022-08-12 00:05:58 +02:00
Laurent Destailleur
1dd4288189
Merge pull request #21713 from grandoc/new_branch_11_08_2022 
update code for PHP8 compliance
 2022-08-12 00:00:52 +02:00
Laurent Destailleur
c7aa3b81f2
Merge pull request #21721 from frederic34/patch-4 
doc
 2022-08-12 00:00:22 +02:00
Laurent Destailleur
9bc6c41ca7 Clean code: No more fetch to clone 2022-08-11 23:59:25 +02:00
Laurent Destailleur
0f3ed254fd Add version and date of website template generation in the sql. 2022-08-11 23:36:13 +02:00
Laurent Destailleur
c3d5d99044 Fix lang 2022-08-11 23:28:13 +02:00
Laurent Destailleur
2d29568231
Merge pull request #21584 from Quatadah/template1 
NEW: Adding template 01
 2022-08-11 23:24:33 +02:00
Laurent Destailleur
daf3b928c7 Debug v16 2022-08-11 22:31:01 +02:00
Laurent Destailleur
b36838f103 Prepare v16 2022-08-11 22:11:33 +02:00
Laurent Destailleur
a6c6f2d50b Fix avoid error message when pressing enter into bank reconciliation 2022-08-11 20:49:18 +02:00
Laurent Destailleur
8c903bf935 Clean deprecated code. Fix go back to mode1 in supplier invoice 2022-08-11 20:23:44 +02:00
Laurent Destailleur
c44f75f818 css 2022-08-11 17:12:10 +02:00
Laurent Destailleur
24b0ae85ca Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-11 16:55:47 +02:00
Laurent Destailleur
d29f7ae8d2 Responsive 2022-08-11 16:55:30 +02:00
Frédéric FRANCE
95878e13a7
doc 2022-08-11 16:51:41 +02:00
Christophe Battarel
1faa9d8231 add hook to complete payment 2022-08-11 16:29:55 +02:00
Christophe Battarel
c14d7a93f9 NEW : add margin infos to takepos invoice lines 2022-08-11 16:01:29 +02:00
Laurent Destailleur
983a530251 Log 2022-08-11 14:36:50 +02:00
Frédéric FRANCE
d7bccaa70c token was not refreshing 2022-08-11 10:53:15 +02:00
Frédéric FRANCE
b748665296 token was not refreshing 2022-08-11 10:16:20 +02:00
Frédéric FRANCE
75fbebbcb6 token was not refreshing 2022-08-11 10:03:44 +02:00
stickler-ci
3d45d9897a Fixing style errors. 2022-08-11 07:40:32 +00:00
Philippe GRAND
c9c5204923 update code for PHP8 compliance 2022-08-11 09:39:29 +02:00
stickler-ci
a4097c9bc1 Fixing style errors. 2022-08-11 07:09:11 +00:00
This Charlène
978f1caf1a
Update admin.lib.php 2022-08-11 09:03:17 +02:00
This Charlène
2d8c629200
if we set another view list mode, we keep it 
if we set another view list mode, we keep it (till we change one more time)
 2022-08-11 09:01:55 +02:00
Yoan Mollard
8b87bfb693 Keep original value of parameter, if any 2022-08-11 02:41:46 +02:00
Laurent Destailleur
deabc0c09d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/core/lib/files.lib.php
 2022-08-11 02:15:31 +02:00