Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
40,390 Commits 36 Branches 189 Tags
f34aadef3df57794de74006bc2c2c9fc4da6be12
Commit Graph

34721 Commits

Author SHA1 Message Date
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
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
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
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
Laurent Destailleur
416cdd2f9c Merge pull request #956 from cbattarel/3.3 
fix bug : external users should not see costprice and margin infos
 2013-05-20 07:39:39 -07:00
Grand Philippe
5f714f1403 fix: wrong trad 2013-05-20 14:39:27 +02:00
Christophe Battarel
f8ca842685 fix typo error 2013-05-20 10:10:34 +02:00
fhenry
cb182752cc Report divert bug fixing from 3.4 2013-05-19 18:47:14 +02:00
fhenry
3d409390a5 Revert Class rewrite and ficheinter line trigger 2013-05-19 18:37:38 +02:00
fhenry
6407139b04 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-05-19 18:28:43 +02:00
fhenry
71107f8dca Triggger ficheinter line 2013-05-19 18:28:27 +02:00
Laurent Destailleur
2ac738d8c4 Merge pull request #955 from FHenry/3.4 
Fix error management and SQL resquest in action comm
 2013-05-19 09:02:00 -07:00
fhenry
a6233a738c Fix trigger in deleteline fiche inter 2013-05-19 14:13:41 +02:00
Christophe Battarel
347fc6d714 fix unauthorized access to margins for external user 2013-05-19 14:04:21 +02:00
Marcos García
0a5bb491d3 Corrected translation key BuyingPrice from lang files 2013-05-19 12:24:19 +02:00
Juanjo Menent
afddded13c Merge pull request #962 from marcosgdf/translations 
Corrected translation key BuyingPrice from lang files
 2013-05-19 03:22:54 -07:00
Marcos García
4318d5c02d Missing succes message in margin module config page 2013-05-19 12:19:31 +02:00
Marcos García
5f4433dbff Missing succes message in margin module config page 2013-05-19 12:09:34 +02:00
Marcos García
08b234ed01 Corrected translation key BuyingPrice from lang files 2013-05-19 12:08:18 +02:00
fhenry
c07d5045d1 Error management 2013-05-19 11:55:03 +02:00
Juanjo Menent
a7e0f8cb8e Merge pull request #958 from atm-maxime/develop 
Add mobile phone in contact export
 2013-05-19 02:54:44 -07:00
fhenry
6190dddac9 GetElmentURL fichinter instead of ficheinter (to be ok with element of 
fichinter class
 2013-05-19 11:30:35 +02:00
fhenry
94e2ea05d2 Fix trigger ficheinterline 2013-05-19 11:18:45 +02:00
fhenry
a8e1d111c3 Add trigger into ficheinter lines and $user pass trought parameters 
every where
 2013-05-19 10:26:25 +02:00
fhenry
181ce52223 Add ficheinter in GetElementURL for action 2013-05-18 22:17:46 +02:00
fhenry
cbf29e20a2 [ task #901 ] Add Extrafeild on Fiche Inter 2013-05-18 13:00:36 +02:00