Commit Graph

87815 Commits

Author SHA1 Message Date
Laurent Destailleur
5822fcfbed FIX several warning with the barcode use in ODT templates 2020-11-23 21:38:45 +01:00
Laurent Destailleur
9cb5673c36 Fix remove var_dump 2020-11-23 19:46:24 +01:00
Laurent Destailleur
c5278197fb More phpunit test for price2num 2020-11-23 19:45:11 +01:00
Laurent Destailleur
e7dbc8407f FIX formating of prices with foreign languages 2020-11-23 19:08:26 +01:00
Laurent Destailleur
3c84962891
Merge pull request #15472 from atm-florianm/FIX_12.0_CRON_methods_cant_be_called_without_params
Fix 12.0 cron methods cant be called without params
2020-11-21 23:39:39 +01:00
Florian Mortgat
6c75997b27 FIX wrong tab 2020-11-20 19:15:15 +01:00
Florian Mortgat
f7228d96af FIX 12.0 - when the cronjob 'params' field is empty, the cron method is called with one empty string param instead of no params at all 2020-11-20 19:12:59 +01:00
Laurent Destailleur
823e399d8d
Merge pull request #15428 from atm-quentin/FIX/actioncomm_desc_cant_be_empty
FIX cant empty action comm desc
2020-11-18 12:47:37 +01:00
Laurent Destailleur
4ae121d870 FIX Can't create shipment for virtual product. Add
STOCK_EXCLUDE_VIRTUAL_PRODUCTS as a quick hack to solve this.
2020-11-16 19:43:45 +01:00
quentin
6ce006f853 FIX cant empty action comm desc 2020-11-16 15:46:16 +01:00
Laurent Destailleur
217aa9c420 Clean CI 2020-11-15 23:50:11 +01:00
Laurent Destailleur
8ac3d5f9bf Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-11-15 23:49:22 +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
b9192744cc Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-11-15 17:16:05 +01:00
Laurent Destailleur
30681f9179 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-11-15 17:15:56 +01:00
Laurent Destailleur
f101b3e43d
Merge pull request #15402 from BlueGarm/BlueGarm-Order-Partially-and-Delay
Add orders received partially and delay icons
2020-11-15 17:13:07 +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
BlueGarm
2425cf82d3 Add Partially Received Order and Delay
Edit file to allow following order received partially and to upgrade lisibility of delayed orders
2020-11-14 13:25:02 +01:00
Mikaël MARTIN
0c37d31e04
Update box_supplier_orders_awaiting_reception.php 2020-11-14 13:01:36 +01:00
Laurent Destailleur
0764cb2abd Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-11-12 14:13:19 +01:00
Laurent Destailleur
777ae9af9b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-11-12 14:12:13 +01:00
Laurent Destailleur
02158928cc FIX #15365 export of extrafields for user and resources 2020-11-12 14:11:59 +01:00
Laurent Destailleur
dd46ca9c3c
Merge pull request #15356 from FHenry/12_fix_php7.4_deprecated
fix deprecated warning php 7.4
2020-11-12 12:36:19 +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
Florian HENRY
b16af0a7c3 fix deprecated warning php 7.4 2020-11-11 15:43:36 +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
Laurent Destailleur
73df033000 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/core/boxes/box_birthdays.php
2020-11-10 11:05:53 +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
Laurent Destailleur
59abed9153
Merge pull request #15337 from ATM-Consulting/FIX_12.0_remove_set_thirdparty_action_on_invoice
Following PR#15336: it should not be possible to modify the third par…
2020-11-09 19:08:14 +01:00
Laurent Destailleur
18d4840f85
Merge pull request #15334 from aspangaro/10_p57
FIX: Accountancy - Some ajustments on length of the account (general & auxiliary)
2020-11-09 19:02:35 +01:00
Laurent Destailleur
c529a92b92
Merge pull request #15333 from atm-gauthier/11.0_fix_disabled_sales_representative
FIX : disabled users must not be available in sales representative list on societe edit mode
2020-11-09 19:02:01 +01:00
Florian Mortgat
bf27c56fa7 Following PR#15336: it should not be possible to modify the third party of an invoice 2020-11-09 17:09:06 +01:00
Alexandre SPANGARO
0a078da8e4 FIX: Accountancy - Some ajustments on length of the account 2020-11-09 14:59:29 +01:00
Alexandre SPANGARO
617c930574 FIX: Accountancy - Some ajustments on length of the account (general & auxiliary) 2020-11-09 14:13:09 +01:00
Got2be
2f11f4e104 FIX : disabled users must not be available in sales representative list on societe edit mode 2020-11-09 11:22:07 +01:00
Laurent Destailleur
a017943083
Merge pull request #15321 from atm-lena/11.0_FIX_BoxBirthdayAndSocCommercial_UserStatus
FIX - Don't display inactive users in birthday box and company card
2020-11-06 18:43:56 +01:00
atm-lena
047785b273 FIX - Don't display inactive users in birthday box and soc card 2020-11-06 11:58:36 +01:00
Laurent Destailleur
4689d42afd FIX #15303 2020-11-05 14:10:46 +01:00
Laurent Destailleur
6080e5335f Minor fix 2020-11-05 12:56:20 +01:00
Laurent Destailleur
9380ea4bc5 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-11-05 09:43:38 +01:00
Laurent Destailleur
a5328f4230 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-11-05 09:43:28 +01:00
Laurent Destailleur
6bb598498e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-11-05 09:42:51 +01:00
Laurent Destailleur
4b7c8a0d1d
Merge pull request #15291 from prietojc/12.0_patch-1
FIX force payment mode to withdraw
2020-11-04 20:36:29 +01:00
Laurent Destailleur
e505586926
Merge pull request #15280 from prietojc/12.0
Fix computed import
2020-11-04 18:49:17 +01:00