arnaud
977c18513d
FIX pdf supplier payment work
2017-02-14 12:00:56 +01:00
Laurent Destailleur
bcd624e5a5
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-02-13 01:37:53 +01:00
Laurent Destailleur
25e8caa64e
Fix reversing test for a test
2017-02-13 01:37:12 +01:00
Laurent Destailleur
868f2e5473
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/tools/update.php
htdocs/core/lib/functions.lib.php
2017-02-13 01:36:02 +01:00
Laurent Destailleur
ae740b7c1b
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/langs/en_US/errors.lang
2017-02-13 01:19:30 +01:00
Laurent Destailleur
bf32acaadd
Fix control of module format.
2017-02-13 01:13:41 +01:00
Laurent Destailleur
cda301f6b7
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-12 20:51:52 +01:00
Laurent Destailleur
d4fd9bd71e
Merge pull request #6414 from laudeco/fix/dictionnary_without_rowid
...
[FIX] Dictionaries without rowid
2017-02-12 20:46:43 +01:00
Laurent Destailleur
a8c5ba2983
Fix php7 error
2017-02-12 20:40:20 +01:00
Laurent Destailleur
5233b8c87f
Fix support for option MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES
2017-02-12 18:38:24 +01:00
Laurent Destailleur
05c9f57fd4
Move edition of emails templates out of dictionaries so we would be able
...
to have templates per user (not reserved to admin).
2017-02-12 18:13:49 +01:00
Laurent Destailleur
f34e0b1bdb
NEW Can deploy an external module from the module setup area.
2017-02-11 15:41:01 +01:00
Laurent Destailleur
4723eac227
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-11 13:56:39 +01:00
Laurent Destailleur
f6a8aacc8d
Fix: deployement of a module
2017-02-10 18:42:59 +01:00
arnaud
4230b075c2
INIT pdf supplier payment
2017-02-10 17:28:00 +01:00
Laurent Destailleur
44ab6ad9b7
NEW Can control constants values into file integrity checker
2017-02-10 17:05:45 +01:00
De Coninck Laurent
4fb4bc6f6c
[FIX] Dictionnaries without rowid
...
It's possible to create a dictionnary without the key rowid.
But in that case it's impossible to enable/disable the value because the dictionnary fonctionality uses always rowid even another primary key is defined.
By this fix, the id property uses is the primary key defined on the dictionnary creation.
2017-02-10 10:29:08 +01:00
Laurent Destailleur
488d68113d
Add total in the file integrity checker
2017-02-09 12:56:39 +01:00
Laurent Destailleur
fbe0b13706
Add parameter to set the url to use for the file integrity checker
2017-02-09 01:07:54 +01:00
Laurent Destailleur
b250485efd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-08 11:00:19 +01:00
Laurent Destailleur
31c3398b7f
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/modules.php
2017-02-08 10:59:05 +01:00
Laurent Destailleur
dc0856413c
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-02-08 10:57:02 +01:00
florian HENRY
7fcf598c78
Fix travis
2017-02-08 08:52:58 +01:00
Laurent Destailleur
d56b5f30c8
FIX #6330
2017-02-07 01:34:21 +01:00
Laurent Destailleur
e58743ea5b
Fix regression: Textarea to enter data was crushed.
2017-02-07 01:13:04 +01:00
Laurent Destailleur
74992ee53f
Merge pull request #6375 from marcosgdf/admin-view
...
Little improvements to admin pages where a FREE_TEXT or a watermark constant was set
2017-02-06 20:11:22 +01:00
Laurent Destailleur
9220a638b5
NEW Filechecker can include custom dir and report added files.
2017-02-06 15:29:07 +01:00
Laurent Destailleur
fea2b081f9
Fix: The long description feature will be available with 6.0. Large
...
content creates problem with tooltip.
2017-02-04 14:17:55 +01:00
Laurent Destailleur
a673afe601
NEW Description of feature of a module into a dedicated popup
2017-02-04 14:16:17 +01:00
Marcos García de La Fuente
a94a951a89
Little improvements to admin pages where a FREE_TEXT or a watermark constant was set
2017-02-03 19:38:33 +01:00
Laurent Destailleur
c48400331f
Merge pull request #6157 from atm-ph/new_develop_use_rate_on_document_date
...
NEW get multicurrency rate from document date (propal, order)
2017-01-27 01:32:52 +01:00
Laurent Destailleur
29df2c9115
Merge branch 'develop' into mail-lines
2017-01-27 01:29:58 +01:00
Laurent Destailleur
39151d7a74
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-22 12:14:18 +01:00
Laurent Destailleur
65f7de8f64
Fix css and look 5.0
2017-01-22 12:13:32 +01:00
Laurent Destailleur
809e3ce4d5
Debug browser notification
2017-01-20 20:10:16 +01:00
Juanjo Menent
2374aa351e
Merge remote-tracking branch 'upstream/develop' into develop
2017-01-20 15:55:51 +01:00
Laurent Destailleur
412be59f78
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-01-20 12:09:39 +01:00
Laurent Destailleur
bb95f139a8
Fix responsive
2017-01-17 20:04:41 +01:00
BENKE Charlie
e701ea0b2f
Add dictionnary mail for contract
2017-01-16 14:06:34 +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
d14e4dbaba
Fix pagination when MAIN_DISABLE_FULL_SCANLIST is on
2017-01-15 20:49:20 +01:00
Regis Houssin
f9ed1592e1
Fix: search problem if name contains accents
2017-01-15 16:07:04 +01:00
Juanjo Menent
3a40d5a4f1
NEW: Events notifications in browser
2017-01-13 16:13:01 +01:00
Juanjo Menent
6cc3ef0c99
NEW: Events notifications in browser
2017-01-13 16:08:49 +01:00
Alexis Algoud
8b4a43ec77
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview
2017-01-09 10:31:05 +01:00
Laurent Destailleur
b21998d506
Fix global checksum not visible on old versions. Link with checksum file
...
to check was hardcoded.
2017-01-07 15:56:04 +01:00
Laurent Destailleur
358616cda2
Fix link should be https
2017-01-07 15:18:57 +01:00
Laurent Destailleur
680c48d90a
Fix error on expired tokens
2017-01-07 14:48:05 +01:00
Laurent Destailleur
9cfc8d4095
Fix several problems into OAuth2 module.
2017-01-06 19:58:46 +01:00
arnaud
b813144edb
NEW generation ODT
2017-01-06 16:44:09 +01:00
