Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-07 01:23:00 +01:00
Code Issues Packages Projects Releases Wiki Activity
67,951 Commits 37 Branches 191 Tags
0ce101f395b2770b51dc1371eca16ea7eaa9ab8f
Commit Graph

59270 Commits

Author SHA1 Message Date
Laurent Destailleur
0ce101f395 Merge pull request #9096 from grandoc/new_branch_12_07_2018 
update code and typo
 2018-07-15 19:48:05 +02:00
Laurent Destailleur
20e360e918 Start to introduce array fields for products 2018-07-15 18:22:26 +02:00
Laurent Destailleur
a45ac4519a Fix translation 2018-07-15 18:03:31 +02:00
Laurent Destailleur
988b6a49d2 Fix warning php 7.3 2018-07-13 18:40:54 +02:00
Laurent Destailleur
1e775ffa6e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-13 09:12:01 +02:00
Laurent Destailleur
c27dd8d301 Fix phpcs 2018-07-13 09:11:46 +02:00
Laurent Destailleur
e4be3ab954 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-13 09:09:51 +02:00
Laurent Destailleur
1b33703cd8 Fix missing country code 2018-07-13 09:08:42 +02:00
Laurent Destailleur
ebe5325f2b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-12 18:06:26 +02:00
Laurent Destailleur
52dee71b39 Responsive 2018-07-12 18:06:06 +02:00
Laurent Destailleur
872895c0b6 Code comment 2018-07-12 11:17:21 +02:00
Philippe GRAND
6945680e03 update code and typo 2018-07-12 10:11:42 +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
Laurent Destailleur
4c65f4d498 Log 2018-07-11 09:38:40 +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
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
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
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
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
Laurent Destailleur
f5d9403c7d Fix permission to see HR tab on user. All HR on same tabs. 2018-07-09 15:38:00 +02:00
Laurent Destailleur
052d86f3ca Merge pull request #9073 from tarrsalah/fix-side-nav-css 
FIX side nav height.
 2018-07-09 15:37:03 +02:00