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

72072 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
gauthier
80ff7fa86f FIX : case when we valid form with keyboard 2018-07-11 15:18:30 +02:00
Laurent Destailleur
22ab4c54a6
Merge pull request #9089 from atm-florian/dev_addcactiontrigger 
Add DELETE Trigger action into admin event agenda log
 2018-07-11 10:56:35 +02:00
Laurent Destailleur
b203421ac6 Fix log 2018-07-11 10:54:42 +02:00
Laurent Destailleur
2e36e5afa5 Some fix with dolistore api 2018-07-11 10:47:55 +02:00
Laurent Destailleur
6eb9f13ec2 Fix warning 2018-07-11 10:01:26 +02:00
gauthier
103c7e6d06 FIX : page must always be 0 when we search (to avoid case : when we're on page 3 and we're looking for a precise thirdparty, we stay on page 3 and nothing's displaied) 2018-07-11 09:51:36 +02:00
Laurent Destailleur
4c65f4d498 Log 2018-07-11 09:38:40 +02:00
Hytham Soliman
e17d5279ac
Merge pull request #2 from IAS-SYSTEMS-CSC/develop 
develop > dolibarr-fixes
 2018-07-11 10:03:18 +03:00
Regis Houssin
f52187e829 Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0_price 2018-07-11 08:22:13 +02:00
Hytham Soliman
eeb0076b15
Merge pull request #1 from Dolibarr/develop 
dolibarr/develop > IAS/develop
 2018-07-11 08:23:04 +03:00
Philippe GRAND
72adc485f0 Docs : Update and complete 2018-07-10 22:32:55 +02:00
florian HENRY
2f2ca16e2b Add DELETE Trigger action into admin event agenda log 2018-07-10 16:44:14 +02:00
Laurent Destailleur
4c363d1d4f Trans 2018-07-10 15:08:51 +02:00
Philippe GRAND
0d10722a7f Docs : Update and complete 2018-07-10 14:57:23 +02:00
Laurent Destailleur
f3de1af601 Finish webdav experimental module 2018-07-10 14:56:04 +02:00
Laurent Destailleur
64517d4c0b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/langs/en_US/admin.lang
 2018-07-10 14:06:51 +02:00
Laurent Destailleur
5f52dfa873 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-10 14:02:40 +02:00
Laurent Destailleur
44626a3a48 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2018-07-10 13:57:24 +02:00
Laurent Destailleur
aeb5f5e4f3 Fix phpcs 2018-07-10 13:56:03 +02:00
Laurent Destailleur
a55abb4da7 Fix version 2018-07-10 13:54:20 +02:00
Laurent Destailleur
cbc17d4658 Fix ecm when using multicompany 2018-07-10 12:03:51 +02:00
Laurent Destailleur
b6180fcb58 Fix fetch index in ecm when using multicompany 2018-07-10 12:00:09 +02:00
Laurent Destailleur
bda142d82d
Update commande.class.php 2018-07-10 11:10:55 +02:00
Laurent Destailleur
c0d6aee040
Update propal.class.php 2018-07-10 11:10:01 +02:00
Laurent Destailleur
ed3023f7d9
Update propal.class.php 2018-07-10 11:09:08 +02:00
Laurent Destailleur
dc7fcc009b
Update propal.class.php 2018-07-10 10:56:45 +02:00
Laurent Destailleur
8e0a663b7c Code comment 2018-07-10 10:53:59 +02:00
Laurent Destailleur
3231f0031c
Merge pull request #9085 from grandoc/new_branch_10_07_2018 
Docs : Update and complete
 2018-07-10 10:43:32 +02:00
Laurent Destailleur
f33beb287c
Merge pull request #9080 from grandoc/new_branch_09_07_2018 
Docs : update and complete comments
 2018-07-10 10:42:47 +02:00
Laurent Destailleur
97b1589fb5
Merge pull request #9082 from ATM-Marc/FIX_5.0_propal_projectFromOrigin 
FIX: propal: correctly preset project when creating with origin/originid
 2018-07-10 10:42:10 +02:00
Laurent Destailleur
c01975a40b
Merge pull request #9084 from torvista/texts-setup-en_US 
Texts corrections /langs/en_US
 2018-07-10 10:41:28 +02:00
Laurent Destailleur
31d5b739e7
Merge pull request #9048 from hregis/8.0_rights 
NEW possibility to add all rights of all modules in one time
 2018-07-10 10:38:17 +02:00
Philippe GRAND
243bc49a90 Docs : Typo 2018-07-10 09:38:05 +02:00
Philippe GRAND
b92190ac69 Docs : Update and complete 2018-07-10 09:32:55 +02:00
Laurent Destailleur
86ee37e885 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-07-09 20:16:42 +02:00
Laurent Destailleur
bd1e430a28 Synch transifex 2018-07-09 20:15:14 +02:00
Philippe GRAND
df1bead49b Docs : update and complete comments 2018-07-09 19:04:50 +02:00
Steve
e45e74a3bd spelling and some grammar corrections to en_US 2018-07-09 17:38:28 +02:00
Marc de Lima Lucio
2ba7c07574 FIX: propal: correctly preset project when creating with origin/originid 2018-07-09 17:34:31 +02:00
Laurent Destailleur
2f668ccc79
Merge pull request #9076 from atm-john/fix_count_parameter_6.0 
Fix count(): Parameter must be an array or an object that implements …
 2018-07-09 17:34:10 +02:00
Philippe GRAND
b4b3e33e3e Docs : update and complete comments 2018-07-09 17:22:34 +02:00
Laurent Destailleur
e0c3d176ed
Merge pull request #9067 from torvista/install-texts-en_US 
spelling and some grammar corrections for installation texts en_US
 2018-07-09 17:11:58 +02:00
Laurent Destailleur
3cda462faf
Merge pull request #9065 from aspangaro/9.0_a1 
Add customer accountancy code on deposit slips export
 2018-07-09 17:08:13 +02:00
Laurent Destailleur
19c652ce06
Merge pull request #9066 from hregis/8.0_product 
Fix: differentiate customer prices from supplier prices sharing with getEntity("productsupplierprice")
 2018-07-09 17:05:36 +02:00
Laurent Destailleur
d5cb2fc4cd
Update productcustomerprice.class.php 2018-07-09 17:04:50 +02:00
Laurent Destailleur
551e2efe86
Update productcustomerprice.class.php 2018-07-09 17:03:55 +02:00
Laurent Destailleur
2ef78bee0b Revert "FIX side nav height." 
This reverts commit 78ba8bc3b5.
 2018-07-09 16:16:07 +02:00
Laurent Destailleur
754ec22cfe Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-09 15:40:11 +02:00
Laurent Destailleur
699df860d8 Code comment 2018-07-09 15:39:59 +02:00
Laurent Destailleur
959a75c51e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-07-09 15:38:54 +02:00