lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
42,539 Commits 43 Branches 150 Tags 886 MiB
214fe2d552
Commit Graph

42539 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
BENKE Charles
31c2815d0f Update box_task.php 2014-06-18 21:50:17 +02:00
BENKE Charles
66dc82621d Update modProjet.class.php 
add boxe definition on projet module
 2014-06-18 21:37:56 +02:00
BENKE Charles
c963a6d8a1 Create box_project.php 
add box for project
 2014-06-18 21:36:00 +02:00
BENKE Charles
ff31fff2d7 Create box_task.php 
add boxes of tasks
 2014-06-18 21:34:18 +02:00
Florian HENRY
0645189432 If multiprice level is used the VAT on addline is not correct 2014-06-18 10:56:38 +02:00
Florian HENRY
9bb537f399 - New: If multilangue is enabled, mail (from propal, invoice, etc...) 
message is pre-defaulted in Customer language
 2014-06-18 09:59:15 +02:00
Florian HENRY
c2fc40d62a travis 2014-06-17 12:58:49 +02:00
Florian HENRY
4b78c8e11a comment method in english 2014-06-17 12:21:34 +02:00
Florian HENRY
c4912c5e25 travis 2014-06-17 12:20:41 +02:00
Florian HENRY
df9f153142 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.5.0-3.6.0.sql
 2014-06-17 12:01:45 +02:00
Florian HENRY
7f92031583 Changelog 2014-06-17 11:31:20 +02:00
Florian HENRY
03156b58e3 [ bug #1452 ] variable used but not defined 2014-06-17 11:30:41 +02:00
Florian HENRY
0f77fbaea2 Fix [ bug #1349 ] AJAX contact selector does not work fine in Project 
card
 2014-06-17 11:18:30 +02:00
Juanjo Menent
bb9862d6be Fix: When you add a right ended in 0, add all module rights 2014-06-17 10:15:53 +02:00
aspangaro
576978212e Merge branch 'Upstream/develop' 2014-06-17 06:48:25 +02:00
aspangaro
516363f491 Bank - Enhance readability 2014-06-17 06:43:50 +02:00
aspangaro
736561e8f0 Shop - Bad language file ("boutique" instead of "shop") & add language key 2014-06-17 06:31:20 +02:00
aspangaro
a974fa4a08 Merge branch 'Upstream/develop' 2014-06-17 06:30:12 +02:00
Laurent Destailleur
b70c695776 Fix: checkstyle 2014-06-16 18:41:28 +02:00
aspangaro
e469755d29 Divers 2014-06-16 06:17:46 +02:00
aspangaro
f4efd3b2e8 Move donation receipt to french model cerfa 11580*03 2014-06-15 22:18:19 +02:00
aspangaro
b9c1da7d27 Merge branch 'Upstream/develop' 2014-06-15 22:14:34 +02:00
Maxime Kohlhaas
a3e278993e Fix 1455 outstanding amount 2014-06-14 23:34:19 +02:00
Laurent Destailleur
e6d407d418 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-06-14 14:21:10 +02:00
Laurent Destailleur
f0ce92292a Fix: date start/end of project was lost on some tabs. 
Fix: Bad file name for gantt include.
 2014-06-14 14:20:58 +02:00
Laurent Destailleur
4c0fe98ae2 Merge pull request #1665 from atm-maxime/develop 
Fix 1480, 1483, 1497 $this instead of $object
 2014-06-14 14:13:10 +02:00
Laurent Destailleur
e8bca38daf Fix: syntax error 2014-06-14 13:41:15 +02:00
Laurent Destailleur
7a70f8b513 Merge pull request #1663 from grandoc/develop 
Fix num paiement was not displayed
 2014-06-14 13:29:27 +02:00
Laurent Destailleur
11cb23f4ac Merge pull request #1662 from grandoc/3.5 
Fix : num paiement was not displayed
 2014-06-14 13:28:22 +02:00
Laurent Destailleur
8e5823ddc6 Merge pull request #1661 from KreizIT/develop 
FIX[ bug #1444 ] Shipment product batch is not proposed
 2014-06-14 13:26:19 +02:00
Laurent Destailleur
0c5c1cf849 Merge branch '3.5' of github.com:FHenry/dolibarr into 3.5 
Conflicts:
	ChangeLog
 2014-06-14 13:21:32 +02:00
Laurent Destailleur
dd8fc8727d Merge pull request #1658 from frederic34/develop 
Display the total by currency account
 2014-06-14 13:04:52 +02:00
Laurent Destailleur
5cbf1ed3eb Merge pull request #1659 from fmarcet/develop 
Fix: When you remove a right with id ended in 0, removes all module rights
 2014-06-14 13:01:04 +02:00
Maxime Kohlhaas
19a3194b02 Fix : duedate was not auto calculated + move calculation function to common invoice class 2014-06-14 12:53:02 +02:00
Laurent Destailleur
0453daae72 Merge pull request #1656 from netfab/3.5 
html fix : missing </tr>.
 2014-06-14 12:34:06 +02:00
Laurent Destailleur
710497a081 Merge branch 'bug-1451' of github.com:marcosgdf/dolibarr into 3.5 
Conflicts:
	ChangeLog
 2014-06-14 12:32:59 +02:00
Laurent Destailleur
74a0a9b76e Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-06-14 12:30:56 +02:00
Laurent Destailleur
cf948065f4 Fixes for bug 1449, 1450 and 1451 #1654 2014-06-14 12:30:48 +02:00
Laurent Destailleur
c1e5d65087 Merge branch 'marcosgdf-bug-1432' into 3.5 2014-06-14 12:28:14 +02:00
Laurent Destailleur
c67dad0240 Merge branch 'bug-1432' of github.com:marcosgdf/dolibarr into 
marcosgdf-bug-1432

Conflicts:
	ChangeLog
 2014-06-14 12:27:47 +02:00
Maxime Kohlhaas
bada082b2b Fix 1462, 1468 $this instead of $object 2014-06-14 12:02:07 +02:00
Maxime Kohlhaas
1250804e81 Fix 1490 $this instead of $object 2014-06-14 11:42:17 +02:00
Maxime Kohlhaas
d0a417ad36 Fix 1480, 1483, 1497 $this instead of $object 2014-06-14 11:37:57 +02:00
aspangaro
8490a415c3 Merge branch 'Upstream/develop' 2014-06-14 06:14:16 +02:00
aspangaro
088d34b4b2 Problem of merging 2014-06-14 06:10:52 +02:00
frederic34
0cd4218986 Merge remote branch 'upstream/develop' into develop 2014-06-13 17:04:14 +02:00
Florian HENRY
42e6727e5d Better error return 2014-06-13 15:56:31 +02:00
Florian HENRY
0916d2cf3b Fix link element from project "associates object" pages 
http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/50687-objet-associes-au-projet
 2014-06-13 15:54:37 +02:00
Florian HENRY
aecede08c4 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-06-13 14:38:44 +02:00
philippe
18080deb93 Fix num paiement was not displayed 2014-06-13 12:16:49 +02:00