aspangaro
acbbe823e8
Typo
2014-11-06 20:04:51 +01:00
aspangaro
a8b3153f54
Improve search in list
2014-11-06 19:47:27 +01:00
aspangaro
b60f834d8d
Improve search into supplier command list
2014-11-06 07:19:16 +01:00
aspangaro
4c95cab35f
Improve search in customer command list
2014-11-06 07:13:03 +01:00
aspangaro
16126891a6
Merge remote-tracking branch 'Upstream/develop' into develop-search
2014-11-06 06:41:09 +01:00
aspangaro
b47e899e57
Merge remote-tracking branch 'origin/develop-patch' into develop-search
2014-11-06 06:40:50 +01:00
Laurent Destailleur
0ae1bfab04
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-11-06 00:58:43 +01:00
Juanjo Menent
eadb10e71e
Trad: update es_ES from transifex
2014-11-05 22:31:23 +01:00
aspangaro
89296e3011
Typo search list
2014-11-05 22:27:26 +01:00
Laurent Destailleur
cc1b14e9f8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-11-05 17:42:11 +01:00
Laurent Destailleur
b601afc92b
Merge pull request #1994 from aspangaro/develop-patch
...
Update module accounting
2014-11-05 17:40:51 +01:00
Laurent Destailleur
e052010941
Merge pull request #2004 from Devensys/Develop-FixErrorFormOther
...
fix error FormOther in user/card.php
2014-11-05 17:39:29 +01:00
Laurent Destailleur
60ca5aa026
Debug of module withdraw.
2014-11-05 17:32:42 +01:00
Laurent Destailleur
5e0946bdc2
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/adherents/fiche.php
htdocs/core/lib/date.lib.php
htdocs/langs/fr_FR/bills.lang
htdocs/resource/class/resource.class.php
2014-11-05 16:37:07 +01:00
Laurent Destailleur
4f08408065
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
ChangeLog
htdocs/core/class/commonobject.class.php
2014-11-05 16:28:44 +01:00
Laurent Destailleur
31c38cedbc
Fix: checkstyle
2014-11-05 16:26:11 +01:00
Laurent Destailleur
f7e71d8848
Fix: checkstyle
2014-11-05 16:23:10 +01:00
Laurent Destailleur
90fb05805c
Fix: Missing translation
2014-11-05 16:21:17 +01:00
Andrelec1
5742e42689
Fix require FormOther !
...
If agenda module is desable
2014-11-05 14:24:02 +01:00
Teddy
e37741c114
Merge pull request #4 from Dolibarr/develop
...
Merge pull request #4 from Dolibarr/develop
2014-11-05 11:20:59 +01:00
Laurent Destailleur
0d62556fa0
Maj doc
2014-11-05 11:01:53 +01:00
Laurent Destailleur
606a3f9917
Merge remote-tracking branch 'origin/3.4' into 3.5
2014-11-04 17:54:09 +01:00
Laurent Destailleur
504a9a92a4
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-11-04 17:42:22 +01:00
Laurent Destailleur
5656773430
Update doc
2014-11-04 17:42:01 +01:00
Laurent Destailleur
45d57b0492
Merge pull request #1995 from atm-maxime/3.4
...
Fix : actioncomme report was not filtering by entity...
2014-11-04 17:41:40 +01:00
Laurent Destailleur
5c2862dae3
Merge pull request #1976 from frederic34/patch-2
...
Add a little delay in ajax_autocompleter
2014-11-04 17:41:23 +01:00
Laurent Destailleur
420de76b4b
Merge pull request #1993 from aspangaro/3.6-patch
...
GPLv3
2014-11-04 17:40:38 +01:00
Laurent Destailleur
26bd214e72
Merge pull request #1996 from aspangaro/develop-search
...
Increase list search
2014-11-04 17:40:11 +01:00
Laurent Destailleur
ebb061e68d
Merge pull request #1997 from defrance69/patch-26
...
Update odf.php
2014-11-04 17:37:47 +01:00
Laurent Destailleur
c41e908dba
Merge pull request #2000 from Devensys/Develop-MajPasswordPattern
...
New modGeneratePass with personal conf
2014-11-04 17:37:25 +01:00
Laurent Destailleur
fd8d571d67
Merge pull request #2003 from atm-alexis/3.6
...
fix bug on thm
2014-11-04 17:36:17 +01:00
Laurent Destailleur
e296e52531
Merge pull request #2002 from Devensys/develop-FixErrorinSQLsociete
...
Develop fix errorin sq societe
2014-11-04 17:35:39 +01:00
Laurent Destailleur
899fecb484
Some maintenance sqls
2014-11-04 16:40:01 +01:00
Alexis Algoud
d177a2fbb4
fix bug on thm
2014-11-04 16:13:51 +01:00
Andrelec1
c9c499717b
Fix bad comma
2014-11-04 14:56:18 +01:00
Andrelec1
6837ff730b
Fix missing comma
2014-11-04 14:41:56 +01:00
Laurent Destailleur
0a0dd81c9a
Fix: When selecting a carbon copy fro select list, mail was not attached
...
to user.
2014-11-04 13:54:18 +01:00
Andy
19980ec708
Merge pull request #3 from Dolibarr/develop
...
Merge pull request #3 from Dolibarr/develop
2014-11-04 13:42:05 +01:00
Andrelec1
796f2409a1
Add verif and correction lang
2014-11-04 11:38:16 +01:00
Laurent Destailleur
0b41df7c35
Clean code to manage multiselect jquery: All code is centralized
...
into function multipleselectarray (except loading of css).
Code is prepared to choose which plugin to use (only a if is required
to switch or add a new manager). Introduce working version with
multiple-select jquery plugin. Removed deprecated old jquery plugin.
2014-11-04 00:33:50 +01:00
aspangaro
f3d7da8feb
Merge remote-tracking branch 'Upstream/develop' into develop-search
2014-11-03 20:25:36 +01:00
Laurent Destailleur
b6b6cced30
Fix: Test sur user assigned not filled
...
Can use empty line into select boolean form.
2014-11-03 20:02:11 +01:00
Laurent Destailleur
a4a01de8a1
Fix: Missing label
2014-11-03 18:00:11 +01:00
Andrelec1
5074feacd6
Add option and create new class
2014-11-03 17:57:55 +01:00
Laurent Destailleur
54e2803926
Missing search table for interventions
2014-11-03 17:48:10 +01:00
Laurent Destailleur
cf6a0df3e4
A lot of fix in missing intervention trigger. Align key to use same name
...
to avoid future bugs.
2014-11-03 17:23:02 +01:00
Laurent Destailleur
17b372a4b9
css generic
2014-11-03 16:29:45 +01:00
Laurent Destailleur
155452ba91
Fix: Proposal deadlock situation
...
New: Add missing trigger PROPAL_CLASSIFYBILLED.
2014-11-03 16:20:55 +01:00
Laurent Destailleur
b2ed53b785
Fix: Switch company/individual
2014-11-03 15:47:33 +01:00
aspangaro
29c6797835
Merge remote-tracking branch 'Upstream/develop' into develop-search
2014-11-03 06:15:45 +01:00
