* add dol_buildurl with examples of use
* add dol_buildurl with examples of use
* add dol_buildurl with examples of use
* add dol_buildurl with examples of use
* wip
* wip
* add more example
* add more example
* add more example
* add more example
* add more example
* add more example
* add more example
* add example
* add example
* add example
* add example
* add example
* stay in the same area even we are on other area in other tab
* stay in the same area even we are on other area in other tab
* stay in the same area even we are on other area in other tab
* stay in the same area even we are on other area in other tab
* stay in the same area even we are on other area in other tab
* stay in the same area even we are on other area in other tab
* stay in the same area even we are on other area in other tab
* stay in the same area even we are on other area in other tab
* stay in the same area even we are on other area in other tab
* stay in the same area even we are on other area in other tab
* stay in the same area even we are on other area in other tab
* clean code
* clean code
* clean code
* clean code
* clean code
* clean code
* clean code
* add example
* add example
* add example
* add example
* add example
* add example
add example
add example
add example
add example
* add example
* add example
add example
add example
add example
* fix
* fix
* fix
* fix
* fix
* fix
* fix
* fix
* fix
* fix
* fix
* fix
* fix
* fix
* clean code
* clean code
* clean code
* clean code
* clean code
* clean code
* clean code
* clean code
* clean code
* clean code
* fix
* wip
* wip
* clean code
* 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>
* 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>
La variable MAIN_NO_CONCAT_DESCRIPTION est redondante avec PRODUIT_AUTOFILL_DESC.
Cette redondance créée une difficulté de compréhension et des effets de bord, principalement lorsqu'un utilisateur souhaite mettre une description à vide.
# Confirmation de la redondance de MAIN_NO_CONCAT_DESCRIPTION
Pour confirmation : Ajout de lignes de débug pour constatation.
Lignes 1116 à 1122 de DOL_ROOT/core/class/conf.class.php
```php
print "<p>Before : PRODUIT_AUTOFILL_DESC = " . $this->global->PRODUIT_AUTOFILL_DESC . " ; MAIN_NO_CONCAT_DESCRIPTION = ".$this->global->MAIN_NO_CONCAT_DESCRIPTION . "</p>";
if (!empty($this->global->PRODUIT_AUTOFILL_DESC)) {
$this->global->MAIN_NO_CONCAT_DESCRIPTION = 1;
} else {
unset($this->global->MAIN_NO_CONCAT_DESCRIPTION);
}
print "<p>After : PRODUIT_AUTOFILL_DESC = " . $this->global->PRODUIT_AUTOFILL_DESC . " ; MAIN_NO_CONCAT_DESCRIPTION = ".$this->global->MAIN_NO_CONCAT_DESCRIPTION . "</p>";
```
Application d'une valeur à MAIN_NO_CONCAT_DESCRIPTION = 4 depuis l'interface Configuration -> Divers.
Modification de la variable PRODUIT_AUTOFILL_DESC par l'interface d'admin du module Produit :
```
Before : PRODUIT_AUTOFILL_DESC = 0 ; MAIN_NO_CONCAT_DESCRIPTION = 4
After : PRODUIT_AUTOFILL_DESC = 0 ; MAIN_NO_CONCAT_DESCRIPTION =
```
```
Before : PRODUIT_AUTOFILL_DESC = 1 ; MAIN_NO_CONCAT_DESCRIPTION = 4
After : PRODUIT_AUTOFILL_DESC = 1 ; MAIN_NO_CONCAT_DESCRIPTION = 1
```
```
Before : PRODUIT_AUTOFILL_DESC = 2 ; MAIN_NO_CONCAT_DESCRIPTION = 4
After : PRODUIT_AUTOFILL_DESC = 2 ; MAIN_NO_CONCAT_DESCRIPTION = 1
```
# Conservation de la valeur dans conf.class.php
Pour des raisons de compatibilités, je pense qu'il vaut mieux laisser la partie de conf.class.php pour définir la valeur si jamais il y a des modules tiers qui l'utilisent.
En dehors de cet usage de rétrocompatibilité, je suis passé sur tous les autres fichiers pour la retirer. Je modifierai le wiki pour l'en retirer aussi une fois la PR intégrée.
# Modification des card.php
## Modification de $product_desc en $line_desc.
L'utilisation de $product_desc laissait supposer que le contenu de cette variable était récupérée de la description renseignée dans le produit, or elle est en réalité récupérée du formulaire envoyé.
Je l'ai donc modifiée pour correspondre davantage à la réalité.
## Comportement
Dans le cas où PRODUIT_AUTOFILL_DESC == 0, on concatene la $line_desc avec la description issue du produit, récupérée préalablement par $desc
Co-authored-by: Arnaud Serrut <arnaud.serrut@gmail.com>
