Commit Graph

106004 Commits

Author SHA1 Message Date
Laurent Destailleur
626a5b90f1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-16 21:23:45 +01:00
Laurent Destailleur
c3733a92e1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
	htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
2022-02-16 21:22:49 +01:00
Laurent Destailleur
eb8caf7419 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-02-16 21:17:19 +01:00
Laurent Destailleur
c16e013b99 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
	htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
2022-02-16 21:13:49 +01:00
Laurent Destailleur
92cb95a184
Merge pull request #20064 from ATM-Consulting/FIX_uniformize_pdf_logo_behaviour
Fix uniformize pdf logo behaviour for supplier orders
2022-02-16 21:09:45 +01:00
lvessiller
9b1d800311 NEW add triiger and event on totally received status 2022-02-16 20:52:01 +01:00
lvessiller
690a91d546 NEW automatically set totally received status in reception 2022-02-16 20:51:47 +01:00
Laurent Destailleur
5cf8fae151
Merge pull request #20072 from fappels/15_fix_barcode_viewimage
Fix barcode viewimage regression on yogosha8628
2022-02-16 20:36:59 +01:00
Laurent Destailleur
ed10db668d
Merge pull request #20073 from atm-quentin/FIX_13_combinations
FIX weight is lost if it's comma on combinations card
2022-02-16 20:34:24 +01:00
Laurent Destailleur
73e2b13418 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-16 20:32:30 +01:00
Laurent Destailleur
2a18bce2f3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/api/index.php
	htdocs/langs/en_US/productbatch.lang
	htdocs/langs/fr_FR/productbatch.lang
	htdocs/ticket/list.php
2022-02-16 20:31:55 +01:00
Laurent Destailleur
906651d404 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-02-16 20:27:26 +01:00
Laurent Destailleur
e0563d2bef Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-02-16 20:27:07 +01:00
Laurent Destailleur
7029bb7000
Merge pull request #20077 from AlexisLaurier/bugfix/paymentByBankTransfertIndexTabEntity
add missing entity check on list of withdraws on index of paymentbyba…
2022-02-16 20:26:39 +01:00
Laurent Destailleur
a33ca21151
Merge pull request #20079 from AlexisLaurier/bugfix/fixPrelevmentLineDetails-ForBankPaymentTransfert
manage details of prelevment line for bank transfer
2022-02-16 20:22:54 +01:00
Laurent Destailleur
645bf9564e
Merge pull request #20084 from altairis-noe/stock_doc14
FIX: correct warehouse document location
2022-02-16 20:18:43 +01:00
Laurent Destailleur
357f6e234a
Merge pull request #20086 from altairis-noe/duplicate_serial_move_trans
FIX : translation string instead of error message text
2022-02-16 20:18:01 +01:00
Laurent Destailleur
b3d71b2a12
Merge pull request #20087 from ATM-Consulting/FIX_job_card_button_add_event
FIX : HRM | Change button and add title on job card
2022-02-16 20:17:10 +01:00
Laurent Destailleur
190d8d6143
Merge pull request #19076 from inovea-conseil/FIX_ISSUE_DB_ERROR_SYNTAX-#18921
FIX ISSUE DB_ERROR_SYNTAX #18921
2022-02-16 20:15:25 +01:00
Laurent Destailleur
e1bf1a54f7
Merge pull request #20089 from thomas-Ngr/14_fix_ticket_return_list_db_error_syntax
fix: ticket return list creates db error syntax
2022-02-16 20:14:27 +01:00
Laurent Destailleur
1ede8a30b2 Missing NOSESSION 2022-02-16 17:49:05 +01:00
Florian
aa2a57ff95 Check that the value is not an array 2022-02-16 17:00:54 +01:00
Florian
7ed6ca6ec6 FIX ISSUE DB_ERROR_SYNTAX-#18921 2022-02-16 17:00:50 +01:00
Atm-Gregr
5f09ac61b2 insert precommit1 2022-02-16 16:27:47 +01:00
Atm-Gregr
1f2659d411 insert precommit 2022-02-16 16:26:57 +01:00
Atm-Gregr
038298a638 change button and add title 2022-02-16 16:10:48 +01:00
Noé Cendrier
98c50f531c translation string instead of error message text 2022-02-16 15:57:39 +01:00
Alexis LAURIER
ff8dcdc4b7 manage details of prelevment line for bank transfer 2022-02-16 10:52:20 +01:00
Alexis LAURIER
8b0280a9d2 add missing entity check on list of withdraws on index of paymentbybanktransfert 2022-02-16 10:26:44 +01:00
Francis Appels
95c0e72956 Fix barcode viewimage regression on yogosha8628 2022-02-15 11:37:24 +01:00
Quentin VIAL-GOUTEYRON
82b3d89923 FIX wieght is loose if it's comma on combinations 2022-02-15 11:31:09 +01:00
Laurent Destailleur
0e664cc969 Fix API call from ajax 2022-02-15 11:12:08 +01:00
Laurent Destailleur
9173eec8ac Fix input lost 2022-02-14 23:02:43 +01:00
Laurent Destailleur
54bf8ed1ed Fix link 2022-02-14 22:53:24 +01:00
Laurent Destailleur
b6879d7953 css 2022-02-14 22:38:45 +01:00
atm-greg
96c7a9f77c fix pdf_cornas 2022-02-14 15:16:36 +01:00
atm-greg
3ebdb89133 fix pdf_mucadet 2022-02-14 15:11:26 +01:00
Laurent Destailleur
05bd37a921 Fix menu "New" when using paranoiac MAIN_SECURITY_CSRF_WITH_TOKEN = 3 2022-02-14 12:29:00 +01:00
Laurent Destailleur
ff17fe5ae7 Fix reponsive 2022-02-14 12:28:19 +01:00
Laurent Destailleur
dce996a53f Reponsive 2022-02-14 12:28:11 +01:00
Laurent Destailleur
5d90a00728 Debug v15 2022-02-14 12:27:35 +01:00
Laurent Destailleur
d5e5e8d436 Debug v15 2022-02-13 17:09:40 +01:00
Laurent Destailleur
1097111706 Fix autofocus 2022-02-13 16:37:08 +01:00
Laurent Destailleur
cafdcb7206 Show translation value 2022-02-13 16:13:38 +01:00
Laurent Destailleur
b98f547c4a Fix autoselect 2022-02-12 12:12:50 +01:00
Laurent Destailleur
8000adb694 Fix test 2022-02-11 18:50:12 +01:00
Laurent Destailleur
eff2fc1e9e Complete option MAIN_FREE_PRODUCT_CHECKED_BY_DEFAULT 2022-02-11 18:19:50 +01:00
Laurent Destailleur
b623b88674 css 2022-02-11 18:06:39 +01:00
Laurent Destailleur
271e9da425 Add option MAIN_STORE_FULL_EVENT_IN_GMT to fix TZ pb with full day event 2022-02-11 15:15:50 +01:00
Laurent Destailleur
89ffe5baba Clean code for param of dol_stringtotime() 2022-02-11 14:07:10 +01:00