Commit Graph

2591 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
Frédéric FRANCE
ff3cec75d0 fix translations (#34055) 2025-05-05 20:13:55 +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
Frédéric FRANCE
15fce79455 remove duplicate code (#33681)
* remove duplicate code

* Update card.php
2025-04-01 11:10:54 +02:00
Noé Cendrier
bbfd7a3eda QUAL: doActions should be able to redefine default actions (#33637)
* QUAL: doActions should be able to redefine default actions

* FIX: no blank line in opening if
2025-03-28 15:03:24 +01:00
ldestailleur
ae59c409f6 Modulebuilderization 2025-03-26 00:56:24 +01:00
Yannis Hoareau
1f15c35b15 Removed unnecessary tests (#33603) 2025-03-25 16:29:44 +01: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
ldestailleur
2426a50cba Fix CSS and td balance 2025-03-20 13:31:52 +01:00
Clément
9d25e2cd58 Hook doAction on statistics pages (#33532)
* Hook doAction on statistics pages

* Hook doAction on statistics pages

* Update index.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-19 18:02:28 +01: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
Yannis Hoareau
611757bb99 Fix bug where id could be changed by the line id and would create bug (#33498) 2025-03-19 14:01:24 +01:00
lvessiller-opendsi
9a570dfa0c FIX float posted quantities on dispatch shipment (#33503) 2025-03-19 13:49:29 +01:00
Frédéric FRANCE
869d7af747 comment test not needed (#33504) 2025-03-19 13:48:56 +01:00
Laurent Destailleur
395157d16c Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-17 19:46:08 +01:00
Laurent Destailleur
e9928ef7e6 Fix br 2025-03-17 00:32:51 +01:00
Laurent Destailleur
b389cbb59e Fix reponsive and NA that must not be visible 2025-03-17 00:27:40 +01:00
MDW
0cc1aa6d80 Qual: Fix phan notices (asset..compta/paiement) (#33484)
* Qual: Fix phan notices (accountancy, adherents)

* Qual: Fix phan notices (admin)

* Qual: Fix phan notices (asset..compta/paiement)

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-16 20:45:04 +01:00
ldestailleur
8082c7bd96 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-15 10:57:53 +01:00
MDW
2cd6459d10 Qual: Fix phan notices (*card) (#33450) 2025-03-14 17:25:11 +01:00
Laurent Destailleur
051a902f1f Revert "Revert "Reverse const STOCK_ALLOW_NEGATIVE_TRANSFER to STOCK_DISALLOW…" (#33454)
This reverts commit e943c9c97f.
2025-03-13 23:22:40 +01:00
Laurent Destailleur
e943c9c97f Revert "Reverse const STOCK_ALLOW_NEGATIVE_TRANSFER to STOCK_DISALLOW_NEGATIV…" (#33453)
This reverts commit d93e8e2978.
2025-03-13 23:17:02 +01:00
ThomasNgr-OpenDSI
d93e8e2978 Reverse const STOCK_ALLOW_NEGATIVE_TRANSFER to STOCK_DISALLOW_NEGATIVE_TRANSFER (#33444) 2025-03-13 23:15:04 +01:00
ldestailleur
0d17d0a478 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-03-11 17:32:23 +01:00
ldestailleur
2fa9fbdb9a Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-03-11 17:32:09 +01:00
lvessiller-opendsi
98a0dfa1b0 FIX shipment dispatch origin line (#33415) 2025-03-11 17:25:18 +01:00
sonikf
4bf70b0c2d FIX: #33365 Global search for single shipment (#33401)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-11 11:41:54 +01:00
ldestailleur
141288c1f0 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-10 23:59:19 +01:00
ldestailleur
b129c97363 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-03-10 23:55:29 +01:00
ldestailleur
ae0da2bf6d Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-03-10 23:54:10 +01:00
ldestailleur
200fa88e1d FIX Duplicate load of extrafield ->fetch_optionals() 2025-03-10 22:59:35 +01:00
MDW
988fc75ca2 Qual: Fix phan notices (emailcollector, bookkeeping) (#33375)
* Qual: Fix phan notices (mostly propal)

* Fix some const arguments to Form::select_dolusers()

* Update phan baseline

* Qual: Fix phan notices (propal)

* Qual: Fix phan notices (emailcollector, bookkeeping)
2025-03-10 15:47:55 +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
MDW
6b9361d252 Fix phpstan notices 2025-03-02 20:49:48 +01:00
MDW
035ede5874 Qual: Fix phan notices in API classes 2025-03-02 20:49:46 +01:00
MDW
c02293a880 Qual: Add phpdoc for request_data param 2025-03-02 20:49:45 +01:00
VESSILLER
ff870fb199 QUAL db prefix on expedition class 2025-02-20 14:42:07 +01:00
VESSILLER
e0d459a1b2 QUAL use one var to determine if sell-by or eat-by date is enabled 2025-02-19 14:41:37 +01:00
Laurent Destailleur
c15a37b879 Merge pull request #33089 from Easya-Solutions/qual-shipment-replace-warehouse
QUAL use fk_warehouse instead of deprecated entrepot_id in line batch
2025-02-14 23:25:25 +01:00
VESSILLER
5d6d07745e QUAL use fk_warehouse instead of deprecated entrepot_id in line batch 2025-02-14 16:47:08 +01:00
VESSILLER
6d87423e88 QUAL replace MAIN_DB_PREFIX with db prefix in shipment dispatch 2025-02-14 14:35:54 +01:00
Laurent Destailleur (aka Eldy)
382394575d Fix warning 2025-02-12 22:58:51 +01:00
Laurent Destailleur (aka Eldy)
863248b618 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-12 15:50:23 +01:00
Laurent Destailleur (aka Eldy)
acc8338927 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-02-12 15:49:37 +01:00