Commit Graph

9579 Commits

Author SHA1 Message Date
ldestailleur
20f7898bec Fix test of minimum price 2025-05-13 10:49:36 +02:00
Delthair
1192ce5791 #33951 Non-blocking minimum sale price in the proposals (#34104)
#33951 Non-blocking minimum sale price in the proposals 
the price base type was not in the $price_base_type variable and therefore none of the checks were done so it was possible to have a price below the min price
2025-05-12 19:45:21 +02:00
Yannis Hoareau
1301cd36a1 NEW Subtotal module (#33502)
* Changes to follow mvc logic

* Reworked admin page and form to add lines

* Reworked adding line logic

* Adding options when editing subtotal lines

* Fix translations

* Fixed errors/displays and started pdf

* Color for subtotals pdf lines

* FIX display of subtotal totht

* Added pdf azur for propal

* Fix duplicate translation

* Added subtotal support for facture pdf

* Added subtotal support for commande pdf

* Improve UI/translations

* Restored old pdf

* Info to warn user for unsupported pdf

* Added title lines VAT rate and discount support

This is meant for future feature wich is block mass changing vat rate
and discount percentage

* Working on block apply vat and discount

* Added buttons for block actions

* Handle editing vat and discount for subtotal lines

* Editing vat and discount for subtotal lines bloc working

* Added possibility to move by block

* Updated adding and updating a subtotal line

* Improved vat and discount block update

* Improvement for block vat/discount and line edition

Editing a title line edits the corresponding subtotal line

* Improvement for moving by block

* Bad tile or st line placement managing

* Improved bad title or st line placement managing

* Adding subtotal line improved

Adding a subtotal line adds it right under its corresponding title

* Improved deleting subtotal line

Added possibility to choose if you want to delete the corresponding
subtotal line when deleting a title line

* Preventing too high level titles to be created

* Create and update line errors managing

* Improved bad title or st line placement managing

* Improved st line creation

* improve headers

* fix bad block placement managing

* fix adding st line not working if duplicates titles

* fix translations

* Fix block update

* FIX special chars bug

If special char like " ' " was used in title it could be converted to
special char entity.

* Prepare for pdf options

Pdf options like page break befor title should be shown as a picto if activated on a subtotal line on a document

* Added option managing

* Improved subtotal options and PDF integration

* Code refactor

* Action name/Error managment/PDF refreshing

When adding or updating a subtotal line

* Reformat

* Reworked subtotal options database managment

* Changed access to special code

* Remove unecessary call to php trait

* Changed definition of subtotals special code constant

* Reworked align on PDF

* Removed unecessary function and improved error managment

* Typo fix and removed treated todos

* Post typo changed for to better match subtotals names

* Disabled edit if status is not draft

* Changed way subtotals options are stored

* Added view managing when creating a document form an other

* Improved creating document from an other

Can check subtotals lines with table head checkbox and removed highlight
class for better UI.

* Make include of subtotals tpl more clear

* Manage centered or justified case

If user chose to center or justify, we don't change nothing

* Improved pdf

* Removed unecessary code block

* optimisation

* Code sniffer fix

* Code sniffer fix

* Code sniffer fix

* Code sniffer fix

* Code sniffer fix and added missing translation

* Fix php code sniffer

* Reload page when setup saved on subtotals admin page

* Fix php code sniffer

* pjan fix

* phan fix

* phan fix

* phan fix

* phan fix

* phan fix

* phan fix

* phan fix

* phan fix

* phan fix

* phan fix

* phan fix

* php warning fix

* php warning fix

* php phan fix

* php phan fix

* php phan fix

* Fix bug admin page not loading because of const not defined

* php phan fix

* php phan fix

* FIX subtotals admin page display

* php phan fix

* FIX php phan

* Fix bugs and langs

* Fix bug pdf align

* Replace include by require

* Add headers to avoid refreshing and adding unwanted lines

* Fix phan

* Add GETPOST check for security

* Fix phan

* Fix phan

* Fix phan

* Subtotal option when creating a document from another

* Fix phan

* Add field subtotal options for subtotal lines

* Fix phan

* Fix phan

* Fix phan

* Update to follow mvc

* Fix php phan

* Fix php phan

* Fix phpstan/phan

* Fix phpstan

* Fix phpstan

* Fix phpstan

* Fix phpstan

* Fix phpstan

* Update to switch to extraparams

* Update to switch to extraparams

* Retrieve extraparams from db to objectline

* Modified last things to switch to extraparams

* Cleaning unnecessary code lines

* Fix php-stan

* Section subtotal in extraparams to differentiate if needed for further devs

* Fix phan

* Keep extraparams when creating from another object

* Change default value to false when creating a subtotal line

* Fix clone would not keep extraparams in new object

* Fix dark subtotal line background color

Fix when a subtotal background color is too dark and edit pencil or
delete trash could not be seen

* Fix typo

* Fix typo

* Added subtotals for facturerec

* Fix precommit

* Added extraparams when creating rec from fac and other way

* Fix phan

* Fix objectline null

* Desactivating block vat / discount update for facturerec

* reformating code

* Added expeditions for subtotal

* Save extraparams for shipping lines

* Display of subtotals lines in shipments

* Display when creating facture from shipments

* Improve display of lines and invoice creation from shipments

* Fix error if missing line rang

* Deleted duplicate

* Added deletion of subtotal line in shipping documents

* Not including subtotal lines if there is no product line in between

* Update get subtotal lines in shipment docs to disable

* Delete possibility to edit subtotal lines in shipments

* Handle pdf for shipment

* Handle conf stock or shipment supporting services

* Fix precommit

* Fix duplicate name creating bug

* Fix bug where id could be changed by the line id and would create bug

* Deleted subtotal lines when STOCK_SUPPORTS_SERVICES is enabled and block would only have service lines

* Disable shipments in admin modules

Shimpements subtotals lines are only created from commands

* Fixing phan and stan

* Deleted unused template and phan fix

* Fix phan

* Fix phan

* Fix phan

* FIX: phan

* Fix template bug

If document was not in subtotal scope and would use a template used by
subtotal it would create an error.

* Fix php-stan

* Fix bad display when modules and confs were activated

* Fix php codesniffer

* Excluding subtotal lines when mass updating

* Fix shipments service lines exluded + showing subtotal line with specific configs

* Fix line display with situation invoices + bug block line update

* Added ODT managment

This works with invoices but has not been tested with other documents

* Fix bug when editing VAT/discount by block

* Fix error raised when subtotal line added

Subtotal line had no fk_product and raised the error but we want this
line to have no fk product

* Fix precommit

* Added ODT template for documents that uses subtotals

This template can be usefull to understand how to create an odt template
using subtotals module

* Fix phan

* Fix phan

* fix: buttons showing in bad document status

* clean: unwanted commited files

* add: table examples to use with subtotals on ODT templates

* fix: Unwanted print of value when creating a document from another

* feat: renaming for better understanding

* feat: Improved templates for documents related to subtotals

---------

Co-authored-by: Marc de Lima Lucio <68746600+marc-dll@users.noreply.github.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-05-10 02:44:31 +02:00
ldestailleur
d73d760b53 FIX Hour and min were lost when editing a past event. 2025-05-05 14:26:14 +02:00
ldestailleur
995f68489d Debug v22 2025-05-05 13:13:39 +02:00
Charlène Benke
704910b4b3 NEW Add internal contact of proposal, order and invoice on api call (#34009)
* add internal contact of elements

* Update api_orders.class.php

* Update api_invoices.class.php

* Update api_proposals.class.php

* Update api_orders.class.php

* Fix CI

* Update api_orders.class.php

* Update api_invoices.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-05-05 02:07:24 +02:00
ldestailleur
2736a4b382 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-05-05 00:07:09 +02:00
ldestailleur
a74979bc04 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-05-05 00:04:17 +02:00
Frédéric FRANCE
57aa02f0f4 Fix missing translation (#34014)
* fix missing translation

* fix missing translation

* fix missing translation

* fix missing translation

* fix missing translation

* fix missing translation

* fix missing translation

* fix missing translation

* fix missing translation
2025-04-29 10:53:52 +02:00
Eduardo Pulpillo
35fd24e506 Fix #31047 #23763 mailing.class.php do not retrieve the public and private notes (#33994)
* Fix bug #31047  mailing.class.php do not retrieve the public and private notes

Fix bug #31047 The public and private notes are stored but not retrieved in /comm/mailing/class/mailing.class.php because the fields note_public & note_private are not detailed in the /comm/mailing/class/mailing.class.php class. After this commit it works like a charm.

* Update mailing.class.php

* Update mailing.class.php

* Update mailing.class.php

* Update mailing.class.php

* Update mailing.class.php

* Update mailing.class.php

* Update mailing.class.php
2025-04-29 06:39:07 +02:00
ldestailleur
c675f7439c Fix title of event no more visible 2025-04-26 04:05:01 +02:00
ldestailleur
46c9fd064d Look and feel v22 2025-04-25 11:44:15 +02:00
ldestailleur
17a0352ebe Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-24 12:26:39 +02:00
Laurent Destailleur
1435c02986 FIX #33958 2025-04-23 23:45:44 +02:00
ldestailleur
9ee4771375 FIX error management when creating event with resource already used 2025-04-22 19:39:42 +02:00
ldestailleur
6766cd8b5c css 2025-04-22 15:55:48 +02:00
ldestailleur
86506c32b7 Debug v22 2025-04-22 15:51:11 +02:00
ldestailleur
dcbd2437e7 Fix info on server 2025-04-22 15:21:30 +02:00
ldestailleur
7db8252225 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-21 13:52:25 +02:00
ldestailleur
c521262f5f Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-04-20 12:39:08 +02:00
ldestailleur
5b8de3560d Fix cast var in sql 2025-04-20 12:38:48 +02:00
Frédéric FRANCE
5d777bbf59 clean code (#33882)
* clean code

* clean code

* clean code

* Update mailtemplate.php
2025-04-18 13:38:03 +02:00
Laurent Destailleur
a40aec6029 Debug v22 2025-04-17 03:56:54 +02:00
Frédéric FRANCE
de763b4b43 clean code of order (#33880)
* clean code of order

* clean code of order

* clean code of order

* clean code of order
2025-04-16 21:09:45 +02:00
Frédéric FRANCE
67962812d1 fix CI branch 21.0 (#33851) 2025-04-15 17:19:27 +02:00
Frédéric FRANCE
2c3cb5806d fix CI (#33827)
* fix CI

* fix CI

* fix CI

* fix CI

* fix CI

* fix CI

* fix CI

* fix CI

* fix CI

* fix CI

* fix CI

* fix CI

* try to fix

* fix
2025-04-14 19:37:33 +02:00
Laurent Destailleur
e12d4deba2 CSS v22 2025-04-14 19:05:45 +02:00
ldestailleur
1fcacf2f98 Fix filter on agenda list 2025-04-11 23:42:44 +02:00
ldestailleur
b14d28c983 Fix filter on agenda list 2025-04-11 23:42:18 +02:00
Eric - CAP-REL
be1948e1eb better fields definition with full objects reference (#33798) 2025-04-09 16:36:42 +02:00
Vaadasch
facb31000d FIX $object not initialised in extrafields_list_print for propals (#33753)
* FIX object->id not initialise for propal / objectoffield

* Update extrafields_list_print_fields.tpl.php

* Update extrafields_list_print_fields.tpl.php

* Update list.php

* Update list.php

* Update list.php

---------

Co-authored-by: Arnaud Serrut <arnaud.serrut@gmail.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-08 15:28:41 +02:00
Anthony Berton
664ea5f8c1 FIX - const for affect warehouse (#33751)
Co-authored-by: Anthony Berton <anthony.berton@bb2a.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-07 18:29:42 +02:00
ldestailleur
16e05c08a7 Fix CI 2025-04-07 16:40:15 +02:00
Frédéric FRANCE
a427277958 fix phpstan (#33709)
* fix phpstan

* remove debug

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix

* fix

* fix

* fix

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-07 15:48:16 +02:00
ldestailleur
6af8298736 Fix related to #33449 2025-04-07 15:46:10 +02:00
ldestailleur
fa5c98824f Fix related to #33449 2025-04-07 15:10:51 +02:00
ldestailleur
ab742e7bd8 NEW Support of monthly or weekly recurring events 2025-04-03 14:58:41 +02:00
ldestailleur
9a54786884 Factorize code for tooltip of actioncomm 2025-04-03 14:23:16 +02:00
ldestailleur
10c0fba6b0 WIP Recurring events 2025-04-03 13:59:46 +02:00
ldestailleur
18cc530d40 Remove useless colspan 2025-04-03 13:34:06 +02:00
ldestailleur
a0079c802b WIP Recurring events 2025-04-03 13:31:21 +02:00
ldestailleur
b3f3da4a79 Look and feel v22 2025-04-03 13:04:23 +02:00
ldestailleur
191f6ba00e NEW Look and feel - Checkboxes and radio buttons are larger 2025-04-03 13:00:19 +02:00
ldestailleur
c4c3906297 Enhance recurring events 2025-04-03 12:19:11 +02:00
ldestailleur
c0d3e87746 Debug v22 2025-04-03 12:09:48 +02:00
ldestailleur
ebe60801c4 Enhance code for recurring events 2025-04-02 23:51:03 +02:00
Jon Bendtsen
27dc84fe3b NEW Can link member subscription/contribution with proposal, order and invoice (#33647)
* linking member subscription contribution <-> proposal, order and invoice
This can both be done manually from an existing proposal/order/invoice to a subscription created without creating an invoice. I use this when we sell memberships as part of registration for our membership classes.

The link will also be shown on the invoice that can be created as part of the subscription contribution creation.

These links show up in the json from the API on proposals, orders and invoices. The subscription does not show anything. It is currently unknown if the API can do this link or it will have to be done manually in the GUI.

* Update html.form.class.php

---------

Co-authored-by: Jon Bendtsen <xcodeauthor@jonb.dk>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-01 21:36:35 +02:00
ldestailleur
6361c1032b Debug v22 2025-03-27 14:18:52 +01:00
ldestailleur
6f9d1a50dd Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-27 13:43:22 +01:00
ldestailleur
576ea1fe56 Fix responsive 2025-03-27 10:54:43 +01:00