Laurent Destailleur
|
9cd5c8a564
|
Code comment
|
2017-08-22 18:34:58 +02:00 |
|
Laurent Destailleur
|
e05ac34966
|
Fix remove var_dump
|
2017-08-22 18:03:37 +02:00 |
|
Laurent Destailleur
|
64c4f899f3
|
Fix charset management with ace
|
2017-08-22 18:00:54 +02:00 |
|
Laurent Destailleur
|
a2b41a30fc
|
Fix duplicate header in website module
|
2017-08-22 15:44:28 +02:00 |
|
Laurent Destailleur
|
ec56ff59d6
|
Fix invalid link after renaming a website key.
|
2017-08-22 15:32:45 +02:00 |
|
Laurent Destailleur
|
db9cc4683a
|
Fix php warning
|
2017-08-22 15:29:40 +02:00 |
|
John
|
b18104788e
|
New extrafield on facture_rec
|
2017-08-22 15:22:41 +02:00 |
|
Laurent Destailleur
|
14cd150762
|
NEW Introduce experimental feature to search dolistore from application
|
2017-08-22 14:47:01 +02:00 |
|
Laurent Destailleur
|
d945047794
|
Remove log
|
2017-08-22 13:15:56 +02:00 |
|
Laurent Destailleur
|
5cf684f5a2
|
NEW Popup for preview of image add a button "Original size"
|
2017-08-22 13:14:10 +02:00 |
|
Laurent Destailleur
|
f8ac586105
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-08-22 11:19:08 +02:00 |
|
Laurent Destailleur
|
30c39d246b
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-08-22 11:18:56 +02:00 |
|
Laurent Destailleur
|
9966631871
|
Merge pull request #7274 from hregis/develop_travis
Fix: Travis error "Missing parameter name"
|
2017-08-22 10:46:47 +02:00 |
|
Laurent Destailleur
|
ca3b3b9843
|
Merge pull request #7270 from atm-florian/6.0_fix
6.0 fix
|
2017-08-22 10:33:08 +02:00 |
|
Laurent Destailleur
|
b3d1cdf84c
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/expensereport/card.php
|
2017-08-22 10:11:32 +02:00 |
|
Regis Houssin
|
e86d3d7905
|
Fix: Travis error "Missing parameter name"
|
2017-08-22 09:47:33 +02:00 |
|
Laurent Destailleur
|
731f826a55
|
NEW jquery date selector become default date selector
|
2017-08-22 09:23:35 +02:00 |
|
Laurent Destailleur
|
9ffcd9e922
|
Fix cover background size
|
2017-08-21 21:18:07 +02:00 |
|
Laurent Destailleur
|
2104ab9aed
|
Disable event reminder
|
2017-08-21 13:11:29 +02:00 |
|
Laurent Destailleur
|
70dcace0a1
|
Fix regression syntax
|
2017-08-21 12:52:47 +02:00 |
|
Laurent Destailleur
|
fe724a2e69
|
Fix syntax error
|
2017-08-21 12:35:43 +02:00 |
|
Laurent Destailleur
|
583fc485a9
|
Work on website module
|
2017-08-21 03:13:44 +02:00 |
|
Laurent Destailleur
|
68c31c55c5
|
FIX delete dir when there is symlinks
|
2017-08-21 01:26:22 +02:00 |
|
Laurent Destailleur
|
eedf5e0a22
|
FIX delete dir when there is symlinks
|
2017-08-21 01:24:34 +02:00 |
|
Laurent Destailleur
|
ac3a270e17
|
FIX Do not delete files into sym links
Conflicts:
htdocs/core/lib/files.lib.php
|
2017-08-21 00:43:52 +02:00 |
|
Laurent Destailleur
|
b9511fd4c6
|
FIX Do not delete files into sym links
|
2017-08-21 00:40:32 +02:00 |
|
Laurent Destailleur
|
083cb33a6c
|
Clean ecm code
|
2017-08-20 23:16:20 +02:00 |
|
Laurent Destailleur
|
2321091170
|
NEW Move the upload input on top right in ECM module
|
2017-08-20 21:23:19 +02:00 |
|
Laurent Destailleur
|
188653a85d
|
Work on website module
|
2017-08-20 18:50:51 +02:00 |
|
Laurent Destailleur
|
5c5c4046a1
|
Prepare setup for email reminder
|
2017-08-20 16:07:22 +02:00 |
|
Laurent Destailleur
|
5d76227948
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-08-18 23:22:36 +02:00 |
|
Laurent Destailleur
|
260beed512
|
NEW Generated files are now indexed in database
|
2017-08-18 23:19:55 +02:00 |
|
Laurent Destailleur
|
097b660c41
|
Mutualize code
|
2017-08-18 16:25:00 +02:00 |
|
florian HENRY
|
874d61bb6d
|
Other fix
|
2017-08-18 11:35:20 +02:00 |
|
florian HENRY
|
c793e847bc
|
fix comondoc generator
|
2017-08-18 11:30:13 +02:00 |
|
Laurent Destailleur
|
22a7c9bd6b
|
Merge pull request #7220 from guerrierk/develop
NEW|Add possibility to propose last num releve in conciliation
|
2017-08-17 23:42:07 +02:00 |
|
Laurent Destailleur
|
185b865d83
|
Merge pull request #7060 from defrance/patch-18
TPL refactoring
|
2017-08-17 22:36:06 +02:00 |
|
Laurent Destailleur
|
dcc6822c3c
|
Merge pull request #7056 from defrance/patch-17
Refactoring tpl Folder
|
2017-08-17 22:34:47 +02:00 |
|
Laurent Destailleur
|
4d46b2ae58
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/filefunc.inc.php
|
2017-08-17 22:21:30 +02:00 |
|
Laurent Destailleur
|
744f0ab198
|
Merge remote-tracking branch 'origin/5.0' into 6.0
|
2017-08-17 22:03:26 +02:00 |
|
Laurent Destailleur
|
0dd5bcde40
|
Merge pull request #7135 from apachler/develop
NEW Added functionality to get order customer contact as contact_xx tags
|
2017-08-17 18:28:23 +02:00 |
|
Laurent Destailleur
|
d95a39b191
|
Merge pull request #7245 from fappels/develop_supplier_order_PDF_pictures
New show product picture in supplier proposals
|
2017-08-17 18:23:45 +02:00 |
|
Juanjo Menent
|
3330f040ba
|
FIX: Bad tax calculation with expense report
|
2017-08-16 11:19:28 +02:00 |
|
Laurent Destailleur
|
d37d1a033a
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
htdocs/compta/bank/bankentries.php
htdocs/core/lib/admin.lib.php
htdocs/install/mysql/migration/repair.sql
|
2017-08-11 19:56:17 +02:00 |
|
Laurent Destailleur
|
54b8fff0d8
|
Merge pull request #7241 from atm-florian/dev_manageextrafieldswithmultientity
fix : Better management for exstrafeild management
|
2017-08-10 13:01:51 +02:00 |
|
fappels
|
34153eec7f
|
Add reading of picture paths
|
2017-08-07 22:36:12 +02:00 |
|
fappels
|
7fc359df5d
|
Fix pic position when VAT column hidden
|
2017-08-07 21:48:01 +02:00 |
|
fappels
|
3ef4b0fd2b
|
Add pictures to pdf muscadet
|
2017-08-07 21:47:45 +02:00 |
|
fappels
|
ea5dcbf611
|
Fix constant to show pics and remove pics column line
|
2017-08-07 21:35:30 +02:00 |
|
Laurent Destailleur
|
fd38a55f51
|
FIX amount overlap other amount when a pagebreak is done due to an image
at the bottom of page.
|
2017-08-07 15:49:54 +02:00 |
|