Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
136,669 Commits 36 Branches 189 Tags
033f0aa0a7f23165579f6af2a8e5b51e69e90e98
Commit Graph

3710 Commits

Author SHA1 Message Date
Laurent Destailleur
ee0412dd27 Fix phan warning 2024-07-31 18:54:52 +02:00
Laurent Destailleur
f1cfbb68c6 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-22 11:23:41 +02:00
Laurent Destailleur
5890f359d0 Fix missing the compatibility layer for conferenceofbooth 2024-07-21 12:15:30 +02:00
Laurent Destailleur
a39d55474f Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-18 02:44:35 +02:00
Laurent Destailleur
b303be54fd Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-07-18 02:41:28 +02:00
Laurent Destailleur
9d4951e85b Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-07-18 02:35:53 +02:00
Pichi1966
f8da618789 FIX : issue to get the right files exported in Quadratrus export.php (#30004) 
* FIX : issue to get the right files exported in Quadratrus export.php

The export of files does not work correctly when using Accounting option export Quadratus with file export.
The files are not attached to the zip until we uncommment the 3 lines of this PR.

* Update export.php
 2024-07-17 20:07:40 +02:00
Alexandre SPANGARO
50646e70a0 FIX Accountancy - Generate entries of expense report with localtax (#30411) 
* FIX User List - Function is show in wrong column when module HRM enabled

* FIX Accountancy - Generate entries of expense report with localtax. $cpttva don't exist
 2024-07-17 19:42:12 +02:00
Laurent Destailleur
f7936d4378 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-07-15 00:46:03 +02:00
Laurent Destailleur
9487a4f918 FIX transfer in accountancy for expense reports. 2024-07-15 00:43:30 +02:00
Laurent Destailleur
147a8bfaee Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/subscription/list.php
	htdocs/categories/viewcat.php
	htdocs/contrat/card.php
	htdocs/contrat/list.php
	htdocs/eventorganization/conferenceorbooth_list.php
	htdocs/expedition/list.php
	htdocs/societe/card.php
 2024-07-11 10:44:39 +02:00
Alexandre SPANGARO
128769811c Add css bodylist on list (#30334) 
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-07-11 00:45:05 +02:00
Frédéric FRANCE
2707475a12 fix phpstan (#30319) 
* fix phpstan

* fix phpstan expects int, false given ...

* fix phpstan expects int, true given ...
 2024-07-08 21:45:35 +02:00
Laurent Destailleur
8712c1c900 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 
Conflicts:
	htdocs/product/card.php
 2024-07-06 14:04:23 +02:00
Laurent Destailleur
146c9e5732 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-07-06 14:00:32 +02:00
Laurent Destailleur
9ddc8dd93c Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-07-06 13:59:47 +02:00
Laurent Destailleur
0a88dc95a5 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2024-07-06 13:59:13 +02:00
Laurent Destailleur
86362599c1 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2024-07-06 13:55:04 +02:00
Laurent Destailleur
ca39809658 Fix #30256 2024-07-06 13:53:54 +02:00
Laurent Destailleur
4c6f4839ea Better fix for #30256 2024-07-06 13:49:34 +02:00
Laurent Destailleur
f1b5902c28 Enhance popup of social contribution ref 2024-07-06 13:42:05 +02:00
Laurent Destailleur
e825898437 Fix #30256 2024-07-04 20:46:29 +02:00
Laurent Destailleur
e804c69a99 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-01 03:47:18 +02:00
Laurent Destailleur
e6138f8744 Fix br 2024-07-01 03:47:01 +02:00
Laurent Destailleur
af8e350ed5 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-01 03:45:19 +02:00
Laurent Destailleur
0bda54186e Remove space 2024-07-01 03:37:55 +02:00
Alexandre SPANGARO
96afcaa476 Better comments (#30200) 
* Fix language

* Fix language

* Fix language

* Fix language

* Fix language

* Fix language

* Fix language

* CI Missing language key

* Update eventorganization.lang

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-06-30 21:02:50 +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
Laurent Destailleur
675e761297 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/margin/tabs/productMargins.php
	htdocs/margin/tabs/thirdpartyMargins.php
 2024-06-30 04:11:04 +02:00
Laurent Destailleur
db61320098 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 
Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/product/price.php
	htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
	htdocs/user/list.php
 2024-06-30 04:05:46 +02:00
Laurent Destailleur
b2e288f8ec Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/core/menus/standard/eldy.lib.php
 2024-06-30 03:53:16 +02:00
Laurent Destailleur
f64e4b4981 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-06-29 20:53:10 +02:00
Laurent Destailleur
d4b49fac4a Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-06-29 20:49:03 +02:00
Laurent Destailleur
00b58c94c3 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2024-06-29 20:48:39 +02:00
Laurent Destailleur
300fd7c1c4 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2024-06-29 20:45:08 +02:00
Laurent Destailleur
70799e392f Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2024-06-29 20:44:41 +02:00
Laurent Destailleur
cfaadbaa7c Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-06-26 21:50:14 +02:00
Laurent Destailleur
0fbaaffa57 Fix link to setup pages 2024-06-26 13:33:22 +02:00
Laurent Destailleur
7f52f47dfd Fix link for warning 2024-06-25 10:31:13 +02:00
Laurent Destailleur
aba18839cb Fix link for warning 2024-06-25 10:30:34 +02:00
Laurent Destailleur
7321d76bd7 Fix warning 2024-06-25 10:15:57 +02:00
Laurent Destailleur
fbfc767ea4 Fix warning 2024-06-25 10:05:57 +02:00
Laurent Destailleur
f83e345a98 Fix phan warning 2024-06-25 10:01:34 +02:00
Laurent Destailleur
48ccdde495 A try to fix phan 2024-06-25 09:59:07 +02:00
Laurent Destailleur
adb354f97a Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-06-23 14:00:12 +02:00
Alexandre SPANGARO
aa0c182e6d Situation invoice #29897 - Uniformize language key (#30115) 2024-06-22 15:58:07 +02:00
Alexandre SPANGARO
852f571bae Situation invoice #29897 - Add admin message to prevent to move to progressive mode with an help of a preferred partner (#30129) 2024-06-22 15:34:31 +02:00
Laurent Destailleur
587e6347ff Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-06-20 20:41:09 +02:00
Laurent Destailleur
cdd7488f20 Fix option must be visible on condition 2024-06-20 14:54:07 +02:00
Laurent Destailleur
858843ed6e Fix trans 2024-06-20 14:33:37 +02:00