lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
108,095 Commits 43 Branches 150 Tags 886 MiB
revert-19677-develop#1
Commit Graph

95746 Commits

Author SHA1 Message Date
Laurent Destailleur
e10f9b4435 css 2022-03-31 17:07:13 +02:00
Laurent Destailleur
5b86476f0b Link of country not defined, jump on country setup line 2022-03-31 16:57:15 +02:00
stickler-ci
63b8c126d0 Fixing style errors. 2022-03-31 14:52:41 +00:00
jpb
be82fd73ed remove var_dump 2022-03-31 16:47:06 +02:00
jpb
5fe9a4404a add hook doactions on expensereport_rule 2022-03-31 16:43:37 +02:00
Laurent Destailleur
bbcfc4b9f9 Fix condition on table creation 2022-03-31 16:39:36 +02:00
Laurent Destailleur
af15e3ae9e Fix condition on table creation 2022-03-31 16:34:24 +02:00
Laurent Destailleur
ea8bc86c9f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-03-31 16:26:36 +02:00
Laurent Destailleur
3ba9916be2 Fix default value used on install after a first failed try 2022-03-31 16:23:36 +02:00
Laurent Destailleur
5f7abc0f8c
Merge pull request #19703 from atm-maxime/fix_mysql8_createuser 
Fix #19662 : mysql8 user creation in 2 steps
 2022-03-31 16:06:53 +02:00
Laurent Destailleur
cd81312b6a
Update mysqli.class.php 2022-03-31 16:04:28 +02:00
Laurent Destailleur
643a3b1740
Merge pull request #20484 from atm-jpb/NEW_Trigger_expense_report_udpate_delete 
add trigger update and delete on expense report det
 2022-03-31 15:58:30 +02:00
Laurent Destailleur
9b206f9224 Can retreive some param of install from url 2022-03-31 15:51:48 +02:00
Laurent Destailleur
df4e5fe84d Fix missing param 2022-03-31 13:28:19 +02:00
Laurent Destailleur
7b84b3e92d css 2022-03-31 13:27:14 +02:00
Laurent Destailleur
ca55bd157a Look and feel v16 2022-03-31 11:47:18 +02:00
Laurent Destailleur
5062064e9a css 2022-03-31 11:38:40 +02:00
Laurent Destailleur
5ffb6e2546 Look and feel v15 2022-03-31 11:34:12 +02:00
Laurent Destailleur
af4c0dcf6a Fix missing status on tooltip 2022-03-31 11:29:56 +02:00
Ralf Müller
a2b60e52e9 core/login/ldap: allow anonymous user lookup 2022-03-31 09:36:58 +02:00
Laurent Destailleur
800080c06f FIX Navigation between invoices 2022-03-30 18:42:17 +02:00
Laurent Destailleur
97a7450f10 NEW Auto set invoice paid when adding credit not and remain to pay is 0 2022-03-30 18:41:45 +02:00
Laurent Destailleur
7422fd9b07 css on separators 2022-03-30 18:20:09 +02:00
andreubisquerra
e46541708c
Avoid grouping lines with ordered lines 2022-03-30 17:49:54 +02:00
kamel
a22450391f FIX - Fix search by filters 2022-03-30 15:50:36 +02:00
Laurent Destailleur
199faaa6f6
Update modHRM.class.php 2022-03-30 15:19:57 +02:00
Laurent Destailleur
4e81de2a4a
Merge pull request #20485 from atm-gauthier/FIX_ref_supplier_on_bill_several_fourn_orders_case 
FIX : ref_client doesn't exists on supplier invoice, then ref_fourn needs to have a default value when we want to bill several supplier orders
 2022-03-30 15:16:12 +02:00
Gauthier PC portable 024
684e816ac3 FIX : incrementation 2022-03-30 14:12:16 +02:00
Eric Seigne
1589afde19 fix #20477 : add online_payment_url as public var 2022-03-30 14:06:15 +02:00
Laurent Destailleur
f7c5154cac Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-30 13:04:50 +02:00
Laurent Destailleur
c37e2756b1
Merge pull request #20490 from fmarcet/15.0 
Fix: Sales representative column crash on invoice list
 2022-03-30 12:43:13 +02:00
Laurent Destailleur
1304ed5763
Merge branch 'develop' into Notify 2022-03-30 12:41:57 +02:00
Laurent Destailleur
f7f318feb2
Update notification.php 2022-03-30 12:38:34 +02:00
Laurent Destailleur
14d8c1045d
Merge pull request #20056 from aspangaro/14p32 
FIX Disable customer type by default if type prospect/customer is disabled
 2022-03-30 12:17:44 +02:00
Laurent Destailleur
e93f1cc507
Update card.php 2022-03-30 12:15:33 +02:00
atm-steve
4fa656be96
Merge branch 'develop' into NEW_Employee_management_improvement 2022-03-30 12:13:17 +02:00
steve
8f39efd2b9 fix: change Read and Write employee label with personal information 2022-03-30 12:11:07 +02:00
Laurent Destailleur
889c35e8df NEW Default value for MAIN_SECURITY_CSRF_WITH_TOKEN is now 2 2022-03-30 12:02:20 +02:00
Gauthier PC portable 024
7d3dbf1876 FIX : "WHERE" clause missing on resource export 2022-03-30 11:20:01 +02:00
Laurent Destailleur
fe381ef02e Fix default value of typeent on thirdparty creation. 2022-03-30 10:14:28 +02:00
Gauthier PC portable 024
6480877b99 FIX : We need to have a different default_ref_supplier for each new fourn invoice 2022-03-30 10:01:17 +02:00
Ferran Marcet
f8b457e61c Merge branch '15.0up' into 15.0 2022-03-30 09:34:28 +02:00
Ferran Marcet
dd20907d53 Fix: Sales representative column crash on invoice list 2022-03-30 09:33:14 +02:00
Laurent Destailleur
42198d79f2
Merge pull request #20489 from dolibit-ut/patch-385 
Update llx_20_c_departements.sql
 2022-03-29 21:12:13 +02:00
Laurent Destailleur
8eeb6f3c8d
Merge pull request #20315 from atm-steve/FIX_Facture_dolGetButtonAction 
Fix: Facture dolGetButtonAction
 2022-03-29 21:11:24 +02:00
UT from dolibit
b6ab3275c3
Update llx_20_c_departements.sql 
San Salvador / El Salvador Departmentos
 2022-03-29 21:00:34 +02:00
Laurent Destailleur
636188f28a
Merge pull request #20247 from thomas-Ngr/develop_new_check_invoice_date 
NEW: check invoice date
 2022-03-29 16:07:31 +02:00
Laurent Destailleur
8e7b145510
Update modFacture.class.php 2022-03-29 16:05:41 +02:00
Gauthier PC portable 024
b7e7c95d2a FIX : ref_client doesn't exists on supplier invoice, then ref_fourn needs to have a default value when we want to bill several supplier orders 2022-03-29 16:02:39 +02:00
Laurent Destailleur
63d9f69732 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
 2022-03-29 15:55:47 +02:00
jpb
4e9c7afc01 add td 2022-03-29 15:54:49 +02:00
Laurent Destailleur
a221b17809 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/accountancy/index.php
	htdocs/compta/facture/class/facture.class.php
 2022-03-29 15:50:25 +02:00
Laurent Destailleur
a415711a66 Fix phpcs 2022-03-29 15:47:54 +02:00
Laurent Destailleur
3dd0716933 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/hrm/skill_list.php
 2022-03-29 15:40:10 +02:00
Laurent Destailleur
5c218d6e4b Fix url 2022-03-29 15:37:14 +02:00
Laurent Destailleur
5f2ba49dfa Fix regression 2022-03-29 15:20:36 +02:00
Laurent Destailleur
1251e80963 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/accountancy/index.php
	htdocs/commande/list.php
	htdocs/langs/en_US/errors.lang
	htdocs/projet/class/task.class.php
 2022-03-29 15:10:11 +02:00
Laurent Destailleur
007004c2e0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/accountancy/customer/lines.php
	htdocs/accountancy/index.php
	htdocs/accountancy/supplier/lines.php
	htdocs/compta/facture/card.php
	htdocs/core/tpl/extrafields_view.tpl.php
	htdocs/langs/en_US/errors.lang
 2022-03-29 15:02:29 +02:00
Laurent Destailleur
d1c5c79d22 Merge pull request #20299 from 
Easya-Solutions/13.0_fix-thirdparty-mandatory-fields-on-validate-invoice

FIX check mandatory thirdparty fields for mass action
 2022-03-29 14:53:19 +02:00
Laurent Destailleur
8dd44246b0
Merge pull request #20348 from daraelmin/daraelmin-patch-5 
Fix #20263 Accountancy setup displayed with right
 2022-03-29 14:47:57 +02:00
stickler-ci
147f1b9a0c Fixing style errors. 2022-03-29 12:39:13 +00:00
jpb
732b1ab548 add trigger update and delete on expense report det 
add class name on card.php expensereport
 2022-03-29 14:31:17 +02:00
Laurent Destailleur
f21e3364dd Code comment 2022-03-29 14:27:22 +02:00
Laurent Destailleur
b6b20ac818 Code comment 2022-03-29 14:23:47 +02:00
Laurent Destailleur
038033f0ec
Merge pull request #20389 from atm-GregM/retoursGRH 
NEW/fix GRH extrafields and more stuff
 2022-03-29 14:19:24 +02:00
Laurent Destailleur
c1b962b7f7
Update position.php 2022-03-29 14:19:05 +02:00
Laurent Destailleur
27e431bd59
Merge pull request #20467 from atm-gauthier/14.0_fix_no_confirm_before_delete_various_payment 
14.0 fix no confirm before delete various payment
 2022-03-29 14:14:46 +02:00
Laurent Destailleur
5108240ed5
Merge pull request #20456 from hregis/fix_mutlicompany_sharings_compatibility 
FIX multicompany sharings compatibility
 2022-03-29 13:56:43 +02:00
Laurent Destailleur
c3fc9b8e9d
Merge pull request #20473 from hregis/fix_avoid_warning_illegal_string_offset 
FIX avoid php warning "illegal string offset"
 2022-03-29 13:53:21 +02:00
Laurent Destailleur
4d77c97c43 css 2022-03-29 12:01:31 +02:00
Laurent Destailleur
13d0701351 FIX filter into the list of product lots 2022-03-29 11:20:39 +02:00
Laurent Destailleur
bf86f0ceb4 Fix color 2022-03-29 10:56:15 +02:00
Laurent Destailleur
e300f270fe FIX bad status of member on widget by type and status 2022-03-29 10:54:35 +02:00
Eric Seigne
9f2480712b end of #20477 2022-03-29 10:32:14 +02:00
Laurent Destailleur
301805f383 More log 2022-03-29 10:28:44 +02:00
kamel
d43b180115 FIX - Move delete task time trigger position 2022-03-29 10:26:38 +02:00
Laurent Destailleur
b3f0681d7c Fix price2num when $langs not defined 2022-03-29 10:22:03 +02:00
kamel
e17bbdebcf NEW - Add hooks on project task time page 2022-03-29 10:16:06 +02:00
Eric Seigne
53ff837d0f fix #20477: add online_payment_url on orders API requests 2022-03-29 09:48:18 +02:00
Laurent Destailleur
e2425c10e0 Fix log 2022-03-28 21:12:57 +02:00
Laurent Destailleur
3fd1f22b28 NEW Can filter on a thirdparty of product statistics 2022-03-28 21:09:01 +02:00
Laurent Destailleur
7212d6bb03 Fix phpunit 2022-03-28 14:52:46 +02:00
Laurent Destailleur
95dc25587c Standardize code of the fetch_lines() 2022-03-28 13:50:47 +02:00
GregM
d2fd5f7bcd update backtopage 2022-03-28 09:56:56 +02:00
Regis Houssin
5b5f3a4aaf FIX avoid php warning "illegal string offset" 2022-03-27 11:11:16 +02:00
Laurent Destailleur
35c57988a0 Responsive 2022-03-26 20:06:50 +01:00
Laurent Destailleur
78ee498151 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-26 16:13:54 +01:00
Laurent Destailleur
55e414ca30 Fix sql 2022-03-26 16:02:53 +01:00
Laurent Destailleur
d75483552d Responsive 2022-03-26 15:48:36 +01:00
Regis Houssin
009ad3be0f FIX remove unused code 2022-03-26 13:10:23 +01:00
Regis Houssin
97a1774bf3 NEW add hooks contact tab badge and hooks parameter for avoid conflicts 2022-03-26 12:57:30 +01:00
Laurent Destailleur
c2a088c5ff Fix regression in phpunit 2022-03-26 12:34:52 +01:00
Laurent Destailleur
453c8981e8 CSS 2022-03-26 12:24:28 +01:00
Laurent Destailleur
a80a831ea3 Partnership module swtich from status development to experimental 2022-03-26 12:04:31 +01:00
Laurent Destailleur
50847efdf8 Add the country into the popup with info on company. 2022-03-26 11:44:36 +01:00
Laurent Destailleur
bc938d86ba NEW Can enter price with tax for predefined products on purchase objects 2022-03-26 11:22:54 +01:00
Laurent Destailleur
e8a9a7b732 Responsive 2022-03-26 10:02:20 +01:00
Laurent Destailleur
396b532400 Can cumulate error message on different authentication modes 2022-03-26 09:40:22 +01:00
Regis Houssin
4479ba8015 FIX missing translation keys 2022-03-26 08:32:20 +01:00
lvessiller
8a7b97bed1 FIX check thirdparty object loaded and properties exist 2022-03-25 16:47:41 +01:00
Gauthier PC portable 024
fdf8a3f4ad FIX : comment 2022-03-25 16:43:54 +01:00
Gauthier PC portable 024
ab2e6ddf43 FIX : forgotten form confirm before various payment delete 2022-03-25 16:41:41 +01:00
Laurent Destailleur
8236a8e846 Fix bad test for button to show / hide canceled orders 2022-03-25 15:37:15 +01:00
Laurent Destailleur
4d91e448ce Fix bad test for button to show / hide canceled orders 2022-03-25 15:35:49 +01:00
Laurent Destailleur
446ee8dc3c
Merge pull request #20274 from altairis-noe/mass_action_ship_orders 
FIX: Mass action ship orders
 2022-03-25 15:15:12 +01:00
Laurent Destailleur
8e610ddce7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-25 15:10:50 +01:00
Laurent Destailleur
b9095fb10c
Merge pull request #20425 from atm-GregM/DolGetButtonAction_Fourn 
FIX: replacing to dolGetButtonAction on Fourn card
 2022-03-25 15:08:42 +01:00
Laurent Destailleur
99277ddb15
Merge pull request #20406 from atm-GregM/DolGetButtonAction_Salaries 
FIX: replacing to dolGetButtonAction on Salaries card
 2022-03-25 15:07:30 +01:00
Laurent Destailleur
01468b1798
Merge pull request #20400 from atm-GregM/DolGetButtonAction_Ticket 
FIX: replacing to dolGetButtonAction on Ticket card
 2022-03-25 15:05:58 +01:00
Laurent Destailleur
8f5b68bf3a
Merge pull request #20458 from Easya-Solutions/fix-takepos-barcode-rule-qty 
FIX search bracode rule and avoid undefined quantity on search in tak…
 2022-03-25 14:55:06 +01:00
Laurent Destailleur
9f0e9c1de9
Merge pull request #20460 from aspangaro/16a14 
FIX Accountancy - Removed old code for reconciled (or lettering...)
 2022-03-25 14:47:56 +01:00
Laurent Destailleur
ce12b379c5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-25 14:44:04 +01:00
Laurent Destailleur
644e509265 Rename "Reconciled" with "BankLineReconciled" for bank conciliation 2022-03-25 14:43:48 +01:00
Laurent Destailleur
8d2d0f1e84 Fix trans 2022-03-25 12:22:52 +01:00
Florian HENRY
6774f0e571 new: entities is now updated on project update method 2022-03-25 11:53:27 +01:00
Alexandre SPANGARO
9db7d29237 Accountancy - Removed old code for reconciled (or lettering...) 2022-03-24 23:14:23 +01:00
Regis Houssin
ffa79c59f9 FIX wrong alias of table if no parent and parentkey 2022-03-24 20:48:43 +01:00
Laurent Destailleur
488b35d096
Merge pull request #20232 from hregis/fix_missing_advanced_perms 
FIX missing advanced perms
 2022-03-24 20:32:58 +01:00
Laurent Destailleur
76470c9548
Merge pull request #20297 from aspangaro/12p23 
FIX #20279 Accountancy - PostGreSQL - Error on mass update lines already binded
 2022-03-24 20:30:01 +01:00
Laurent Destailleur
6177e914e2
Merge pull request #20293 from atm-quentin/NEW_Availibility_dictionary_field 
NEW Availibility dictionnary new column unit and number
 2022-03-24 20:28:38 +01:00
Regis Houssin
391c02993d FIX better test for all usage 2022-03-24 20:26:47 +01:00
Laurent Destailleur
08bc2a7ac0 Better modulebuilder design pattern 2022-03-24 19:27:42 +01:00
lvessiller
1db60116e1 FIX search bracode rule and avoid undefined quantity on search in takepos 2022-03-24 18:02:32 +01:00
Marc de Lima Lucio
1c43617d93 FIX: contact card: single extrafield update failed 2022-03-24 17:34:50 +01:00
Regis Houssin
c38437f0de FIX wrong error message 2022-03-24 17:12:37 +01:00
Regis Houssin
6fdb140f04 FIX missing table alias 2022-03-24 16:54:02 +01:00
Regis Houssin
e8dae7a8db FIX Multiccompany sharings compatibility 2022-03-24 16:40:51 +01:00
Laurent Destailleur
872cbd1fdc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-24 15:46:13 +01:00
Laurent Destailleur
d91db3fe55 Fix: when cloning a website page, the page has the status draft. 2022-03-24 15:42:01 +01:00
Laurent Destailleur
e9aab2188e css 2022-03-24 15:39:02 +01:00
Laurent Destailleur
0fde73b4bc
Merge pull request #20405 from elsp1991/fix/pmp_price_of_produced_prod_mrp 
FIX MO produced product WAP calculation when MO is based on BOM (not free lines)
 2022-03-24 14:29:33 +01:00
Laurent Destailleur
9747efe050 Fix phpcs 2022-03-24 14:09:46 +01:00
Laurent Destailleur
3056635aaf css 2022-03-24 14:04:03 +01:00
Laurent Destailleur
8f25477db6 Debug v16 2022-03-24 13:41:11 +01:00
Laurent Destailleur
a22d66b021 css 2022-03-24 13:31:03 +01:00
Laurent Destailleur
38439603be Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-24 13:23:04 +01:00
Laurent Destailleur
a6134f9e36 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-24 13:22:15 +01:00
Laurent Destailleur
ef204b2620 Fix column conditions 2022-03-24 12:52:04 +01:00
Laurent Destailleur
27d8691fcc Use default to null 2022-03-24 12:30:26 +01:00
Laurent Destailleur
793407a87d
Merge pull request #20443 from defrance/patch-181 
New holliday field for store nb_open_day  complex compute
 2022-03-24 12:28:11 +01:00
Laurent Destailleur
8661902bfa
Update llx_holiday.sql 2022-03-24 12:26:31 +01:00
Laurent Destailleur
d952419fac
Update llx_holiday.sql 2022-03-24 12:25:42 +01:00
GregM
6302e11471 update GRH redirection position 2022-03-24 12:24:33 +01:00
Laurent Destailleur
35822370ec
Merge pull request #20449 from atm-greg/FIX_develop_missing_hooks_for_dictionaryadmin 
add more specific context and doAction hook
 2022-03-24 12:08:37 +01:00
Laurent Destailleur
cd969449f2 Replaced duplicated code with extends of CommonObjectLine 2022-03-24 12:07:04 +01:00
Laurent Destailleur
6ea5708f97
Merge pull request #20450 from atm-jpb/FIX_trigger_expensereport_det 
Fix trigger expensereport det
 2022-03-24 12:04:22 +01:00
Laurent Destailleur
ea4b842c86
Update card.php 2022-03-24 12:01:53 +01:00
Laurent Destailleur
fdfbf05705
Update card.php 2022-03-24 12:00:11 +01:00
Laurent Destailleur
5a947a9e71
Merge pull request #20447 from bb2a/FIX---Lang-PaymentMode 
FIX - Lang PaymentMode
 2022-03-24 11:54:38 +01:00
Laurent Destailleur
ddfcbf6e2c
Merge pull request #20452 from frederic34/patch-4 
replace debug
 2022-03-24 11:54:21 +01:00
Laurent Destailleur
154069179b Fix php syntax 2022-03-24 11:51:06 +01:00
Laurent Destailleur
6c28426b3a Fix tab 2022-03-24 11:49:34 +01:00
Laurent Destailleur
6438a99960 Fix php syntax 2022-03-24 11:48:51 +01:00
Laurent Destailleur
6abeb2804e Fix phpcs 2022-03-24 11:47:12 +01:00
Thomas Negre
6dfad5d69f facture/card.php: replace redirection by = '' 2022-03-24 11:09:39 +01:00
Thomas Negre
2709e69a32 rename $form into $formcategory 2022-03-24 11:00:37 +01:00
Frédéric FRANCE
e157dc117d
replace debug 2022-03-24 10:51:01 +01:00
Frédéric FRANCE
5f6437cbde
remove debug 2022-03-24 10:46:30 +01:00
stickler-ci
671ab9a412 Fixing style errors. 2022-03-24 08:55:18 +00:00
jpb
71c1f2de3c add class td 2022-03-24 09:51:12 +01:00
jpb
7be3c8b64d ajout de class pour les <td> 2022-03-24 09:51:00 +01:00
jpb
4bc75f6487 ajout class name on create det <td> 2022-03-24 09:50:44 +01:00
jpb
a577956b73 ajout de nom de class dans les entes de ligne det en affichage 2022-03-24 09:50:30 +01:00
jpb
37e589807d add trigger create on expensereportdet 2022-03-24 09:50:16 +01:00
atm-greg
07b0a4e516 Merge branch 'FIX_develop_missing_hooks_for_dictionaryadmin' of github.com:atm-greg/dolibarr into FIX_develop_missing_hooks_for_dictionaryadmin 2022-03-24 09:42:50 +01:00
atm-greg
7fb343b3ef add context 2022-03-24 09:42:02 +01:00
stickler-ci
efbaf030ec Fixing style errors. 2022-03-24 08:41:13 +00:00
atm-greg
f70ceb9398 add more specific context and doAction hook 2022-03-24 09:34:11 +01:00
BB2A Anthony Berton
1266da05ef Lang fr 2022-03-23 19:43:34 +01:00
BB2A Anthony Berton
958b6abdaa pdf_path 2022-03-23 17:31:54 +01:00
Laurent Destailleur
4a80f35aaa Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2022-03-23 17:26:25 +01:00
Laurent Destailleur
289c32b880 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-23 17:23:35 +01:00
Laurent Destailleur
c620757dbc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/langs/en_US/projects.lang
	htdocs/product/price.php
	htdocs/reception/class/reception.class.php
 2022-03-23 17:23:21 +01:00
Laurent Destailleur
161e795759 Look and feel 2022-03-23 17:12:25 +01:00
Laurent Destailleur
32f2499c36 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/langs/en_US/projects.lang
	htdocs/langs/en_US/propal.lang
	htdocs/product/price.php
	htdocs/projet/card.php
	htdocs/reception/class/reception.class.php
 2022-03-23 17:04:31 +01:00
Laurent Destailleur
ee611e8517 Hide not important options 2022-03-23 16:56:07 +01:00
Laurent Destailleur
947b6008c8
Merge pull request #20308 from frederic34/patch-1 
Fix do not modify entity on group edit
 2022-03-23 16:55:55 +01:00
BENKE Charlene
95c8dfcaa0
Update llx_holiday.sql 2022-03-23 16:53:12 +01:00
BENKE Charlene
fcc8a953ae
Update 15.0.0-16.0.0.sql 2022-03-23 16:51:36 +01:00
Laurent Destailleur
94224e9275
Merge pull request #20255 from Easya-Solutions/new-proposal-clone-update-prices 
NEW option update prices on proposal cloning
 2022-03-23 16:49:12 +01:00
Laurent Destailleur
6167d8a02c
Merge pull request #20302 from marc-dll/13.0_FIX_product_price_update_error_management 
FIX: better error management at product selling price update
 2022-03-23 16:48:15 +01:00
Laurent Destailleur
6c74fee9ac
Merge pull request #20421 from atm-GregM/DolGetButtonAction_Delivery 
FIX: replacing to dolGetButtonAction on Delivery card
 2022-03-23 16:41:40 +01:00
Laurent Destailleur
1f7e1c3c91
Merge pull request #20307 from bb2a/complete_label_tab_custom_module 
NEW - Record count badge in custom modules tab
 2022-03-23 16:40:19 +01:00
Laurent Destailleur
d82aae1871
Update functions.lib.php 2022-03-23 16:39:55 +01:00
Laurent Destailleur
eac3a6cf86
Update functions.lib.php 2022-03-23 16:38:57 +01:00
Laurent Destailleur
5f522c9087
Merge pull request #20388 from atm-john/15.0_fix_missing_lang_trad 
Fix missing lang trad
 2022-03-23 16:19:14 +01:00
Laurent Destailleur
61ed36e181
Update other.lang 2022-03-23 16:19:06 +01:00
Laurent Destailleur
0cfd374314
Merge pull request #20393 from hregis/new_add_hook_in_contact_list 
NEW add selectCompaniesForNewContactListWhere hook
 2022-03-23 16:07:50 +01:00
Laurent Destailleur
a06fc4691b
Merge pull request #20394 from hregis/new_add_hook_in_commercialindex 
NEW add hooks in commercial index
 2022-03-23 16:05:12 +01:00
Laurent Destailleur
bc9ec3e2b9
Merge pull request #20395 from hregis/fix_uniformize_with_element_name 
FIX uniformize with element name "contact"
 2022-03-23 16:04:53 +01:00
Laurent Destailleur
9d2f59a10d
Merge pull request #20397 from hregis/new_add_hook_in_box_customer_and_product 
NEW add hooks in customers and products boxes
 2022-03-23 16:04:23 +01:00
Laurent Destailleur
c9672e4605
Merge pull request #20442 from grandoc/new_branch_23_03_2022 
fix : Nested ternary expressions (without parentheses) deprecated in …
 2022-03-23 16:03:36 +01:00
Laurent Destailleur
0e63e09fbb
Merge pull request #20403 from Easya-Solutions/develop_remake_variants_permissions 
NEW : Update variants to standard card and list (permissions)
 2022-03-23 16:02:34 +01:00
Laurent Destailleur
1c7e2d3034
Merge pull request #20402 from Easya-Solutions/develop_remake_variants 
NEW : Update variants to standard card and list
 2022-03-23 16:02:08 +01:00
Laurent Destailleur
4e4081c4dd
Merge pull request #20399 from manu8170/develop 
Fix a few CSS errors
 2022-03-23 16:00:29 +01:00
Laurent Destailleur
b8a74668ff
Merge pull request #20407 from leninrivas/patch-2 
Fix delete link in Delivery
 2022-03-23 15:59:07 +01:00
Laurent Destailleur
01396cc07a Code comment 2022-03-23 15:58:55 +01:00
Philippe GRAND
b59196d3f9 fix : Nested ternary expressions (without parentheses) deprecated in PHP 7.4. Targeting PHP 8.1.0. 2022-03-23 15:55:50 +01:00
Laurent Destailleur
13311a9ac6
Merge pull request #20416 from atm-GregM/DolGetButtonAction_Expedition 
FIX: replacing to dolGetButtonAction on Expedition card
 2022-03-23 15:55:31 +01:00
Laurent Destailleur
0e3fa3cdc3
Merge pull request #20420 from defrance/patch-180 
NEW : add hook for more buttons
 2022-03-23 15:54:13 +01:00
Laurent Destailleur
18636103fc
Merge pull request #20412 from dolibit-ut/patch-383 
Update fournisseurs.php
 2022-03-23 15:53:43 +01:00
Laurent Destailleur
d92ed35447
Merge pull request #20424 from marc-dll/13.0_FIX_propal_mass_action 
FIX: propal list mass action translations and error management
 2022-03-23 15:53:28 +01:00
Regis Houssin
fcb1bdaca1 # WARNING: head commit changed in the meantime 
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
new_add_hook_load_state_board
 2022-03-23 15:53:09 +01:00
Laurent Destailleur
c4e58ab4c0
Merge pull request #20428 from Easya-Solutions/13.0_fix-reception-pmp-with-discount-price 
FIX include discount price for PMP after a reception (Issue #20029)
 2022-03-23 15:51:22 +01:00
Laurent Destailleur
8dcddde982
Merge pull request #20431 from fmarcet/15.0 
Fix: The origin of the stock movement is not being recorded
 2022-03-23 15:40:13 +01:00
Laurent Destailleur
0150b9390e
Merge pull request #20436 from hregis/new_add_hook_load_state_board 
NEW add hook printFieldWhere in load_state_board function
 2022-03-23 15:37:58 +01:00
Laurent Destailleur
5eb6ddd7b4 Merge 20374 and add some fix. Need to be restested. 2022-03-23 15:32:05 +01:00
Laurent Destailleur
2b7797fa75 Clean code 2022-03-23 15:02:45 +01:00
Laurent Destailleur
279a8c9df5 Code comment 2022-03-23 14:39:10 +01:00
Laurent Destailleur
12db2a8f67 Doc 2022-03-23 13:02:49 +01:00
Laurent Destailleur
3e6e67680c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-23 13:02:22 +01:00
Laurent Destailleur
8ad310c8a0 FIX Bad filter on date on salary list 2022-03-23 13:01:24 +01:00
Marc de Lima Lucio
100c48372b FIX: permit access to medias when logged in a different entity 2022-03-22 17:13:48 +01:00
Laurent Destailleur
a5e9970866 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2022-03-22 16:58:57 +01:00
Laurent Destailleur
2943e68c42 Fix regression 2022-03-22 16:57:39 +01:00
Regis Houssin
e0e99e8955 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into new_add_hook_load_state_board 2022-03-22 16:51:51 +01:00
Regis Houssin
b95bb58ba0 FIX remove unused global 2022-03-22 16:49:29 +01:00
Regis Houssin
4ca3d45eca NEW add hook printFieldWhere in load_state_board function 2022-03-22 15:51:30 +01:00
GregM
e3a375b948 add &amp 2022-03-22 14:18:48 +01:00
Ferran Marcet
ccf8b01020 Fix: The origin of the stock movement is not being recorded 2022-03-22 13:46:55 +01:00
Laurent Destailleur
f662afa762 Fix sql syntax 2022-03-22 13:37:33 +01:00
Laurent Destailleur
8686e37fa9 Work on generic report. 2022-03-22 13:23:16 +01:00
Regis Houssin
5adcdd6b4e FIX use sanitize instead escape 2022-03-22 12:27:36 +01:00
Regis Houssin
ca3a4839e5 FIX try to fix CodingPhpTest::testPHP error 2022-03-22 12:06:37 +01:00
GregM
4fb62ee15a replacing to dolGetButtonAction on Commande card 2022-03-22 12:04:51 +01:00
Laurent Destailleur
02e2f9815d NEW Add option INVOICEREC_SET_AUTOFILL_DATE_START/END 2022-03-22 11:47:25 +01:00
Marc de Lima Lucio
344c29ae15 FIX: trans 2022-03-22 11:35:37 +01:00
lvessiller
5914f2ac65 FIX include discount price for PMP after a reception (Issue #20029) 2022-03-22 11:17:27 +01:00
Marc de Lima Lucio
3aae8cc3bb FIX: propal list: bad error management for set not ssigned mass action 2022-03-22 10:54:04 +01:00
GregM
00fab67225 add &amp 2022-03-22 10:52:58 +01:00
Marc de Lima Lucio
cf64fc288d FIX: propal list: missing not signed massaction translation keys for transifex 2022-03-22 10:49:03 +01:00
Regis Houssin
4efe10a9a5 NEW add hook printFieldListWhere in "show_contacts" function 2022-03-22 10:46:26 +01:00
GregM
52b562ca69 Merge branch 'Dolibarr_develop' into DolGetButtonAction_Fourn 2022-03-22 10:31:33 +01:00
GregM
f24e1862ee replacing to dolGetButtonAction on Fourn card 2022-03-22 10:29:34 +01:00
Marc de Lima Lucio
d4f55ae116 FIX: propal list: bad error management in mass actions 2022-03-22 10:11:10 +01:00
Regis Houssin
33398a3031 FIX missing object and action hooks parameters 2022-03-22 10:10:42 +01:00
Regis Houssin
c23752b3d5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into new_add_hook_in_contact_list 2022-03-22 10:09:01 +01:00
Marc de Lima Lucio
8ef55eae07 FIX: propal list: missing translation keys for transifex 2022-03-22 10:04:05 +01:00
Laurent Destailleur
2e27c40de4 Fix customreport with link to parents 2022-03-21 22:10:51 +01:00
Laurent Destailleur
40fbaf15fe Add welsh language 2022-03-21 17:12:26 +01:00
GregM
14d91a98fa replacing to dolGetButtonAction on Delivery card 2022-03-21 15:55:53 +01:00
BENKE Charlene
5fd2ec3fda
add hook for more buttons 2022-03-21 15:43:37 +01:00
Laurent Destailleur
dd38f6c35b Prepare 15.0.2 2022-03-21 12:53:03 +01:00
stickler-ci
aec5f4da13 Fixing style errors. 2022-03-21 11:25:46 +00:00
GregM
362352b198 replacing to dolGetButtonAction on Expedition card 2022-03-21 12:18:36 +01:00
Laurent Destailleur
bf7c707d05 Doc 2022-03-21 11:11:36 +01:00
UT from dolibit
1313be410a
Update fournisseurs.php 
$helpurl for DE
 2022-03-21 10:49:37 +01:00
Laurent Destailleur
cd37d4b403 Code comment 2022-03-21 00:14:42 +01:00
Laurent Destailleur
6c0e333c7d Fix we must user relative timezone of date. 2022-03-20 16:33:35 +01:00
Laurent Destailleur
3293a6f8b8 Fix position of table on new page of PDF 2022-03-19 19:40:20 +01:00
Laurent Destailleur
d5dc29e794 Fix position of image on line 2022-03-19 19:26:58 +01:00
Laurent Destailleur
592a277091 FIX ZATCA Encoding 2022-03-19 19:17:22 +01:00
Laurent Destailleur
cb93ab472d FIX ZATCA Encoding 2022-03-19 19:14:12 +01:00
Laurent Destailleur
79d34bd7d1 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-19 18:21:08 +01:00
Laurent Destailleur
9878b04a98 Fix position of text in PDF 2022-03-19 18:20:24 +01:00
Laurent Destailleur
8603d493ad Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/list.php
	htdocs/install/mysql/tables/llx_partnership.key.sql
 2022-03-19 17:34:26 +01:00
Laurent Destailleur
1bb1475b54 Fix phpdoc 2022-03-19 15:03:32 +01:00
Laurent Destailleur
e48d29e4f2 Fix bad position of order 2022-03-19 14:48:22 +01:00
Laurent Destailleur
6a7309305b Fix out of memory with a lot of contracts 2022-03-19 14:41:10 +01:00
Laurent Destailleur
65ed94f9d0 Fix sql is executed twice 2022-03-19 13:14:34 +01:00
Laurent Destailleur
4c293aa49b Update doc 2022-03-19 13:06:30 +01:00
Laurent Destailleur
ef21def5ce NEW Add option MAIN_API_DEBUG to save API logs into a file 2022-03-19 10:42:06 +01:00
Lenin Rivas
12acf2342c
Fix delete link en Delivery 
Add actions dellink
 2022-03-18 16:01:56 -05:00
GregM
9417545997 clean 2022-03-18 16:58:59 +01:00
GregM
457c760177 clean 2022-03-18 16:57:42 +01:00
BB2A Anthony Berton
f0e3c33dc3 $labeltemp is alwase true 2022-03-18 16:55:53 +01:00
GregM
e2068f1aa8 clean 2022-03-18 16:41:18 +01:00
BB2A Anthony Berton
006dc787c1 method_exists skip fatal error 2022-03-18 16:34:44 +01:00
stickler-ci
3ef36c566f Fixing style errors. 2022-03-18 15:32:11 +00:00
GregM
4c4d18ebd6 clean 2022-03-18 16:28:25 +01:00
GregM
7d059d7fcd clean 2022-03-18 16:27:01 +01:00
GregM
a64bb071cf fix dolGetButtonAction params 2022-03-18 16:20:18 +01:00
Laurent Destailleur
ed631b2b06 Fix doxygen, missing error message 2022-03-18 16:14:20 +01:00
GregM
84ef951a99 replacing to dolGetButtonAction on Salaries card 2022-03-18 16:12:38 +01:00
kamel
26a462dce0 NEW : Update variants to standard card and list (permission) 2022-03-18 15:43:32 +01:00
kamel
1418fd7054 NEW : Update variants to standard card and list 2022-03-18 15:38:44 +01:00
stickler-ci
27000dcfb1 Fixing style errors. 2022-03-18 14:16:09 +00:00
GregM
13522a9fb5 Merge branch 'Dolibarr_develop' into DolGetButtonAction_Ticket 2022-03-18 15:05:53 +01:00
GregM
e4e16bee5d replacing to dolGetButtonAction on Ticket card 2022-03-18 15:04:25 +01:00
manu8170
0d04c8e906
Merge branch 'Dolibarr:develop' into develop 2022-03-18 14:35:37 +01:00
Manu
4e61bbec71 Fix a few CSS errors 2022-03-18 14:30:50 +01:00
Laurent Destailleur
47acdc8f34 Fix database corruption without that. 2022-03-18 14:10:42 +01:00
Laurent Destailleur
4ef9d29b9d Fix missing constraints 2022-03-18 14:09:53 +01:00
Ilias Patsiaouras
b666ec2142 removing dead code free and bom lines are MO lines 2022-03-18 13:46:40 +01:00
Laurent Destailleur
60d9db248f NEW The backup tools has an "lowmemory" for mysqldump on large database 2022-03-18 13:38:07 +01:00
Regis Houssin
f31bf8df48 FIX stickler problem ?? 2022-03-18 13:15:25 +01:00
Regis Houssin
27e893be1d FIX missing element name 2022-03-18 13:13:13 +01:00
Regis Houssin
1d8f170d32 NEW add hooks in customers and products boxes 2022-03-18 12:59:07 +01:00
Laurent Destailleur
62ca286ac9 Try a fix to solve backup that fails on large database 2022-03-18 12:07:00 +01:00
Regis Houssin
b70d3eb8eb FIX uniformize with element name "contact" 2022-03-18 12:05:59 +01:00
Regis Houssin
56280f340f NEW add hooks in commercial index 2022-03-18 11:55:45 +01:00
Regis Houssin
a2f1f4331e NEW add selectCompaniesForNewContactListWhere hook 2022-03-18 11:11:25 +01:00
John BOTELLA
989f00ae63
Update other.lang 2022-03-18 09:42:37 +01:00
lvessiller
566bced9dc FIX escape values and find indexed columns by key 2022-03-18 08:53:54 +01:00
Laurent Destailleur
a970f78c4e css 2022-03-17 21:34:14 +01:00
Laurent Destailleur
876a013ded Fix migration 2022-03-17 19:09:58 +01:00
Laurent Destailleur
167df9593b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/langs/en_US/products.lang
	htdocs/reception/class/reception.class.php
 2022-03-17 19:08:51 +01:00
Laurent Destailleur
e46ee982ec FIX Option to manage packaging. FIX size/length/volume of reception 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/langs/en_US/products.lang
	htdocs/reception/card.php
	htdocs/reception/class/reception.class.php
 2022-03-17 19:00:19 +01:00
Laurent Destailleur
360a565a29 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2022-03-17 18:54:26 +01:00
Laurent Destailleur
5d415b183e FIX Option to manage packaging. FIX size/length/volume of reception 2022-03-17 18:53:50 +01:00
Thomas Negre
14d9bf0322 fix non-sanitize string in SQL request 2022-03-17 16:05:35 +01:00
Thomas Negre
fc7f097c25 stickler corrections 2022-03-17 16:05:35 +01:00
Thomas Negre
3a82817ad9 avoid displaying warning messages on the public interface 2022-03-17 16:05:35 +01:00
Thomas Negre
ac37c7e4ca link intervention to a ticket contract 2022-03-17 16:05:35 +01:00
Thomas Negre
c68e16c087 admin/ticket.php: correct parameters table 2022-03-17 16:05:35 +01:00
Thomas Negre
c745237ee9 Stickler corrections 2022-03-17 16:05:35 +01:00
Thomas Negre
f92154d057 declare ticket-related constants in modTicket.class.php 2022-03-17 16:05:35 +01:00
Thomas Negre
5fba0dc237 ticket config : select product type matching tickets. 2022-03-17 16:05:35 +01:00
Thomas Negre
2cf433019e FormCategory : create method to select the product category 2022-03-17 16:05:35 +01:00
Thomas Negre
8d997de3bb add options in workflow admin panel : WORKFLOW_TICKET_LINK_CONTRACT, WORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS 2022-03-17 16:05:35 +01:00
Thomas Negre
90ab7da40d Workflow : sort contracts when automatic linking to ticket. 
Introduces constants TICKET_PRODUCT_CATEGORY and WORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS.
Rename constant TICKET_AUTO_ASSIGN_CONTRACT_CREATE to WORKFLOW_TICKET_LINK_CONTRACT.
 2022-03-17 16:05:35 +01:00
Thomas Negre
a14a63fdad Contrat->getListOfContracts(): allow to sort contracts by contract status, product category, and line status. 2022-03-17 16:05:35 +01:00
Thomas Negre
4d01969a4c Societe: add method to find parent companies 2022-03-17 16:05:35 +01:00
Laurent Destailleur
f75049d0e8
Merge pull request #20356 from aspangaro/16a3 
NEW Accountancy - Add subledger account when we generate a transaction with a deposit invoice
 2022-03-17 15:34:07 +01:00
GregM
ab87d772c7 update GRH extrafields and more stuff 2022-03-17 15:20:23 +01:00
Laurent Destailleur
49e53abf53 Fix pdf on letter format 2022-03-17 15:01:15 +01:00
ATM john
f1f3a0aa24 Fix missing AutoFill Trad 2022-03-17 14:56:25 +01:00
Alexandre SPANGARO
2ef8bd42df Merge remote-tracking branch 'upstream/develop' into 16a3 2022-03-17 14:44:38 +01:00
Alexandre SPANGARO
0856a49ef0 Fix 2022-03-17 14:44:00 +01:00
Laurent Destailleur
2f2a70c8b7 Clean code 2022-03-17 14:15:28 +01:00
Laurent Destailleur
98cc40ac8d Fix a useless group by 2022-03-17 13:57:50 +01:00
Laurent Destailleur
7aeaaab7f0
Merge pull request #20365 from gdsoftdev/fix_invoicelineorders 
Fix : keep row order into invoices created from massactions
 2022-03-17 13:37:17 +01:00
Laurent Destailleur
a06b51e06c
Merge pull request #20385 from hregis/fix_missing_object_for_known_current_element 
FIX missing to known the current object element
 2022-03-17 13:29:22 +01:00
Laurent Destailleur
7d60eefb9a
Merge pull request #20386 from hregis/new_add_hook_in_select_product 
NEW add hooks select product list and select thirdparty list function
 2022-03-17 13:26:01 +01:00
Laurent Destailleur
5709f168a8 NEW: MAIN_MAIL_AUTOCOPY_TO can accept several email and special keys 2022-03-17 12:55:12 +01:00
lvessiller
254ae943e1 FIX conflicts with develop 2022-03-17 12:33:13 +01:00
lvessiller
a4508e656c NEW pull develop 2022-03-17 12:20:15 +01:00
Laurent Destailleur
43e7547611 Fix sql errors 2022-03-17 11:49:14 +01:00
Laurent Destailleur
3fe9b6b57c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-03-17 11:49:06 +01:00
Quentin VIAL-GOUTEYRON
5bd2951cbd fix char into varchar 2022-03-17 11:38:42 +01:00
Quentin VIAL-GOUTEYRON
4aa87f3f85 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_Availibility_dictionary_field 2022-03-17 11:37:19 +01:00
Laurent Destailleur
4aa93b363a FIX #20387 2022-03-17 11:24:23 +01:00
Regis Houssin
a73b92c871 NEW add selectContactListWhere hook 2022-03-17 11:08:09 +01:00
Frédéric FRANCE
53909828f9
Update card.php 2022-03-17 10:56:14 +01:00
Regis Houssin
dbd0dd7e97 NEW add selectThirdpartyListWhere hook 2022-03-17 10:54:09 +01:00
Regis Houssin
e8b5fa45f2 FIX missing global $hookmanager 2022-03-17 09:55:26 +01:00
Regis Houssin
7a3b051ca0 FIX missing object element and action 2022-03-17 09:51:44 +01:00
Regis Houssin
b0fe8994e4 NEW add hook selectProductsListWhere in select_produits_list function 2022-03-17 09:32:45 +01:00
Regis Houssin
f6c9791f2f FIX missing to known the current object element 2022-03-17 09:18:08 +01:00
Laurent Destailleur
c6338e0de0
Merge pull request #20252 from wdammak/patch-47 
Simplification of the code by separating the part given to menu proce…
 2022-03-17 02:48:08 +01:00
Laurent Destailleur
6617cbc531
Merge pull request #20256 from marc-dll/13.0_FIX_project_creation_role_not_found 
FIX: project creation prevented if PROJECTLEADER contact role renamed, de-activated or deleted
 2022-03-17 02:38:11 +01:00
Laurent Destailleur
c147acabe1
Update projects.lang 2022-03-17 02:37:46 +01:00
Laurent Destailleur
63b96e22b0
Update card.php 2022-03-17 02:37:30 +01:00
Laurent Destailleur
62f6686ad0
Merge pull request #20311 from Easya-Solutions/14.0_fix_error_propagation_and_triggers_position_on_delete_propal_line 
[FIX] errors propagation and trigger position on delete proposal line
 2022-03-17 02:35:30 +01:00
Laurent Destailleur
6885568b7c
Merge pull request #20268 from FHenry/14_fix_date_behaviour_action_card 
fix: #20267 #Evarisk same required field displayed on edit or new card
 2022-03-17 02:31:16 +01:00
Laurent Destailleur
813e1a23eb Var not defined 2022-03-17 02:13:08 +01:00
Laurent Destailleur
1a8af3509e Fix regression in button 2022-03-17 00:19:48 +01:00
Laurent Destailleur
b1e826da15 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-17 00:16:28 +01:00
Laurent Destailleur
079fcacf13 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/products.lang
 2022-03-17 00:16:14 +01:00
Laurent Destailleur
ee0ffae407 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
 2022-03-17 00:15:01 +01:00