lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40,390 Commits 43 Branches 150 Tags 886 MiB
f34aadef3d
Commit Graph

40390 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maxime Kohlhaas
f66750d5e7 Fix : Reset every month with @99 was not working properly (for 3.4 branch) 2013-05-24 11:23:56 +02:00
Christophe Battarel
5de7f77a09 update ChaneLog 2013-05-23 23:09:32 +02:00
Christophe Battarel
b89b7405f8 update function comments header 2013-05-23 22:54:06 +02:00
Christophe Battarel
b96bff4770 [ bug #806 ] Tasks are ordered alphabetically instead of chronological order 2013-05-23 22:51:27 +02:00
Laurent Destailleur
a76c2f500e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-05-23 22:37:25 +02:00
Laurent Destailleur
02facd0a7e Update doc 2013-05-23 22:37:07 +02:00
Laurent Destailleur
e9f964978d Merge pull request #974 from cbattarel/develop 
fix bug when creating fichinter from order
 2013-05-23 12:50:32 -07:00
Laurent Destailleur
44434e2689 Merge pull request #973 from atm-maxime/develop 
Reset every month with @99 was not working properly.
 2013-05-23 12:50:17 -07:00
Laurent Destailleur
6270a2e23c Try a fix for some browsers 2013-05-23 19:29:39 +02:00
Christophe Battarel
ebb8171d28 fix bug when creating fichinter from order (create function should receive $user as parm) 2013-05-23 11:36:00 +02:00
Maxime Kohlhaas
53c6638a90 Reset every month with @99 was not working properly. 2013-05-23 11:07:56 +02:00
Laurent Destailleur
ee84457104 Fix: not defined default value 2013-05-23 10:04:35 +02:00
Laurent Destailleur
3b6c55f908 Fix: Param was renamed 2013-05-22 17:29:25 +02:00
Lukas Prömer
bb42f8384b Fix: 'rights' instead of 'right' 2013-05-22 16:31:50 +02:00
Laurent Destailleur
a9fe9cf0b2 Merge pull request #972 from LProemer/develop 
Fix: 'rights' instead of 'right'
 2013-05-22 07:28:26 -07:00
Laurent Destailleur
7856b7f613 Removed warning 2013-05-22 15:52:26 +02:00
Lukas Prömer
f1d9a6545c Fix: 'rights' instead of 'right' 2013-05-22 14:59:21 +02:00
Laurent Destailleur
99438926db Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-05-22 12:24:05 +02:00
Laurent Destailleur
e9df560b74 New: Show process id in all command line scripts 2013-05-22 12:23:42 +02:00
Laurent Destailleur
469ae91e70 Fix: regression 2013-05-22 12:02:39 +02:00
Laurent Destailleur
d5d4bc33ba Merge pull request #971 from cbattarel/3.3 
fix wrong construction of description when creating from orders
 2013-05-22 02:57:34 -07:00
Laurent Destailleur
edf00db0e0 Merge pull request #970 from FHenry/develop 
Add generic behaviour in showphoto of html.form.class.php
 2013-05-22 02:57:21 -07:00
Laurent Destailleur
1109527528 Merge pull request #968 from FHenry/3.3 
3.3
 2013-05-22 02:56:06 -07:00
Laurent Destailleur
f6f93eeec0 Merge pull request #967 from cbattarel/develop 
add ability to include products on intervention card
 2013-05-22 02:55:55 -07:00
Laurent Destailleur
f21b149361 Merge pull request #969 from FHenry/3.4 
Fix bug in DDLCreateTable
 2013-05-22 02:55:26 -07:00
Laurent Destailleur
0bffb6e654 Fix: Test error code 2013-05-22 11:43:16 +02:00
Laurent Destailleur
a61f6194ca Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-05-22 11:29:37 +02:00
Laurent Destailleur
0d562347fb Add a protection into test mode 2013-05-22 11:29:19 +02:00
simnandez
8d9b1e4788 Fix: Show date formatted 2013-05-22 10:51:45 +02:00
Christophe Battarel
992600664e fix wrong construction of description when creatin from orders (it was putting a mess on update) 2013-05-22 10:29:31 +02:00
Christophe Battarel
c69a44d6e9 fix wrong construction of description when creatin from orders (it was putting a mess on update) 2013-05-22 10:23:26 +02:00
Laurent Destailleur
961ce6e3e2 Fix: Removed error blocking redirect 2013-05-21 19:53:10 +02:00
fhenry
40827a7ef3 Add generic behaviour in showphoto of html.form.class.php 2013-05-21 14:52:39 +02:00
Laurent Destailleur
8fe45b1af6 Manifest usage is useless for a dynamic application like dolibarr. 2013-05-21 14:41:11 +02:00
fhenry
b36a16ed43 Change-Id: I2e25d4b82388f6a0fc83b97f9162a095247e3fa1 2013-05-21 14:32:30 +02:00
fhenry
13ad88832c Fix bug in DDLCreateTable 2013-05-21 14:31:39 +02:00
fhenry
f08ce6d96a Fix bug on DDLCreateDb in Mysql 2013-05-21 14:28:42 +02:00
Christophe Battarel
c97384d5db restore UNIX type (LF) 2013-05-21 12:32:41 +02:00
Christophe Battarel
4b1ae9e9a9 add ability to include products on intervention card (some companies prefer to have both products and services on the intervention card that they give to their consultant) 2013-05-21 11:44:11 +02:00
Laurent Destailleur
12681994ea Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/fichinter/class/fichinter.class.php
	htdocs/fichinter/fiche.php
 2013-05-20 21:21:03 +02:00
Laurent Destailleur
91d1f9d48b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-05-20 21:04:22 +02:00
Laurent Destailleur
7ef45b9226 Can force out email 2013-05-20 21:04:00 +02:00
Laurent Destailleur
4539f6ce58 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-05-20 19:26:24 +02:00
Laurent Destailleur
6db07ac2d8 Fix: Several bugs into filter on statistics pages. 2013-05-20 19:24:27 +02:00
simnandez
1470b75e5c Trad: Fix Catalan words into Spanish 2013-05-20 18:44:41 +02:00
simnandez
3f1dabb4e2 Trad: Fix Catalan words into Spanish 2013-05-20 18:43:21 +02:00
Laurent Destailleur
53c053604f Merge pull request #966 from FHenry/3.4 
Fix bug on service date strat date end in propal line not recorded
 2013-05-20 09:02:15 -07:00
fhenry
250b6d6502 Fix bug on service date strat date end in propal line not recorded 2013-05-20 17:58:03 +02:00
Laurent Destailleur
71e14df62f Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
 2013-05-20 17:37:08 +02:00
Laurent Destailleur
e00df58153 Merge pull request #965 from grandoc/3.4 
fix: wrong trad
 2013-05-20 07:46:26 -07:00