Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NEW: payment conditions enabling semi-automatic deposit creation (Issue #18439) #18853

Merged
merged 45 commits into from May 9, 2022

Conversation

marc-dll
Copy link
Contributor

@marc-dll marc-dll commented Sep 29, 2021

I began implementing issue #18439, considering input from the following forum discussion : https://www.dolibarr.fr/forum/t/demande-davis-sur-fonctionnalite-acompte-automatique/37824

@eldy I will update regularly until it is ready to be fully reviewed and merged. Feel free to comment if you see anything disturbing ;)

marc-dll and others added 30 commits September 29, 2021 11:10
… an origin with the corresponding payment conditions
@marc-dll
Copy link
Contributor Author

marc-dll commented Oct 5, 2021

@eldy All good for me, you can review ;)

@marc-dll
Copy link
Contributor Author

@eldy: conflicts solved ;)

@@ -397,6 +397,7 @@
$object->warehouse_id = GETPOST('warehouse_id', 'int');
$object->duree_validite = $duration;
$object->cond_reglement_id = GETPOST('cond_reglement_id');
$object->deposit_percent = GETPOST('cond_reglement_id_deposit_percent', 'int');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would use here deposit_percent = alpha so we will be able to enhance in future the field with
"30:30:20:10"
for example for deposit of 30% then invoice of 30%, then 20% , etc...

@@ -92,6 +92,7 @@ create table llx_societe
remise_supplier real DEFAULT 0, -- discount by default granted by this supplier
mode_reglement tinyint, -- payment mode customer
cond_reglement tinyint, -- payment term customer
deposit_percent real DEFAULT NULL, -- default deposit % if payment term needs it
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would use a string here. Goal is to be able in future to store here complex rules with a given string syntax.

@eldy eldy added the PR OK to merge (but suggested fix required) PR was analyzed by PR merger and seems ok to be merged as soon as a fix has been published label Oct 19, 2021
@marc-dll
Copy link
Contributor Author

@eldy : All done : conflicts solved, fields and checks changed to strings, getDictvalue() renamed to getDictionaryValue() and a couple of other bugs fixed ;)

@marc-dll
Copy link
Contributor Author

@eldy : Can you please make a feedback on this PR if still needed ?

@isamuse2
Copy link

isamuse2 commented Jan 7, 2022

Great feature, long awaited!

@eldy eldy added the PR to fix or conflict to solve PR needs to be fixed to be integrated (except for conflicts, a comment describes the fix to do) label Feb 11, 2022
@eldy
Copy link
Member

eldy commented Feb 11, 2022

@marc-dll can you fix confllicts and repush pr ?

@marc-dll
Copy link
Contributor Author

marc-dll commented Mar 8, 2022

@eldy It should be ok now

@marc-dll
Copy link
Contributor Author

@eldy : conflicts solved again, it would be really nice for this to be done once and for all ;)

@eldy eldy merged commit 5912a4a into Dolibarr:develop May 9, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
PR OK to merge (but suggested fix required) PR was analyzed by PR merger and seems ok to be merged as soon as a fix has been published PR to fix or conflict to solve PR needs to be fixed to be integrated (except for conflicts, a comment describes the fix to do)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants