Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-25 19:01:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
93,177 Commits 36 Branches 191 Tags
ce035eb4cebb52e13f9f327debcfe62d221d12f4
Commit Graph

93177 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
ce035eb4ce Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/bom/bom_card.php
 2021-01-06 21:33:59 +01:00
Laurent Destailleur
1aa7e4adeb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-01-06 21:32:46 +01:00
Laurent Destailleur
0dc182553e Merge pull request #15896 from atm-lena/FIX/issue_14197 
FIX balance starting and ending fiscal month #14197
 2021-01-06 21:32:02 +01:00
Laurent Destailleur
2a31ca969f FIX #15388 #15891 2021-01-06 21:29:58 +01:00
Laurent Destailleur
4c00167687 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/societe/card.php
 2021-01-06 20:51:44 +01:00
Laurent Destailleur
ca11ea9839 Fix phpunit 
Signed-off-by: Laurent Destailleur <eldy@destailleur.fr>
 2021-01-06 20:47:57 +01:00
Laurent Destailleur
123bd81721 Trim no more required 2021-01-06 20:42:18 +01:00
Laurent Destailleur
ef8021467b FIX #15892 #15017 2021-01-06 20:41:40 +01:00
Laurent Destailleur
93323f6d61 Merge pull request #15889 from atm-quentin/FIX/issue_15516 
FIX wrong name for search status param issue #15516
 2021-01-06 20:35:52 +01:00
Laurent Destailleur
8f1617884a Merge pull request #15888 from atm-quentin/FIX/issue_15659 
FIX issue 15659 : Missing test if supplier conf is enabled
 2021-01-06 20:35:34 +01:00
Laurent Destailleur
679948e207 Merge pull request #15893 from atm-lena/FIX_issue_15629 
FIX #15629
 2021-01-06 20:34:31 +01:00
Laurent Destailleur
71278b173e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-06 20:28:33 +01:00
Laurent Destailleur
654cf2d990 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2021-01-06 20:27:46 +01:00
Laurent Destailleur
9e50a06f2b Merge pull request #15894 from atm-john/11.0_fix_issue_14833 
Fix #14833 A security mecanism generates data loss
 2021-01-06 20:26:19 +01:00
Laurent Destailleur
a955df21bf Merge pull request #15905 from atm-quentin/FIX/issue_14501 
FIX useless tracking number displayed on pdf if empty issue #14501
 2021-01-06 20:22:43 +01:00
Laurent Destailleur
2ab74e871e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-06 20:21:40 +01:00
Laurent Destailleur
170814c718 Fix missing rollback 2021-01-06 20:21:22 +01:00
Laurent Destailleur
3d96c5a454 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/bom/tpl/objectline_create.tpl.php
	htdocs/bom/tpl/objectline_edit.tpl.php
	htdocs/bom/tpl/objectline_view.tpl.php
	htdocs/core/boxes/box_shipments.php
	htdocs/societe/class/societe.class.php
 2021-01-06 20:20:37 +01:00
Laurent Destailleur
7f21332533 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-01-06 20:12:17 +01:00
Laurent Destailleur
17306bc715 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/boxes/box_shipments.php
 2021-01-06 20:12:09 +01:00
Laurent Destailleur
d3bc6aadec Merge pull request #15902 from atm-john/11.0_fix_box_issue_15465 
FIX #15465 External user sees last 5 shipments to other customers in the dashboard
 2021-01-06 19:56:57 +01:00
Laurent Destailleur
7372a18283 Update box_shipments.php 2021-01-06 19:56:49 +01:00
Laurent Destailleur
33b138b5ba Merge pull request #15904 from atm-jpb/12.0_Fix 
Fix add ticket on elementList
 2021-01-06 19:48:10 +01:00
Laurent Destailleur
62d527b68c Merge pull request #15908 from atm-adrien/NEW/add_doActions_hooks_to_banks 
NEW : Added of doActions hooks in bank module
 2021-01-06 19:39:24 +01:00
Laurent Destailleur
99066eaf5c Merge pull request #15912 from atm-jpb/12.0_fix_cat_product_list 
FIX : add categories params  on llxHeader filter
 2021-01-06 19:38:57 +01:00
Laurent Destailleur
4f2c6e2901 Merge pull request #15911 from atm-kevin/Fix_create_contact_from_thirdparty_from_member 
Fix #15829
 2021-01-06 19:33:25 +01:00
Laurent Destailleur
fead1b7e86 Merge pull request #15907 from atm-kevin/Fix_multicurrency_supplier_invoice_puht_devise 
Fix #14353
 2021-01-06 19:32:53 +01:00
Laurent Destailleur
35d74035be Merge pull request #15913 from atm-john/fix/12.0_bom_unit 
FIX bom line unit display #13831
 2021-01-06 19:31:59 +01:00
jpb
142800f951 Merge branch '12.0_fix_cat_product_list' of github.com:atm-jpb/dolibarr into 12.0_fix_cat_product_list 2021-01-06 16:06:42 +01:00
jpb
2be2cdaadf fix style errors 2021-01-06 16:06:03 +01:00
ATM john
cf324f75d7 Fix bom line unit display #13831 2021-01-06 16:01:19 +01:00
stickler-ci
f9ae8acbc7 Fixing style errors. 2021-01-06 14:47:54 +00:00
jpb
99b977a08e add categories params on llxHeader filter 2021-01-06 15:38:30 +01:00
kevin
5164a96aa0 Fix #15829 2021-01-06 15:35:33 +01:00
kevin
e8ba4de832 Fix #14353 2021-01-06 14:46:56 +01:00
Adrien Raze
6f05ba4db9 NEW : Added of doActions hooks in bank/line.php and bank/transfer.php 2021-01-06 14:26:40 +01:00
stickler-ci
ca557cfacd Fixing style errors. 2021-01-06 13:22:35 +00:00
quentin
e44b14364a FIX useless tracking number displayed on pdf if empty 2021-01-06 14:17:06 +01:00
jpb
19ee163f31 Fix add ticket on elementList 2021-01-06 13:54:51 +01:00
ATM john
50b5226d10 FIX #15465 External user sees last 5 shipments to other customers in the dashboard 2021-01-06 12:40:38 +01:00
atm-lena
4b9bb824d0 FIX balance starting and ending fiscal month #14197 2021-01-06 11:16:51 +01:00
ATM john
92a4314779 Fix security mecanism generating data loss 2021-01-06 10:45:54 +01:00
atm-lena
6f15683709 FIX create ticket : thirdparty/contact notification #15629 2021-01-06 10:42:48 +01:00
quentin
2f932330d3 FIX wrong name for search status param 2021-01-06 10:10:39 +01:00
quentin
7161ca9e70 FIX issue 15659 : Missing test if conf is enabled 2021-01-06 09:54:02 +01:00
Laurent Destailleur
01062c5940 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/product/list.php
 2021-01-05 19:12:22 +01:00
Laurent Destailleur
58e33c59f4 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/product/list.php
 2021-01-05 19:07:53 +01:00
Laurent Destailleur
5709216427 Merge pull request #15881 from OPEN-DSI/v11-fix-product-list-vat-rate-show-right 
FIX right to show VAT rate in product list
 2021-01-05 18:57:06 +01:00
UT from dolibit
346bddf32f Update ChangeLog 
some minor changings
add info #15180
sorting
add info #14725
 2021-01-05 18:54:49 +01:00
UT from dolibit
a370ba1bbc Update check.php 
$arrayphpminversionwarning = array(5, 6, 0);
 2021-01-05 18:53:19 +01:00