aspangaro
f0823a215b
Add language key
2015-03-26 21:16:52 +01:00
aspangaro
4209deafd2
Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc
2015-03-26 21:04:20 +01:00
aspangaro
6a0916b3fa
Correct path
2015-03-26 21:03:56 +01:00
aspangaro
a39f81b1a6
FIXED: Correct path of loan class
2015-03-26 20:51:27 +01:00
aspangaro
059bb40345
Debug
2015-03-26 20:43:34 +01:00
Florian HENRY
2e13479e8f
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2015-03-26 16:56:06 +01:00
Florian HENRY
26c29216d9
syntax
2015-03-26 16:55:13 +01:00
Laurent Destailleur
42c2c81e28
Fix detection of html was wrong with img
2015-03-26 12:05:52 +01:00
Laurent Destailleur
1ca95acbd7
Fix pb during export of agenda events
...
Conflicts:
htdocs/exports/export.php
2015-03-26 11:23:21 +01:00
Laurent Destailleur
ce8bd7a515
Fix pb during export of agenda events
2015-03-26 11:20:39 +01:00
Marcos García de La Fuente
e59fed9f38
Corrected search box alignment in Customer orders list
2015-03-26 11:08:34 +01:00
Marcos García de La Fuente
b83ef4c1ec
Merge branch 'develop' into minor
2015-03-26 10:58:35 +01:00
Marcos García de La Fuente
50a3563f03
Minor correction to the product list of a supplier
2015-03-26 10:57:13 +01:00
aspangaro
b60f1e33d6
Debug
2015-03-26 06:29:16 +01:00
aspangaro
8d4ceadd7e
Dir "Don"
2015-03-25 22:38:44 +01:00
aspangaro
2b2b43afb6
Dir "Don"
2015-03-25 22:37:14 +01:00
aspangaro
f778f47049
Add dirs
2015-03-25 21:46:08 +01:00
aspangaro
679391d337
Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc
2015-03-25 20:59:48 +01:00
Laurent Destailleur
f7b8a2b036
Restore align=right
2015-03-25 18:13:53 +01:00
Laurent Destailleur
ab739e162c
Merge remote-tracking branch 'origin/3.7' into develop
2015-03-25 18:11:29 +01:00
Laurent Destailleur
8be08c692f
Fix some secuity tests were not done.
2015-03-25 18:10:45 +01:00
frederic34
19540b14b5
Add last shipments to company card
2015-03-25 16:38:18 +01:00
Maxime Kohlhaas
b250c5588e
Fix : Quantity displayed for virtual stock explanations was wrong
2015-03-25 16:11:36 +01:00
Laurent Destailleur
21b1f7cc26
Fix bad calculation of email for notifications
2015-03-25 14:51:12 +01:00
Laurent Destailleur
cc2d86bd58
Status of project was not visible on thirdparty card
2015-03-25 14:31:04 +01:00
fmarcet
456b11d148
Fix: Not using where on sellist
2015-03-25 11:23:05 +01:00
Laurent Destailleur
f0fb6f1b2c
Work on md theme
2015-03-24 22:24:15 +01:00
Laurent Destailleur
a32fc9efce
Hide logo when option MAIN_OPTIMIZEFORTEXTBROWSER is set.
...
Avoid logo to overwrap box with css.
Add help text.
2015-03-24 14:08:56 +01:00
Laurent Destailleur
f75c115140
Fix translation
...
Fix permission not managed into get_menudiv.php
2015-03-24 11:19:51 +01:00
aspangaro
9d34b40897
Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc
...
Conflicts:
htdocs/compta/bank/account.php
2015-03-24 05:28:57 +01:00
Laurent Destailleur
b884b28991
Include module loan
2015-03-23 23:39:14 +01:00
Laurent Destailleur
6c4369b7ba
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-03-23 23:29:14 +01:00
Laurent Destailleur
efe9c21b81
Merge pull request #2382 from aspangaro/develop-loan
...
NEW: Module loans
2015-03-23 23:28:57 +01:00
Laurent Destailleur
4802ae029c
Merge pull request #2472 from FHenry/develop
...
fix skeletton
2015-03-23 23:27:50 +01:00
Laurent Destailleur
dd3a6edf4e
Merge pull request #2473 from marcosgdf/invoicesmenu
...
NEW: Implemented statuses submenu for List menu of supplier and customer invoices.
2015-03-23 23:27:29 +01:00
Laurent Destailleur
2a4687834d
Merge pull request #2474 from netfab/3.6
...
Fix displaying of the warning image.
2015-03-23 23:26:09 +01:00
Laurent Destailleur
1202d63f98
Indent
2015-03-23 23:25:07 +01:00
Fab
ea7f00e777
Fix displaying of the warning image.
...
Since last commit, $objp->date_livraison returns nothing ; max() will
then returns wrong result, and the warning image will be displayed when it
should not.
2015-03-23 20:05:31 +01:00
Laurent Destailleur
6f22243104
Add option SUPPLIER_ORDER_NO_DIRECT_APPROVE
2015-03-23 15:25:21 +01:00
Laurent Destailleur
1a59b7b447
Add option SUPPLIER_ORDER_NO_DIRECT_APPROVE
2015-03-23 15:23:44 +01:00
Laurent Destailleur
3844d4e6f7
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
ChangeLog
htdocs/core/boxes/box_activity.php
htdocs/fourn/commande/card.php
htdocs/user/card.php
2015-03-23 15:16:37 +01:00
Laurent Destailleur
72ce60ff36
Enhance themes
2015-03-23 14:53:21 +01:00
Laurent Destailleur
dc0d3504dd
Fix: Bad notification key
2015-03-23 14:52:47 +01:00
Laurent Destailleur
b9c3c074b1
Fix: a line was inserted when making update
...
Fix: missing message into notification admin page
2015-03-23 14:43:19 +01:00
Laurent Destailleur
b7a466c95f
Fix bad style for total
2015-03-23 13:50:14 +01:00
Marcos García de La Fuente
c6ad35e001
Implemented statuses submenu for List menu of supplier and customer invoices.
...
Menu "Pending payment" has been moved to the "List" submenu.
2015-03-23 13:42:50 +01:00
Laurent Destailleur
cbadfa5075
NEW: Title of page project contains project ref and label
2015-03-23 12:44:41 +01:00
Laurent Destailleur
5d2e09ec51
Fix: navigation in page was wrong and typo errors.
2015-03-23 12:31:32 +01:00
Florian HENRY
5617fb14b2
fix skeletton
2015-03-23 09:52:05 +01:00
aspangaro
be0ab4c9b4
Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc
...
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-03-23 06:58:25 +01:00
