Merge 19.1 in 21.1 - #135
Closed
francoisPE wants to merge 113 commits into
Closed
Conversation
NEW Progress report in situation invoice card.php
Make changes to enable selection on new invocie of the order to merge The order to merge is then inserted wrapped in a Subtotal
* NEW import_lines_from_object for invocies now is wrapped in subtitles * NEW new invoice suggest to merge new project orders Make changes to enable selection on new invocie of the order to merge The order to merge is then inserted wrapped in a Subtotal --------- Co-authored-by: Amael-PE <amael@amael.io>
…php (#7) * FIX Fix precommit CI errors * FIX Error in next_invoices avancement * NEW Change the method to compute global progress of an invoice This allows to be closer to the practice in industry * NEW Feat to display total amount of contrat/invoices serie in progress table
* FIX Complete wath was started in Dolibarr#17243 for pdf_cannelle * FIX Continue for eagle_proforma
* NEW Custom model for commercial proposal Based on cyan model, with no ref client * NEW Custom Situation Invoice model update V1 available. Still missing prorata feature, which will depend on another branch. Total progress to change also * REFACT Refactoring for better maintenance capability (factoring in functions) * FIX Model custom for situation invoices All is find, except pro rata: feature to be added * Fix Typo
…#10) * NEW Template for supplier order without prices * FIX Remove TVA column in supplier orders without prices * FIX Template sansprix fix padding in pagehead for styling * NEW Supplier order template for ProductWithdrawal * Fix Some small styling updates. New field info shown SentBy * NEW Template supplier order custom with prices
* FIX : removes traces of <<<HEAD conflicts following the postponement of branch 13 modifications (Dolibarr#32014) Co-authored-by: John Fleuret <john.fleuret@atgp.net> * fix CI * Test pr action * Avoid error * Exclude test files * fix * fix join societe_commerciaux in societe list * fix: remove list mass action update price wihen price mode is not uniq price * fix: remove list mass action update price wihen price mode is not uniq price * Fix : cron job user rights force reload * FIX Bad calculation of the theoretical stock. Did not take into account the inc/dec stock option. * FIX select 2 no record found * FIX Complete wath was started in Dolibarr#17243 for pdf_cannelle * FIX Continue for eagle_proforma * Fix pb in output of label of email --------- Co-authored-by: alkaan <prog@alkaan.com> Co-authored-by: John Fleuret <john.fleuret@atgp.net> Co-authored-by: Frédéric France <frederic.france@free.fr> Co-authored-by: Laurent Destailleur <eldy@destailleur.fr> Co-authored-by: uvaldenaire-opendsi <uvaldenaire@easya.solutions> Co-authored-by: Florian HENRY <florian.henry@open-concept.pro> Co-authored-by: Maxime Kohlhaas <maxime@atm-consulting.fr> Co-authored-by: GregM <gregory.maza@atm-consulting.fr> Co-authored-by: Amael-PE <amael@amael.io>
fix a issue unableing pdf model detection on specimen generation
Reduce padding in 1st page tableau
Round rest to pay
* FIX Display for grid and remove line reference * FIX Some typos * FIX Remove "Reste to invoice on contract"
* NEW Introduce prorata_discount and prorata_rate as new Facture object attributes Building on an existing db field, introduce in Facture class a property prorata_discount (amount in currency) and prorata_rate (virtual property). It also alter total_ht with a hook to update discount based on rate. Prorata, as the name suggest, is a discount whose % is fixed and amount varies with total excl. taxes * NEW Backport to PHP < 8.4 * FIX Fix typo in new functions to remove warnings * FIX Typo in code raising warnings * NEW Introduce prorata in create and view actions for facture.card * FIX Facture.Class fixe setProrataFromRate * FIX Typo in sql update * FIX Remove print * NEW Update feat on facture/card ready to use * NEX Add hook on update and fecth for prorata_rate * NEW Hook for prorata discount management on update_price * NEW Introduce prorata discount in Facture card and accountancy Introduce Prorata rate: + Global variable for Account in accountancy + Write and see in journal + See and modify rate in card + Add in total table in pdf + Langs and trads + Hooks in common object for price claculation (properly manage add_lines and delete_lines) * NEW Add feat to change both rate AND discount in card.php * FIX/FEAT Model pdf commande fournisseur display author and author mobile phone number * FIX Pdf models for Facture (#13) * FIX Display for grid and remove line reference * FIX Some typos * FIX Remove "Reste to invoice on contract" * FIX Langs and roundings & refresh in facture Card related to prorata * FIX Slight display adjustment on Facture pdf models
Bug was due to updatePrice in CommonObject which do not have prorata_discount
* FIX Remove line with ref to cleint order & other linked objects in the pagehead * FEAT PDF for Facture now suppor tFree Text from SUbtotal module
* FEAT Facture pdf custom can now accesp special endlines with special_code 10050172 and put them a the bottom Still need to improve "Total Marché" in pdf and card (+ maybe global progress) * FEAT/FIX Properly manage progress and completed amount with regard to special lines * FEAT Improvement of TableauBTP in custom Facture pdf to support special lines * NEW Facture PDF now support special lines properly in first page
…from mandatory to warning
Fix Co-Traitant FactureFournisseur links, and CustomerOrder collectiosn, using links and not project anymore.
Fetch of Commande/FactureFournisseur is now ok on base logic and filtering/identification. Need to improve a bit the calculation of all cells, and manage complexe case in late situation invoices with long cycles.
…re/card.php Now, properly show the supplier invoice and link to it, instead of the customer invoice.
…from mandatory to warning
Fix Co-Traitant FactureFournisseur links, and CustomerOrder collectiosn, using links and not project anymore.
Fetch of Commande/FactureFournisseur is now ok on base logic and filtering/identification. Need to improve a bit the calculation of all cells, and manage complexe case in late situation invoices with long cycles.
…urés We still miss calculation for remaining amount to pay
Signed-off-by: Amael <41053833+Amael-PE@users.noreply.github.com>
…lay_issues Fix feat for pdf display of Tableau Co-Sous-Traitants
…ect invoice linked
Merging 19.0 for security updates
* Feat(Table CoSousTraitant): Add special support for PROV invocies * Feat(NodeView): First NodeView, with basic features Lack nodes which are not related to invoicing cycles * Fi(Facture/Card): Issue on bad $resteapayer with compensated debt * fix(project/element.php): Fix $db call error * v1 inalized. Refacto would be great * Fix(push): Solve problem with compensated amount on Facture/Card.php
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Push 19.1 in 21.1