Laurent Destailleur
|
d8db32a99c
|
NEW: Introduce option SUPPLIER_ORDER_DOUBLE_APPROVAL to allow 2
approvals to make a supplier order approved. Activating this option
introduce a new permission to the second level approval.
|
2015-04-01 21:00:51 +02:00 |
|
Laurent Destailleur
|
8e9c1c4747
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/commande/card.php
htdocs/commande/class/commande.class.php
htdocs/commande/list.php
htdocs/core/class/notify.class.php
htdocs/core/login/functions_dolibarr.php
htdocs/exports/export.php
htdocs/langs/en_US/admin.lang
|
2015-04-01 16:33:39 +02:00 |
|
Laurent Destailleur
|
16a620f926
|
Fix: Deadlock situation (when order were canceled, no way to make
nothing on it)
Fix: Don't know how I forgot this events into trigger system.
|
2015-04-01 16:07:22 +02:00 |
|
Laurent Destailleur
|
ad1e4134a9
|
Fix: bcc was lost if notif to bcc was also forced
|
2015-04-01 12:22:50 +02:00 |
|
Laurent Destailleur
|
1bc0f6c99f
|
Fix: do not show end date when it is same than start date
|
2015-04-01 12:02:32 +02:00 |
|
Laurent Destailleur
|
293495467f
|
Fix: Bad ref used into notification message
|
2015-04-01 11:30:48 +02:00 |
|
Laurent Destailleur
|
5fe5ec939d
|
Fix: delivery date must not be autofill with current date
|
2015-04-01 10:54:24 +02:00 |
|
Laurent Destailleur
|
39d0c15c15
|
Comment
|
2015-03-31 17:23:07 +02:00 |
|
Laurent Destailleur
|
29e049d4f9
|
Comment
|
2015-03-31 17:22:14 +02:00 |
|
Laurent Destailleur
|
c71efc8f2e
|
Avoid pb with scrutinizer
|
2015-03-31 16:59:40 +02:00 |
|
Laurent Destailleur
|
2bdca3d76b
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2015-03-31 11:33:10 +02:00 |
|
Laurent Destailleur
|
2d50cc92b9
|
Differentiate title for customer and supplier orders/invoices.
|
2015-03-31 11:32:47 +02:00 |
|
Laurent Destailleur
|
9d752c6fca
|
Sync from transifex
|
2015-03-30 10:55:08 +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
|
1b7ffd80f1
|
Typo
|
2015-03-30 03:19:20 +02:00 |
|
Marcos García de La Fuente
|
831177ef99
|
Implemented constants for Product class
|
2015-03-30 03:14:07 +02:00 |
|
Laurent Destailleur
|
f174b662c3
|
git push origin developMerge branch 'frederic34-loan' into develop
|
2015-03-30 02:56:59 +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
|
63ec6febec
|
Merge pull request #2502 from frederic34/patch-7
Travis Fix don.class.php
|
2015-03-30 02:00:26 +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 |
|
Laurent Destailleur
|
f53c36cea2
|
Merge pull request #2503 from aspangaro/develop-ReviewAssoc
New: Add management for accounting account in admin donation & debug
|
2015-03-30 01:59:29 +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
|
6c26063fc8
|
Travis Fix don.clss.php
|
2015-03-29 18:29:09 +02:00 |
|
Frédéric FRANCE
|
bcd7516e25
|
Fix for donation.lib.php
|
2015-03-29 18:22:45 +02:00 |
|
frederic34
|
b6b1617741
|
Work on payment loan
|
2015-03-29 17:53:36 +02:00 |
|
Laurent Destailleur
|
73b2e0bd01
|
Merge pull request #2471 from marcosgdf/refactor
refactor
|
2015-03-29 16:17:36 +02:00 |
|
Laurent Destailleur
|
3cc4358e72
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
build/makepack-dolibarr.pl
htdocs/commande/liste.php
htdocs/product/stock/product.php
|
2015-03-29 15:24:17 +02:00 |
|
Laurent Destailleur
|
018a0d779f
|
Fix translation
|
2015-03-29 15:18:10 +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 |
|
Laurent Destailleur
|
661961876a
|
Merge pull request #2485 from aspangaro/develop-patch2
Fix: Missing language key
|
2015-03-29 15:05:37 +02:00 |
|
Laurent Destailleur
|
af51415f8e
|
Merge pull request #2486 from frederic34/patch-2
PhotoInTooltip for getNomUrl company
|
2015-03-29 15:05:25 +02:00 |
|
Laurent Destailleur
|
32bda97712
|
Merge pull request #2494 from aspangaro/develop-ReviewAssoc
New: Review module donation
|
2015-03-29 15:04:22 +02:00 |
|
Laurent Destailleur
|
b4c096de09
|
Merge pull request #2495 from frederic34/loan
Debug payment loan
|
2015-03-29 15:03:08 +02:00 |
|
aspangaro
|
96b7cac93f
|
Delete useless line
|
2015-03-29 14:30:43 +02:00 |
|
aspangaro
|
ed493b651b
|
Icons & fr_FR options not show
|
2015-03-29 14:29:53 +02:00 |
|
frederic34
|
7b9ba4bd26
|
debug payment
|
2015-03-29 13:37:17 +02:00 |
|
frederic34
|
bf3e78a63d
|
Debug payment loan
|
2015-03-29 11:39:55 +02:00 |
|
aspangaro
|
a92f68a5ed
|
Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc
|
2015-03-29 09:25:06 +02:00 |
|
aspangaro
|
c733249c75
|
Don Remove old file
|
2015-03-29 09:23:39 +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 |
|
Laurent Destailleur
|
cc5bdf85af
|
Merge pull request #2493 from GPCsolutions/github-issues
Contribution guidelines update
|
2015-03-28 18:19:34 +01:00 |
|
Laurent Destailleur
|
0c1a51ddae
|
Merge pull request #2489 from frederic34/loan
Note private and Note public for loan
|
2015-03-28 18:09:21 +01:00 |
|
frederic34
|
be1595a187
|
Add tab for notes
|
2015-03-28 17:42:33 +01:00 |
|
Laurent Destailleur
|
3f5fe432e7
|
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
|
2015-03-28 17:18:10 +01:00 |
|
Laurent Destailleur
|
b60a56dc94
|
Fix search on command
|
2015-03-28 17:17:55 +01:00 |
|