Florian Henry
c465cc621d
Fix actioncomm_ressource column name
2013-11-04 19:27:59 +01:00
Florian Henry
35c0695513
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-11-04 19:21:26 +01:00
Florian Henry
a57afb6d40
[ task #1127 ] Add feature filter on extrafield type : select for table
2013-11-04 19:21:13 +01:00
Laurent Destailleur
c815bd96fb
Doxygen
2013-11-04 16:50:41 +01:00
Laurent Destailleur
5e246107a7
Doxygen
2013-11-04 16:31:12 +01:00
Laurent Destailleur
fd168c1214
Doc comments
2013-11-04 15:04:04 +01:00
Laurent Destailleur
c41ac34356
Merge remote-tracking branch 'origin/3.3' into 3.4
2013-11-04 15:01:31 +01:00
Laurent Destailleur
8653f3f026
Add missing Country UK.
2013-11-04 12:38:21 +01:00
Laurent Destailleur
f1c398f93c
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-11-04 10:57:04 +01:00
Laurent Destailleur
32983b79ee
Sec: Add option to salt password
2013-11-04 10:47:24 +01:00
Laurent Destailleur
e5fd19ffc0
Add option to salt hash passwords
2013-11-04 10:45:43 +01:00
Grand Philippe
59085d7331
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr into 3.4
2013-11-04 10:41:32 +01:00
Grand Philippe
aaf1dd1b27
fix some language error
2013-11-04 10:41:02 +01:00
Laurent Destailleur
b2df689669
Merge pull request #1274 from FHenry/3.4
...
USe good status icon for thirdparty ActivityCeased
2013-11-03 13:18:37 -08:00
aspangaro
a9dd9d6dfc
Modify the presentation of the card
2013-11-03 15:07:26 +01:00
Grand Philippe
c5f29e14a4
missing trad and fix language
2013-11-02 17:50:24 +01:00
Florian Henry
6aea0bf7a1
Fix [ bug #1105 ] Searching Boxes other search option
2013-11-02 12:49:37 +01:00
Florian Henry
b52b49cbb0
USe good icons for customer status
2013-11-02 02:42:44 +01:00
Florian Henry
a4ce2d5f72
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
2013-11-02 02:25:33 +01:00
Florian Henry
f727e832d9
Add mandatory and transparent into llx_actioncomm_ressource
2013-11-02 02:25:06 +01:00
Florian Henry
662f48ddc2
Use good icons
2013-11-02 02:21:45 +01:00
Florian Henry
11d2af0f7e
Fix hook object call
2013-11-01 23:20:10 +01:00
Florian Henry
48c8b470af
Add hook into product/document.php
2013-11-01 18:59:00 +01:00
Laurent Destailleur
469dd03673
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
build/debian/changelog
build/exe/doliwamp/doliwamp.iss
build/makepack-dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/core/class/commonobject.class.php
htdocs/core/tpl/objectline_view.tpl.php
htdocs/filefunc.inc.php
htdocs/langs/nl_NL/margins.lang
2013-11-01 17:58:38 +01:00
Laurent Destailleur
f8e3a3e38a
Fix: Sub level of dir must not always be visible. So I added parameter
...
"showrelpart". Default value is old behaviour (only filenmae is
visible).
2013-11-01 17:36:22 +01:00
Laurent Destailleur
84b36d1230
Prepare for 3.4.2
2013-11-01 17:24:09 +01:00
Laurent Destailleur
ecb1f490ae
Fix: Option drop tables was broken
2013-11-01 17:20:36 +01:00
Laurent Destailleur
139ed68d6e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-11-01 17:19:43 +01:00
Laurent Destailleur
60d4033e59
Fix: Option drop tables was broken
2013-11-01 17:19:25 +01:00
Florian Henry
987c09b882
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
2013-11-01 14:21:25 +01:00
Florian Henry
399093f501
USe good status icon for thirdparty ActivityCeased
2013-11-01 13:48:22 +01:00
Florian Henry
7db319975f
Use good icon for status caesed societe
2013-11-01 13:47:17 +01:00
Laurent Destailleur
d8216a09e1
Fix: Try a fix to avoid error on big sql
2013-10-31 14:39:41 +01:00
Florian Henry
c0ad86cd5c
Add column fk_c_element_role into llx_actioncomm_ressource to manage
...
role of linked element
In this exemple we can have
fk_element = 1
element_type= "user" or contact or place or whatever element
fk_c_element_role = 1 // 'Guest' or Host or whatever define in
dictionnary
fk_c_element_status = Present // or whatever define in dictionnary
according element type
2013-10-31 13:23:38 +01:00
Laurent Destailleur
44a78ca884
Merge pull request #1262 from defrance69/patch-17
...
Update html.formfile.class.php
2013-10-31 04:49:01 -07:00
Laurent Destailleur
4d10540600
Merge pull request #1272 from altairis-fr/rounding
...
fix bad rounding on margin calculation and display
2013-10-31 04:40:41 -07:00
Laurent Destailleur
154a75cc39
Merge pull request #1268 from FHenry/develop
...
Add NL_nl translation for category contact
2013-10-31 04:38:52 -07:00
Laurent Destailleur
ecfa795306
Merge pull request #1270 from grandoc/develop
...
missing GETPOST
2013-10-31 04:37:46 -07:00
Laurent Destailleur
87369393a8
Merge pull request #1271 from braito4/patch-5
...
Update list.php
2013-10-31 04:37:12 -07:00
Florian Henry
70bbe10f9e
Start Task 172
2013-10-31 01:21:09 +01:00
Laurent Destailleur
692aa66cad
Fix: Tons of bug with new field planned_workload
2013-10-30 21:44:04 +01:00
Laurent Destailleur
c51ff1d462
New: Add hidden option to disable log handlers.
2013-10-30 19:08:41 +01:00
Christophe Battarel
ba0273ccc4
fix bad rounding on margin calculation and display
2013-10-30 18:17:37 +01:00
Florian Henry
693918d8b6
misspelling
2013-10-30 12:40:00 +01:00
Florian Henry
27e4852a35
upgrade process to change const SOCIETE_DONOTSEARCH_ANYWHERE to
...
COMPANY_DONOTSEARCH_ANYWHERE
2013-10-30 12:27:36 +01:00
Florian Henry
f512ef344a
Better managent of contact status and fix COMPANY_DONOTSEARCH_ANYWHERE
...
use every where before SOCIETE_DONOTSEARCH_ANYWHERE was used
2013-10-30 12:24:51 +01:00
Laurent Destailleur
b3a0510407
Fix: Allow text input for hour.
2013-10-30 11:57:32 +01:00
braito4
e89c3fa074
Update list.php
...
sql error.
2013-10-30 11:51:23 +01:00
Florian Henry
64745ecefe
Add function field into webservice contact
2013-10-30 09:52:39 +01:00
Grand Philippe
0ae489aee7
missing GETPOST
2013-10-30 09:34:59 +01:00
