lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
93,408 Commits 43 Branches 150 Tags 886 MiB
b553dbb9d2
Commit Graph

93408 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
b553dbb9d2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-06 20:23:07 +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
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
d31ac0fa22
Merge pull request #15895 from OPEN-DSI/fix_show_default_contact_on_contact_card 
FIX : Fix the display on the 'contact by default' on the contact card
 2021-01-06 20:02:47 +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
94fb3dfadb
Merge pull request #15899 from homer8173/patch-21 
German date format
 2021-01-06 19:44:04 +01:00
Laurent Destailleur
209ff84a18
Merge pull request #15828 from hregis/fix_php_8.0 
FIX avoid warning with php 8.0
 2021-01-06 19:43:09 +01:00
Laurent Destailleur
7788e60879
Merge pull request #15884 from frederic34/thirdparty_letering 
doxygen
 2021-01-06 19:40:04 +01:00
Laurent Destailleur
7e5444da9a
Merge pull request #15903 from dolibit-ut/patch-61 
Update ChangeLog
 2021-01-06 19:39:40 +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
jpb
19ee163f31 Fix add ticket on elementList 2021-01-06 13:54:51 +01:00
UT from dolibit
40f2d884dd
Update ChangeLog 
sorting TakePOS changelogs
minor edits
 2021-01-06 13:09:42 +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
Norbert Penel
361d2352a5
German date format 
fixed by my client, they use a dot in this case : 
https://www.wikihow.com/Write-German-Dates
 2021-01-06 12:12:14 +01:00
stickler-ci
4691b5e4df Fixing style errors. 2021-01-06 10:41:49 +00:00
Regis Houssin
fadfe4a4bf FIX syntax error 2021-01-06 11:39:12 +01:00
Regis Houssin
f80a476bc5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0 2021-01-06 11:37:56 +01:00
kamel
c2489dd313 FIX : Fix the display on the 'contact by default' on the contact card 2021-01-06 11:07:25 +01:00
Frédéric FRANCE
58a4249222
clean code 2021-01-05 20:21:15 +01:00
Frédéric FRANCE
76d46652b7
doxygen 2021-01-05 20:17:26 +01:00
Laurent Destailleur
007ae59788 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-05 19:13:06 +01:00
Laurent Destailleur
ba68c958e1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-05 19:12:57 +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
Laurent Destailleur
a044d1b91f
Merge pull request #15880 from frederic34/api_bank_account 
fix unknown variable
 2021-01-05 18:55:35 +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
Laurent Destailleur
65852b5734
Merge pull request #15882 from dolibit-ut/patch-59 
Update ChangeLog
 2021-01-05 18:54:21 +01:00
UT from dolibit
a370ba1bbc Update check.php 
$arrayphpminversionwarning = array(5, 6, 0);
 2021-01-05 18:53:19 +01:00
Laurent Destailleur
84e6daa683
Merge pull request #15883 from dolibit-ut/patch-60 
Update check.php
 2021-01-05 18:52:30 +01:00
UT from dolibit
19b8123ddf
Update check.php 
$arrayphpminversionwarning = array(5, 6, 0);
 2021-01-05 18:09:59 +01:00
UT from dolibit
27b4627825
Update ChangeLog 
some minor changings
add info #15180
sorting
add info #14725
 2021-01-05 17:41:24 +01:00
lvessiller
ca6899c138 FIX right to show VAT rate in product list 2021-01-05 16:11:46 +01:00
Laurent Destailleur
9764f086d3 Fix Field code is mandatory but not field note in tax dictionary 2021-01-05 14:31:14 +01:00