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

40847 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
fed3ac9b70 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2014-01-15 09:10:30 +01:00
Laurent Destailleur
8de8e9d886 Fix: reference to a file that does not exists 2014-01-15 09:09:52 +01:00
Laurent Destailleur
9aacb0e7ed Fix: bad permissions on files 2014-01-15 03:15:31 +01:00
Laurent Destailleur
0725fea923 Fix: doxygen 2014-01-15 03:08:11 +01:00
Laurent Destailleur
ac45051b53 Fix: Showing version is wrong when replace by external module 2014-01-15 02:04:44 +01:00
Laurent Destailleur
fa1c88d80b Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-01-14 22:18:57 +01:00
Laurent Destailleur
4f1df33e51 Fix: thumb image was not up to date compared to new skin. 2014-01-14 22:18:44 +01:00
Laurent Destailleur
3a246bdca9 Merge pull request #1377 from csalvador/containsObject 
add a method to check for the presence of an object in a category
 2014-01-14 09:11:47 -08:00
Laurent Destailleur
12ee5dece2 Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5 2014-01-14 18:10:14 +01:00
Laurent Destailleur
b455686b57 Merge pull request #1376 from grandoc/3.5 
Fix: path to image must not be hardcoded but use dol_buildpath or
 2014-01-14 09:09:32 -08:00
Cedric GROSS
6d4a9833e2 Fix bug on stock calculation for replenishment: wrong order in ifsql. 2014-01-14 18:08:26 +01:00
Laurent Destailleur
3461b1932b Merge pull request #1378 from KreizIT/fix 
Fix bug on stock calculation for replenishment: wrong order in ifsql.
 2014-01-14 09:06:46 -08:00
Laurent Destailleur
c704182b4d Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2014-01-14 18:01:39 +01:00
Laurent Destailleur
bd1a10c116 Fix: doxygen 2014-01-14 16:49:06 +01:00
Cedric GROSS
911c43c862 Fix bug on stock calculation for replenishment: wrong order in ifsql. 2014-01-13 19:46:23 +01:00
Grand Philippe
b61ccb8234 Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1 2014-01-13 10:15:07 +01:00
Grand Philippe
462f65614d Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1 2014-01-13 10:10:17 +01:00
Grand Philippe
c5689b86b4 Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1 2014-01-13 09:43:21 +01:00
Cédric Salvador
ecfff5636b rename is_in_cat to containsObject 2014-01-13 09:27:10 +01:00
Cédric Salvador
abe76708de renamed object_exists 2014-01-13 09:06:00 +01:00
Cédric Salvador
e7f7dd49a5 add a method to check for the presence of an object in a category 2014-01-13 09:06:00 +01:00
philippe
9bada81b63 Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5 2014-01-13 08:47:57 +01:00
Laurent Destailleur
795dcad59f Fix: The login page should have same code than standard page using 
common footer.
 2014-01-12 22:26:48 +01:00
Grand Philippe
938f31f383 Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1. 2014-01-12 21:45:52 +01:00
philippe
d2d84c3e48 Fix: path to image must not be hardcoded but use dol_buildpath or 
img_picto with param src=1.
 2014-01-12 21:26:44 +01:00
Laurent Destailleur
5f65b2a97f Merge remote-tracking branch 'origin/3.5' into develop 2014-01-12 20:23:24 +01:00
Laurent Destailleur
0f329e72ef Fix: MAIN_FORCETHEME was not working when user set its own theme 2014-01-12 20:22:35 +01:00
Laurent Destailleur
4d298b1891 Update code comments and add log warning to help debug 2014-01-12 20:03:18 +01:00
Laurent Destailleur
0990ef3961 Update code comments and add log warning to help debug 2014-01-12 20:02:41 +01:00
Laurent Destailleur
ffeb2778e5 Fix: path to image must not be hardcoded but use dol_buildpath or 
img_picto with param src=1.
 2014-01-12 19:23:36 +01:00
Laurent Destailleur
b688d287e8 Merge pull request #1375 from GPCsolutions/3.4-fixsessionpath 
Handle default session path nicely
 2014-01-12 06:59:23 -08:00
Laurent Destailleur
51b455b85a Start to normalize code for category to not use named table, columns but 
only type of category.
 2014-01-12 15:54:28 +01:00
Laurent Destailleur
1cf058b8e9 Bad comment 2014-01-12 15:12:25 +01:00
BENKE Charles
28204d66b1 Update modFacture.class.php 
remplace price by subprice on export invoice
 2014-01-12 14:59:23 +01:00
Laurent Destailleur
77688100bd Merge pull request #1372 from defrance69/patch-23 
Update modFacture.class.php
 2014-01-12 05:58:04 -08:00
Laurent Destailleur
c3360c4c30 Fix: Bad merge 2014-01-12 14:51:54 +01:00
Laurent Destailleur
06aa3b8250 Merge branch 'opensurvey-improvements' of 
https://github.com/marcosgdf/dolibarr into
marcosgdf-opensurvey-improvements

Conflicts:
	ChangeLog
 2014-01-12 14:50:00 +01:00
Laurent Destailleur
02989b9f32 New: An external module can add tabs with a label that is a dynamic 
value.
Qual: The deprecated way (with 4 parameters) to declare a new tab into a
module descriptor file has been removed. You must now use the 6
parameters way. See file modMyModule.class.php for example.
 2014-01-12 14:11:03 +01:00
Raphaël Doursenaud
78b40eaa8c Handle default session path nicely 2014-01-11 17:30:29 +01:00
Laurent Destailleur
eaf3bd5679 Update doc 2014-01-11 13:34:39 +01:00
Laurent Destailleur
23eb0f3770 Qual: Mutualize code for actions of editing notes 
New: Add button 'cancel' to cancel edition of a note (private or public)
 2014-01-11 13:33:30 +01:00
Laurent Destailleur
171e74ae7e Reduce time to hide/show 2014-01-11 13:31:12 +01:00
Laurent Destailleur
db5fe44b93 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2014-01-10 16:48:56 +01:00
BENKE Charles
dd3da37ce6 Update modFacture.class.php 
remplace price by subprice on export invoice
 2014-01-10 10:35:42 +01:00
Laurent Destailleur
5bdd7fc074 Fix: Doxygen 2014-01-10 03:39:43 +01:00
Laurent Destailleur
45b3a02e8b Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-01-10 01:37:58 +01:00
Laurent Destailleur
2c310e26a6 Fix: Missing lang file 2014-01-10 01:37:41 +01:00
Laurent Destailleur
9b9492a5d6 New: Start to work on option MAIN_AUTO_TIMESTAMP_IN_NOTES to 
automatically add timestamp and user line into comment. Remain to do:
Add button "cancel" into note edition mode.
 2014-01-10 01:31:23 +01:00
Laurent Destailleur
c3da8ca80a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-01-10 01:25:55 +01:00
Laurent Destailleur
7809e0baa9 Fix: dol_htmlentitiesbr behaviour was different if input was html 
or not. Add phpunit test to avoid that in future.
 2014-01-10 01:25:28 +01:00