6c1ba8e2c3
Merge branch '15.0.2_oine' into 15.0.3_oine
2022-10-02 12:08:59 +04:00
Laurent Destailleur
d9f7a3efd1
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
...
Conflicts:
htdocs/product/inventory/inventory.php
2022-07-22 17:38:24 +02:00
Laurent Destailleur
50af2747a2
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2022-07-22 17:35:03 +02:00
Laurent Destailleur
346a716ad4
Merge pull request #21530 from noec764/14.0_Fix_MissingTabHelp
...
Fix: tabhelp must be present in every module. Related to #21529
2022-07-19 19:01:21 +02:00
Noé Courtier
2aae7525da
Fix: tabhelp must be present in every module
2022-07-19 17:27:15 +02:00
Noé Courtier
276168ef6f
Fix: tabhelp must be present in every module
2022-07-19 17:14:57 +02:00
Regis Houssin
7db5f7eb1c
FIX regression + add $forceentity parameter
2022-07-18 19:26:13 +02:00
Regis Houssin
ade854a469
FIX security breach if we have same ref number in multiple entities
2022-07-18 16:48:53 +02:00
Laurent Destailleur
6c1b22eb48
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-07-12 19:08:15 +02:00
Laurent Destailleur
dfb5bb0936
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2022-07-12 19:07:35 +02:00
Laurent Destailleur
c2712242be
Fix css
2022-07-12 17:42:20 +02:00
stickler-ci
3434460cc3
Fixing style errors.
2022-07-11 09:55:39 +00:00
atm-lena
851416a61e
No display extrafield line on PDF if empty
2022-07-11 11:48:37 +02:00
Laurent Destailleur
88543c85ba
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-07-10 19:22:15 +02:00
Laurent Destailleur
3d226801ba
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2022-07-10 19:22:02 +02:00
Laurent Destailleur
840d9b182b
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2022-07-10 19:19:08 +02:00
Laurent Destailleur
52661e09c7
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/core/modules/modResource.class.php
2022-07-10 19:18:59 +02:00
Laurent Destailleur
c16cd502d0
Update actions_massactions.inc.php
2022-07-10 18:43:25 +02:00
Florian HENRY
56c4817d6d
fix: Bad amount calc on Invoice index
2022-07-08 17:30:15 +02:00
jpb
226488b7ed
rank change. if we only have one order we leave the origin rank otherwhise we pass -1
2022-07-08 12:32:17 +02:00
Laurent Destailleur
61f1595f8c
Fix look and feel v15
2022-07-08 11:21:54 +02:00
Gauthier PC portable 024
d375c9fbbe
FIX : backport commit 5b3fcc5e43, chkbxlst cannot be emptied
2022-07-08 10:35:43 +02:00
Laurent Destailleur
7741826d34
phpcs
2022-07-07 23:09:39 +02:00
Laurent Destailleur
63ce535deb
Merge pull request #21448 from atm-jpb/patch-1
...
# FIX : rank duplicate on mass action
2022-07-07 20:57:51 +02:00
Laurent Destailleur
5afe1dbb84
Update actions_massactions.inc.php
2022-07-07 20:57:29 +02:00
jpb
ea52403339
rank change. if we only have one order we leave the origin rank otherwise we leave the -1 and let the class set the max rank.
2022-07-07 11:08:01 +02:00
jpb
f10788e4c6
fix export resource type filter
2022-07-07 10:24:39 +02:00
Laurent Destailleur
76e3c10c06
Revert "fix page titles"
2022-07-06 15:56:04 +02:00
Laurent Destailleur
a0caf7be71
Merge pull request #21394 from cfoellmann/PR/improve-page-titles
...
fix page titles
2022-07-06 15:55:10 +02:00
Juanjo Menent
4f091c4394
Fix: PHP Fatal error: Call to undefined function getOnlineSignatureUrl()
2022-07-05 17:11:02 +02:00
stickler-ci
244a3fc819
Fixing style errors.
2022-07-04 15:22:40 +00:00
boudet jean pascal
5dabcec767
rank duplicate on mass action
...
#### rank duplicate on mass action invoice from multiple orders
we have to define the max rank for each line which makes it possible not to have a duplicate on the rank field in the case of several order massaction request.
2022-07-04 17:17:55 +02:00
Christian Foellmann
89d1389e2d
fix page titles
2022-06-27 12:48:04 +02:00
dfafb3ccef
CustomersInvoicesAndPayments export: add line buyprice
2022-06-24 12:59:04 +04:00
313838c7ab
Merge branch stock_decrease_on_credit_invoice
2022-06-24 12:59:04 +04:00
Laurent Destailleur
e4797c9184
Merge pull request #21353 from FHenry/15_fix_badcall_massaction_delete_on_actioncomm
...
fix: 15 fix bad call massaction delete on actioncomm delete parameters
2022-06-22 18:25:46 +02:00
Laurent Destailleur
e73bd1bf1f
Merge pull request #21350 from FHenry/15_fix_search_user
...
fix: 15 fix search user
2022-06-22 18:23:59 +02:00
Laurent Destailleur
8075a40bd9
FIX #21323
2022-06-22 18:12:36 +02:00
Florian HENRY
98ee53c4b1
fix: massaction delete on actioncomm list do not call delete with good paramters
2022-06-22 15:13:13 +02:00
Florian HENRY
9d20e602d1
fix: remove warning GETPOST
2022-06-22 14:28:33 +02:00
Laurent Destailleur
88fc3a4d21
Merge pull request #21186 from Quatadah/fix18704
...
FIX #18704
2022-06-12 12:25:34 +02:00
Laurent Destailleur
3a1c8206f1
Merge pull request #21203 from fboitel/fix#21093
...
FIX#21093
2022-06-12 11:48:14 +02:00
Faustin
71ef074987
FIX#21093
2022-06-11 00:41:15 +02:00
Faustin
ef959ecddd
FIX#21093
2022-06-11 00:18:38 +02:00
NASDAMI Quatadah
793e95d88c
fixing bug (colspan should be int)
2022-06-09 14:04:32 +02:00
Laurent Destailleur
62d2084237
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-06-09 12:49:49 +02:00
Laurent Destailleur
a4ca81d4ce
FIX #21174
2022-06-09 12:46:13 +02:00
Laurent Destailleur
7ee4cccc84
FIX ODT tags for subobjects {object_subobject_yyy} was not working.
2022-06-07 19:59:33 +02:00
Laurent Destailleur
8303347ab8
FIX label and get_substitutionarray_each_var_object on ODT generation
2022-06-07 19:27:43 +02:00
Laurent Destailleur
6f6d7d7f48
Fix ODT tags in BOM template
...
Conflicts:
htdocs/core/class/commonobjectline.class.php
2022-06-02 20:18:11 +02:00