Laurent Destailleur
|
e981e719a1
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
htdocs/comm/action/card.php
|
2017-02-23 02:54:40 +01:00 |
|
Laurent Destailleur
|
a79903a2fc
|
Fix responsive design
|
2017-02-23 01:29:35 +01:00 |
|
Laurent Destailleur
|
1e45e64a9a
|
Files sent from ECM module are also indexed in database.
|
2017-02-22 20:35:42 +01:00 |
|
Laurent Destailleur
|
b66ba6c57c
|
Fix warning
|
2017-02-22 19:48:15 +01:00 |
|
Laurent Destailleur
|
a0fb53d5b1
|
Merge branch 'develop' into NEW_pdf_supplier_payment
|
2017-02-22 14:20:47 +01:00 |
|
Laurent Destailleur
|
bb72121179
|
Fix menu loading
|
2017-02-22 01:47:22 +01:00 |
|
Laurent Destailleur
|
32678015c9
|
FIX protection against infinite loop on hierarchy
|
2017-02-21 23:52:13 +01:00 |
|
arnaud
|
842859c394
|
FIX travis bis
|
2017-02-20 10:16:28 +01:00 |
|
arnaud
|
26b8112d4e
|
FIX travis check
|
2017-02-20 09:22:57 +01:00 |
|
Laurent Destailleur
|
2dbae7b808
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-02-17 17:14:00 +01:00 |
|
Laurent Destailleur
|
fd111cb1c6
|
NEW tooltip can be on hover or on click with textwithpicto function.
|
2017-02-17 17:11:14 +01:00 |
|
arnaud
|
4ec664029d
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_pdf_supplier_payment
|
2017-02-17 16:40:14 +01:00 |
|
arnaud
|
fc0abe659a
|
NEW PDF with numbertoword
|
2017-02-17 16:39:36 +01:00 |
|
Laurent Destailleur
|
49afc83a7f
|
Merge pull request #6437 from defrance/patch-80
"Preview" not translated
|
2017-02-17 13:28:29 +01:00 |
|
Laurent Destailleur
|
8d03f86f45
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-02-17 13:10:46 +01:00 |
|
BENKE Charlie
|
e4ede5aef3
|
"Preview" not translated
|
2017-02-17 12:32:06 +01:00 |
|
Laurent Destailleur
|
c61c13d9fd
|
Merge pull request #6428 from laudeco/fix/enable_module_with_dependencies
fix the enabling of a dependency module already ON
|
2017-02-17 10:47:29 +01:00 |
|
De Coninck Laurent
|
fd6c4fd4d0
|
fix the enabling of a dependency module already ON
If a depency module is already activated and we try to activate the parent, we got an error because the entry is already existing in the database.
|
2017-02-16 09:26:18 +01:00 |
|
arnaud
|
977c18513d
|
FIX pdf supplier payment work
|
2017-02-14 12:00:56 +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
|
0e6ba5df4e
|
Merge pull request #6410 from aspangaro/5.0-25
Fix : Bank account label not shown in dol_banner_tab
|
2017-02-12 20:42:38 +01:00 |
|
Laurent Destailleur
|
7e3785d446
|
FIX the dolCopyDir fails if target dir does not exists.
|
2017-02-11 15:42:57 +01:00 |
|
Laurent Destailleur
|
3fa19f84e3
|
FIX the dolCopyDir fails if target dir does not exists.
|
2017-02-11 15:40:25 +01:00 |
|
arnaud
|
4230b075c2
|
INIT pdf supplier payment
|
2017-02-10 17:28:00 +01:00 |
|
Alexandre SPANGARO
|
5c9c761911
|
Fix : Bank account label not shown in dol_banner_tab
|
2017-02-09 05:58:39 +01:00 |
|
Laurent Destailleur
|
6fef6ac2fb
|
Optimize code and performance of module variant
|
2017-02-08 14:07:54 +01:00 |
|
Laurent Destailleur
|
e1a6e6e4ab
|
Rename "attributes" into "variants" to avoid confusion with extrafields
|
2017-02-08 12:37:38 +01:00 |
|
Laurent Destailleur
|
b24f244f67
|
Merge pull request #5533 from marcosgdf/prod-attr
Feature Request: NEW Added product attributes feature
|
2017-02-08 11:20:33 +01:00 |
|
Laurent Destailleur
|
b611c5ca53
|
Merge pull request #6054 from atm-gauthier/develop_NEW_reduc_on_excess_received
NEW Develop new reduc on excess received
|
2017-02-08 11:16:10 +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
|
bda915c63a
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-02-03 15:34: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 |
|
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 |
|
Laurent Destailleur
|
13f37b2cb9
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-02-02 02:25:49 +01:00 |
|
Laurent Destailleur
|
c3fb559d3b
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/modules/modProduct.class.php
|
2017-02-01 20:58:17 +01:00 |
|
fappels
|
8e675fa039
|
Improve lot qty separation
Add spaces to lot info separation.
Use implode params according PHP doc.
|
2017-01-31 12:54:00 +01:00 |
|
phf
|
e73c60b526
|
New htmlid can be use instead of htmlname for select projects
|
2017-01-31 12:20:45 +01:00 |
|
Laurent Destailleur
|
d7c2bdba38
|
Fix: link was useless with a nofollow tag.
|
2017-01-29 16:42:59 +01:00 |
|
Laurent Destailleur
|
3321d865d7
|
Merge pull request #6304 from IonAgorria/fix-objelem
NEW: Add supplier order/invoice to elementproperties
|
2017-01-27 00:34:17 +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
|
5362d10c0d
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/hookmanager.class.php
|
2017-01-21 21:56:24 +01:00 |
|
Laurent Destailleur
|
3a2d9c8610
|
Fix for rtl languages
|
2017-01-21 16:12:25 +01:00 |
|
BENKE Charlie
|
e6697c32c4
|
Update images.lib.php
in fact $dir is not used in the function
Conflicts:
htdocs/core/lib/images.lib.php
|
2017-01-21 12:56:39 +01:00 |
|
Laurent Destailleur
|
a250ba5f56
|
Close #6307 #6306
|
2017-01-20 17:52:52 +01:00 |
|
Laurent Destailleur
|
ac32161711
|
Fix error in total of tasks
|
2017-01-20 14:36:56 +01:00 |
|
Laurent Destailleur
|
e66aabea85
|
Fix error in total of tasks
|
2017-01-20 14:35:18 +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 |
|