Commit Graph

102232 Commits

Author SHA1 Message Date
Maxime Kohlhaas
1bb07dbc6b Fix #19404 : only validated invoice must be considered in unpaid indicator 2021-12-28 11:02:45 +01:00
Laurent Destailleur
0273ab67fe Prepare 14.0.5 2021-12-23 10:24:06 +01:00
Laurent Destailleur
00b43be7e6 Code comment 2021-12-23 10:20:01 +01:00
Laurent Destailleur
fee64f57d4 FIX Can't close a down payment if paid with credit notes. 2021-12-23 10:09:20 +01:00
Laurent Destailleur
51225b9801 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-12-21 16:33:43 +01:00
Laurent Destailleur
c517cabd16 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-12-21 16:33:31 +01:00
Laurent Destailleur
e76c85bc8d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-12-21 16:32:45 +01:00
Laurent Destailleur
856b010a45 FIX #19651 2021-12-21 15:56:59 +01:00
Laurent Destailleur
82bab7bcac
Merge pull request #19668 from ATM-Consulting/FIX_ContactCategorie_Double_Display_On_Societe_Create_Card_With_THIRDPARTY_SUGGEST_ALSO_ADDRESS_CREATION
FIX : double display for contact categorie on societe create card
2021-12-21 15:53:53 +01:00
Laurent Destailleur
084f298836 Fix regression. The entity for bank is in table itself not into a parent 2021-12-21 14:34:47 +01:00
atm-gregr
3feb3d5b76 double contactcategorie 2021-12-21 14:26:28 +01:00
Laurent Destailleur
13b17fa0da FIX #19564 2021-12-19 20:28:27 +01:00
Laurent Destailleur
4f572287dd Fix remove .BAK files 2021-12-19 17:28:19 +01:00
Laurent Destailleur
5c4fad3cc0 phpcs 2021-12-19 00:37:43 +01:00
Laurent Destailleur
98ddfbf792 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/compta/facture/info.php
	htdocs/compta/facture/list.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/fourn/facture/list.php
	htdocs/mrp/mo_movements.php
	htdocs/product/stock/movement_card.php
	htdocs/product/stock/movement_list.php
	htdocs/product/stock/replenishorders.php
	htdocs/reception/card.php
	htdocs/supplier_proposal/list.php
2021-12-19 00:17:37 +01:00
Laurent Destailleur
baa9585f85 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/core/lib/functions.lib.php
	htdocs/holiday/month_report.php
2021-12-19 00:01:11 +01:00
Laurent Destailleur
1cc0f8e15f
Merge pull request #18167 from ATM-Consulting/FIX_13.0_extrafields_inoperative_in_receptions
FIX: line extrafields are inoperative in dispatch cards even when they exist
2021-12-16 18:54:38 +01:00
Laurent Destailleur
e17ddee559
Merge pull request #19396 from FHenry/14.0_fix_margin_cal_with_depositinvoice
fix: #ZENDSI fix margin calc with credit note
2021-12-16 18:48:27 +01:00
Laurent Destailleur
e4dede7aba
Merge pull request #19605 from atm-jpb/14_fix_bank_restrictedArea
Fix : add  info for acces right  on compta/ bank / info
2021-12-16 17:35:31 +01:00
Laurent Destailleur
9d6ddced56
Merge pull request #19607 from fbosman/patch-1
Update functions.lib.php
2021-12-16 17:33:13 +01:00
Laurent Destailleur
15b85258e8
Merge pull request #19634 from atm-gregr/FIX_Info_Tab_returns_Record_not_found
FIX :  info tab on customer invoice record not found
2021-12-16 17:05:22 +01:00
Laurent Destailleur
e9b7fd0ef8
Update info.php 2021-12-16 17:05:12 +01:00
Laurent Destailleur
dc1118a3df
Update info.php 2021-12-16 17:04:25 +01:00
Laurent Destailleur
36ba158a8b
Merge pull request #19637 from atm-john/12.0_fix_get_prev_progress
FIX : test of method exist on wrong object
2021-12-16 16:49:59 +01:00
Laurent Destailleur
dcc8a68cdf
Merge pull request #19636 from 1ocate/FIX_author_searching_include_first_and_last_name_13
Fix 13.0 author searching include first and last name
2021-12-16 16:49:17 +01:00
Laurent Destailleur
140cca7596
Merge pull request #19640 from atm-kevin/FIX_Holidays_Filter
FIX Holiday month report
2021-12-16 16:36:54 +01:00
kevin
a5b8d0cd4b FIX Take into consideration work leave over serveral months 2021-12-16 15:41:13 +01:00
Laurent Destailleur
f1af5a41bf Fix several pb with down payments 2021-12-16 12:53:46 +01:00
Laurent Destailleur
43e682b56f Fix several pb with down payments 2021-12-16 12:33:45 +01:00
Jay Yeo
e8eaf986fe Fix author searching include first and last name 2021-12-16 16:55:47 +07:00
John BOTELLA
d149596043 fix test of method exist on wrong object 2021-12-16 10:33:53 +01:00
Jay Yeo
41e4e70c6e Fix author searching include first and last name 2021-12-16 16:28:45 +07:00
atm-gregr
cc12baed57 fix info tab on customer invoice record not found 2021-12-16 10:19:42 +01:00
Frans Bosman
cf05f38e54
Update functions.lib.php
Change exists to isset in price2num
2021-12-13 19:56:06 +01:00
jpb
ac8538a812 add info for acces right 2021-12-13 16:53:34 +01:00
Laurent Destailleur
964656c728 Fix label of status 2021-12-11 22:28:16 +01:00
Laurent Destailleur
e85289777c
Merge pull request #19593 from atm-gauthier/fix_compat_postgres
FIX : postgresql compatibility, '' as is not authorized
2021-12-10 12:45:00 +01:00
Gauthier PC portable 024
b609c579b6 FIX : postgresql compatibility, "" as is not authorized 2021-12-10 11:40:25 +01:00
Laurent Destailleur
783ddcc671 Fix phpcs 2021-12-09 18:01:44 +01:00
Laurent Destailleur
10225d2b1f Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-12-09 17:59:08 +01:00
Laurent Destailleur
e3932377a6 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
2021-12-09 17:58:57 +01:00
Laurent Destailleur
37fd2e05b9
Merge pull request #19582 from atm-florianm/FIX_13.0_duplicate_hook_printFieldListWhere_in_replenish
FIX 13.0: printFieldListWhere called twice on same query
2021-12-09 17:40:50 +01:00
Laurent Destailleur
1fa8e1db98
Merge pull request #19579 from atm-maxime/fix_xml_trunc
Fix #18586 : special char "…" not allowed in XML file and added by dol_trunc
2021-12-09 17:21:56 +01:00
Laurent Destailleur
98d534d7a4
Merge pull request #19581 from hregis/fix_wrong_sql_request
FIX wrong syntax of sql request
2021-12-09 17:20:17 +01:00
Laurent Destailleur
a9bdefa358 FIX select too large into addrights (pb of missing parenthesis) 2021-12-09 11:12:40 +01:00
Regis Houssin
1098426005 FIX wrong syntax of sql request 2021-12-09 10:31:02 +01:00
Laurent Destailleur
76779aa9e1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-12-09 10:00:59 +01:00
Laurent Destailleur
92a0c9e4fb Fix sql error in repair.php 2021-12-09 10:00:42 +01:00
Maxime Kohlhaas
1123bf3cde Fix #18586 : special char "…" not allowed in XML file and added by dol_trunc 2021-12-09 09:34:00 +01:00
Laurent Destailleur
1697cdf4b9
Merge pull request #19526 from hregis/fix_missing_default_value
FIX missing default value for more comprehensive
2021-12-08 21:26:56 +01:00