Regis Houssin
|
97a8a84b9d
|
Fix: missing encrypt/decrypt with llx_const
|
2016-11-12 09:57:41 +01:00 |
|
Laurent Destailleur
|
97d84ab4ab
|
Better responsive design
|
2016-11-11 23:47:56 +01:00 |
|
Laurent Destailleur
|
b1bd9e4930
|
Responsive design
|
2016-11-11 23:17:37 +01:00 |
|
Laurent Destailleur
|
071ba4fbfd
|
Fix as suggested for #5960
|
2016-11-11 15:27:29 +01:00 |
|
Laurent Destailleur
|
1082997f62
|
FIX #5972 #5734
|
2016-11-11 15:19:25 +01:00 |
|
Laurent Destailleur
|
cd9f1db229
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/fiche-rec.php
|
2016-11-11 15:12:30 +01:00 |
|
Laurent Destailleur
|
a605e0b972
|
Fix phpcs
|
2016-11-11 15:06:31 +01:00 |
|
Laurent Destailleur
|
e4617ec76c
|
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
Conflicts:
htdocs/core/filemanagerdol/connectors/php/config.php
htdocs/viewimage.php
|
2016-11-11 15:03:05 +01:00 |
|
Laurent Destailleur
|
fd1c0f404c
|
Merge pull request #5864 from hregis/4.0_bug
Fix: add possibility to change width type to prevent some display issues
|
2016-11-11 14:55:28 +01:00 |
|
Laurent Destailleur
|
614787c123
|
Merge pull request #5940 from aspangaro/5.0-p33
Correct typo
|
2016-11-11 14:26:33 +01:00 |
|
Laurent Destailleur
|
e82dadedd4
|
Merge pull request #5974 from defrance/patch-41
FIX : subscription never filled with "yes"
|
2016-11-11 14:25:44 +01:00 |
|
Laurent Destailleur
|
787f508172
|
More complete fix for #5974
|
2016-11-11 14:25:22 +01:00 |
|
aspangaro
|
44a6bc8960
|
Cancel typo profit
|
2016-11-11 14:19:21 +01:00 |
|
Laurent Destailleur
|
899ba6d90b
|
NEW Add option to include parent products too in stats of orders
|
2016-11-11 14:17:11 +01:00 |
|
Laurent Destailleur
|
e2b7773353
|
Merge pull request #5943 from atm-alexis/FIX_vitual_product_virtual_stock
Fix vitual product virtual stock
|
2016-11-11 14:11:56 +01:00 |
|
Laurent Destailleur
|
5ed2f633eb
|
Merge pull request #5969 from aspangaro/5.0-p34
Work on supplier credit/deposit note
|
2016-11-11 14:08:40 +01:00 |
|
Laurent Destailleur
|
f7e780fa9e
|
Merge pull request #5967 from marcosgdf/bug-5966
FIX #5966 Bug: getNomUrl tooltips show Proposal info even if user has no rights to read them
|
2016-11-11 14:07:10 +01:00 |
|
Laurent Destailleur
|
94544fb9ae
|
Merge pull request #5968 from philazerty/patch-6
Update companies.lang
|
2016-11-11 14:06:21 +01:00 |
|
Laurent Destailleur
|
2b2bd03eda
|
Merge pull request #5971 from atm-florian/4.0
FIX : translation missing
|
2016-11-11 14:05:59 +01:00 |
|
Laurent Destailleur
|
da387db166
|
NEW Error code of each email sent is visible in list of email targets
|
2016-11-11 14:03:57 +01:00 |
|
Laurent Destailleur
|
360d697fc3
|
Add missing field to store result of email sending
|
2016-11-11 13:45:18 +01:00 |
|
BENKE Charlie
|
448cd8c38a
|
subscription never filled with "yes"
|
2016-11-11 12:57:59 +01:00 |
|
Laurent Destailleur
|
b20c4bdfe4
|
Responsive design
|
2016-11-11 12:55:03 +01:00 |
|
aspangaro
|
c65678d00a
|
Update cactus numbering model
|
2016-11-11 07:36:26 +01:00 |
|
aspangaro
|
60219fa84d
|
Update tulip model
|
2016-11-11 07:06:45 +01:00 |
|
aspangaro
|
be65515aa9
|
Merge remote-tracking branch 'Upstream/develop' into 5.0-p34
|
2016-11-11 06:46:00 +01:00 |
|
Laurent Destailleur
|
2cfcca82b4
|
Fix list of linked object block
|
2016-11-11 02:18:48 +01:00 |
|
Laurent Destailleur
|
e4c4ced5a3
|
Complete work on usin dol_banner
|
2016-11-11 01:55:53 +01:00 |
|
Laurent Destailleur
|
ab269bd7a6
|
Better responsive
|
2016-11-11 01:15:41 +01:00 |
|
Laurent Destailleur
|
ff4e61e70a
|
Fix doc debian
|
2016-11-10 18:45:28 +01:00 |
|
Laurent Destailleur
|
66ff139030
|
Fix travis
|
2016-11-10 18:03:35 +01:00 |
|
Laurent Destailleur
|
9606f67bdb
|
Better responsive design
|
2016-11-10 14:57:50 +01:00 |
|
Laurent Destailleur
|
fe9c880984
|
NEW Add missing unique key on table llx_links
|
2016-11-10 14:24:29 +01:00 |
|
Laurent Destailleur
|
c2ce5c4eeb
|
FIX False positive on services not activated
|
2016-11-10 11:54:02 +01:00 |
|
Laurent Destailleur
|
eaa2125373
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/projet/card.php
htdocs/projet/class/project.class.php
htdocs/projet/list.php
|
2016-11-10 11:40:39 +01:00 |
|
Laurent Destailleur
|
cc64994f30
|
Better responsive design
|
2016-11-10 11:33:25 +01:00 |
|
florian HENRY
|
9daac25519
|
Fix translation for CRON
|
2016-11-10 08:31:08 +01:00 |
|
aspangaro
|
f3da39c0a7
|
Add buttons to convert to reduction or money back
|
2016-11-10 06:51:15 +01:00 |
|
aspangaro
|
77eaa635fe
|
Align actions buttons
|
2016-11-10 06:29:11 +01:00 |
|
Laurent Destailleur
|
9fd5ddf807
|
NEW Add REST API for projects
|
2016-11-09 22:54:51 +01:00 |
|
aspangaro
|
a794033dae
|
Merge remote-tracking branch 'Upstream/develop' into 5.0-p34
|
2016-11-09 22:32:58 +01:00 |
|
Laurent Destailleur
|
71a573df61
|
FIX Pb in management of date end of projects
|
2016-11-09 17:46:30 +01:00 |
|
Laurent Destailleur
|
ff4eddb8dc
|
Fix warning on project late
|
2016-11-09 17:37:58 +01:00 |
|
Laurent Destailleur
|
bc6d655cfb
|
Uniformize code
|
2016-11-09 16:11:02 +01:00 |
|
philazerty
|
24c12df356
|
Update companies.lang
Ajout du Gabon
|
2016-11-09 12:16:41 +01:00 |
|
Marcos García de La Fuente
|
c6f96a81d1
|
Little correction
|
2016-11-09 11:30:55 +01:00 |
|
Marcos García de La Fuente
|
0b594eab59
|
FIX #5966 Bug: getNomUrl tooltips show Proposal info even if user has no rights to read them
|
2016-11-09 11:28:05 +01:00 |
|
Laurent Destailleur
|
e30622cbd8
|
FIX Bcc must not appears to recipient when using SMTPs lib
|
2016-11-09 00:10:02 +01:00 |
|
Laurent Destailleur
|
c45c24f80c
|
FIX Must use external link into a forged email content.
|
2016-11-08 23:18:43 +01:00 |
|
Laurent Destailleur
|
52080fb917
|
Fix code not reachable
|
2016-11-08 20:06:50 +01:00 |
|