Commit Graph

60001 Commits

Author SHA1 Message Date
Laurent Destailleur
d230883638 Merge pull request #6367 from gnovaro/patch-2
Code style
2017-02-06 20:25:16 +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
821978d54c FIX #6363 More complete fix 2017-02-06 20:08:47 +01:00
Laurent Destailleur
bee507c76c Merge pull request #6386 from laudeco/fix/expense_type_deactivate
[expense type deactivate] [#6363] Expense type deactivated but list
2017-02-06 20:06:54 +01:00
De Coninck Laurent
bbf34bfda8 [expense type deactivate] [#6363] Expense type deactivated but list
When an expense type is disabled in dictionaries, it's always displayed and selectable in expense note module, when we create a new line in an expense note.
2017-02-06 18:57:56 +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
6cb3199824 Translation message 2017-02-06 12:03:20 +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
Laurent Destailleur
f9c510f4fb More complete translation 2017-02-04 11:34:29 +01:00
Laurent Destailleur
6450154553 Removed useless table-tr-td 2017-02-04 11:32:26 +01:00
Laurent Destailleur
f75bd1ac44 Doxygen for javascript functions file. 2017-02-04 11:02:10 +01:00
Marcos García de La Fuente
62a0c5be73 Little correction 2017-02-03 20:12:26 +01:00
Marcos García de La Fuente
2dfced366e NEW #2763 Go to document block after clicking in Generate document button
Close #2763
2017-02-03 20:11:06 +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
d03f804025 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-03 17:00:51 +01:00
Laurent Destailleur
517a20db35 Update screenshot 2017-02-03 16:59:35 +01:00
arnaud
7f6ab748c5 NEW add rapport file for supplier paiement 2017-02-03 16:42:06 +01:00
arnaud
6d3e43ddaf NEW Report page and menu for suppliers paiements 2017-02-03 16:34:14 +01:00
arnaud
480d099d81 Fix project filter traduction 2017-02-03 16:19:13 +01:00
Laurent Destailleur
10353d1e1a Merge pull request #6370 from defrance/patch-72
FIX : $resaction not used in all case in hookmanager
2017-02-03 16:09:19 +01:00
Laurent Destailleur
3a649590f1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-03 16:02:54 +01:00
Laurent Destailleur
ffedf1fd57 New demo page 2017-02-03 16:02:37 +01:00
Laurent Destailleur
1dd62c7daf New demo page 2017-02-03 16:01:06 +01:00
Laurent Destailleur
e232a5a444 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-03 15:36:05 +01:00
Laurent Destailleur
bda915c63a Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-03 15:34:59 +01:00
Laurent Destailleur
a0251a262a The demo has its own CSS file. 2017-02-03 15:34:09 +01:00
Laurent Destailleur
5381eadc75 Fix translation 2017-02-03 15:33:44 +01:00
Laurent Destailleur
bd812a0bef NEW new demo entry page 2017-02-03 14:48:16 +01:00
Laurent Destailleur
bc43a052f4 Default usage to send token is header. 2017-02-03 12:16:13 +01:00
BENKE Charlie
3f236b1ebf FIX : $resaction not used in all case
Please integrate on next 5.0
2017-02-03 12:14:29 +01:00
Laurent Destailleur
53661e1e4f Merge pull request #6211 from GPCsolutions/optimizetranslate
[Qual] Optimize language file loading
2017-02-03 11:55:29 +01:00
Laurent Destailleur
9d3c774163 Merge pull request #6364 from atm-ph/new_trigger_in_expensereport_class
NEW add triggers for expensereport object
2017-02-03 11:46:59 +01:00
Laurent Destailleur
3dea950c24 Merge pull request #6355 from atm-ph/new_alternate_htmlid_select_project
New htmlid can be use instead of htmlname for select projects
2017-02-03 11:44:54 +01:00
Laurent Destailleur
76280f8ae2 Fix #6365 2017-02-03 11:42:49 +01:00
Laurent Destailleur
d740bdbc73 Fix #6365 2017-02-03 11:38:09 +01:00
fappels
76bd5e009a Merge remote-tracking branch 'refs/remotes/Dolibarr/5.0' into 5.0 2017-02-03 11:37:39 +01:00
florian HENRY
dccddf5c7e NEW : change render extrafields checkbox list for multiselectarray 2017-02-03 09:25:26 +01:00
Laurent Destailleur
bdca134e99 NEW Change to allow a specific numbering rule for invoice with POS
module.
2017-02-02 23:49:17 +01:00
Laurent Destailleur
a42ad74a37 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-02 23:22:34 +01:00
Laurent Destailleur
b4c97e2279 Update pad files 2017-02-02 23:14:51 +01:00
Gustavo Novaro
f815d1bed3 Code style 2017-02-02 17:30:06 -03:00
atm-ph
ac20a1a874 Fix remove param htmlid in ajax_combobox 2017-02-02 20:47:45 +01:00
Marcos García de La Fuente
d06fb423c0 Merge branch 'develop' into prod-attr
# Conflicts:
#	htdocs/core/class/html.form.class.php
#	htdocs/fourn/commande/card.php
#	htdocs/fourn/facture/card.php
#	htdocs/langs/en_US/products.lang
2017-02-02 20:07:41 +01:00
phf
f2fdee0ed2 New add trigger for expensereport object 2017-02-02 11:42:38 +01:00
Laurent Destailleur
d7060b0c4b FIX #6360 2017-02-02 03:14:21 +01:00
Laurent Destailleur
b5ca8ebef9 FIX #6316 2017-02-02 03:07:40 +01:00
Laurent Destailleur
4d78e0d45c FIX #6315 2017-02-02 02:53:32 +01:00
Laurent Destailleur
40737eac2e FIX #6361 2017-02-02 02:49:04 +01:00
Laurent Destailleur
64da0e77d5 Merge pull request #6358 from defrance/patch-71
FIX : fill fourn remise percent with select product mode
2017-02-02 02:27:35 +01:00