lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,113 Commits 43 Branches 150 Tags 886 MiB
2bd7dc68d3
Commit Graph

32113 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcos García
2bd7dc68d3 Project::setClose wasn't setting the new status 2012-08-18 07:35:55 +02:00
Marcos García
173ff4f92a Fixed a bug where files were not being uploaded to a project's task 
Reported by Jose Antonio Garcia in dolibarr.es' forum
http://www.dolibarr.es/index.php/foro/7-bugs-versiones-estables/1250-error-subir-archivo-en-una-tarea-de-un-proyecto

Conflicts:
	htdocs/projet/tasks/document.php
 2012-08-18 07:35:39 +02:00
Marcos García
1f9e0d3e00 Translated message was generating an incomplete string 2012-08-17 20:19:10 +02:00
Laurent Destailleur
594d5ee216 Merge pull request #311 from marcosgdf/changelog 
Missing changelog entry
 2012-08-15 13:00:28 -07:00
Marcos García
2130b9715c Missing changelog entry 2012-08-15 15:58:36 +02:00
Regis Houssin
b2ff7b5ea1 Fix: limit to products and services 2012-08-15 10:35:15 +02:00
Marcos García
f03e0965e2 Forgot to rename the variable 2012-08-15 07:32:10 +02:00
Marcos García
acb9380f1c Fixed a problem with supplier's orders stats 
They were showing orders even if they were not approved or ordered

Conflicts:
	htdocs/commande/class/commandestats.class.php
 2012-08-15 07:31:55 +02:00
Marcos García
40660482d4 Fixed more average amount graph stats. They include: 
* Customer's orders
* Supplier's orders
* Customer's invoices
* Trips and expense

Conflicts:
	htdocs/commande/stats/index.php
 2012-08-15 07:30:28 +02:00
Regis Houssin
f1cbb10edc Fix: wrong user count 2012-08-14 19:52:51 +02:00
Marcos García
640f001bba Propal stats weren't showing average total for more than 1 year 
Conflicts:
	htdocs/comm/propal/stats/index.php
	htdocs/core/class/stats.class.php
 2012-08-14 16:30:16 +02:00
Regis Houssin
7b671815e0 Merge pull request #305 from marcosgdf/missing-changelog-entry 
Missing changelog entry
 2012-08-14 02:22:19 -07:00
Marcos García
cb1e1be0d3 Missing changelog entry 2012-08-14 11:06:16 +02:00
Marcos García
78a26d61ad Fixed bug #485 
Merged patch from J. Fernando Lagrange (lowmemory)
https://doliforge.org/tracker/?func=detail&aid=485&atid=246&group_id=144
 2012-08-14 10:23:38 +02:00
Laurent Destailleur
ff2dc246eb Update pad files 2012-08-11 13:02:44 +02:00
Laurent Destailleur
7e0b500d75 Update doc 2012-08-11 03:57:55 +02:00
Laurent Destailleur
3670cfd966 Fix: Broken feautres after migration from old versions 2012-08-10 19:16:53 +02:00
Laurent Destailleur
d090788caa Fix: Do not run request if param is empty 2012-08-08 14:08:37 +02:00
Laurent Destailleur
db4240afad Fix: Do not overwrite global $user information 2012-08-08 09:23:57 +02:00
Raphaël Doursenaud
34673e220d Fix: Display correct user in project tasks' time spent list 
Use a local object rather than modifying the global $user object (sic!)
 2012-08-08 09:21:29 +02:00
Laurent Destailleur
7f7fa693f3 Merge branch '3.2' of git@github.com:Dolibarr/dolibarr.git into 3.2 2012-08-08 04:09:25 +02:00
Laurent Destailleur
4786ab9268 Fix: Specimen generation fails 2012-08-08 04:06:19 +02:00
Laurent Destailleur
0db0ab34b4 [ bug #480 ] Can't receive to stock with strict mode 2012-08-07 19:36:34 +02:00
Laurent Destailleur
69b65de41b Fix: Missing desc field 2012-08-07 19:11:26 +02:00
Laurent Destailleur
0f2a1a854b Fix: autoselect when it should not 2012-08-07 18:59:07 +02:00
Laurent Destailleur
32a7747440 Fix: Delete all files (PROV* when validating. 2012-08-07 16:05:00 +02:00
Regis Houssin
0a8ae2934d Fix: remove unused file and missing print 2012-08-06 20:41:17 +02:00
Regis Houssin
afeabd44f0 Fix: update jquery fileupload 2012-08-06 19:06:11 +02:00
Regis Houssin
99e234d703 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-08-06 17:41:06 +02:00
Regis Houssin
117cd337dd Fix: missing object 2012-08-06 17:39:56 +02:00
Regis Houssin
4f5432160d Fix: remove draft status if invoice is validated 2012-08-06 09:14:44 +02:00
Laurent Destailleur
92624d650f Fix into categorie functions 2012-08-05 23:59:13 +02:00
Laurent Destailleur
8b2f1eee13 Fix: W3C 2012-08-05 22:01:26 +02:00
Regis Houssin
96726c1c9b Fix: function setEventMessage() not in 3.2 2012-08-05 21:18:36 +02:00
Regis Houssin
bbe270d4bf Fix: missing delete shipping and delivery files 
(minimum for possibility to merge with 3.2)

Conflicts:
	htdocs/core/modules/livraison/modules_livraison.php
	htdocs/livraison/class/livraison.class.php
 2012-08-05 20:42:06 +02:00
Regis Houssin
bb74a63d59 Fix: delete pdf if supplier invoice is deleted 
Fix: compatibility with external modules
(minimum for 3.2)
 2012-08-05 18:37:48 +02:00
Regis Houssin
b1f3dbd45e Fix: indentation 2012-08-05 18:37:34 +02:00
Regis Houssin
da8bc79c6d Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-08-05 18:37:17 +02:00
Regis Houssin
54134e3d19 Fix: compatibility with jquery fileupload 2012-08-05 18:36:59 +02:00
Laurent Destailleur
fa4c69c52f Merge branch '3.2' of git@github.com:Dolibarr/dolibarr.git into 3.2 2012-08-05 14:55:21 +02:00
Laurent Destailleur
e1f57b60e3 Qual: Removed bad herit 2012-08-05 14:46:24 +02:00
Regis Houssin
da29ea89a7 Fix: avoid warning with php 5.4 2012-08-05 14:34:37 +02:00
Laurent Destailleur
fe672e1e4b Merge branch '3.2' of git@github.com:Dolibarr/dolibarr.git into 3.2 2012-08-05 00:46:39 +02:00
Laurent Destailleur
be4960cfbb Fix: exit code when upgrade is ran from command line 2012-08-05 00:46:10 +02:00
Regis Houssin
e4f7df25b0 Fix: remove unused code for avoid warning with IE9 2012-08-04 13:52:02 +02:00
Laurent Destailleur
17c45208d3 Fix: Prepare 3.2.1 version 2012-08-03 23:57:17 +02:00
Laurent Destailleur
6a4f03eab3 Prepare 3.2.1 2012-08-03 19:27:50 +02:00
Laurent Destailleur
3778d206ac Fix: project validation 2012-08-03 19:05:49 +02:00
Laurent Destailleur
f4c9da5e9f Fix: Bad object 2012-08-03 18:53:31 +02:00
Laurent Destailleur
a2641b89e7 Fix: Bad fix 2012-08-03 18:43:30 +02:00