lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
88,214 Commits 43 Branches 150 Tags 886 MiB
8d2edfc5ab
Commit Graph

88214 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
florian HENRY
b47761e05c fix comment 2020-06-04 20:20:43 +02:00
florian HENRY
ca4a1dc266 Merge branch '11.0' of github.com:atm-florian/dolibarr into 11.0 2020-06-04 20:18:46 +02:00
florian HENRY
9a3e68b594 Merge branch '11.0' of github.com:Dolibarr/dolibarr into 11.0 2020-06-04 20:14:29 +02:00
florian HENRY
7115bd7033 better fix 2020-06-04 20:14:19 +02:00
Laurent Destailleur
c7a614bd50 Fix clean data 2020-06-04 17:07:22 +02:00
ptibogxiv
319710d6aa
Update 12.0.0-13.0.0.sql 2020-06-04 16:50:24 +02:00
ptibogxiv
7da6a063f9
Update llx_subscription.sql 2020-06-04 16:46:36 +02:00
Laurent Destailleur
eb7dd74026 Revert error 2020-06-04 16:05:40 +02:00
Laurent Destailleur
88f6c71e88 Add tuto for live streaming 2020-06-04 16:05:04 +02:00
Florian Mortgat
c393f8149c FIX: when creating a VariousPayment, the value date is not copied onto the AccountLine that gets created at the same time, so the bank transaction's value date will be the payment date instead of the payment's value date 2020-06-04 11:29:51 +02:00
Alexandre SPANGARO
ede084a111 Fix stickler 2020-06-04 05:11:00 +02:00
Maxime Kohlhaas
f6e0ed08e2 Fix #14027 : emptying social network value on contact wasn't working 2020-06-04 00:30:17 +02:00
Maxime Kohlhaas
e19f496d62 Fix missing test on module enabled for user validators 2020-06-03 23:30:06 +02:00
Alexandre SPANGARO
9e5c7d0acf FIX: Show ref_customer, amount on contract link object 2020-06-03 23:00:53 +02:00
Laurent Destailleur
bd56210e97 doc 2020-06-03 19:24:26 +02:00
Laurent Destailleur
7f1fea1e09 Add json-ld structure 'qa' 2020-06-03 19:23:36 +02:00
Francis Appels
d41f2dcd86 Merge remote-tracking branch 'Dolibarr/12.0' into 12 2020-06-03 14:34:51 +02:00
Laurent Destailleur
474860d546 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-03 14:06:35 +02:00
Laurent Destailleur
f1b791d5e0 Doc 2020-06-03 14:05:55 +02:00
Laurent Destailleur
7b84518e59 Fix webp support 2020-06-03 14:05:18 +02:00
Laurent Destailleur
8023bc2fbb Fix cancel in media filemanager 2020-06-03 12:39:06 +02:00
Laurent Destailleur
51c578840c Fix cancel in media filemanager 2020-06-03 12:39:00 +02:00
Laurent Destailleur
ae3d786593 Fix crop on media file manager 
Conflicts:
	htdocs/core/ajax/ajaxdirpreview.php
	htdocs/core/photos_resize.php
	htdocs/theme/eldy/global.inc.php
 2020-06-03 12:38:42 +02:00
Laurent Destailleur
93320deddc Fix cancel in media filemanager 2020-06-03 12:34:09 +02:00
Laurent Destailleur
66df7fca41 Fix cancel in media filemanager 2020-06-03 11:40:51 +02:00
Laurent Destailleur
8894570054 Fix crop on media file manager 2020-06-03 11:20:59 +02:00
Laurent Destailleur
f92426034f Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/website/index.php
 2020-06-03 01:06:27 +02:00
Laurent Destailleur
2965dda815 Typo 2020-06-03 01:02:48 +02:00
Laurent Destailleur
a37a4031e9 FIX Delete of website page need permission. Conflict with mass action. 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/website/index.php
 2020-06-03 01:02:19 +02:00
Laurent Destailleur
d4db1836d1 FIX Delete of website page need permission. Conflict with mass action. 2020-06-03 00:46:09 +02:00
Laurent Destailleur
71cb17b58b css 2020-06-02 20:58:56 +02:00
Laurent Destailleur
3755c7d25b css 2020-06-02 20:58:18 +02:00
Laurent Destailleur
9e6bb6f784 Sanitize params 2020-06-02 20:19:45 +02:00
Laurent Destailleur
a2287b3061 Trans 2020-06-02 20:19:14 +02:00
gauthier
68bb552dcc FIX : Tickets mail models doesn't work 2020-06-02 17:06:49 +02:00
Laurent Destailleur
054d5c5f4c css 2020-06-02 17:00:08 +02:00
Laurent Destailleur
da481049c1
Update commonobject.class.php 2020-06-02 15:45:40 +02:00
Laurent Destailleur
a9973ad60e Fix language key and css 2020-06-02 15:30:07 +02:00
Laurent Destailleur
658e7a2f87 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-02 13:32:09 +02:00
Laurent Destailleur
9a30d4ca44 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-02 13:32:02 +02:00
Laurent Destailleur
9651b5a7c9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-06-02 13:31:33 +02:00
Laurent Destailleur
3b4fe0d582 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/langs/en_US/main.lang
	htdocs/product/class/html.formproduct.class.php
 2020-06-02 13:31:22 +02:00
Laurent Destailleur
f91e7e4917
Merge pull request #13922 from atm-lena/11.0_NEW_AddHook_SelectWarehouses 
11.0 new add hook select warehouses
 2020-06-02 13:27:01 +02:00
Laurent Destailleur
009780b895
Update html.formproduct.class.php 2020-06-02 12:13:55 +02:00
Laurent Destailleur
88a831c05a
Update html.formproduct.class.php 2020-06-02 12:12:07 +02:00
Laurent Destailleur
0033267033
Merge pull request #14019 from indelog/12.0 
Fix line heiht overflow for blochet template
 2020-06-02 12:10:34 +02:00
Laurent Destailleur
c6a53d9b3d
Update pdf_blochet.class.php 2020-06-02 12:09:11 +02:00
DEMAREST Maxime (Indelog)
7189e060e0 Fix line heiht overflow for blochet template 
Fixed if by adding dynamic line height calculation. Now line height depend on
bank field content or transmitter field content. You can use long text in this
fields.
 2020-06-02 11:17:37 +02:00
atm-lena
ae9c490134 Merge branch '11.0' of https://github.com/Dolibarr/dolibarr into 11.0_NEW_AddHook_SelectWarehouses 2020-06-02 09:55:56 +02:00
atm-lena
99b4bfc91e Movement of hook "selectwarehouse" 2020-06-02 09:53:30 +02:00