Laurent Destailleur
|
f9fa19e7ae
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2018-07-02 12:26:45 +02:00 |
|
Laurent Destailleur
|
9c5d34fc5f
|
Fix translation
|
2018-07-02 12:26:32 +02:00 |
|
Laurent Destailleur
|
a2c89d8110
|
Fix page code in pdf
|
2018-07-02 12:25:09 +02:00 |
|
Laurent Destailleur
|
63f3143718
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-07-02 12:18:34 +02:00 |
|
Laurent Destailleur
|
dc69960b00
|
Code comment
|
2018-07-02 12:17:34 +02:00 |
|
Laurent Destailleur
|
7bf33b1bac
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/hrm/index.php
htdocs/install/mysql/tables/llx_website_account.key.sql
htdocs/modulebuilder/template/myobject_card.php
|
2018-07-02 12:16:51 +02:00 |
|
Laurent Destailleur
|
af21222c30
|
Fix translation
|
2018-07-02 11:47:04 +02:00 |
|
Laurent Destailleur
|
e8b97b0be4
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2018-07-02 11:33:49 +02:00 |
|
Laurent Destailleur
|
11021353da
|
Fix text in payment area of crabe pdf
|
2018-07-02 11:33:33 +02:00 |
|
Regis Houssin
|
9709207a4f
|
Fix: superadmin can show all users in master entity
|
2018-07-02 10:18:16 +02:00 |
|
Regis Houssin
|
df718cca5c
|
Fix: better sql request with multicompany transverse mode
|
2018-07-02 10:09:56 +02:00 |
|
Laurent Destailleur
|
fec9a96ad1
|
Fix travis
|
2018-07-02 09:34:34 +02:00 |
|
Laurent Destailleur
|
7e7d419e2d
|
Test travis
|
2018-07-02 08:43:08 +02:00 |
|
Laurent Destailleur
|
93184c5f66
|
Fix travis
|
2018-07-01 23:57:54 +02:00 |
|
Laurent Destailleur
|
884e8cee90
|
Test travis
|
2018-07-01 23:39:14 +02:00 |
|
Laurent Destailleur
|
41e1370f7a
|
Fix travis
|
2018-07-01 23:27:27 +02:00 |
|
Laurent Destailleur
|
a04055dc47
|
Fix travis
|
2018-07-01 23:17:12 +02:00 |
|
Laurent Destailleur
|
c03d7b97db
|
Test travis
|
2018-07-01 23:14:03 +02:00 |
|
Laurent Destailleur
|
216df5622f
|
Test travis
|
2018-07-01 23:00:10 +02:00 |
|
Laurent Destailleur
|
c92d341996
|
Test travis
|
2018-07-01 22:56:23 +02:00 |
|
Laurent Destailleur
|
26306c90f4
|
Better log
|
2018-07-01 22:46:54 +02:00 |
|
Laurent Destailleur
|
c0eac8600d
|
Test travis
|
2018-07-01 22:41:09 +02:00 |
|
Laurent Destailleur
|
2872cf0c2a
|
Fix travis
|
2018-07-01 21:16:36 +02:00 |
|
Laurent Destailleur
|
0297290365
|
Travis test
|
2018-07-01 21:13:29 +02:00 |
|
Regis Houssin
|
233ad2945c
|
Fix: missing hook parameter
|
2018-07-01 20:03:08 +02:00 |
|
Regis Houssin
|
26495fb698
|
Fix: !!!! Dont't use entity if you use rowid in fetch or others !!!!
|
2018-07-01 18:49:37 +02:00 |
|
Regis Houssin
|
f13dd9c9bd
|
Fix: missing hook parameter
|
2018-07-01 18:22:18 +02:00 |
|
Regis Houssin
|
8f124efc15
|
Fix: wrong mysql resource name
|
2018-07-01 17:48:01 +02:00 |
|
BENKE Charlene
|
43c5d7abdc
|
add holliday_admin_prepare_head
sorry eldy i forget it
|
2018-07-01 17:33:35 +02:00 |
|
Regis Houssin
|
05c666c18b
|
Fix: use numbering model corresponding to the entity of the object
|
2018-07-01 17:06:19 +02:00 |
|
Regis Houssin
|
80adac12c0
|
Fix: use object entity ID instead current entity
|
2018-07-01 16:01:30 +02:00 |
|
Regis Houssin
|
df55bee8ae
|
Fix: missing "$disableremove" global
|
2018-07-01 15:33:10 +02:00 |
|
Regis Houssin
|
c0c8a70dd5
|
Fix: permissions
|
2018-07-01 12:21:51 +02:00 |
|
Laurent Destailleur
|
bd5729f941
|
Test travis
|
2018-07-01 11:59:06 +02:00 |
|
Regis Houssin
|
d699667722
|
Fix: possibility to overload permissions (multicompany sharing)
|
2018-07-01 11:06:47 +02:00 |
|
Regis Houssin
|
496907d448
|
Fix: changelog
|
2018-07-01 10:15:47 +02:00 |
|
Laurent Destailleur
|
e6bec412ac
|
Show logs
|
2018-07-01 00:56:32 +02:00 |
|
Laurent Destailleur
|
00cee4a88c
|
Fix travis
|
2018-07-01 00:00:07 +02:00 |
|
Laurent Destailleur
|
e06eb9e2fc
|
Fix phpcs
|
2018-06-30 18:38:23 +02:00 |
|
Laurent Destailleur
|
751ddb46d2
|
Update pdf_blochet.class.php
|
2018-06-30 18:31:32 +02:00 |
|
Laurent Destailleur
|
a502271029
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
|
2018-06-30 18:30:16 +02:00 |
|
Laurent Destailleur
|
7fe7b9b626
|
Merge branch 'hregis-8.0_canvas' into develop
|
2018-06-30 18:29:53 +02:00 |
|
Laurent Destailleur
|
d8c7c61951
|
Merge branch '8.0_canvas' of https://github.com/hregis/dolibarr into
hregis-8.0_canvas
# Conflicts:
# htdocs/product/canvas/product/tpl/list.tpl.php
|
2018-06-30 18:29:08 +02:00 |
|
Laurent Destailleur
|
f5054b4500
|
Merge pull request #9036 from hregis/develop_travis
Fix: syntax error (Travis)
|
2018-06-30 18:16:28 +02:00 |
|
Regis Houssin
|
598f90486f
|
Fix: syntax error (Travis)
|
2018-06-30 17:05:34 +02:00 |
|
Laurent Destailleur
|
ee2d543781
|
Merge pull request #8837 from delcroip/patch-modulebuilder-supportsellist
NEW support selllist in the module builder
|
2018-06-30 15:33:17 +02:00 |
|
Laurent Destailleur
|
edd2e12b8d
|
css
|
2018-06-30 14:35:33 +02:00 |
|
Laurent Destailleur
|
982a1ffbaf
|
NEW Automatic position of scroll when creating an extrafield
|
2018-06-30 14:22:05 +02:00 |
|
Philippe GRAND
|
640f7697e4
|
update code
|
2018-06-30 11:45:49 +02:00 |
|
Regis Houssin
|
f3d213bab8
|
Fix: remove old code
|
2018-06-30 11:05:13 +02:00 |
|