lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
110,430 Commits 43 Branches 150 Tags 886 MiB
6a8882b60d
Commit Graph

110430 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yoan Mollard
6a8882b60d Bugfix: regression, keep newamount equal to amount for the payment 
Follows 759900bcce
 2022-06-30 00:39:13 +02:00
stickler-ci
f4c7c03dc1 Fixing style errors. 2022-06-29 14:38:43 +00:00
Yoan Mollard
3dcf7db198 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into membership-rework 2022-06-29 16:12:05 +02:00
Laurent Destailleur
09449ece26 css 2022-06-29 15:51:39 +02:00
Laurent Destailleur
0299f18cec Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-06-29 15:38:27 +02:00
Laurent Destailleur
770a160b8b Debug v16 2022-06-29 14:31:21 +02:00
Laurent Destailleur
6fb1e126c5
Merge pull request #21245 from Quatadah/dolicloud-qnasdami-scrutinizer-003 
BUG FIX : Changing type of the parameter
 2022-06-29 10:30:49 +02:00
Laurent Destailleur
a681ae7283 css 2022-06-29 10:23:31 +02:00
Laurent Destailleur
64c661b7f8 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2022-06-29 10:10:15 +02:00
Yoan Mollard
f4d5962254 Allow to skip membership table for retrocompatibility 2022-06-29 03:27:48 +02:00
Yoan Mollard
e7058c253e NEW: Table of membership types 2022-06-29 03:25:33 +02:00
Yoan Mollard
f8af181cee Label clarification following the new per-type setting "CanEditAmount" 2022-06-29 00:28:33 +02:00
Yoan Mollard
759900bcce No longer allow to edit amount in the payment step 
If amount is editable, edition has been done in the previous screen in
public/members/new.php
It also allows the possibility to prevent the visitor from doing a >0
payment if this is not wanted.
 2022-06-29 00:27:18 +02:00
Yoan Mollard
ea0c710104 dopayment string fix 2022-06-29 00:23:27 +02:00
Laurent Destailleur
67ade177c7 Fix error message 2022-06-28 20:11:18 +02:00
Laurent Destailleur
b0e0ceb8f6 Fix phpunit 2022-06-28 14:59:15 +02:00
Laurent Destailleur
485c85a2a3 Fix SEPA 2022-06-28 14:49:03 +02:00
Laurent Destailleur
d2a9826795 Fix phpcs 2022-06-28 13:17:59 +02:00
Laurent Destailleur
d23426847e css 2022-06-28 13:14:36 +02:00
Laurent Destailleur
4c4e081997 Debug v16 2022-06-28 13:09:53 +02:00
Laurent Destailleur
941245c5e2 Debug v16 2022-06-28 12:26:49 +02:00
Laurent Destailleur
b8e5f3c4f2 Look and feel v16 2022-06-28 11:33:19 +02:00
Laurent Destailleur
0091c31b99 Debug v16 2022-06-28 11:07:06 +02:00
Yoan Mollard
5998999f18 NEW: Add free membership amounts at the membership type level 2022-06-28 02:33:17 +02:00
Yoan Mollard
0fca79529a Missing lib import 2022-06-28 01:51:14 +02:00
Laurent Destailleur
763c9f7441 Responsive 2022-06-28 00:27:49 +02:00
Laurent Destailleur
dd6b2a4685 Fix tooltip 2022-06-28 00:11:59 +02:00
Laurent Destailleur
f2a9db5fe3 Typo 2022-06-27 22:45:09 +02:00
Laurent Destailleur
0e0c9888a2 Typo 2022-06-27 22:43:29 +02:00
Laurent Destailleur
748c714b1b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-06-27 22:36:31 +02:00
Laurent Destailleur
34464ac92b Maxi debug of OAuth module. Solve tons of problems. 2022-06-27 22:35:58 +02:00
Laurent Destailleur
79ca774de3
Merge pull request #21393 from Dolibarr/dependabot/github_actions/actions/checkout-3 
Bump actions/checkout from 2 to 3
 2022-06-27 17:32:55 +02:00
Laurent Destailleur
35187e2e2f
Merge pull request #21291 from Quatadah/dolicloud-qnasdami-scrutinizer-015 
BUG FIX : Temporary transformation (from string to array) so it can be traversable
 2022-06-27 12:24:40 +02:00
Laurent Destailleur
252215402f
Merge pull request #21260 from Quatadah/dolicloud-qnasdami-scrutinizer-009 
BUG FIX : changing function name to existing one (2)
 2022-06-27 12:23:53 +02:00
Laurent Destailleur
7c4a6a6624
Merge pull request #21389 from bb2a/FIX---php-V8-expedition-card 
FIX - php V8 expedition card
 2022-06-27 12:23:08 +02:00
Laurent Destailleur
cf34d07d5d
Update card.php 2022-06-27 12:22:46 +02:00
Laurent Destailleur
0d25e3d236
Merge pull request #21392 from bb2a/FIX---php-V8-order-liste 
FIX - php V8 order liste
 2022-06-27 12:20:31 +02:00
Laurent Destailleur
3eec5f0e69 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-06-27 12:16:17 +02:00
Laurent Destailleur
11e11c99b8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-06-27 12:12:07 +02:00
Laurent Destailleur
bbd2f05e3a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/card.php
 2022-06-27 12:11:40 +02:00
Laurent Destailleur
6e5cbd9f08 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-06-27 12:09:42 +02:00
Laurent Destailleur
b29393c6c6 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-06-27 12:09:19 +02:00
Laurent Destailleur
3a664521c7 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-06-27 12:08:53 +02:00
Laurent Destailleur
bcfb4c8ba3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-06-27 12:08:46 +02:00
Laurent Destailleur
69cbe48a75 doc 2022-06-27 12:07:34 +02:00
Laurent Destailleur
fb1a548a1e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-06-27 12:05:44 +02:00
dependabot[bot]
9464fe0abc
Bump actions/checkout from 2 to 3 
Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-27 09:52:41 +00:00
Laurent Destailleur
9372b69eb4 clean code 2022-06-27 11:52:33 +02:00
Laurent Destailleur
bc81f372ac
Merge pull request #21362 from bb2a/FIX---Cancel-order 
FIX - Right close order
 2022-06-27 11:46:55 +02:00
Laurent Destailleur
bec187b9b4
Merge pull request #21370 from atm-lena/develop_FIX_TransferCorrectionStock_Extrafields 
FIX : don't display product's extrafields for transer / correction stock
 2022-06-27 11:45:31 +02:00