Marcos García de La Fuente
|
e0cbcadd98
|
In case Model for document generation is not defined, the criteria to select the model is now:
1. Model for the object
2. Custom default module
3. Hardcoded default module
|
2017-01-16 21:16:05 +01:00 |
|
Marcos García de La Fuente
|
6dbb3efc89
|
NEW #6280: Generate PDF after creating an invoice from a customer order
Close #6280
|
2017-01-16 20:24:26 +01:00 |
|
Philippe GRAND
|
2525a6e3a4
|
update code for next php versions
|
2017-01-16 17:24:50 +01:00 |
|
BENKE Charlie
|
c0a8752ef4
|
Update card.php
|
2017-01-16 14:17:38 +01:00 |
|
BENKE Charlie
|
e701ea0b2f
|
Add dictionnary mail for contract
|
2017-01-16 14:06:34 +01:00 |
|
Juanjo Menent
|
9674bdef54
|
Best directory for img
|
2017-01-16 13:40:57 +01:00 |
|
Juanjo Menent
|
e232c1c408
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2017-01-16 13:37:01 +01:00 |
|
Laurent Destailleur
|
d21bb1e6b1
|
FIX #6237
|
2017-01-16 13:10:54 +01:00 |
|
Laurent Destailleur
|
7ebb5f7d92
|
FIX #6270
|
2017-01-16 13:06:26 +01:00 |
|
Laurent Destailleur
|
fdbe4051f1
|
FIX #6230
|
2017-01-16 12:54:51 +01:00 |
|
Laurent Destailleur
|
c1d6ad90b3
|
FIX #6255
|
2017-01-16 12:35:19 +01:00 |
|
Laurent Destailleur
|
43cb9c30b2
|
Fix var_dump
|
2017-01-16 12:21:37 +01:00 |
|
Laurent Destailleur
|
c01baf1223
|
FIX #6255
|
2017-01-16 12:16:49 +01:00 |
|
Laurent Destailleur
|
4f949bea29
|
FIX #6273
|
2017-01-16 11:46:30 +01:00 |
|
Laurent Destailleur
|
983f707553
|
Add comment
|
2017-01-16 11:35:25 +01:00 |
|
Laurent Destailleur
|
9c60474953
|
FIX #6277
|
2017-01-16 11:06:17 +01:00 |
|
Laurent Destailleur
|
da64d4d398
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-01-16 10:58:45 +01:00 |
|
Laurent Destailleur
|
fafe71ec52
|
Fix autocalculation of surface and volume.
|
2017-01-16 10:55:33 +01:00 |
|
Laurent Destailleur
|
1b1bab94ca
|
More complete commit for #6114
|
2017-01-16 10:43:22 +01:00 |
|
Laurent Destailleur
|
81d76f8600
|
Merge pull request #6114 from defrance/patch-52
NEW Allow to change heigth and width on product
|
2017-01-16 10:19:47 +01:00 |
|
Laurent Destailleur
|
41f6d70eaf
|
Merge pull request #6269 from defrance/patch-65
Fix: forgotten translation
|
2017-01-16 10:18:37 +01:00 |
|
Laurent Destailleur
|
d2b766f9f4
|
Fix PHP 7.1
|
2017-01-16 10:17:25 +01:00 |
|
Laurent Destailleur
|
f36dea5be7
|
Fix holiday class
Conflicts:
htdocs/holiday/class/holiday.class.php
|
2017-01-16 09:32:04 +01:00 |
|
Laurent Destailleur
|
ac80d4057d
|
Fix several running time errors
|
2017-01-16 09:30:28 +01:00 |
|
Laurent Destailleur
|
f43b3ebda4
|
Fix holiday class
|
2017-01-16 09:30:00 +01:00 |
|
altatof
|
3dd160c663
|
use dol_escape_htmltag
|
2017-01-16 09:17:37 +01:00 |
|
Laurent Destailleur
|
36bd63c1a7
|
NEW PHP 7.1 compatibility
|
2017-01-16 09:05:18 +01:00 |
|
Laurent Destailleur
|
a05132d26e
|
Fix PHP 7.1 error
|
2017-01-16 09:05:09 +01:00 |
|
Laurent Destailleur
|
6a79a80320
|
Reenable php 7.1
|
2017-01-16 08:50:17 +01:00 |
|
Laurent Destailleur
|
10a10f459c
|
Update ChangeLog
|
2017-01-16 01:23:43 +01:00 |
|
Laurent Destailleur
|
6bfd534a36
|
NEW PHP 7.1 compatibility
|
2017-01-16 01:21:33 +01:00 |
|
Laurent Destailleur
|
9d72f1df62
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-01-16 01:12:11 +01:00 |
|
Laurent Destailleur
|
a07a77e323
|
Not yet ready for php 7.1
|
2017-01-16 01:11:38 +01:00 |
|
Laurent Destailleur
|
94a180a775
|
Fix POO best practice
|
2017-01-16 00:54:08 +01:00 |
|
Laurent Destailleur
|
9c1895a03a
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-01-16 00:49:19 +01:00 |
|
Laurent Destailleur
|
846e827e09
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-01-16 00:49:11 +01:00 |
|
Laurent Destailleur
|
f5458b4337
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
htdocs/admin/modules.php
htdocs/core/class/html.formfile.class.php
htdocs/product/stats/card.php
|
2017-01-16 00:48:37 +01:00 |
|
Laurent Destailleur
|
9f17e56923
|
Merge pull request #6279 from hregis/4.0_bug3
Fix: search problem if name contains accents
|
2017-01-16 00:44:56 +01:00 |
|
Laurent Destailleur
|
25958c241b
|
Merge pull request #6278 from hregis/4.0_bug2
Fix: avoid foreach error
|
2017-01-16 00:43:41 +01:00 |
|
Laurent Destailleur
|
0bac99028e
|
Merge pull request #6276 from aljawaid/develop
Fix: Add Missing Translation String
|
2017-01-16 00:43:00 +01:00 |
|
Laurent Destailleur
|
ed6e3fe8a0
|
Merge pull request #6275 from hregis/4.0_bug
Fix: preview image not show with multicompany product sharing
|
2017-01-16 00:41:15 +01:00 |
|
Laurent Destailleur
|
6903acfe1c
|
Include php 7.1 in tests
|
2017-01-16 00:22:12 +01:00 |
|
Laurent Destailleur
|
d95ac3bbdd
|
Fix warning
|
2017-01-16 00:16:20 +01:00 |
|
Laurent Destailleur
|
4ecd657f34
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-01-16 00:02:43 +01:00 |
|
Laurent Destailleur
|
0671f75417
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-01-16 00:01:37 +01:00 |
|
Laurent Destailleur
|
0fe844aa00
|
FIX usage of tag {y} in numbering modules
|
2017-01-16 00:01:06 +01:00 |
|
Laurent Destailleur
|
7bccaff28a
|
Fix remove warnings
|
2017-01-15 23:32:14 +01:00 |
|
Laurent Destailleur
|
54a974cb5c
|
Fix position of dropdown tooltip
|
2017-01-15 21:03:44 +01:00 |
|
Laurent Destailleur
|
d14e4dbaba
|
Fix pagination when MAIN_DISABLE_FULL_SCANLIST is on
|
2017-01-15 20:49:20 +01:00 |
|
Juanjo Menent
|
58c25a68a8
|
NEW: Event notifications in browser
|
2017-01-15 18:48:32 +01:00 |
|