2
0
forked from Wavyzz/dolibarr
Commit Graph

132 Commits

Author SHA1 Message Date
ldestailleur
92ffba11ca Remove old lang files that are too small (moved into other lang files) 2025-09-11 13:31:34 +02:00
ldestailleur
4b9ebb0e6a Fix #26682 and complete #34396 2025-08-14 15:26:13 +02:00
Pichinov-Valentin
49a6995fa1 NEW(propal): Add messaging and agenda features to proposals (#34883) 2025-08-07 12:28:09 +02:00
Pichinov-Valentin
db1552e27d NEW Added Messaging and agenda tabs on order and shipments (#34859)
* feat: Messaging and agenda core modifications

* feat: Core modifications for messaging and agenda

* fix(expedition): Décris ici la correction ou l'ajout fait à card.php

* Update company.lib.php

---------

Co-authored-by: Lou31 <valentingrimal2@gmail.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-08-04 13:12:22 +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
Frédéric FRANCE
387e3b1da7 shipping can manage its contacts (#33680)
* shipping can manage its contacts

* shipping can manage its contacts

* fix

* add contacts from origin

* clean code

* apply changes

* apply changes
2025-04-01 20:47:40 +02:00
ldestailleur
0c09be61a2 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-25 14:01:28 +01:00
ldestailleur
ae13ad70ae FIX Responsive 2025-03-20 13:55:19 +01:00
MDW
a0f71fbe76 Qual: Fix phan notices (core/lib) (#33379)
* Qual: Fix PhanMismatchType

* Finalize rename of $attrV into $value

* Correct getGlobalString into getGlobalInt

* Do not require some fields in the 'title' definition of $cols

* Qual: Fix phan notices (core/lib)
2025-03-11 01:43:54 +01:00
ldestailleur
3de6ed0331 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-03-10 23:57:15 +01:00
ldestailleur
0b921141b8 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-03-10 23:56:40 +01:00
ldestailleur
03cbf05f0f FIX Loading of deiveries in shipping card was loading everything 2025-03-10 23:56:04 +01:00
ldestailleur
cfef1b9f53 FIX Loading of deliveries from a shipment was loading everything 2025-03-10 23:53:31 +01:00
Laurent Destailleur
58cc96cd33 QUAL All $conf->global->module->enabled are replaced with isModEnabled() 2024-10-07 14:40:29 +02:00
MDW
1834c37c16 Qual: Fix phan notices (#31212)
* Qual: Fix phan notices

# Qual: Fix phan notices

Fix several phan notices related to classes with UnknownObject
classes.

* Qual: Fix phan notices

* Qual: Fix phan notices

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-10-03 19:40:34 +02:00
MDW
7b4c4d772c Qual: Fix notices for FormSms, RssParser, ExpenseReportIk and related (#31086)
* Qual: Fix Array of tabs typing hints

# Qual: Fix Array of tabs typing hints

Fixed same typing hints accross several files

* Qual: Fix pdf.lib.php, project.lib.php and related files

# Qual: Fix pdf.lib.php, project.lib.php and related files

Fix most phan notices for pdf.lib.php and project.lib.php.
And fixed some items in other files in the process

* Qual: Fix notifications commande/card advtarget.tpl fichinter/card societe/card supplier_proposal/card

* Qual: Fix notices for FormSms, RssParser, ExpenseReportIk and related

# Qual: Fix notices for FormSms, RssParser, ExpenseReportIk and related

Fix notices in the files for the classes above and other files to accomodate
these changes/fixes
2024-09-23 00:37:30 +02:00
William Mead
72aec91064 NEW shipment signed status update (#30928)
* Added event message

* Added CommonSignedObject trait. Updated LibStatut method. Removed unnecessary properties.

* Added SHIPPING_MODIFY notification

* Refactored to use setSignedStatus method

* Updated PHPDoc. Removed unnecessary properties. Added contributor details.

* Added signed status to shipping list

* Added signed status to fetch method

* Fixed type

* Added signed status to notification message

* Updated EN localization

* Fixed static property

* Added event message localization

* Updated EN localization

* Updated PHPDoc

* Added signed status for use in tooltip

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-09-13 03:09:53 +02:00
Benjamin Falière
ed468036bd FIX: undefined property warning (#29730)
Prevent  property from being marked as undefined in warning

Co-authored-by: Benjamin Falière <benjamin.faliere@altairis.fr>
2024-05-21 17:59:55 +02:00
Zephyriony
6f524405af QUAL Rename column fk_origin_line on shipment lines into fk_elementdet to match a generic use. (#28989)
* Update expedition.class.php 

Adapting the query and code to the new table format

* Update llx_expeditiondet.sql

* Update expedition.class.php

* Update expedition.class.php

* Update expedition.class.php

* Update expedition.class.php

* Update expedition.class.php

* Update expedition.class.php

* Update expedition.class.php

* Update expedition.class.php

* Update expedition.class.php

* Update llx_expeditiondet.sql

* Update expedition.class.php

* rename fk_origin_line to fk_elementdet

* rename fk_origin_line to fk_elementdet

* rename fk_origin_line to fk_elementdet

* rename fk_origin_line to fk_elementdet

* rename fk_origin_line to fk_elementdet

* rename fk_origin_line to fk_elementdet

* rename fk_origin_line to fk_elementdet

* rename fk_origin_line to fk_elementdet

* rename fk_origin_line to fk_elementdet

* rename fk_origin_line to fk_elementdet

* Update expedition.class.php

* Update expedition.class.php

* rename fk_origin_line to fk_elementdet

* rename fk_origin_line to fk_elementdet

* Update 19.0.0-20.0.0.sql

---------

Co-authored-by: sonikf <93765174+sonikf@users.noreply.github.com>
2024-04-08 12:44:49 +02:00
Laurent Destailleur
54556b37fd Clean code 2024-03-12 21:59:29 +01:00
MDW
89004f7e03 Qual: Spelling htdocs/core (#27491)
Highlights:
- initialY in pdf_standard.modules.php was unused
  - remove (otherwise -> initially) (+same in other file)
2024-01-13 19:48:20 +01:00
Laurent Destailleur
7ede5d8f82 Debug v19 2023-12-02 19:13:51 +01:00
Frédéric FRANCE
53c8a3acf8 clean phpdoc for phpstan (#26905) 2023-12-01 19:51:32 +01:00
Laurent Destailleur
53dab922fd Fix php8.2 warnings 2023-11-27 11:39:32 +01:00
Laurent Destailleur
1f38e54e78 Clean code 2023-10-15 15:32:35 +02:00
Laurent Destailleur
492b726da9 Fix regression with label of order 2023-09-19 20:32:23 +02:00
Laurent Destailleur
e31cdbe297 Fix dispatch tab on reception (no way to change batch number once set) 2023-09-12 19:47:45 +02:00
Laurent Destailleur
9972277679 Debug v18 2023-05-22 15:59:48 +02:00
hystepik
1b75dc54b4 can update and create 2023-05-09 11:04:53 +02:00
Laurent Destailleur
8e51bf2c55 Debug 18 2023-04-18 14:04:27 +02:00
Laurent Destailleur
b0cf8cd72d Clean code 2023-02-21 13:19:57 +01:00
Philippe GRAND
0633ead0e6 fix : Warning: Undefined array key delivery in /home/httpd/vhosts/aflac.fr/domains/dev.aflac.fr/httpdocs/core/lib/sendings.lib.php on line 53 2023-02-05 18:05:03 +01:00
Laurent Destailleur
3e5273d83b NEW Option PRODUIT_DESC_IN_FORM accept (desktop only or +smartphone) 2022-10-21 11:14:28 +02:00
Laurent Destailleur
b051da4b04 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-10-07 22:50:58 +02:00
Laurent Destailleur
73c1efecaf Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-10-07 22:47:36 +02:00
Laurent Destailleur
2df791ccf7 Fix badge not visible on delivery tab 2022-10-07 21:22:17 +02:00
Alexandre SPANGARO
d7d5199689 Use isModEnabled 2022-09-25 06:02:37 +02:00
Philippe GRAND
1dc58f9684 update code toward php8 compliance 2022-09-24 14:44:16 +02:00
Frédéric France
8e66b7207e replace ! empty by !empty 2022-08-31 22:14:20 +02:00
Laurent Destailleur
4de50da0dd Repare code to forbidden var_dump() into code 2022-05-17 14:55:38 +02:00
Laurent Destailleur
0e8b7ef656 Clean code 2022-01-24 16:38:25 +01:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
Laurent Destailleur
6bf66adff0 Fix remove some $_REQUEST 2021-05-17 07:27:02 +02:00
Frédéric FRANCE
554e449e40 code syntax core directory 2021-02-23 22:03:23 +01:00
Francis Appels
ade0e008e9 Some debug on Shipments.
Wrong object status on list paging.
Parameter error on link contact.
nbr Linked files not shown in tab badge.
2021-01-02 17:42:33 +01:00
Scrutinizer Auto-Fixer
208740c9c4 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-28 16:49:52 +00:00
Laurent Destailleur
6c1f60f6c0 Fix regression 2020-10-25 17:19:15 +01:00
Laurent Destailleur
8578a7cd7c Fix regressions 2020-10-25 17:02:25 +01:00
Aurélien
f954e8b173 :mod livraison rename user acces right #14697 2020-10-06 16:10:48 +02:00
Aurélien
c8cd55e158 debug access right after rename class #14697 2020-10-06 15:57:50 +02:00