lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,286 Commits 43 Branches 150 Tags 886 MiB
d056abc4e1
Commit Graph

45286 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
d056abc4e1 No need to have this protected. Property can be read with method show() 
and this method can be override.
 2015-03-13 21:45:52 +01:00
Laurent Destailleur
bc3f9bf800 Fix: the visible version was not enough to know version of dolibarr. We 
also need the MAIN_FEATURES_LEVEL.
 2015-03-13 18:11:31 +01:00
Laurent Destailleur
51c877e32c Hide a feature that is really not stable. So i move it as a "develop" 
feature.
 2015-03-13 18:03:21 +01:00
Laurent Destailleur
f75749cc2b Sync transifex 2015-03-13 17:43:04 +01:00
Laurent Destailleur
927925f4fd Can also sync alternatives languages from transifex now. 2015-03-13 17:42:50 +01:00
Laurent Destailleur
5cc48c7c78 Prepare cleaning tools for release. 2015-03-13 16:20:42 +01:00
Laurent Destailleur
b47e16fbe9 Update changelog 2015-03-13 16:02:40 +01:00
Laurent Destailleur
a452823e1e Include option FCKEDITOR_ENABLE_DETAILS_FULL to restore compatibility 
with 3.6
 2015-03-13 15:20:08 +01:00
Laurent Destailleur
895b2c6e9c Fix bad merge 2015-03-13 14:37:27 +01:00
Laurent Destailleur
dfe1ee7e7d Fix: count of notification emails was wrong 2015-03-13 14:11:59 +01:00
Laurent Destailleur
c1432eb2da Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/compta/salaries/fiche.php
	htdocs/projet/element.php
 2015-03-11 03:29:52 +01:00
Laurent Destailleur
41b09d8c70 Merge pull request #2448 from atm-maxime/3.6 
Fix : display proposal date on proposal list
 2015-03-11 02:50:26 +01:00
Laurent Destailleur
242a71e967 Merge pull request #2436 from marcosgdf/patch-1 
Update ChangeLog
 2015-03-11 02:31:24 +01:00
Laurent Destailleur
6f39270450 Merge pull request #2310 from FHenry/3.7 
re-add index.html file
 2015-03-11 02:29:29 +01:00
Laurent Destailleur
0b661675e2 Merge branch 'marcosgdf-bug-1825-37' into 3.7 2015-03-11 02:26:20 +01:00
Laurent Destailleur
0ff2a0ad9f Merge branch 'bug-1825-37' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1825-37

Conflicts:
	htdocs/comm/action/index.php
 2015-03-11 02:26:01 +01:00
Laurent Destailleur
734a7dd5c7 Merge pull request #2443 from biznext/patch-4 
Fix Anchor link for quick access when editing.
 2015-03-11 02:13:29 +01:00
Laurent Destailleur
f484abe5ec Merge pull request #2446 from GPCsolutions/3.6-#1901 
FIXED #1901: Inverted supplier order/invoice buttons in project referring objects
 2015-03-11 02:12:01 +01:00
Laurent Destailleur
154865f545 Fix return error when it is not 2015-03-10 16:37:39 +01:00
Laurent Destailleur
0df2b4cc26 Fix check parameters 2015-03-10 16:14:46 +01:00
Maxime Kohlhaas
05a2a6af00 FIX : [bug #1900] Unable to remove a salary with enough permissions 2015-03-10 15:53:02 +01:00
Maxime Kohlhaas
154e1a7991 Merge branch '3.6' of github.com:Dolibarr/dolibarr into 3.6 2015-03-10 15:14:25 +01:00
Maxime Kohlhaas
978dc8170d Fix : display proposal date on proposal list 2015-03-10 14:56:58 +01:00
Laurent Destailleur
d847f9581e Fix generation of RUM number. Show it on card to help debug. 2015-03-10 11:31:23 +01:00
Raphaël Doursenaud
f8dfa61859 FIXED #1901: Inverted supplier order/invoice buttons in project referring objects 2015-03-09 16:20:51 +01:00
Florian HENRY
15dfd7c08d Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-03-09 10:52:09 +01:00
Estephe L.
9d320e4268 Fix Anchor link for quick access when editing. 
This is a quick fix to make anchor link works well when editing a proposal, order or invoice ...
 2015-03-08 23:29:09 +01:00
Laurent Destailleur
a169b3348e Fix show alays date fields for contract module. 
Fix select of product were lost.
 2015-03-06 14:36:22 +01:00
Laurent Destailleur
77dd07c846 Fix thumbs generation 2015-03-06 13:12:33 +01:00
Marcos García
9a7346f889 Update ChangeLog 2015-03-06 12:09:23 +01:00
Florian HENRY
0d801be6a1 NEW: (Dev) DolGraph allow extended class to override $_stringtoshow 2015-03-06 06:12:47 +01:00
Laurent Destailleur
22045603b7 Fix bad update of denormalized field 2015-03-05 13:51:29 +01:00
Laurent Destailleur
9c12c325db Fix regression into enable/disable external calendars 2015-03-05 11:46:03 +01:00
Laurent Destailleur
6c1c1fd691 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/core/lib/agenda.lib.php
	htdocs/fourn/paiement/fiche.php
 2015-03-05 11:35:39 +01:00
Laurent Destailleur
35a0575aad Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-03-05 11:22:34 +01:00
Laurent Destailleur
dc15eee533 Fix: missing dependcy on project to check before deleting 2015-03-05 11:21:58 +01:00
Marcos García de La Fuente
c9b3cab22b Mytasks is not clickable 2015-03-05 10:22:33 +01:00
Marcos García de La Fuente
d549030078 Fixed bug with hide/show checkboxes reported by Ruben Almeida (aruben) 2015-03-05 10:20:32 +01:00
Laurent Destailleur
8d51890fd7 Merge pull request #2428 from fmarcet/3.7 
Fix: Masks works with thirdparty type
 2015-03-04 22:03:08 +01:00
Laurent Destailleur
5f9f536f0b Merge pull request #2417 from marcosgdf/bug-1892 
[ bug #1892 ] PHP Fatal error when using USER_UPDATE_SESSION trigger and adding a supplier invoice payment
 2015-03-04 22:01:37 +01:00
Laurent Destailleur
4e144b6b76 Merge pull request #2416 from marcosgdf/bug-1825 
Fixed bug with hide/show checkboxes reported by Ruben Almeida (aruben)
 2015-03-04 20:38:47 +01:00
fmarcet
1a02f6aa80 Fix: Masks works with thirdparty type 2015-03-04 18:18:55 +01:00
Laurent Destailleur
081875c4d9 Merge pull request #2383 from aspangaro/3.7-patch4 
FIXED: Remove condition to show accountancy field on user.
 2015-03-04 18:02:09 +01:00
Marcos García de La Fuente
41c55d1913 Better fix for bug-1825. There are actually a lot to things to escape and escaped methods can make conflict with similar names so it is better to make a md5 to have a unique value 2015-03-04 11:55:17 +01:00
Laurent Destailleur
fa2e57eaa3 pcpcs 2015-03-04 01:10:23 +01:00
Laurent Destailleur
35733c4c08 More comments 2015-03-03 17:47:17 +01:00
Laurent Destailleur
7050ef6176 Fix parameter notolderthan was not effective 2015-03-02 17:56:37 +01:00
Laurent Destailleur
79023cddb0 Fix external calendar for users were not visible if no global calendar 
was set.
 2015-03-02 17:34:50 +01:00
Marcos García de La Fuente
77605bce3e [ bug #1892 ] PHP Fatal error when using USER_UPDATE_SESSION trigger and adding a supplier invoice payment 2015-03-02 13:33:31 +01:00
Florian HENRY
d80a8bbdba revert bug1840 to eldy solution 2015-03-02 10:13:06 +01:00