Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
125,615 Commits 36 Branches 189 Tags
fd2ccf584b4875cabf3edff8ea693a09fdc58e05
Commit Graph

13396 Commits

Author SHA1 Message Date
Laurent Destailleur
fd2ccf584b Look and feel v19 2023-10-17 15:27:07 +02:00
Laurent Destailleur
0fbffea663 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-17 14:49:16 +02:00
Laurent Destailleur
b37a438067 The property ->user_validation to store ID of user validating has been 
renamed into ->user_validation_id.
 2023-10-17 11:10:25 +02:00
Laurent Destailleur
f18529f944 Clean code 2023-10-17 10:52:19 +02:00
Laurent Destailleur
fb8b4acdbf The duplicated and deprecated property ->date_livraison that was renamed 
into ->delivery_date has been completely removed.
 2023-10-17 10:36:11 +02:00
Laurent Destailleur
cdf53e402e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2023-10-16 20:57:07 +02:00
Laurent Destailleur
d6086f07b4 Fix regression triggers was not triggered 2023-10-16 20:55:56 +02:00
William Mead
2f023e162a NEW show VAT free amount on payment input close #26208 (#26209) 
* NEW Added VAT free & VAT amounts on payment input

* Fixed VAT amount translation strings. Added amount including VAT CSS class.

* Added amount including VAT CSS class.

* Added contributor details

* Fixed contributor indentation after GitHub merge conflict error

* Deleted blank line at start of control structure

* Revert "NEW Added VAT free & VAT amounts on payment input"

This partially reverts commit 9333afb0

* Revert "Added amount including VAT CSS class."

This reverts commit 8a4c308ae0.

* Removed contributor details

This reverts commit 165645cc

* NEW payment full amount detail tooltip

* Reverted commit aa78a1e2

* Reverted commit 165645ccd5

* Added full amount detail tooltip for multicurrency

---------

Co-authored-by: William Mead <william.mead@manchenumerique.fr>
 2023-10-16 15:43:23 +02:00
Laurent Destailleur
9144293f0b Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-10-16 06:02:17 +02:00
Laurent Destailleur
0360d61f9c Code comment for develop 2023-10-16 05:51:47 +02:00
Laurent Destailleur
abe3f00b11 Fix regression. Restore old behaviour even if some case are not tested. 2023-10-16 05:15:39 +02:00
Noé Cendrier
a92458ebbc FIX check tva_tx before comparing price_min_ttc (#25220) 
* FIX check tva_tx before comparing price_min_ttc

* better price_ttc comparison for propal, commande, facture lines

* price_ht must be transformed into number before using it for calculating
 2023-10-16 04:07:10 +02:00
Laurent Destailleur
251ccf85ea Debug v19 2023-10-15 23:13:20 +02:00
Laurent Destailleur
1f38e54e78 Clean code 2023-10-15 15:32:35 +02:00
Laurent Destailleur
c507adeef7 NEW Top menu support picto of modules that are font awesome picto. 2023-10-13 15:00:51 +02:00
Laurent Destailleur
2e3c378ec0 Fix phpcs 2023-10-12 18:47:19 +02:00
Randall Mora
3ba1449602 doActions,printFieldListTitle,printFieldListValue to hookmanager (#24971) 
* Update card.php

Add events doActions,printFieldListTitle,printFieldListValue to hookmanager

* Update card.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2023-10-12 18:14:20 +02:00
Laurent Destailleur
94796d6154 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-10-12 15:00:15 +02:00
Laurent Destailleur
48e35b5f86 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-10-12 13:18:32 +02:00
Laurent Destailleur
c32fe8dc5f QUAL: Use dol_clone with parameter 2 for ->oldcopy 2023-10-11 19:10:24 +02:00
am97
b9136ee59c FIX: modification of complementary attributes in invoices (#26180) 
Fixes the following error:

PHP Fatal error:  Uncaught Exception: Serialization of PgSql\Connection is not allowed in /var/www/html/core/lib/functions.lib.php:1168
Stack trace:
#0 /var/www/html/core/lib/functions.lib.php(1168): serialize()
#1 /var/www/html/compta/facture/card.php(2798): dol_clone()
#2 {main}
 2023-10-11 19:02:11 +02:00
Laurent Destailleur
5308e3e183 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-10-11 04:35:44 +02:00
Laurent Destailleur
465fe0ffd4 Close #24481 2023-10-11 04:29:52 +02:00
Laurent Destailleur
005bab38c3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2023-10-11 03:24:47 +02:00
Randall Mora
7613e59eb2 Update card.php (#24972) 
Add events doActions,printFieldListTitle,printFieldListValue to the hookmanager
 2023-10-11 02:39:12 +02:00
Laurent Destailleur
3e0e64ac41 Clean code 2023-10-11 00:21:25 +02:00
Laurent Destailleur
946239dbf3 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-10 23:04:47 +02:00
Laurent Destailleur
98ca102e1c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2023-10-10 21:48:07 +02:00
Laurent Destailleur
25d3ead0a0 FIX Error not returned on sales with takepos and batch module enabled 2023-10-10 11:51:52 +02:00
William Mead
b0494d8098 FIX extrafield list filter (#26159) 
Co-authored-by: William Mead <william.mead@manchenumerique.fr>
 2023-10-09 20:08:00 +02:00
Laurent Destailleur
bf2ab5453c Fix warnings 2023-10-09 13:30:51 +02:00
Laurent Destailleur
f661f88b6d Merge pull request #26140 from aspangaro/19a7 
Update some object
 2023-10-09 10:28:54 +02:00
Laurent Destailleur
f450e23ce6 Clean code: set_paid is deprecated. Replaced with setPaid. 2023-10-09 10:22:49 +02:00
Laurent Destailleur
11f4940765 Doc 2023-10-09 10:18:03 +02:00
Alexandre SPANGARO
52ec4107aa Update social contrib list 2023-10-09 05:50:24 +02:00
Alexandre SPANGARO
53671958c0 typo 2023-10-09 05:49:40 +02:00
Alexandre SPANGARO
ed6c985344 Update paymentvat.class 2023-10-09 05:49:16 +02:00
Dev2a
fcd4c4e429 Fix: Change access to $conf->global to function getDolGlobal (automatique) 2023-10-08 23:19:49 +02:00
Laurent Destailleur
68404bec9b Merge pull request #22619 from mbinformatique68/develop 
NEW Add the formEditObjectLine hook on commande card and invoice card
 2023-10-06 19:13:58 +02:00
Laurent Destailleur
a2b6532c5a Debug v19 2023-10-05 16:32:38 +02:00
Laurent Destailleur
40f10588e3 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-04 13:04:31 +02:00
Laurent Destailleur
9bd3bb0594 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 
Conflicts:
	htdocs/compta/bank/various_payment/card.php
	htdocs/compta/bank/various_payment/list.php
	htdocs/core/lib/security.lib.php
	htdocs/core/lib/signature.lib.php
 2023-10-04 12:43:03 +02:00
Laurent Destailleur
4298150413 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/signature.lib.php
 2023-10-04 10:22:33 +02:00
Laurent Destailleur
d3dc6615db Remove deprecated use of ->modelpdf (good is ->model_pdf) 2023-10-02 21:49:08 +02:00
Kamel Khelifa
ee921ab540 NEW: Add trigger when delete a bank account line 2023-10-02 15:52:44 +02:00
Laurent Destailleur
12a9a1ce4d FIX Bad value of accounting account shown in list. Edit fails. 2023-10-02 14:51:15 +02:00
Laurent Destailleur
9016ed0c28 Fix warning 2023-10-02 14:39:49 +02:00
Laurent Destailleur
f9288ce862 Look and feel v18 2023-10-02 11:26:26 +02:00
Laurent Destailleur
b2a6823e56 Merge pull request #26087 from hregis/fix_menu_force_entity 
NEW possibility to deselect line when create a recurring invoice + missing to use fk_parent_line
 2023-10-01 17:54:05 +02:00
Laurent Destailleur
b8bd760e28 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-01 16:06:58 +02:00