Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-10 18:02:34 +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
frederic34
b6b1617741 Work on payment loan 2015-03-29 17:53:36 +02:00
Laurent Destailleur
fd8d09c8c0 Fix avoid warning 2015-03-29 17:53:05 +02:00
Laurent Destailleur
b5690142aa Prepare 3.6.3 2015-03-29 16:26:31 +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
frederic34
af92174ae2 Small correction but unable to make loan payment 2015-03-28 17:15:07 +01:00
Laurent Destailleur
253955dc31 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2015-03-28 17:13:05 +01:00
Laurent Destailleur
ffe1ee0d84 Target 98 to publish of dolibarr sevrer is now working 2015-03-28 17:12:31 +01:00
Laurent Destailleur
5e33068e29 Update doc 2015-03-28 16:51:25 +01:00
Raphaël Doursenaud
ad8214884d Added documentation to contribution guidelines 2015-03-28 16:10:29 +01:00
Raphaël Doursenaud
91632ea431 Added GitHub for issue tracking to contribution guidelines 2015-03-28 16:01:33 +01:00
frederic34
7282a6faf2 Trans in Loan Calculator 2015-03-28 10:59:10 +01:00
frederic34
680317f250 Trans in Loan Calculator 2015-03-28 10:02:33 +01:00
Ion Agorria
1791631976 check if $mc is a valid global 2015-03-28 03:44:16 +01:00
frederic34
a0c7cedaf1 Tooltip for loan 2015-03-27 18:09:00 +01:00
frederic34
631c3d72e3 Correction for notes 2015-03-27 17:23:27 +01:00
frederic34
82b8fe6b7d Note private and Note public for loan 2015-03-27 17:13:52 +01:00
Frédéric FRANCE
375e0b7e2a PhotoInTooltip for getNomUrl company 2015-03-27 08:32:51 +01:00
aspangaro
9d25a1c7ed Fix: Missing language key 2015-03-27 06:59:21 +01:00
aspangaro
77b123cb2d Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc 2015-03-27 06:30:35 +01:00
Laurent Destailleur
f6df1d6380 Update to match new issue tracker 2015-03-27 02:26:12 +01:00
Laurent Destailleur
cb16e069df Better explanation 2015-03-27 01:17:21 +01:00
Laurent Destailleur
e777516f38 Merge pull request #2483 from FHenry/3.7 
FIX : fetch actioncomm return 0 if no record found instead of nothing
 2015-03-27 01:10:28 +01:00
Laurent Destailleur
d0e4d8046b Merge pull request #2480 from marcosgdf/minor-2 
Corrected search box alignment in Customer orders list
 2015-03-27 01:09:06 +01:00
Laurent Destailleur
39f46227c8 Merge pull request #2479 from marcosgdf/minor 
Merge branch 'develop' into minor
 2015-03-27 01:08:23 +01:00
Laurent Destailleur
60c24f7162 Merge pull request #2478 from frederic34/listexpe 
Add last shipments to company card
 2015-03-27 01:04:05 +01:00
Laurent Destailleur
78638a30cd Merge pull request #2477 from atm-maxime/3.6 
Fix : Quantity displayed for virtual stock explanations was wrong
 2015-03-27 01:01:37 +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
Laurent Destailleur
dea6b534fb Merge pull request #2484 from aspangaro/develop-patch1 
FIXED: Correct path of loan class
 2015-03-27 00:44:12 +01:00