lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
46,735 Commits 43 Branches 150 Tags 886 MiB
8390b9bd16
Commit Graph

46735 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
8390b9bd16 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-02 12:55:58 +02:00
Laurent Destailleur
50d77d7e6f Correct source lang 2015-04-02 12:55:44 +02:00
Laurent Destailleur
c62687d198 Comment 2015-04-02 12:55:00 +02:00
Laurent Destailleur
fcb70bc193 Merge pull request #2528 from frederic34/patch-16 
Update card.php
 2015-04-02 11:46:59 +02:00
Laurent Destailleur
c5d81193a2 Merge pull request #2515 from frederic34/patch-11 
Correction warning delay workboard propal
 2015-04-02 11:45:57 +02:00
Laurent Destailleur
52523effc8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-02 11:42:29 +02:00
Laurent Destailleur
e827b1b9cd Merge pull request #2529 from aspangaro/develop-don 
NEW better integration in project for donation module
 2015-04-02 11:42:15 +02:00
Laurent Destailleur
d8bec2fb59 Merge pull request #2507 from frederic34/doc4contact 
Add document tab for contact
 2015-04-02 11:41:35 +02:00
Laurent Destailleur
c9f690904c Merge pull request #2514 from frederic34/patch-10 
Correction for workboard in compta/bank/index.php
 2015-04-02 11:40:55 +02:00
Laurent Destailleur
7932923251 Merge pull request #2523 from frederic34/initdata 
Remove logo in initdata for admin user
 2015-04-02 11:39:55 +02:00
Laurent Destailleur
051f3474c4 Merge pull request #2512 from frederic34/patch-9 
Add badge
 2015-04-02 11:25:06 +02:00
Laurent Destailleur
c5b6fc45eb Merge pull request #2527 from frederic34/patch-15 
Delete phpinfo.php
 2015-04-02 11:24:52 +02:00
Laurent Destailleur
bff4b0e52e Merge pull request #2506 from frederic34/patch-8 
Add ORDER_CANCEL in interface_90_all_Demo.class.php
 2015-04-02 11:22:38 +02:00
Laurent Destailleur
d20873454c Follow a more standard syntax 2015-04-02 11:17:57 +02:00
Laurent Destailleur
17b0d98211 Merge pull request #2516 from aspangaro/develop-search 
New: Add a button to purge criteria in bank lines list
 2015-04-02 11:15:12 +02:00
Laurent Destailleur
fd1b644490 Make things easier to remind. Same rule for commit and PR. 2015-04-02 11:14:32 +02:00
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
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
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