Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-11 02:12:33 +01:00
Code Issues Packages Projects Releases Wiki Activity
47,328 Commits 39 Branches 191 Tags
b0baed83fc94de4807d73e9b7c9b4bec3d4c818f
Commit Graph

47328 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
c476858880 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-02 11:01:41 +02:00
Laurent Destailleur
29fc2652e1 FIX #2519 2015-04-02 11:00:37 +02:00
Laurent Destailleur
10de082a60 Merge pull request #2530 from aspangaro/develop-project1 
New: In project - Elements - Show detail of amounts with a minus when the amount decrease margin
 2015-04-02 10:44:07 +02:00
aspangaro
115777f05d New: Module project - Elements - Show detail of amounts with a minus when the amount decrease margin 2015-04-02 06:54:04 +02:00
aspangaro
d8f56eb406 New: better integration in project for donation module 
Fixed: Rename fk_project in fk_projet (Sic!) for better compatibility
 2015-04-02 06:36:32 +02:00
Juanjo Menent
4588b2bb4c Merge pull request #2517 from frederic34/patch-12 
Closes #2509  Bug: Ref is not shown in the bubble that appears when the mouse is over an agenda link
 2015-04-02 00:56:42 +02:00
Juanjo Menent
b42903440c Merge pull request #2521 from aspangaro/develop-don 
Closes #2520
 2015-04-02 00:51:29 +02:00
Frédéric FRANCE
dc89e36583 Update card.php 2015-04-01 21:12:08 +02:00
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
Frédéric FRANCE
824d8ddb57 Delete phpinfo.php 2015-04-01 18:57:54 +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
frederic34
3c2499f9a2 Remove logo in initdata for admin user 2015-04-01 10:10:39 +02:00
aspangaro
4918326958 Fixed: Wrong path to don.class in element project 2015-04-01 08:13:10 +02:00
Frédéric FRANCE
08e7cb2e84 Correction for tooltip 2015-03-31 21:57:48 +02:00
Frédéric FRANCE
f0ed848609 Update actioncomm.class.php 2015-03-31 21:38:38 +02:00
Frédéric FRANCE
9ee6fdd163 Tooltip of actioncomm show empty ref 2015-03-31 21:07:17 +02:00
aspangaro
309b059089 New: Add a button to purge criteria in bank lines list 2015-03-31 21:00:22 +02:00
Frédéric FRANCE
46af2caba1 Correction warning delay workboard propal 2015-03-31 18:51:24 +02:00
Frédéric FRANCE
fc5d7e57a2 Correction for workboard in compta/bank/index.php 2015-03-31 18:31:36 +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
Frédéric FRANCE
2a34ec9db1 Add badge 2015-03-31 16:26:32 +02:00
Francis Appels
bba8b206a1 FIX: dispatch batch products 
Fix dispatching batch products and add error message.
Make DispatchProduct method backwards comp and add missing $trigger.
Add missing ORDER_SUPPLIER_DISPATCH trigger to demo class.
 2015-03-31 15:48:08 +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
frederic34
fe6227e93f Typo 2015-03-31 08:45:36 +02:00
Florian HENRY
104bbfdc1c Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2015-03-30 19:14:49 +02:00
Florian HENRY
65ec02bae1 FIX : [ bug #1913 ] [EXPORT] [PGSQL] Bug when filtering export on a 
specific year
 2015-03-30 19:13:55 +02:00
frederic34
bab04258e0 Add document tab for contact 2015-03-30 18:15:29 +02:00
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
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