Cédric Salvador
3f774adbd0
form to link a file
2013-11-06 10:11:40 +01:00
Cédric Salvador
23008c3b31
factorized document actions
...
Conflicts:
htdocs/societe/document.php
2013-11-06 10:11:40 +01:00
Laurent Destailleur
9a0471286a
Merge pull request #1283 from aspangaro/develop
...
Changelog & lang en_US for Skype module
2013-11-05 15:09:31 -08:00
aspangaro
092c98e6aa
Changelog & lang en_US for Skype module
2013-11-05 20:51:32 +01:00
aspangaro
255c469b67
Merge branch 'upstream/develop'
2013-11-05 20:34:50 +01:00
Laurent Destailleur
27b33cafe6
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-11-05 19:54:58 +01:00
Laurent Destailleur
addedb6f15
Merge branch 'develop' of https://github.com/FHenry/dolibarr into
...
FHenry-develop
Conflicts:
htdocs/core/class/extrafields.class.php
2013-11-05 19:53:49 +01:00
Laurent Destailleur
c4a43890c4
Merge pull request #1282 from grandoc/develop
...
fix : language
2013-11-05 10:50:14 -08:00
Laurent Destailleur
2d7181553b
Fix: translation
2013-11-05 15:29:58 +01:00
Grand Philippe
a14de0c035
fix : language
2013-11-05 15:29:33 +01:00
Laurent Destailleur
628fbc7b7d
Fix: bad picto
2013-11-05 15:14:23 +01:00
Laurent Destailleur
a9a2bd9eec
Fix error reported by travis.
2013-11-05 14:39:25 +01:00
Laurent Destailleur
b18e125143
Merge pull request #1279 from aspangaro/skype
...
Task 157 : add a Skype button
2013-11-05 05:33:33 -08:00
Laurent Destailleur
e226fe1547
Merge pull request #1281 from grandoc/develop
...
missing trad
2013-11-05 05:31:39 -08:00
Laurent Destailleur
223e50276c
Fix: Info tab was wrong with interventions
2013-11-05 14:24:37 +01:00
philippe
852a657e89
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-11-05 14:17:00 +01:00
Laurent Destailleur
190dabc3f7
Fix: Tons of bugs with extrafields feature.
2013-11-05 13:11:36 +01:00
Grand Philippe
685ada72a6
missing trad
2013-11-05 11:39:29 +01:00
Laurent Destailleur
e5daee86b8
Fix: Missing translation
2013-11-05 11:26:30 +01:00
Florian Henry
0d2a019c3f
Extrafield : better filter on select from table management for
...
extrafields table
2013-11-05 11:26:13 +01:00
Laurent Destailleur
922929fffb
Fix: Missing column
...
Fix: Line was not added correctly
Fix: Missing message
2013-11-05 11:17:54 +01:00
Laurent Destailleur
0587ad5af8
Fix: duplicate button
2013-11-05 10:44:58 +01:00
Florian Henry
d000e9b6d0
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-11-05 09:55:14 +01:00
Florian Henry
36ec7509ac
Set same icon status rule as for thirdparty
2013-11-05 09:54:49 +01:00
Laurent Destailleur
2f47b0fcfd
Fix: picto for status8 is a flash red icon to report a critical error
...
that need a task to fix. This is not the case for a close thirdparty (a
close thirdparty is a regular status). However to have a bigger contrast
with thirdparty active, i set picto to statut5.png
2013-11-04 23:56:15 +01:00
aspangaro
76263213ab
Merge branch 'origin/develop'
2013-11-04 22:04:36 +01:00
aspangaro
ccea7ebd50
Merge branch 'upstream/develop'
2013-11-04 22:02:25 +01:00
aspangaro
d64fe2b729
Merge branch 'upstream/develop'
2013-11-04 21:59:32 +01:00
aspangaro
8fd021bf36
Merge branch 'upstream/develop'
2013-11-04 21:44:58 +01:00
aspangaro
d79ba9695a
Task 157 : Add a skype button
2013-11-04 21:41:36 +01:00
Laurent Destailleur
c054ced37d
Merge pull request #1278 from grandoc/develop
...
language
2013-11-04 10:41:53 -08:00
Laurent Destailleur
e11b95921f
Merge pull request #1273 from FHenry/develop
...
Contining task 172
2013-11-04 10:34:36 -08:00
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
Grand Philippe
8f43b2f2c0
language
2013-11-04 14:11:33 +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
Laurent Destailleur
84f6efbb0f
Merge pull request #1276 from aspangaro/develop
...
Modify the presentation of the card
2013-11-03 13:36:00 -08:00
aspangaro
a9dd9d6dfc
Modify the presentation of the card
2013-11-03 15:07:26 +01:00
Florian Henry
b52b49cbb0
USe good icons for customer status
2013-11-02 02:42:44 +01:00
Florian Henry
f727e832d9
Add mandatory and transparent into llx_actioncomm_ressource
2013-11-02 02:25:06 +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
