Commit Graph

94827 Commits

Author SHA1 Message Date
Laurent Destailleur
026259ebd7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/ajax.lib.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/product/fournisseurs.php
2021-02-15 13:12:27 +01:00
Laurent Destailleur
49f8ff5708 FIX #16286 2021-02-15 12:18:09 +01:00
Laurent Destailleur
f15696620f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-15 11:51:23 +01:00
Laurent Destailleur
6e21839169 Fix migration 2021-02-15 11:50:59 +01:00
Laurent Destailleur
b2826025f6 Fix missing event type 2021-02-15 11:48:48 +01:00
Laurent Destailleur
67cfa05489 Fix missing event type 2021-02-15 11:48:37 +01:00
Laurent Destailleur
4e2e5db9de
Merge pull request #16260 from atm-lena/develop_NEW_BankEntries_TaxSalarySocial_DisplayUser
New bank entries tax salary social display user
2021-02-15 11:05:28 +01:00
Laurent Destailleur
e56635b329 Fix filter on date on movement list 2021-02-14 23:05:11 +01:00
Laurent Destailleur
5fc36ab736
Merge pull request #16139 from aspangaro/14a14
NEW: Stock movement list - Add more complete date field
2021-02-14 22:45:39 +01:00
Laurent Destailleur
5bead8577c Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-02-14 22:44:17 +01:00
Laurent Destailleur
f4c23654f8 FIX #16275 #15604 2021-02-14 22:44:04 +01:00
Laurent Destailleur
a9e7d04536 Fix #16256 2021-02-14 22:18:59 +01:00
Laurent Destailleur
fac38e50d6 Fix #16256 2021-02-14 22:16:15 +01:00
Laurent Destailleur
40c0a0ee26
Merge pull request #16256 from Hystepik/develop#1
Close #16248 : new column in Stock to date
2021-02-14 22:00:44 +01:00
Laurent Destailleur
2669de8324
Merge pull request #16272 from AlexisLaurier/13.0
Add missing comma in contract list.php
2021-02-14 21:59:07 +01:00
Laurent Destailleur
3d7dfcc043
Merge pull request #16271 from frederic34/doxygencron
doxygen
2021-02-14 21:58:40 +01:00
Laurent Destailleur
e0a7ba6bdf
Merge pull request #16276 from frederic34/patch-3
FIX inverted test
2021-02-14 21:58:10 +01:00
Laurent Destailleur
3e41f69d3d Fix bad permission check 2021-02-14 21:56:15 +01:00
Laurent Destailleur
4a35600e62
Merge pull request #16278 from bafbes/abb120357
new : hook context subscriptioncard and restrictedArea block for subscriptions
2021-02-14 21:53:25 +01:00
Laurent Destailleur
342978005a
Merge pull request #16277 from bafbes/abb120356
Fix : To use restrictedArea Hook, we need to call initHooks before restrictedArea
2021-02-14 21:51:53 +01:00
Laurent Destailleur
27ffd5d84f
Merge pull request #16287 from FHenry/dev_modbuilder_feature_setuppage
NEW : Setup Page for module create with module builder enhancement #FoundationFunding
2021-02-14 21:48:50 +01:00
Laurent Destailleur
25230fb4bb
Merge pull request #16284 from andreubisquerra/develop
Improve logo printing compatibility with TakePOS connector
2021-02-14 21:41:45 +01:00
Laurent Destailleur
4d526569a7
Merge pull request #16292 from frederic34/patch-5
Use dictionary to display social network icon
2021-02-14 21:34:13 +01:00
Laurent Destailleur
2cc4632a39 Fix js error 2021-02-14 21:32:19 +01:00
Frédéric FRANCE
917f15a781
Use dictionary to display social network icon 2021-02-14 21:30:54 +01:00
Laurent Destailleur
9e16cd5b77 Look and feel v14 2021-02-14 20:47:57 +01:00
Laurent Destailleur
66c7770146 Factorize some common code for type of event 2021-02-14 20:12:43 +01:00
stickler-ci
d636aa6cfa Fixing style errors. 2021-02-14 15:48:44 +00:00
Florian HENRY
5c8e7b224f add feature to setup pages 2021-02-14 16:44:42 +01:00
Florian HENRY
85a450cdd2 setup page feature 2021-02-14 15:02:05 +01:00
stickler-ci
fb7e103d65 Fixing style errors. 2021-02-14 06:29:06 +00:00
Alexandre SPANGARO
dc91dbabd1 Fix tzuserrel 2021-02-14 07:26:53 +01:00
andreubisquerra
abda9eeb93
Improve compatibility with logo printing with TakePOS connector 2021-02-14 00:02:03 +01:00
abb
d92e17aabd new : hook context subscriptioncard and restrictedArea block for subscriptions 2021-02-12 19:21:31 +01:00
abb
b8fde12def Fix : To use restrictedArea Hook, we need to call initHooks before restrictedArea 2021-02-12 17:19:45 +01:00
Laurent Destailleur
50797bf892 Fix typo 2021-02-12 17:17:48 +01:00
Laurent Destailleur
34525f3ba9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-12 17:15:37 +01:00
Laurent Destailleur
cd4d790d2b Add parameters of batch into comment description 2021-02-12 17:15:23 +01:00
Frédéric FRANCE
811c02b970
fix inverted test 2021-02-12 15:45:49 +01:00
stickler-ci
6f7a223a8d Fixing style errors. 2021-02-12 10:17:03 +00:00
atm-lena
b3c1bb9706 Merge branch 'NEW_BankEntries_TaxSalarySocial_DisplayUser' of github.com:atm-lena/dolibarr into develop_NEW_BankEntries_TaxSalarySocial_DisplayUser 2021-02-12 11:13:14 +01:00
atm-lena
1f56166801 FIX ret : fetch user instead of search with main sql request 2021-02-12 11:05:15 +01:00
LAURIER Alexis
4b9f71d20e
Add missing comma in contract list.php 2021-02-12 09:00:29 +01:00
Frédéric FRANCE
fa72021ca8
doxygen 2021-02-12 08:49:29 +01:00
Laurent Destailleur
f2f9085fb5 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-02-11 23:05:17 +01:00
Laurent Destailleur
5392e11370 Add missing ethiopian birr currency 2021-02-11 23:05:01 +01:00
Laurent Destailleur
60ae50abb3
Merge pull request #16270 from frederic34/patch-3
fix unknown variable
2021-02-11 23:00:36 +01:00
Laurent Destailleur
e796c514aa
Merge pull request #16269 from frederic34/doxygentest
doxygen
2021-02-11 22:59:37 +01:00
Frédéric FRANCE
ac40067e88
fix unknown variable 2021-02-11 22:11:16 +01:00
Frédéric FRANCE
bcac4386d6
doxygen 2021-02-11 21:26:21 +01:00