Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 01:28:19 +01:00
Code Issues Packages Projects Releases Wiki Activity
49,918 Commits 36 Branches 190 Tags
d71ccc4a0292f3bbdd449768b51a4c310f4e744c
Commit Graph

49918 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian HENRY
727db56576 FIX : #3724 Bug: Blank page after cloning proposal with changed client 2015-10-14 08:27:56 +02:00
Florian HENRY
00b610d87f FIX : fix HTML into formconfirm box 2015-10-14 08:23:52 +02:00
Laurent Destailleur
57ea4fc23d FIX sql syntax error when sort order not defined. 2015-10-13 14:40:02 +02:00
Laurent Destailleur
70f3da80df FIX Option SOCIETE_DISABLE_PROSPECTS not supported into title of box 2015-10-13 14:21:00 +02:00
Laurent Destailleur
6520ed7a08 Use css not bold title. 
Add missing badge (count of draft records) on draft list.
 2015-10-13 14:09:14 +02:00
Laurent Destailleur
9f0c0bfc92 NEW Introduce hidden option MAIN_REPLACE_TRANS_xx_XX to allow simple 
replacement of translated string on the fly.
 2015-10-13 13:27:44 +02:00
Laurent Destailleur
a84ec64ece The new banner tab is available on all tabs of thirdparty. 2015-10-13 13:06:32 +02:00
Laurent Destailleur
918d9b7c18 Fix filter was lost if nothing found 2015-10-13 12:05:24 +02:00
Marcos García de La Fuente
87ad6e7941 Merge branch 'develop' into doactions-usercard 
# Conflicts:
#	htdocs/user/agenda_extsites.php
 2015-10-13 09:49:19 +02:00
Florian HENRY
8aaa1993c6 FIX : #3724 Bug: Blank page after cloning proposal with changed client 2015-10-13 09:37:33 +02:00
Alexis Algoud
0251728e28 FIX double db escape add too quote 2015-10-12 17:36:24 +02:00
Raphaël Doursenaud
ddb23eaf3b [Qual] Use default data root path if no conf 
Installation can be protected by an install.lock file in the
data root path. This protection was ineffective if no configuration
file was available. Whith this change, it still searches the default
path.
 2015-10-12 15:25:36 +02:00
Laurent Destailleur
618e5f0419 FIX no need to remove file into mail form #3573 2015-10-11 20:47:31 +02:00
Laurent Destailleur
84f5b72d2b Merge pull request #3719 from Dolibarr/revert-3573-FIX_remove_file_from_mail_remove_file 
Revert "FIX no need to remove file into mail form"
 2015-10-11 20:43:16 +02:00
Laurent Destailleur
87fad70f4a Revert "FIX no need to remove file into mail form" 2015-10-11 20:42:49 +02:00
Laurent Destailleur
62dd936b08 Merge pull request #3573 from atm-alexis/FIX_remove_file_from_mail_remove_file 
FIX no need to remove file into mail form
 2015-10-11 20:42:42 +02:00
Laurent Destailleur
80bd563fde Use GETPOST 2015-10-11 20:41:06 +02:00
Laurent Destailleur
75b7815d08 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-10-11 20:32:37 +02:00
Laurent Destailleur
e6e4f0500d Update changelog 2015-10-11 20:32:24 +02:00
Laurent Destailleur
5b715c29e2 Merge pull request #3717 from marcosgdf/bug-3197 
FIX [ bug #3197 ] Trigger LINECONTRACT_CREATE does not follow common denomination
 2015-10-11 20:30:33 +02:00
Laurent Destailleur
df39a1054e Fix 3.8.1 2015-10-11 20:19:52 +02:00
Laurent Destailleur
9fa2afb44b Merge branch '3.6' of github.com:Dolibarr/dolibarr into 3.6 
Conflicts:
	ChangeLog
 2015-10-11 19:55:50 +02:00
Laurent Destailleur
4e4efc97f0 Merge branch 'marcosgdf-bug-1776' into 3.6 2015-10-11 19:54:51 +02:00
Laurent Destailleur
c76af687ed Merge pull request #3715 from marcosgdf/clone-proposals 
FIX 1794 Error when cloning Proposal gives error in a malformed page
 2015-10-11 19:52:30 +02:00
Laurent Destailleur
1acaf44acf Merge pull request #3718 from hregis/3.8_bug 
Fix: wrong files name
 2015-10-11 19:48:25 +02:00
Laurent Destailleur
a9a3c3b97f Exclude file from sources. It is generated when building package. 2015-10-11 19:47:47 +02:00
Laurent Destailleur
a8e52f9c54 Update filelist 2015-10-11 19:45:53 +02:00
Regis Houssin
f8f600828d Fix: wrong files name 2015-10-11 19:18:03 +02:00
Laurent Destailleur
9a6ac4f457 CSS enhancement 2015-10-11 16:32:46 +02:00
Laurent Destailleur
3bb8eac92b New banner tab is available on all tab of user object 2015-10-11 16:25:31 +02:00
Laurent Destailleur
b24d609ecc New banner tab is available on all tab of user object 2015-10-11 16:12:12 +02:00
Laurent Destailleur
7fae9450a3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-10-11 15:21:45 +02:00
Laurent Destailleur
bd48ad265d The new banner tab is also on user card now 2015-10-11 15:21:21 +02:00
Laurent Destailleur
0ba6bdb7c2 CSS enhancement 2015-10-11 13:26:22 +02:00
Marcos García de La Fuente
8cd17c0165 FIX [ bug #3197 ] Trigger LINECONTRACT_CREATE does not follow common denomination 
Close #3197
 2015-10-11 13:01:28 +02:00
Marcos García de La Fuente
fd9f51df88 Missing changelog 2015-10-11 12:39:42 +02:00
Marcos García de La Fuente
4e9a378f0d Merge branch '3.6' into bug-1776 2015-10-11 12:37:41 +02:00
Marcos García de La Fuente
9f1fa7e212 Missing changelog 2015-10-11 12:32:02 +02:00
Marcos García de La Fuente
252f00dfe7 Merge branch '3.6' into clone-proposals 2015-10-11 12:29:45 +02:00
Laurent Destailleur
db9d09c7a3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-10-11 12:28:03 +02:00
Laurent Destailleur
6ec77e2ca0 New banner card on contact card. 2015-10-11 12:27:04 +02:00
Marcos García de La Fuente
1cd0f7263f Merge remote-tracking branch 'upstream/develop' into doactions-usercard 
# Conflicts:
#	htdocs/user/card.php
#	htdocs/user/param_ihm.php
 2015-10-10 22:38:02 +02:00
Marcos García de La Fuente
3fd626705f NEW Added doActions hooks to user cards 
Close #3394
 2015-10-10 22:31:01 +02:00
Laurent Destailleur
3f8e9bd181 Remove warning 2015-10-10 19:24:31 +02:00
Laurent Destailleur
7b7d27920d Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/adherents/type.php
	htdocs/categories/class/categorie.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/lib/tax.lib.php
	htdocs/product/composition/card.php
 2015-10-10 18:56:28 +02:00
Laurent Destailleur
525f9841fa Fix doxygen 2015-10-10 18:38:22 +02:00
Laurent Destailleur
8d9f52ee4b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-10-10 18:31:51 +02:00
Laurent Destailleur
fb50daaa40 Fix bad parameter 2015-10-10 16:09:01 +02:00
Laurent Destailleur
e58de1fd34 Merge pull request #3672 from ndrosis/patch-20 
For devices not supporting unicode characters
 2015-10-10 15:20:16 +02:00
Laurent Destailleur
cea6968478 Merge pull request #3713 from frederic34/patch-10 
Update account.php
 2015-10-10 15:18:49 +02:00