lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
36,970 Commits 43 Branches 150 Tags 886 MiB
982fec65ec
Commit Graph

36970 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
982fec65ec Merge pull request #984 from FHenry/3.4 
Fix [ bug #895 ] Description is lost when adding a new predefined
 2013-05-25 08:11:48 -07:00
Florian Henry
8656a9f417 Fix [ bug #895 ] Description is lost when adding a new predefined 
product to a contract
 2013-05-25 16:50:55 +02:00
Laurent Destailleur
7b13be4653 Merge pull request #978 from atm-maxime/3.4 
Fix : Reset every month with @99 was not working properly (for 3.4 branc...
 2013-05-25 01:59:15 -07:00
Laurent Destailleur
4c54bfe3a9 Merge pull request #980 from FHenry/3.4 
Fix multilangue search product list
 2013-05-25 01:52:06 -07:00
Florian Henry
0a041a7705 Fix multilangue search product list 2013-05-24 22:39:28 +02:00
Laurent Destailleur
7b29e58760 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
 2013-05-24 19:07:20 +02:00
Laurent Destailleur
eecfbf9670 Fix: Bad link if not supplier defined for product 2013-05-24 18:55:04 +02:00
Laurent Destailleur
9ecb1ddcb4 Fix: Missing translation 2013-05-24 18:53:28 +02:00
Laurent Destailleur
c97d1cb15b Try a fix for some browsers 2013-05-24 18:29:59 +02:00
Laurent Destailleur
7bbdae239f Fix: Removed errors with not defined vars 2013-05-24 14:32:12 +02:00
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
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
7856b7f613 Removed warning 2013-05-22 15:52:26 +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
1109527528 Merge pull request #968 from FHenry/3.3 
3.3
 2013-05-22 02:56:06 -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
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
Laurent Destailleur
961ce6e3e2 Fix: Removed error blocking redirect 2013-05-21 19:53:10 +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
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
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
Laurent Destailleur
2321170540 Merge pull request #964 from FHenry/3.4 
Revert Class rewrite and ficheinter line trigger
 2013-05-20 07:35:11 -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
3d409390a5 Revert Class rewrite and ficheinter line trigger 2013-05-19 18:37:38 +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
fea0e6de54 Fix - external users should not see costprice and margin infos 2013-05-19 14:06:51 +02:00
Christophe Battarel
347fc6d714 fix unauthorized access to margins for external user 2013-05-19 14:04:21 +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
Juanjo Menent
bd712262b6 Merge pull request #961 from marcosgdf/minor 
Missing success message in margin module config page
 2013-05-19 03:18:50 -07: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
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
fefb21a56e Fix bug on Extrafield checkbox 
Fix bug on ActionComm Update
[ task #900 ] Review code of ficheinter.class.php
 2013-05-18 12:17:43 +02:00