Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-15 14:01:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
68,451 Commits 36 Branches 190 Tags
4d8e5ab0e6ce8e77e2286f59319b901b9e8d0460
Commit Graph

14494 Commits

Author SHA1 Message Date
Laurent Destailleur
4279ba66e1 Merge pull request #9103 from grandoc/new_branch_13_07_2018 
fix: breacking link
 2018-07-15 19:59:10 +02:00
Laurent Destailleur
29c76a3f56 Merge pull request #9090 from grandoc/new_branch_10_07_2018 
New branch 10 07 2018
 2018-07-15 19:52:07 +02:00
Philippe GRAND
9ae7e55fea fix: breaking link 2018-07-13 19:54:37 +02:00
ATM-Nicolas
170a668b2b FIX : Set contactCivName substitution key 2018-07-13 11:09:56 +02:00
florian HENRY
09fe2f83fa Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2018-07-12 18:27:22 +02:00
florian HENRY
1fa13fc747 fix list of event unformize code 2018-07-12 18:27:09 +02:00
Philippe GRAND
6945680e03 update code and typo 2018-07-12 10:11:42 +02:00
ias-ceo
076bf0a3a7 fix sql error 2018-07-12 05:09:36 +03:00
Laurent Destailleur
4c65f4d498 Log 2018-07-11 09:38:40 +02:00
Philippe GRAND
72adc485f0 Docs : Update and complete 2018-07-10 22:32:55 +02:00
Philippe GRAND
0d10722a7f Docs : Update and complete 2018-07-10 14:57:23 +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
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
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
Philippe GRAND
df1bead49b Docs : update and complete comments 2018-07-09 19:04:50 +02:00
Philippe GRAND
b4b3e33e3e Docs : update and complete comments 2018-07-09 17:22:34 +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
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
f5d9403c7d Fix permission to see HR tab on user. All HR on same tabs. 2018-07-09 15:38:00 +02:00
Laurent Destailleur
ba6566867e Merge pull request #9064 from grandoc/new_branch_06_07_2018 
fix : typo and update code
 2018-07-09 15:33:25 +02:00
Laurent Destailleur
2d74f03d34 Merge pull request #9077 from grandoc/new_branch_09_07_2018 
Docs : update and complete
 2018-07-09 15:32:34 +02:00
Laurent Destailleur
e427496ddf FIX Injection 2018-07-09 14:13:01 +02:00
Philippe GRAND
2c4d7c4835 Docs : update and complete 2018-07-09 14:06:59 +02:00
Laurent Destailleur
d3d1b6d513 NEW Can enable a module, even external module, from command line 2018-07-09 13:02:01 +02:00
Philippe GRAND
12d4880e7b Docs : update and complete 2018-07-09 10:08:27 +02:00
Laurent Destailleur
291f149a9b NEW Can set a tooltip help text on extrafields 2018-07-08 20:26:48 +02:00
Laurent Destailleur
41f21f3867 Translation 2018-07-08 20:06:24 +02:00
Philippe GRAND
47e80123d5 Docs : update code 2018-07-07 11:36:46 +02:00
Philippe GRAND
fe5bfe3aaf Docs : update comments 2018-07-07 10:51:09 +02:00
Philippe GRAND
1e1ed485f5 Docs : update comments 2018-07-07 10:47:56 +02:00
Regis Houssin
e8afd7e833 Fix: use "supplier" instead "reseller" 2018-07-07 08:48:26 +02:00
Regis Houssin
1522a5b22d Fix: differentiate customer prices from supplier prices sharing 2018-07-07 08:43:59 +02:00
Alexandre SPANGARO
655d55eae6 Add customer accountancy code on deposit slips export 2018-07-07 02:46:56 +02:00
Laurent Destailleur
a62fd8ef84 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-06 16:10:45 +02:00
Laurent Destailleur
45d1a14c8e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-06 16:10:37 +02:00
Laurent Destailleur
4db7e04523 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/html.formactions.class.php
	htdocs/loan/index.php
 2018-07-06 16:09:32 +02:00
Laurent Destailleur
2a676b414a Merge pull request #9024 from atm-maxime/fix_link_create_event 
Fix link to create event had no socid if from thirdparty card
 2018-07-06 14:26:38 +02:00
Laurent Destailleur
2113965b57 Update html.formactions.class.php 2018-07-06 14:26:21 +02:00
Laurent Destailleur
a725ceaf42 Merge pull request #9049 from grandoc/new_branch_04_07_2018 
docs: complete comments
 2018-07-06 14:21:47 +02:00
Laurent Destailleur
05ed721a8c Fix name of constant for module TICKET 2018-07-06 13:09:07 +02:00
Philippe GRAND
988130d2a1 docs: complete comments 2018-07-05 17:04:11 +02:00