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 |
|
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
|
b104047365
|
Merge pull request #20426 from marc-dll/14.0_FIX_propal_mass_actions
FIX: propal list mass action translations and error management (v14 edition)
|
2022-03-23 15:52:44 +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
|
c44cfb0885
|
Merge pull request #20435 from marc-dll/13.0_FIX_medias_access_multicompany
FIX: permit access to medias when logged in a different entity
|
2022-03-23 15:37:20 +01:00 |
|
Laurent Destailleur
|
8fbb79734d
|
git push origin developMerge branch 'Easya-Solutions-new-import-fec-clean-values-and-amounts' into develop
|
2022-03-23 15:32:30 +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 &
|
2022-03-22 14:18:48 +01:00 |
|