Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
32,251 Commits 36 Branches 189 Tags
85f03913fed7ac3a6b51c3fb159b54098b98a8a3
Commit Graph

1359 Commits

Author SHA1 Message Date
Laurent Destailleur
825130d633 Fix: ldap errors 2012-10-24 16:30:10 +02:00
Laurent Destailleur
878d5612a1 Fix: [ bug #260 ] Page breaks on PDF export of supplier order when you 
have a service with 40 lines
 2012-10-18 12:36:20 +02:00
Regis Houssin
6d85629495 Fix: possibility to disable ajax 2012-10-16 16:15:00 +02:00
Laurent Destailleur
8506df28d7 Fix: Try another fix on getTrad bug. 2012-10-04 09:44:55 +02:00
Laurent Destailleur
2868961661 Fix: TZ 2012-10-03 18:36:22 +02:00
Laurent Destailleur
ae945732be Fix: getTradFromKey 2012-10-03 17:48:56 +02:00
Laurent Destailleur
f1870ae37d Fix: syntax error with postgresql 2012-09-18 11:24:54 +02:00
Laurent Destailleur
a79d440a9b Fix: Var not used 2012-09-10 09:52:35 +02:00
Laurent Destailleur
5046c20b81 Fix: Bad name of var 2012-09-09 15:11:02 +02:00
Regis Houssin
dbb62f010d Fix: add distinct for avoid double record 2012-09-04 11:53:00 +02:00
Regis Houssin
8de657a215 Fix: comaptibility with multicompany and transverse mode 2012-09-04 11:11:48 +02:00
Laurent Destailleur
a7d6289d4b Fix: edit of percentage 
Conflicts:
	htdocs/comm/action/fiche.php
 2012-09-02 14:27:00 +02:00
Regis Houssin
f425762e9d Fix: missing show field if "in progress" is chosen first 2012-08-20 08:21:05 +02:00
Laurent Destailleur
cb96735f50 Fix: [ bug #506 ] Can't set percentage of a started event 2012-08-20 02:16:53 +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
Laurent Destailleur
0f2a1a854b Fix: autoselect when it should not 2012-08-07 18:59:07 +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
54134e3d19 Fix: compatibility with jquery fileupload 2012-08-05 18:36:59 +02:00
Regis Houssin
ae0a746510 Fix: bad document path with multicompany 2012-08-01 19:35:55 +02:00
Regis Houssin
a2db2c5012 Fix: regression (multicompany) 2012-08-01 13:04:32 +02:00
Laurent Destailleur
8a77ffe58f Fix: Removing chekstyle warning helps me to find real bugs 2012-07-29 15:08:03 +02:00
Regis Houssin
51ccb33964 Fix: carriage return 2012-07-26 18:12:02 +02:00
Regis Houssin
a92bb8373a Fix: bad path 2012-07-26 17:04:50 +02:00
Laurent Destailleur
70cf8227a2 Fix: Products with no prices not visible 
Conflicts:
	htdocs/core/class/html.form.class.php
 2012-07-25 12:47:50 +02:00
Laurent Destailleur
d68a2cb0d8 Fix: Removed warning 2012-07-19 16:27:03 +02:00
Laurent Destailleur
9327858bee Fix: Bad merge 2012-07-13 12:23:17 +02:00
Regis Houssin
20704d6a5c New: classify billed order if invoice billed (workflow 
manager)

Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/langs/en_US/workflow.lang
	htdocs/langs/fr_FR/workflow.lang
 2012-07-13 12:14:41 +02:00
Regis Houssin
925bded6d9 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-07-07 12:29:04 +02:00
Regis Houssin
dd60c384a5 Fix: missing object 2012-07-07 12:27:45 +02:00
Regis Houssin
250e3555c3 Fix: more bugs with multicompany 2012-07-07 11:03:16 +02:00
Regis Houssin
8ee06f02b1 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-07-07 11:02:59 +02:00
Regis Houssin
ba896c024d Fix: problem with template 2012-07-07 11:01:48 +02:00
Regis Houssin
c8eb666826 Fix: compatibility with multicompany 2012-07-06 20:53:18 +02:00
Regis Houssin
92858a7b47 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-07-02 17:13:39 +02:00
Regis Houssin
9623d50f48 Fix: big problem with linked elements 2012-07-02 17:11:35 +02:00
Regis Houssin
3164b5615c Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-06-27 16:37:47 +02:00
Laurent Destailleur
62f14e3dd5 Fix: Removed warning. Fix compatibility. 2012-06-26 23:13:03 +02:00
Regis Houssin
c8c31b2167 Fix: mutualize ckeditor parameters 2012-06-12 23:14:54 +02:00
Regis Houssin
c4fbdbbce4 Fix: mutualize ckeditor parameters 2012-06-12 23:13:59 +02:00
Regis Houssin
548266d607 Fix: uniformize code 2012-06-11 21:46:37 +02:00
Regis Houssin
c9c4ba2a72 Fix: problem with external modules and uniformize code 
Conflicts:
	htdocs/comm/propal/document.php
	htdocs/core/class/fileupload.class.php
	htdocs/projet/fiche.php

Change-Id: Ib36cd4d6ad5eb1e9ad2a188ef276f37c098cfef4
 2012-06-09 18:47:16 +02:00
Regis Houssin
aee1c3b069 Fix: more clean code for new version of jQuery fileupload 2012-06-08 07:25:55 +02:00
Regis Houssin
c43b5f99ac Works on jQuery fileupload upgrade (Todo: css problem) 2012-06-08 07:24:22 +02:00
Laurent Destailleur
06442f4755 Fix: Var not initialized 2012-06-06 21:39:37 +02:00
Regis Houssin
ff33cb4a88 Fix: merge array of hookmanager errors 2012-06-03 23:55:05 +02:00
Laurent Destailleur
4fd98dfb72 Fix: Revert a lot of commits made on wrong branch. No new features, no 
change on architecture on a beta, only bug fixes on visible features.
 2012-06-01 02:22:39 +02:00
Laurent Destailleur
73f1d8ee99 Revert "Fix: more clean code for new version of jQuery fileupload" 
This reverts commit d7308525ae.
 2012-06-01 02:06:43 +02:00
Laurent Destailleur
1a73347866 Merge branch '3.2' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-06-01 01:54:24 +02:00
Regis Houssin
d7308525ae Fix: more clean code for new version of jQuery fileupload 2012-05-31 21:12:40 +02:00
Regis Houssin
a717297a8c Works on jQuery fileupload upgrade (Todo: css problem) 2012-05-30 23:36:17 +02:00