Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-14 05:21:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
139,032 Commits 36 Branches 190 Tags
21f9d417cdeb43af1caf2c8b51a6a0908ebe2fbe
Commit Graph

139032 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
21f9d417cd Trans 2024-11-12 17:05:15 +01:00
Laurent Destailleur
ffd9bde1cd Disable bugged code and rewrite it in comment to show the way 2024-11-12 15:26:50 +01:00
antonin_tdj
369fb8b898 FIX Supplier orders : delete dispatched lines on supplier order deletion (#25292) 
* Add 2 entries for DispatchedLines on Delete

* Delete dispatched lined on order deletion

* add choice on deletion while dispatched lines exists

* fix indent

* fix begin, rollback and commit locations

* fix indent

* Update card.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-11-12 14:56:09 +01:00
Laurent Destailleur
9730a83d9c Fix phpstan missing parenthesis 2024-11-12 14:42:07 +01:00
Laurent Destailleur
6c7c12b4b4 Rename variables 2024-11-12 14:20:08 +01:00
Andrew Burks
c8e8651c66 NEW [Accounting] Allow grouping taxes with primary line price (#26732) 
* Fix expense report journal entries bind to user

WAS: expense report payments did not fill out $tabtb (credit) to associate with their $tabpay (debit). The case would always fall through to 'NotDefined' and require manual adjustment.

NEW: if a user is associated with the expense report, then that user will get an associated credit line ($tabtp) generated.

* allow grouping tax with actual cost for accounting

Provides the ability for taxes paid in expense reports (ER_JOURNAL_GROUP_TAX_WITH_LINES) or purchases (AC_JOURNAL_GROUP_TAX_WITH_LINES) to get grouped with the main expense/purchase line and associated with the accounting account for the item itself. This is in contrast to the default behavior designed around VAT which splits off any taxes paid into a separate accounting account for each type of tax.

* fixed out of date reference

fixed merge error

* fixed linting issues

whitespace around braces and if/else keywords

* Update bankjournal.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-11-12 14:14:36 +01:00
Bahfir Abbes
4b807e2b47 sells do not need to be paid completely to be included in the cash control (#31727) 
Co-authored-by: abb <contact@ab1consult.com>
 2024-11-12 13:51:13 +01:00
atm-corentin
3bd2aa1921 FIX tpl object line because the was twice marginclass2 on col margin rates but also on mark rates (#31774) 
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-11-12 13:48:12 +01:00
sonikf
3720b748b1 fix column is_also_delivery_note belongs to llx_facture table (#31779) 
* fix remove is_also_delivery_note

* New: Add field is_also_delivery_note
 2024-11-12 13:46:45 +01:00
Frédéric FRANCE
98c92337f1 Update security.php (#31777) 
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-11-12 13:46:13 +01:00
Laurent Destailleur
542b4bd099 Fix phan 2024-11-12 13:45:15 +01:00
Laurent Destailleur
4b384b3753 Doc 2024-11-12 13:28:50 +01:00
Laurent Destailleur
405444879a Debug v21 2024-11-12 13:25:46 +01:00
Laurent Destailleur
14d548143b Try to fix phpstan 2024-11-12 13:08:03 +01:00
Laurent Destailleur
a64de4d24d Clean code 2024-11-12 12:57:08 +01:00
Laurent Destailleur
b86a48106b Fix phan 2024-11-12 12:43:50 +01:00
Laurent Destailleur
4c556babaf Clean code 2024-11-12 11:51:14 +01:00
Laurent Destailleur
487f910aa7 Fix bad value 2024-11-12 11:42:09 +01:00
Laurent Destailleur
bd170e0474 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2024-11-12 11:33:31 +01:00
Laurent Destailleur
9dd3357890 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-11-12 10:53:37 +01:00
Laurent Destailleur
2c3d6fa66a Reduce limit for list 2024-11-12 10:53:08 +01:00
Laurent Destailleur
7e95ab1513 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-11-12 04:04:48 +01:00
Laurent Destailleur
5312bd80b9 Doc 2024-11-12 04:04:31 +01:00
JonathanBtq
71a47c6555 add custom tpl to note (#31736) 
* add custom tpl to note

* Update note.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-11-12 04:00:37 +01:00
Laurent Destailleur
4a97adfc62 Add column is_also_delivery_note 2024-11-12 03:52:08 +01:00
sonikf
34b4b07fe2 New: prepare for e-shipment (SQL part) (#31773) 
* Add issue date

* Add field fk_unit

* Add shipment contacts

* New Add is_delivery_note SQL part

* New fields for e-shipment SQL part

* Update llx_facture.sql

* Update 20.0.0-21.0.0.sql

* Update 20.0.0-21.0.0.sql

* Update llx_expedition.sql

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-11-12 03:40:38 +01:00
Frédéric FRANCE
836bb71303 fix customreports.lib.php (#31771) 
* fix customreports.lib.php

* Update commondict.class.php

* Update ctyperesource.class.php

* fix

* CommonDict is not a business class

* Update ctyperesource.class.php

* Update ctyperesource.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-11-12 03:38:38 +01:00
iLLixM
3b0ccddaea set payment method information on new membership subscriptions (#31750) 
When creating new membership subscriptions and choosing to create an invoice (for linked thirdparty), existing payment method information of the customer should be used.

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-11-12 03:37:48 +01:00
Laurent Destailleur
c9972f1dd9 Fix phan 2024-11-12 03:32:57 +01:00
Laurent Destailleur
5eca796098 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-11-12 03:23:09 +01:00
Laurent Destailleur
353696b3ba Doc 2024-11-12 03:22:51 +01:00
Laurent Destailleur
f35fd7c1f0 Clean code 2024-11-12 03:17:55 +01:00
UT from dolibit
d395924150 Update /datapolicy/admin/setup.php (#25709) 
* Update /datapolicy/admin/setup.php

* Update setup.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-11-12 02:54:18 +01:00
UT from dolibit
e5caa2170e Update workstation_list.php (#25707) 
* Update workstation_list.php

* Update workstation_list.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-11-12 02:43:46 +01:00
Laurent Destailleur
22eec4ba8a Doc 2024-11-12 02:38:34 +01:00
Laurent Destailleur
66ee2a2cfe Close #24828 2024-11-12 02:24:25 +01:00
Laurent Destailleur
960413db0f Close #24389 2024-11-12 01:57:51 +01:00
Laurent Destailleur
07c3690bb7 FIX the style not visible in combo using autocomplete 2024-11-12 01:26:08 +01:00
Florian Hödl
75ce3e8513 [FIX] Update ticket create form to hide contracts from other thirdparties for external users (#31762) 
Co-authored-by: fhoedl <florian@hoedl.co>
 2024-11-12 00:36:34 +01:00
MDW
56dc321665 Qual: Fix phan notices (in order of appearance) (#31768) 
* Qual: Fix phan notices (in order of appearance)

* Qual: Fix phan notices (in order of appearance)/2
 2024-11-12 00:35:14 +01:00
Frédéric FRANCE
cf0782d96d fix sql (#31769) 2024-11-12 00:33:28 +01:00
MDW
e8c51e8802 Qual: fix ci phpstan by removing useless test (#31772) 
# Qual: fix phpstan by removing useless test

!$error && $champdatefin && ($champdatefin > 0) has useless tests.
- $error is still 0.
- $champdatefin is also not 0 when it is >0
- By casting $champdatefin to int, we ensure that '' (error) is
  converted to 0.
 2024-11-12 00:32:59 +01:00
Laurent Destailleur
40aca2803f Add std deviation in custom report 2024-11-11 21:51:51 +01:00
Laurent Destailleur
982c356493 Debug v21 2024-11-11 21:28:21 +01:00
Laurent Destailleur
8c1f823851 Debug v21 2024-11-11 21:22:18 +01:00
Laurent Destailleur
0436458a8f FIX Date of survey must be in future 2024-11-11 20:36:52 +01:00
Laurent Destailleur
b51dc54db8 FIX edit label of survey 2024-11-11 20:32:02 +01:00
Laurent Destailleur
9b68d78fe5 Debug v21 2024-11-11 18:53:16 +01:00
Laurent Destailleur
0d905fc7a7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-11-11 18:39:39 +01:00
Laurent Destailleur
e127d3c044 Debug v21 2024-11-11 18:39:15 +01:00