Frédéric FRANCE
|
e602c43e12
|
Add ORDER_CANCEL in interface_90_all_Demo.class.php
|
2015-03-30 12:14:35 +02:00 |
|
Laurent Destailleur
|
86603b01dd
|
Merge pull request #2504 from marcosgdf/constants
Implemented constants for some object types and statuses
|
2015-03-30 09:25:18 +02:00 |
|
Marcos García de La Fuente
|
8b8171c700
|
Merge branch 'develop' into commercial-name
Conflicts:
htdocs/comm/card.php
|
2015-03-30 03:25:57 +02:00 |
|
Marcos García de La Fuente
|
831177ef99
|
Implemented constants for Product class
|
2015-03-30 03:14:07 +02:00 |
|
Laurent Destailleur
|
b83e9ea32f
|
Merge branch 'loan' of https://github.com/frederic34/dolibarr into
frederic34-loan
Conflicts:
htdocs/compta/bank/ligne.php
|
2015-03-30 02:56:26 +02:00 |
|
Marcos García de La Fuente
|
cc1d298f29
|
Merge branch 'develop' into constants
Conflicts:
htdocs/commande/card.php
htdocs/compta/facture/class/facture.class.php
|
2015-03-30 02:36:46 +02:00 |
|
Laurent Destailleur
|
a3b5f35903
|
Merge pull request #2501 from frederic34/patch-5
Travis Fix for donation.lib.php
|
2015-03-30 02:00:14 +02:00 |
|
Laurent Destailleur
|
b66d8c9afc
|
Merge pull request #2496 from aspangaro/develop-ER-patch1
Fixed: HRM menu is not activated when only Expense Report module is acti...
|
2015-03-30 01:59:50 +02:00 |
|
aspangaro
|
c22a563422
|
New: Add management for accounting account in admin donation & correct bugs
|
2015-03-29 21:04:20 +02:00 |
|
Frédéric FRANCE
|
bcd7516e25
|
Fix for donation.lib.php
|
2015-03-29 18:22:45 +02:00 |
|
Laurent Destailleur
|
fd8d09c8c0
|
Fix avoid warning
|
2015-03-29 17:53:05 +02:00 |
|
Laurent Destailleur
|
73b2e0bd01
|
Merge pull request #2471 from marcosgdf/refactor
refactor
|
2015-03-29 16:17:36 +02:00 |
|
aspangaro
|
a715ccfcb8
|
Fixed: HRM menu is not activated when only Expense Report module is activated
|
2015-03-29 15:11:41 +02:00 |
|
aspangaro
|
a92f68a5ed
|
Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc
|
2015-03-29 09:25:06 +02:00 |
|
aspangaro
|
ce6df7c022
|
Debug
|
2015-03-29 09:20:32 +02:00 |
|
Laurent Destailleur
|
b8bd27009e
|
Simplify code
|
2015-03-28 18:32:53 +01:00 |
|
Ion Agorria
|
043d11d785
|
check if $mc is a valid global
|
2015-03-28 18:22:01 +01:00 |
|
Laurent Destailleur
|
4887a28f91
|
Merge pull request #2492 from IonAgorria/mc-fix
Fix: Check if $mc is a valid global
|
2015-03-28 18:20:28 +01:00 |
|
frederic34
|
be1595a187
|
Add tab for notes
|
2015-03-28 17:42:33 +01:00 |
|
Ion Agorria
|
1791631976
|
check if $mc is a valid global
|
2015-03-28 03:44:16 +01:00 |
|
Laurent Destailleur
|
813cb36424
|
Merge pull request #2476 from fmarcet/3.7
Fix: Not using where on sellist
|
2015-03-27 00:50:48 +01:00 |
|
aspangaro
|
4209deafd2
|
Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc
|
2015-03-26 21:04:20 +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 |
|
aspangaro
|
b60f1e33d6
|
Debug
|
2015-03-26 06:29:16 +01:00 |
|
aspangaro
|
2b2b43afb6
|
Dir "Don"
|
2015-03-25 22:37:14 +01:00 |
|
aspangaro
|
679391d337
|
Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc
|
2015-03-25 20:59:48 +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 |
|
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
|
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
|
efe9c21b81
|
Merge pull request #2382 from aspangaro/develop-loan
NEW: Module loans
|
2015-03-23 23:28:57 +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
|
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
|
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 |
|
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 |
|
Laurent Destailleur
|
e269aa83b5
|
More comments
|
2015-03-23 04:16:58 +01:00 |
|
Laurent Destailleur
|
042556a9cf
|
Better comments
|
2015-03-23 03:50:55 +01:00 |
|
Marcos García de La Fuente
|
3d50b41b8e
|
Reverted $rowid instead of $id property
|
2015-03-23 01:40:33 +01:00 |
|
Marcos García de La Fuente
|
4349f27299
|
Revert "Revert "Refactor 1""
|
2015-03-23 01:39:12 +01:00 |
|
Laurent Destailleur
|
f650a773c3
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2015-03-22 22:30:11 +01:00 |
|
Laurent Destailleur
|
5c36bb94f2
|
Work on theme material design
|
2015-03-22 22:29:52 +01:00 |
|
Laurent Destailleur
|
87faf530e0
|
Merge pull request #2468 from defrance69/patch-55
Update extrafields.class.php
|
2015-03-22 21:28:53 +01:00 |
|
Laurent Destailleur
|
abcebd7875
|
Merge pull request #2462 from defrance69/patch-54
Update extrafields.class.php
|
2015-03-22 21:27:38 +01:00 |
|