Commit Graph

37534 Commits

Author SHA1 Message Date
Florian Henry
fc9752964f Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-10-25 10:02:05 +02:00
Florian Henry
c2def3d0b6 Fix bad display IE for checkbox extrafield readonly 2013-10-25 10:01:41 +02:00
Laurent Destailleur
d5d252dada Fix: [ bug #1077 ] Project card does not update vinculated third when
modified upon refresh
2013-10-23 18:35:18 +02:00
Laurent Destailleur
8203971614 Try to fix bug [ bug #1072 ] Wrong DOL_URL_ROOT value calculated
Conflicts:
	htdocs/filefunc.inc.php
2013-10-23 18:33:56 +02:00
Laurent Destailleur
3050facb96 Fix: [ bug #1070 ] Accountancy code not displayed just after set
Conflicts:
	htdocs/product/fiche.php
2013-10-23 18:29:34 +02:00
Laurent Destailleur
cd085b3ecc Merge pull request #1256 from jfefe/cron
Fix : use GETPOST function into CRON module
2013-10-20 05:06:12 -07:00
Laurent Destailleur
8373982837 Merge pull request #1260 from FHenry/3.4
restrict acces to commercial update if user can only see his own
2013-10-20 04:14:01 -07:00
Laurent Destailleur
96658999f5 Merge pull request #1258 from grandoc/3.4
fix wrong call name
2013-10-20 04:10:09 -07:00
Florian Henry
e1dbee651e restrict acces to commercialupdate if user can only see his own
thirdparty
2013-10-19 22:08:42 +02:00
Laurent Destailleur
24cd2d2b85 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-10-19 14:59:46 +02:00
Laurent Destailleur
8e42a6fd15 Avoid email when travis is ok 2013-10-19 14:11:56 +02:00
Grand Philippe
c773f21c2c fix wrong call name 2013-10-19 12:50:18 +02:00
Laurent Destailleur
4e637d3121 Fix: Sanitizing PHP_SELF 2013-10-18 17:27:17 +02:00
Laurent Destailleur
5e35731693 Add debug info to find a bug 2013-10-18 11:41:37 +02:00
Laurent Destailleur
d9106b6e85 Add debug info to find a bug 2013-10-18 11:19:32 +02:00
jfefe
ef4d3e4666 Fix : use GETPOST function into CRON module 2013-10-15 21:07:11 +02:00
Laurent Destailleur
9bc0f54ae8 Fix: set of country 2013-10-15 20:51:44 +02:00
Regis Houssin
8801d7a1eb Fix: reorder lines problem 2013-10-12 11:54:37 +02:00
Laurent Destailleur
f225b35a90 Fix: filter on warehouse
Conflicts:
	htdocs/product/stock/mouvement.php
2013-10-10 15:51:59 +02:00
Laurent Destailleur
41bf4d53a8 Fix: filter on warehouse
Conflicts:
	htdocs/product/stock/mouvement.php
2013-10-09 20:44:42 +02:00
Laurent Destailleur
e343d3bc6f Fix: missing property 2013-10-08 21:16:53 +02:00
Laurent Destailleur
8d63c2f9c5 Fix: ref_ext was not loaded
Conflicts:
	htdocs/contact/class/contact.class.php
2013-10-08 00:44:55 +02:00
Laurent Destailleur
91c6d47a60 Fix: Clean param
Conflicts:
	htdocs/fourn/class/fournisseur.facture.class.php
2013-10-08 00:06:14 +02:00
Laurent Destailleur
c235c4e4ba Fix: security sql injection 2013-10-07 22:50:27 +02:00
Laurent Destailleur
ebb1dbcec3 Fix: security sql injection 2013-10-07 22:50:12 +02:00
Laurent Destailleur
123beb1e34 Fix: Bad property 2013-10-07 16:58:07 +02:00
Laurent Destailleur
51dd5cf259 Merge pull request #1250 from altairis-fr/margin1
fix bugs on margin calculation and margin reports
2013-10-05 07:42:13 -07:00
Christophe Battarel
02278a399c better margin calculation (especially for credit notes) 2013-10-05 10:29:22 +02:00
Christophe Battarel
c41794ba4c update changelog 2013-10-05 10:23:24 +02:00
Christophe Battarel
37e47272c7 fix bugs on margin reports 2013-10-05 10:21:38 +02:00
Laurent Destailleur
b695204259 Fix: invert parameters 2013-09-28 13:27:53 +02:00
Laurent Destailleur
7ac7034494 Merge pull request #1247 from altairis-fr/3.4
fix bug on filter and sort
2013-09-27 09:01:17 -07:00
Laurent Destailleur
4eb4c5f922 Some users report they need more time 2013-09-27 11:04:21 +02:00
Christophe Battarel
7bc39d7601 update changelog 2013-09-26 19:08:54 +02:00
Christophe Battarel
b7fe0cec34 fix bug on filter and sort 2013-09-26 19:05:56 +02:00
Laurent Destailleur
1f938e6596 Merge remote-tracking branch 'origin/3.3' into 3.4 2013-09-25 12:16:54 +02:00
Laurent Destailleur
f5387081e0 Update doc 2013-09-25 11:25:30 +02:00
Laurent Destailleur
06f668a249 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-09-24 20:20:41 +02:00
Laurent Destailleur
a3e74afb02 Fix: varchar 256 2013-09-24 20:14:42 +02:00
Laurent Destailleur
a674af5bcd Fix: Permission check on event tabs 2013-09-24 11:11:59 +02:00
Laurent Destailleur
b6d5ebf81d Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-09-24 11:02:01 +02:00
Laurent Destailleur
06f36fbfab Fix: Bad permission check 2013-09-24 10:59:15 +02:00
Laurent Destailleur
bdafcb680f Fix: Bad parameters
Conflicts:
	htdocs/comm/action/fiche.php
2013-09-23 21:07:13 +02:00
Laurent Destailleur
8024a61376 Add missing label 2013-09-22 21:07:00 +02:00
Laurent Destailleur
c2ba7956ab Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
2013-09-22 19:57:48 +02:00
Laurent Destailleur
ad09470f48 Fix: Better management of pdf generation when tcpdf not available. 2013-09-22 19:53:27 +02:00
Laurent Destailleur
16396b985b Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-09-21 10:54:34 +02:00
Laurent Destailleur
b74f73c885 Fix: Calculation of deposit amount when using a percent was done only on
last line.
2013-09-21 10:53:46 +02:00
Laurent Destailleur
53979ad58c Fix: Bad param 2013-09-20 14:29:09 +02:00
Laurent Destailleur
7a1efdbab6 Merge remote-tracking branch 'origin/3.3' into 3.4 2013-09-20 11:06:09 +02:00