Commit Graph

87795 Commits

Author SHA1 Message Date
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
jcp
1f483d7c28 Fix force payment mode to create withdrawal 2020-11-04 11:43:03 +01:00
jcp
3ce7a23c70 Revert "NEW massaction for BankTransfer"
This reverts commit a39ff26def.
2020-11-03 20:21:53 +01:00
jcp
a39ff26def NEW massaction for BankTransfer 2020-11-03 20:16:56 +01:00
jcp
bae05bbe7d Fix computed import 2020-11-03 18:43:03 +01:00
Laurent Destailleur
f25a6b2e67
Merge pull request #15213 from ATM-Consulting/fix/10.0_delete_action_from_redirect_url_when_reordering_lines
FIX - 10.0 - remove 'action' parameter from redirect URL when reordering lines
2020-11-02 09:41:00 +01:00
Florian Mortgat
400acf9f65 FIX - 10.0 - regex to remove 'action' parameter: taking feedback from PR#15213 into account 2020-11-02 08:26:36 +01:00
Laurent Destailleur
2cdbfa2048 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-11-01 17:45:22 +01:00
Laurent Destailleur
72160deef7 FIX #14979 2020-11-01 17:01:26 +01:00
Laurent Destailleur
ad922bfde6 FIX #15074 2020-11-01 16:08:09 +01:00
Laurent Destailleur
49ccf2a3cb Update doc 2020-11-01 15:55:51 +01:00
Laurent Destailleur
45f834cb15 FIX #15199 2020-11-01 15:20:33 +01:00
Laurent Destailleur
63a03cdad6 FIX #15208 2020-11-01 14:34:29 +01:00
Laurent Destailleur
41b938047d Fix doc 2020-10-31 14:51:32 +01:00
Laurent Destailleur
9113ecedfa code comment 2020-10-31 12:55:26 +01:00
Laurent Destailleur
623cb54480 Prepare a more complete fix for #15016 2020-10-31 12:30:47 +01:00
Laurent Destailleur
a4d2927f82 Fix for #15016
Conflicts:
	htdocs/core/actions_linkedfiles.inc.php
2020-10-31 12:18:54 +01:00
Laurent Destailleur
d9ca9fe22d Fix clean of contract 2020-10-30 14:50:38 +01:00
Laurent Destailleur
2deb1e6107
Merge pull request #15221 from atm-john/12.0_missign_lang_trans
FIX Missing lang trans
2020-10-30 14:35:04 +01:00
ATM john
61cb99117a Add missing lang trans 2020-10-30 09:33:07 +01:00
Laurent Destailleur
5504e3b236 Fix phpcs 2020-10-30 05:58:40 +01:00