lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
50,561 Commits 43 Branches 150 Tags 886 MiB
88356e2e97
Commit Graph

50561 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frédéric FRANCE
3638f17d75 Update product.class.php 2015-10-14 22:28:03 +02:00
Laurent Destailleur
00c8b27baf Add code comment 2015-10-14 22:04:54 +02:00
Laurent Destailleur
ed4013bb31 Merge pull request #3735 from All-3kcis/develop-patch-8 
Update function, move commit after trigger in categorie.class.php
 2015-10-14 21:42:09 +02:00
Laurent Destailleur
05686b532c Merge pull request #3733 from fappels/3.8-shipment-lot-delete 
FIX: #3605 deleting a shipping
 2015-10-14 21:41:20 +02:00
Laurent Destailleur
df3639957d Merge pull request #3732 from hregis/develop_origin 
Fix: compatibility with dolibarr versions before and after 3.7.1
 2015-10-14 21:32:58 +02:00
Laurent Destailleur
5d585fa04a Merge pull request #3729 from FHenry/3.7 
FIX : #3724 Bug: Blank page after cloning proposal with changed client
 2015-10-14 21:32:26 +02:00
Laurent Destailleur
a5b9a210ce Merge pull request #3725 from FHenry/3.8 
FIX : #3724 Bug: Blank page after cloning proposal with changed client
 2015-10-14 21:27:58 +02:00
Laurent Destailleur
f08d52b0e8 Merge pull request #3723 from atm-alexis/FIX_double_escape_entrepot 
FIX double db escape add too quote
 2015-10-14 21:27:39 +02:00
Frédéric FRANCE
f4cbc81c97 Bad chmod for directory when changing ref 
When changing product ref, the old document directory is renamed and chmod 0664 in place of 0775
 2015-10-14 20:13:14 +02:00
Laurent Destailleur
e9aed15bed Work on the feature to select which field to show 2015-10-14 18:48:03 +02:00
Laurent Destailleur
225313d8ac NEW Introduce hidden option MAIN_LANDING_PAGE to decide the home page 
visible just after login.
 2015-10-14 17:18:26 +02:00
Laurent Destailleur
ca991da312 Introduce usebold variable to allow more option on style in future. 2015-10-14 16:51:20 +02:00
All-3kcis
545f043353 Move db->commit after trigger 2015-10-14 16:24:09 +02:00
fappels
68aac4476c FIX: #3605 deleting a shipping 
Get lots to move back to stock.
Move lots back to stock.
Do not log object because it will be deleted
Improve error reporting
 2015-10-14 12:16:54 +02:00
Regis Houssin
309535c260 Merge branch 'develop' into develop_origin 2015-10-14 12:12:05 +02:00
Regis Houssin
542ed40c9c Fix: compatibility with dolibarr versions before and after 3.7.1 2015-10-14 12:09:51 +02:00
Laurent Destailleur
e9facbf108 FIX bad property so after creating an event from calendar, filter were 
lost.
 2015-10-14 10:53:38 +02:00
Florian HENRY
6b8707516e FIX : skeleton class must use db->order rather than ORDER BY into 
fetchAll
 2015-10-14 10:05:42 +02:00
fappels
1a0ad2d1c9 Merge remote-tracking branch 'refs/remotes/Dolibarr/3.8' into 3.8 2015-10-14 09:40:47 +02:00
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
aspangaro
0b54cc4509 Merge remote-tracking branch 'Upstream/develop' into develop-hrm 2015-10-11 21:05:15 +02:00
aspangaro
2857d7cfda Correct 2015-10-11 21:00:41 +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