Commit Graph

84059 Commits

Author SHA1 Message Date
Laurent Destailleur
a0fe2a8abc
Merge pull request #16022 from frederic34/patch-1
Update .gitignore
2021-01-19 16:19:26 +01:00
Frédéric FRANCE
b2d790b46a
Update .gitignore 2021-01-19 14:27:31 +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
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
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
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
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
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
lvessiller
ca6899c138 FIX right to show VAT rate in product list 2021-01-05 16:11:46 +01:00
Laurent Destailleur
f79dec80e6 Fix phpcs 2020-12-17 16:45:56 +01:00
Laurent Destailleur
f0d787debb Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-12-17 14:07:24 +01:00
Laurent Destailleur
6bbc25e8c3
Merge pull request #15775 from Haldarys/10.0-fix-prelevement
Fix PRELEVEMENT_ADDDAYS check
2020-12-17 13:53:44 +01:00
Laurent Destailleur
27542ed8ed
Update prelevement.php 2020-12-17 13:53:09 +01:00
Laurent Destailleur
36d6b472ce
Update prelevement.php 2020-12-17 13:52:03 +01:00
Haldarys
10ac74162e Fix PRELEVEMENT_ADDDAYS check
If we used a positive value in PRELEVEMENT_ADDDAYS it couldn't submit the changes to database
2020-12-17 10:19:21 +01:00
Laurent Destailleur
7886a6e838 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-12-13 15:06:54 +01:00
Laurent Destailleur
04c233c229
Merge pull request #15747 from aspangaro/10_p57
FIX: Export FEC - Force Carriage Return Line Feed
2020-12-13 15:06:19 +01:00
Alexandre SPANGARO
35b3d4f40a FIX: Export FEC - Force Carriage Return Line Feed 2020-12-13 14:11:04 +01:00
Laurent Destailleur
ad4a8eac52
Merge pull request #15725 from fmarcet/11.0
FIX: Bad rigths to send contract
2020-12-11 14:41:08 +01:00
Ferran Marcet
7360fcd03e FIX: Bad rigths to send contract 2020-12-10 13:11:55 +01:00
Laurent Destailleur
4e72543fde Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/fourn/class/paiementfourn.class.php
	htdocs/fourn/paiement/card.php
2020-12-08 18:11:39 +01:00
Laurent Destailleur
111d6aa621
Merge pull request #15695 from aspangaro/10_p57
FIX : Export FEC - Remove line at zero
2020-12-08 17:55:31 +01:00
Alexandre SPANGARO
7c77a0d84b FIX : Export FEC - Remove line at zero 2020-12-07 23:53:09 +01:00
Laurent Destailleur
12b15a3d90
Merge pull request #15634 from aspangaro/10_p57
FIX: Problem on supplier payment card
2020-12-04 22:05:06 +01:00
Laurent Destailleur
c69821794e
Merge pull request #15651 from fappels/11_fix_volume_calculation
FIX product auto volume calculation
2020-12-04 18:17:38 +01:00
Francis Appels
223205cf9d Fix volume calcution, depends on surface not surface_units
surface_unit can be 0 for m2
2020-12-04 16:54:40 +01:00
Francis Appels
5218550014 Merge remote-tracking branch 'Dolibarr/11.0' into 11 2020-12-04 11:08:21 +01:00
Alexandre SPANGARO
0a24298385 FIX: Problem on supplier payment card 2020-12-04 02:57:40 +01:00
Laurent Destailleur
0ad6ee209a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-12-03 11:21:08 +01:00
Francis Appels
5ec351911d Merge remote-tracking branch 'Dolibarr/11.0' into 11 2020-12-01 16:04:11 +01:00
Laurent Destailleur
26f07992a9 Reduce travis load for v11 2020-11-27 00:27:52 +01:00
Laurent Destailleur
6042b8df4e
Merge pull request #15499 from frederic34/patch-8
fix status on tooltip in box last product
2020-11-24 09:05:46 +01:00
Frédéric FRANCE
69ea0ea791
Update box_produits.php 2020-11-23 23:44:15 +01:00
Frédéric FRANCE
c7d886c918
fix status on tooltip in box last product 2020-11-23 23:25:09 +01:00
Laurent Destailleur
7fdc63faa6 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-11-15 23:48:52 +01:00
Laurent Destailleur
556888d55c Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-11-15 23:48:18 +01:00
Laurent Destailleur
5e1cd459b1 Fix travis 2020-11-15 23:47:53 +01:00
Laurent Destailleur
dff5b13700
Merge pull request #15418 from atm-maxime/fix_ticket_list_filter
Fix #15377 ticket list filter on author
2020-11-15 17:01:47 +01:00
Maxime Kohlhaas
44c5988853 Fix #15377 ticket list filter on author 2020-11-15 10:42:15 +01:00
Laurent Destailleur
2907df8253
Merge pull request #15364 from frederic34/patch-15
Fix missing getpost for scandir odt path
2020-11-12 12:33:59 +01:00
Frédéric FRANCE
ad05451427
Fix missing getpost for scandir odt path 2020-11-12 11:23:03 +01:00
Laurent Destailleur
2db08c8e0d
Merge pull request #15341 from atm-quentin/FIX/HeightForTotWhenTooMuchPayment
FIX : handling $heightforinfotot when he's superior to a page height
2020-11-10 14:38:39 +01:00
quentin
fb27c98f9c FIX : handling $heightforinfotot when he's superior to a page height 2020-11-10 09:40:45 +01:00
Laurent Destailleur
8458025e1d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-11-09 19:47:33 +01:00
Laurent Destailleur
4a5c7d299f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
2020-11-09 19:47:25 +01:00