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
c7be0ee9e2
Merge pull request #1277 from grandoc/3.4
...
3.4
2013-11-04 10:41:30 -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
Laurent Destailleur
c41ac34356
Merge remote-tracking branch 'origin/3.3' into 3.4
2013-11-04 15:01:31 +01:00
Grand Philippe
8f43b2f2c0
language
2013-11-04 14:11:33 +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
Peter Fontaine
eb79b73ead
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-dolibarr
2013-11-04 10:06:44 +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
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
Laurent Destailleur
8105021cfd
Merge pull request #1275 from grandoc/3.4
...
missing trad and fix language
2013-11-03 13:17:56 -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
e8a80e2365
Now comments in changelog are concatenated
2013-11-01 17:46:57 +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
Peter Fontaine
b8a8ee3fb2
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-dolibarr
2013-10-31 13:28:42 +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
e535d1f1f5
Merge pull request #1269 from GPCsolutions/develop
...
CRLF fix
2013-10-31 04:39:22 -07:00
