Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
140,250 Commits 36 Branches 189 Tags
901b9dab72357dad4e162f94d6b53e1e84d20dd5
Commit Graph

3833 Commits

Author SHA1 Message Date
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
Alexandre SPANGARO
4cde150804 NEW Accountancy - Add partial reconcile on subledger (#30027) 
* NEW Accountancy - Add partial lettering on subledger

* Fix PHPCS

* Fix codespell
 2024-06-19 20:10:04 +02:00
lvessiller-opendsi
3929653365 NEW due date in accounting bookkeeping list and card (#30061) 
* NEW due date in accounting bookkeeping list and card

* fix pre-commit

* fix pre-commit
 2024-06-19 19:47:22 +02:00
Laurent Destailleur
f7c84c6621 Merge manually first step for situation invoice from #29897 2024-06-18 20:21:56 +02:00
lvessiller-opendsi
46864255ba FIX validated date filter on accountancy bookkeeping list and export (#30069) 2024-06-18 18:32:27 +02:00
Laurent Destailleur
d636114540 Debug v20 - Fix getMultidirOutput 2024-06-17 13:06:43 +02:00
Laurent Destailleur
61bf5b0f96 Fix protection on too many lines was at the wrong place 2024-06-17 10:47:49 +02:00
Laurent Destailleur
045eb7cecb Finish the cache use in accountancy, remove the TODOs comment 2024-06-17 10:39:42 +02:00
Alexandre SPANGARO
8c8d5333c7 Add llxHeader class to Accountancy ExpenseReport (#30025) 2024-06-15 15:09:10 +02:00
Alexandre SPANGARO
c906401a88 Add llxHeader body css to Accountancy generation (#30026) 2024-06-15 15:08:55 +02:00
Alexandre SPANGARO
f1f61355dd Add llxHeader body css to Accountancy consultation (#30028) 2024-06-15 15:08:21 +02:00
lvessiller-opendsi
c5bb1856c2 FIX modification date from label in accounting bookkeeping list (#30038) 2024-06-15 15:02:19 +02:00
Anthony Damhet
1d7946e0bd Add llxHeader class to Accountancy customers and suppliers (#29994) 2024-06-12 16:42:05 +02:00
Laurent Destailleur
68e9b44d7e css 2024-06-10 20:30:01 +02:00
Laurent Destailleur
e23f2c2363 css 2024-06-10 20:26:15 +02:00
Laurent Destailleur
5154d494d8 CSS 2024-06-10 20:18:23 +02:00
Laurent Destailleur
24c3040fe6 CSS 2024-06-10 19:42:18 +02:00
Laurent Destailleur
29e19efd95 Look and feelv20 2024-06-06 15:10:48 +02:00
Laurent Destailleur
fd6159214f Debug v20 2024-06-05 12:30:38 +02:00
Laurent Destailleur
856600470d Debug v20 2024-06-05 11:57:17 +02:00
Frédéric FRANCE
d5de4f4f67 fix cti (#29809) 
* fix cti

* Update accountingaccount.class.php

* Update accountingaccount.class.php

* Update admin.lang

* Update ignore_translation_keys.lst

* Update ignore_translation_keys.lst

* Update json.lib.php
 2024-06-03 13:44:31 +02:00
Frédéric FRANCE
39fda91129 fix cti (#29808) 
* fix cti

TypeError PhanTypeMismatchArgumentProbablyReal Argument 1 ($rowid)

* Update accountingjournal.class.php

* fix phan
 2024-06-01 12:06:41 +02:00
Laurent Destailleur
7e8565bee7 Debug v20 2024-05-31 13:55:45 +02:00
Laurent Destailleur
82908a30eb Clean phan warnings 2024-05-30 13:37:17 +02:00
Laurent Destailleur
326e611851 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-05-29 14:46:55 +02:00
Alexandre SPANGARO
3ebbfc6bbb FIX #29756 Sql error on comment search (#29761) 2024-05-28 23:57:26 +02:00
Laurent Destailleur
4e62323b70 Fix warnings 2024-05-23 20:20:57 +02:00
Laurent Destailleur
8244b920df Remove phan warning 2024-05-23 15:47:25 +02:00