Commit Graph

732 Commits

Author SHA1 Message Date
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
6d89c2c033 Clean code. Merge/Close #33995 manually. 2025-05-05 02:04:55 +02:00
Clément
585577d667 FIX Bug (#33964) 2025-04-24 15:37:30 +02:00
lvessiller-opendsi
c85cc3061b NEW shipment kits with dispatcher v2 (#33750)
* NEW shipment kits with dispatcher v2

* Show stock of virtual product on select warehouse when dispatching a shipment

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-16 21:11:58 +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
Frédéric FRANCE
65388c0743 clean code (#33683)
* clean code

* Update expedition.class.php
2025-04-01 13:26:54 +02:00
MDW
8669993ecf Qual: Fix phan notices (compta/prel..fichinter) (#33485)
* Qual: Fix phan notices (asset..compta/paiement)

* Qual: Fix phan notices (compta/prel..fichinter)
2025-03-19 15:21:48 +01:00
ThomasNgr-OpenDSI
c9a27ae21d NEW : allow stock management by product (#32326)
* Code part

* Code part 2

* Fix : invert a const

* Fix : invert disable/enable stock values

* Fix

* Fix missing column from select inside sql request

* Fix input hidden missing name

* ajout d'un commentaire

* small fixes

* remove unrelated lines

* phpcs

* stickler fix

* pre-commit fixes

* pre-commit fixes

* pre-commit fix

* fix missing translation

* Fix phpstan

* fix winCI

* fix travis

* fix phpstan

* fix travis (hopefully)

* remove useless lines

* relaunch tests

* change stockable_product type from bool to int

* change test in Expeditin::addline() to allow adding a line for product with disabled stock management

* make stock management mandatory for products with batch number

* try to remove PHAN errors

* fix phpstan

* fix phpstan

---------

Co-authored-by: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Co-authored-by: mrozniecki <mrozniecki@easya.solutions>
Co-authored-by: Ulysse Valdenaire <uvaldenaire@easya.solutions>
2025-03-10 10:49:53 +01:00
yannis
3519174adf Added retrieving extraparams for some object lines 2025-03-03 16:57:32 +01:00
VESSILLER
ff870fb199 QUAL db prefix on expedition class 2025-02-20 14:42:07 +01:00
VESSILLER
5d6d07745e QUAL use fk_warehouse instead of deprecated entrepot_id in line batch 2025-02-14 16:47:08 +01:00
MDW
2130f1395a Qual: Fix phan (product-part-1) implies fixing unit types 2025-02-09 20:14:20 +01:00
MDW
24fa28dfe2 Qual: Fix getKanban phpdoc
# Qual: Fix getKanban phpdoc

Array phpdoc for getKanban corrections.
2025-02-05 01:43:37 +01:00
Laurent Destailleur (aka Eldy)
732f97d73c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-02-05 00:40:06 +01:00
Laurent Destailleur
923649b1ec Merge branch 'develop' into qual/phan.2025.1.19-a 2025-01-30 13:19:39 +01:00
Frédéric FRANCE
d5a7d01566 Merge remote-tracking branch 'upstream/develop' into patch-15 2025-01-29 08:37:49 +01:00
MDW
e5c385999d Qual: Fix multiple phan notices
# Qual: Fix multiple phan notices

Fix multiple phan notices
2025-01-29 01:41:41 +01:00
Frédéric FRANCE
4b23a78f7f Update expedition.class.php 2025-01-28 14:32:09 +01:00
Frédéric France
11cb6282b6 clean phpstan baseline 2025-01-27 19:55:39 +01:00
Laurent Destailleur (aka Eldy)
de321e8f01 Fix typo 2025-01-09 02:01:49 +01:00
Laurent Destailleur (aka Eldy)
c0250e4c91 FIX CVE-2024-55227 CSRF when MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY is
on (hidden option not on by default)
2025-01-08 17:41:45 +01:00
MDW
ec2a1928ba Qual: Update fields phpdoc to include fields that are defined/used in some cases
# Qual: Update fields phpdoc to include fields that are defined/used in some cases

comment, copytoclipboard, autofocusoncreated are documented and used in some cases for the
$fields definition
2024-12-05 02:36:50 +01:00
Frédéric FRANCE
286c3d1093 fix sql ticket list (#32080)
* fix sql ticket list

* fix sql ticket list

* fix phpstan

* fix

* fix
2024-11-28 12:11:50 +01:00
denes44
614d391968 FIX #32072 PUT API call does not handle extra fields in shipment module (#32073)
Store extra field during updating the shipment object
2024-11-26 03:56:15 +01:00
Laurent Destailleur
6e9bbe42bb Add code to make easier to test PDF generation with n lines of product 2024-11-21 19:40:52 +01:00
Frédéric FRANCE
57d121664f set object entity at create (#32019)
* set object entity at create

* set object entity at create

* set object entity at create

* set object entity at create

* set object entity at create

* set object entity at create

* do not break multicompany thing

* do not break multicompany thing

* missing translation

* fix phpstan

* doc

* fix entity

* fix set entity
2024-11-21 19:11:32 +01:00
Noé Cendrier
9f56bfe5b7 FIX: shipping date was not editable in view mode (#32022) 2024-11-20 20:06:43 +01:00
Noé Cendrier
ed6bf372cd NEW: use Expedition::$date_shipping property in card and list (#31701)
* NEW: use Expedition::$date_shipping property in card and list

* FIX: translation

* FIX: PHPStan rebutal

* FIX: not a great idea to copy and not edit comment

* FIX: on create, expected delivery date should precede sending date

* Update card.php

* Update list.php

* Update list.php

* Update list.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-11-14 13:23:22 +01:00
Laurent Destailleur
b1e3830c3b Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-11-13 00:38:58 +01:00
Laurent Destailleur
a186903844 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-11-13 00:38:00 +01:00
Laurent Destailleur
4cd2e572ae Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-11-13 00:30:26 +01:00
lvessiller-opendsi
d5e2f89edc FIX can validate shipment without stock movement (#31780) 2024-11-12 14:25:36 +01:00
Laurent Destailleur
37f15cfb42 NEW Add option to round weight and volumen on shipment pdf 2024-11-06 12:50:24 +01:00
MDW
e7539f2e19 Qual: Fix notices in .lib.php files (#31672)
* Qual: Fix notices in .lib.php files

* Update wrapper.php

* Update availabilities_card.php

* Update index.php

* Update document.controller.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-11-04 12:32:13 +01:00
Laurent Destailleur
e6f1d4835f Clean sql code 2024-10-29 02:58:20 +01: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
5e02bec9df Qual: Fix getTooltipContentArray typing hints (#31081)
* Qual: Fix getTooltipContentArray typing hints

# Qual: Fix getTooltipContentArray typing hints

This defines the aray type for all getTooltipContentArray occurences

* Ignore undeclared property ref_supplier (does not exist on OrderLine)
2024-09-23 03:24:19 +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
William Mead
7600157b5a Qual isolate ExpeditionLigne class to separate file (#30877)
* Moved expedition line class to separate file. Removed unnecessary requires.

* Updated PHPDoc

* Fixed PHPDoc

* Fixed PHPDoc

* Fixed undeclared variable

* Fixed type

* Fixed PHPDoc

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-09-12 22:04:35 +02:00
Zephyriony
313fb9dd6d FIX shipment closing date not saved (#30853)
* Bug: shipment closing date not saved

* Update expedition.class.php

* Update expedition.class.php
2024-09-05 15:24:33 +02:00
MDW
a8367a6cd8 Qual: Fix getNextValue related phan notices (part2) (#30752)
* Qual: 🛟 Fix reference to $db with $this->db

# Qual: reference to $db with $this->db

$db was undeclared, use $this->db.

* Fix suspected issue with environment max size and md5sum working on limited files

* Qual: Fix LDAP typing

* Qual: Fix getNextValue related phan notices (part2)

* Update baseline

* Qual: Fix phan notice
2024-08-29 13:34:24 +02:00
thibdrev
3dbd79dad8 qual: Method getKanbanView() has parameter $arraydata with no value type specified in iterable type array. (#30712)
* Update adherent.class.php

* Update adherent_type.class.php

* Update availabilities.class.php

* Update propal.class.php

* Update account.class.php

* Update paymentvarious.class.php

* Update cashcontrol.class.php

* Update localtax.class.php

* Update remisecheque.class.php

* Update bonprelevement.class.php

* Update chargesociales.class.php

* Update contact.class.php

* Update contrat.class.php

* Update commonorder.class.php

* Update timespent.class.php

* Update don.class.php

* Update conferenceorbooth.class.php

* Update expedition.class.php

* Update expensereport.class.php

* Update paymentexpensereport.class.php

* Update fichinter.class.php

* Update fournisseur.commande.class.php

* Update holiday.class.php

* Update evaluation.class.php

* Update job.class.php

* Update position.class.php

* Update skill.class.php

* Update intracommreport.class.php

* Update knowledgerecord.class.php

* Update loan.class.php

* Update mo.class.php

* Update partnership.class.php

* Update inventory.class.php

* Update entrepot.class.php

* Update project.class.php

* Update holiday.class.php - fix phan error

* Update task.class.php

* Update reception.class.php

* Update recruitmentcandidature.class.php

* Update recruitmentjobposition.class.php

* Update paymentsalary.class.php

* Update salary.class.php

* Update supplier_proposal.class.php

* Update ticket.class.php

* Update user.class.php

* Update usergroup.class.php

* Update webportalinvoice.class.php

* Update webportalorder.class.php

* Update webportalpropal.class.php

* Update workstation.class.php

* Update facture.class.php
2024-08-22 03:31:04 +02:00
MDW
ca414de526 Qual: Fix $fields related notices with Phan (#30704)
* Qual: Typing hints/ignore directives for phan notices

* Update field typing
2024-08-21 13:23:35 +02:00
MDW
54880f92cd Qual: Fix PhanTypeMismatchProperty and some other phan notices (#30542)
* Qual: Fix PhanTypeMismatchProperty and some other phan notices

* Qual: Phan fixes for BOM

* Phan - fix fields

* fixup! Qual: Phan fixes for BOM

* Fix phpstan double array keys for syslog

* Fix $fields phpdoc

* Fix phan typing issues with intermediate var and ??

* Fix phan typing issue with ?? operator

* Ignore htdocs/install/install.forced.php for git

* Qual: Revert to original code, ignore notice

When changing the method to avoid one notice type, another one
appears.  So simply ignoring this error.

* Qual: Revert to original code, ignore notice

When changing the method to avoid one notice type, another one
appears.  So simply ignoring this error.

* Update baseline

* Qual: Phan fixes for BOM

* fixup! Qual: Phan fixes for BOM

* Fix phpstan double array keys for syslog

* Qual: Revert to original code, ignore notice

When changing the method to avoid one notice type, another one
appears.  So simply ignoring this error.

* Ignore PhanTypeSuspiciousNonTraversableForeach to allow integration

* Fix typing hints (phpstan)

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-08-15 17:05:00 +02:00
Laurent Destailleur
b3b21d56b6 Fix doxygen 2024-08-07 02:49:38 +02:00
MDW
d6948077b2 Qual: Fix spelling/update .pre-commit configuration (versions) (#30546)
* Qual: Update pre-commit configuration

* Qual: Update spelling

* Ignore use of deprecated constant
2024-08-07 01:20:43 +02:00
Frédéric FRANCE
4b275dc148 add phpdoc (#30208)
* add phpdoc

* add phpdoc

* add phpdoc

* add phpdoc

* clean phpdoc
2024-06-30 19:39:01 +02:00
Mathieu Moulin
abcb1dad4b Define CommonObject relation in CommonObjectLine classes (#29956) 2024-06-10 16:08:39 +02:00
Yannis Hoareau
cd7651e460 NEW mass facturation from expedition (#29744)
* Add facturation mass action to expedition: button created

* Add facturation mass action to expedition: form mass action settings

* Add facturation mass action to expedition: bills creation

* Add facturation mass action to expedition: Import class

* Add facturation mass action to expedition: Dont reset massaction when creating bills

* Add facturation mass action to expedition: Using right name for linked elements

* Add facturation mass action to expedition: Add linked command to expedition

* Add facturation mass action to expedition: Changed wrong variables names

* Add facturation mass action to expedition: Commentary adjustment

* Add facturation mass action to expedition: Added langs and french translations fur understandability

* Add facturation mass action to expedition: fixing warnings

* Add facturation mass action to expedition: add command to retrieve data

* Add facturation mass action to expedition: added fields when fetching expedition lines

* Add facturation mass action to expedition: fix wrong variable name

* Add facturation mass action to expedition: Avoid adding link between objects twice

* Add facturation mass action to expedition: Clean code + function call

* Add facturation mass action to expedition: added missing brace

* Add facturation mass action to expedition: changed duplicate lang key

* Add facturation mass action to expedition: resolve phan warnings

* Add facturation mass action to expedition: fix variable probably undefined

* Add facturation mass action to expedition: fix php codesniffer

* Add facturation mass action to expedition: fix using new methods

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-05-24 18:44:02 +02:00
lamrani abdelwadoud
999bdaa719 NEW online signature of shipments (#29559)
* New functionality for signed shipment

* Add attribute for check if was already signed

* Update expedition.class.php

* Update onlineSign.php

* Update expedition.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-05-05 02:48:02 +02:00