Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-24 10:21:32 +01:00
Code Issues Packages Projects Releases Wiki Activity
102,267 Commits 36 Branches 191 Tags
8d1648426e8d159d4b9f922c9ce11a2310b51b4c
Commit Graph

102267 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
8d1648426e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-01-04 09:39:43 +01:00
Laurent Destailleur
b600fe7377 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-01-04 09:38:33 +01:00
Laurent Destailleur
ba6033da8e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/modulebuilder/template/admin/setup.php
 2022-01-04 09:38:11 +01:00
Laurent Destailleur
807f2841d4 FIX Navigation on bank transaction list 2022-01-04 09:33:52 +01:00
Laurent Destailleur
64c7472965 Fix link to account id 2022-01-03 22:01:08 +01:00
Laurent Destailleur
a919ade1c6 Fixunit price 2021-12-30 20:00:04 +01:00
Laurent Destailleur
3967ce9c20 Fix unit price 2021-12-30 19:48:59 +01:00
Laurent Destailleur
8085c32b85 Merge pull request #19681 from atm-florianm/FIX_14.0_best_supplier_price_discount_applied_twice 
FIX: discounts are applied twice for displaying best supplier price
 2021-12-30 19:47:07 +01:00
Laurent Destailleur
108df3726a Fix php syntax 2021-12-30 18:46:26 +01:00
Laurent Destailleur
62a74ed428 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
	htdocs/societe/list.php
 2021-12-30 17:57:45 +01:00
Laurent Destailleur
9f82aa1570 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/modulebuilder/template/admin/setup.php
 2021-12-30 17:51:25 +01:00
Laurent Destailleur
7bdfc998bf Fix regression 2021-12-30 17:49:53 +01:00
Laurent Destailleur
76a0caf116 Merge pull request #19717 from OPEN-DSI/fix-company-list-title-on-nature-of 
FIX title for nature of third party in company list
 2021-12-30 17:25:08 +01:00
Laurent Destailleur
c57dc82eaa Merge pull request #19688 from atm-maxime/fix_modbuilder_numbering_model 
Fix modulebuilder params for updatemask action
 2021-12-30 17:07:27 +01:00
lvessiller
f16166c47c FIX title for nature of third party in company list 2021-12-30 15:35:49 +01:00
Laurent Destailleur
63f2cd6a30 Merge pull request #19695 from atm-maxime/fix_user_from_candidate 
Fix #19672 : email unicity was checked when email was null
 2021-12-30 13:17:49 +01:00
Laurent Destailleur
ac7d08d3e7 Merge pull request #19696 from atm-maxime/fix_supinv_unpaidboard 
Fix #19404 : only validated invoice must be considered in unpaid indicator
 2021-12-30 13:00:09 +01:00
Laurent Destailleur
b62741b5a0 Merge pull request #19697 from atm-maxime/fix_order_massbilling 
Fix #19249 : wrong payment cond and mode on mass order billing
 2021-12-30 12:59:21 +01:00
Laurent Destailleur
15b34dedac Merge pull request #19701 from atm-maxime/fix_bankentries_filter 
Fix #19667 : bankentries wrong SQL parenthesis + missing filter
 2021-12-30 12:52:57 +01:00
Laurent Destailleur
30214b7300 Merge pull request #19702 from atm-maxime/fix_skr04_syntax 
Fix #19666 : missing quotes in SQL statement
 2021-12-30 12:49:38 +01:00
Maxime Kohlhaas
4b3289ed84 Fix #19666 : missing quotes in SQL statement 2021-12-28 16:20:01 +01:00
Maxime Kohlhaas
12880f1716 Fix : replace old filters by new ones 2021-12-28 16:02:51 +01:00
Maxime Kohlhaas
1d20694f33 Fix #19667 : bankentries wrong SQL parenthesis + missing filter 2021-12-28 15:47:46 +01:00
Maxime Kohlhaas
0e9b707801 Fix #19249 : wrong payment cond and mode on mass order billing 2021-12-28 11:57:26 +01:00
Maxime Kohlhaas
1bb07dbc6b Fix #19404 : only validated invoice must be considered in unpaid indicator 2021-12-28 11:02:45 +01:00
Maxime Kohlhaas
3ada0a8741 Fix #19672 : email unicity was checked when email was null 2021-12-28 10:40:44 +01:00
Maxime Kohlhaas
d82c1f34e0 Fix modulebuilder params for updatemask action 2021-12-25 11:33:26 +01:00
atm-florian
67910db532 FIX: discounts are applied both when fetching the best supplier price and when displaying it 
cf. PR #18873
commit 2be2423dee
 2021-12-23 19:00:39 +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
9feb3a0adb Merge pull request #19492 from fmarcet/13.0 
Fix: Import don't work if extrafield is separator
 2021-12-22 00:25:03 +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
Ferran Marcet
2b7c3be511 Replace sql operator 2021-12-20 12:34:46 +01:00
Ferran Marcet
aa3f473ebc Merge branch '13.0up' into 13.0 2021-12-20 12:32:43 +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