Frédéric FRANCE
|
872f58f261
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-11-03 21:48:24 +01:00 |
|
Laurent Destailleur
|
99a4781a42
|
Fix better support for multicurrency for template invoices
|
2019-11-03 18:58:26 +01:00 |
|
Frédéric FRANCE
|
3e2d89dc02
|
Update ticket.lib.php
|
2019-11-02 18:16:09 +01:00 |
|
Laurent Destailleur
|
496f93911f
|
Merge pull request #11821 from Tim-Otte/develop
NEW Extrafields support in product supplier prices
|
2019-11-02 16:19:13 +01:00 |
|
Laurent Destailleur
|
df750b6a9d
|
Merge pull request #12287 from TobiasSekan/AddAttendeeToIcal
NEW Add attendee to ical export + cleanup
|
2019-11-02 13:40:27 +01:00 |
|
Laurent Destailleur
|
e087ac434d
|
Merge pull request #12283 from frederic34/socid
replace deprecated user->societe_id by user->socid
|
2019-11-02 13:34:21 +01:00 |
|
Laurent Destailleur
|
04a5054e1c
|
Merge pull request #12279 from atm-john/develop_ticket_file_display
New - ticket file download button display
|
2019-11-02 13:32:33 +01:00 |
|
Laurent Destailleur
|
58ffb73627
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-11-02 12:59:49 +01:00 |
|
Laurent Destailleur
|
45c77b4560
|
Renaming some libelle into label
|
2019-11-02 12:59:38 +01:00 |
|
Laurent Destailleur
|
25e64b0610
|
Merge branch 'develop' into socid
|
2019-11-02 12:01:06 +01:00 |
|
stickler-ci
|
b43d06db37
|
Fixing style errors.
|
2019-11-02 10:55:24 +00:00 |
|
Laurent Destailleur
|
37f4ebb1b2
|
Update xcal.lib.php
|
2019-11-02 11:56:01 +01:00 |
|
Laurent Destailleur
|
d9f333d828
|
Merge pull request #12289 from frederic34/datetime
php is > 5.4
|
2019-11-02 11:46:34 +01:00 |
|
Laurent Destailleur
|
f9031cdbfd
|
Clean code
|
2019-11-02 11:36:48 +01:00 |
|
Frédéric FRANCE
|
77d4ca81dc
|
Merge remote-tracking branch 'upstream/develop' into socid
|
2019-11-02 09:14:15 +01:00 |
|
Laurent Destailleur
|
cea2c3a9f4
|
Look and feel v11
|
2019-11-01 23:58:14 +01:00 |
|
Laurent Destailleur
|
8608c5db9c
|
Fix color of task progression
|
2019-11-01 23:16:08 +01:00 |
|
Frédéric FRANCE
|
dbed10a701
|
Merge remote-tracking branch 'upstream/develop' into socid
|
2019-11-01 21:39:20 +01:00 |
|
Laurent Destailleur
|
2af23aa658
|
Enhance modulebuilder
|
2019-11-01 17:54:17 +01:00 |
|
Laurent Destailleur
|
a1b2130247
|
Enhance the progress bar of tasks
|
2019-11-01 16:09:31 +01:00 |
|
Laurent Destailleur
|
135e65c4aa
|
Look and feel v11
Enhance the progress bar of tasks
|
2019-11-01 15:53:57 +01:00 |
|
Frédéric FRANCE
|
da238e94e1
|
php is > 5.4
|
2019-11-01 15:21:21 +01:00 |
|
Sekan, Tobias
|
e27f1c623d
|
Merge branch 'AddAttendeeToIcal' of https://github.com/TobiasSekan/dolibarr into develop
|
2019-11-01 13:16:54 +01:00 |
|
Sekan, Tobias
|
885c6e6516
|
Fix wrong newline replacement
|
2019-11-01 13:16:14 +01:00 |
|
Laurent Destailleur
|
e3b5be7475
|
All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed
into 'labelStatus'.
All properties 'labelstatusshort' and 'labelstatut_short' were renamed
into 'labelStatusShort'.
|
2019-11-01 12:52:03 +01:00 |
|
stickler-ci
|
fee0a362ad
|
Fixing style errors.
|
2019-11-01 11:11:59 +00:00 |
|
Sekan, Tobias
|
2a983a6a7c
|
fix link in documentation
|
2019-11-01 12:09:43 +01:00 |
|
Sekan, Tobias
|
0bfff92032
|
Add attendee to ical export + cleanup
|
2019-11-01 11:59:54 +01:00 |
|
Laurent Destailleur
|
5b5a2e9804
|
Clean code
|
2019-11-01 03:25:09 +01:00 |
|
Laurent Destailleur
|
c215d534fc
|
Fix phpcs
|
2019-10-31 21:16:41 +01:00 |
|
Laurent Destailleur
|
f98df3c807
|
NEW Can edit link to the translation page in website module
|
2019-10-31 21:09:33 +01:00 |
|
Frédéric FRANCE
|
e93aaa2a75
|
replace deprecated user->societe_id by user->socid
|
2019-10-31 20:46:31 +01:00 |
|
John Botella
|
d0a5e30faa
|
Change btn name
|
2019-10-31 08:44:08 +01:00 |
|
Frédéric FRANCE
|
f7747ed00a
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-30 20:06:43 +01:00 |
|
John Botella
|
0cff122ccd
|
Add file display in ticket
|
2019-10-30 17:46:18 +01:00 |
|
Laurent Destailleur
|
2770f79a86
|
Merge pull request #12216 from frederic34/patch-5
css
|
2019-10-30 03:02:24 +01:00 |
|
Laurent Destailleur
|
66a288a343
|
Merge pull request #12235 from frederic34/scopeindent
clean indent
|
2019-10-30 02:57:59 +01:00 |
|
Laurent Destailleur
|
bf0400a29b
|
Merge pull request #12252 from oscim/patch-10
Update admin.lib.php
|
2019-10-30 02:41:59 +01:00 |
|
Laurent Destailleur
|
f03bf149bd
|
Fix autoselect of field with modulebuilder
|
2019-10-30 02:09:29 +01:00 |
|
Laurent Destailleur
|
4eedf4a113
|
Merge branch '10.0' of https://github.com/dolibarr/dolibarr into develop
|
2019-10-29 11:48:36 +01:00 |
|
Laurent Destailleur
|
9483e367ca
|
Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0
Conflicts:
htdocs/expensereport/class/expensereport.class.php
htdocs/product/stock/replenishorders.php
|
2019-10-29 11:48:11 +01:00 |
|
Laurent Destailleur
|
e58ecaaa64
|
Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0
Conflicts:
htdocs/product/stock/replenishorders.php
|
2019-10-29 11:43:35 +01:00 |
|
stickler-ci
|
52ef2bb990
|
Fixing style errors.
|
2019-10-29 10:16:49 +00:00 |
|
oscim
|
d310ca6e82
|
Update admin.lib.php
add function modulehelp_prepare_head
|
2019-10-29 11:15:03 +01:00 |
|
Laurent Destailleur
|
5e06fe0712
|
FIX Avoid fatal error when creating thumb from PDF
|
2019-10-29 11:11:13 +01:00 |
|
Frédéric FRANCE
|
e2afcfb999
|
clean indent
|
2019-10-27 11:53:20 +01:00 |
|
Frédéric FRANCE
|
a43e6f96b5
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-25 08:12:54 +02:00 |
|
Frédéric FRANCE
|
83ed70f72f
|
Update agenda.lib.php
|
2019-10-24 22:44:51 +02:00 |
|
Laurent Destailleur
|
2814a5c07b
|
Fix phpcs
|
2019-10-24 21:47:31 +02:00 |
|
Laurent Destailleur
|
b45ee20696
|
NEW Add a tab to setup "Opening hours" of company (information only)
|
2019-10-24 21:29:07 +02:00 |
|