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

70430 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
40bed96a01 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-09-24 10:15:20 +02:00
Laurent Destailleur
dbb75e35a1 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/en_US/admin.lang
	htdocs/langs/fr_FR/agenda.lang
 2018-09-24 10:14:38 +02:00
Laurent Destailleur
a4cd96e03c Clean code when there is no setup to do 2018-09-24 10:08:57 +02:00
Laurent Destailleur
2dbb82fc76 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-09-24 10:03:21 +02:00
Laurent Destailleur
12690666e2 Missing trans 2018-09-24 10:03:08 +02:00
Philippe GRAND
2799bd175d Translated comment 2018-09-23 21:35:43 +02:00
Yanis LISIMA
753089a99d NEW Change forgotten password link in general parameters 
In some cases, user password are managed by external systems (ex: LDAP).
The new parameter MAIN_PASSWORD_FORGOTLINK will send users to true forgotten password link.
 2018-09-23 21:26:07 +02:00
Laurent Destailleur
d9ccc7624b Standardize code 2018-09-23 16:09:25 +02:00
Laurent Destailleur
33f9600c9c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-23 15:58:43 +02:00
Laurent Destailleur
6c814b32bd Standardize cod 2018-09-23 15:58:33 +02:00
Laurent Destailleur
f88170e22a
Merge pull request #9596 from tuxgasy/dev_bank_treso_hooks 
NEW Add somes hooks in bank planned entries
 2018-09-23 15:49:50 +02:00
Laurent Destailleur
94c43716b3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-23 15:47:35 +02:00
Laurent Destailleur
48ca7e4603 Typo 2018-09-23 15:47:13 +02:00
Laurent Destailleur
969be3a2a7
Merge pull request #9595 from ptibogxiv/patch-66 
FIX number mailing for a contact with multicompany
 2018-09-23 15:45:06 +02:00
Laurent Destailleur
39e9029e41
Update contact.class.php 2018-09-23 15:44:44 +02:00
Laurent Destailleur
9ddc1770e8
Merge pull request #9501 from atm-gauthier/7.0_fix_tva_if_buyer_hors_cee_and_particulier 
FIX : According to french law, if seller is in France and buyer isn't…
 2018-09-23 15:41:33 +02:00
Laurent Destailleur
1569770855
Rename hidden conf into MAIN_USE_VAT_OF_PRODUCT_FOR_INDIVIDUAL_CUSTOMER_OUT_OF_EEC 2018-09-23 15:41:22 +02:00
Laurent Destailleur
e277670a70
Merge pull request #9573 from grandoc/new_branch_20_09_2018 
Standardize and update code from New branch 20 09 2018
 2018-09-23 15:35:42 +02:00
Laurent Destailleur
29979a8429 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-23 14:57:55 +02:00
Laurent Destailleur
8aa22f2c33 NEW Add option to swap sender/recipient address on PDF 2018-09-23 14:57:44 +02:00
Laurent Destailleur
a5b8c9f9e2
Merge pull request #9581 from grandoc/develop 
Standardize and update code
 2018-09-23 14:46:31 +02:00
Laurent Destailleur
efe7f57add
Merge pull request #9587 from frederic34/patch-9 
remove superfluous spaces and correct indentation
 2018-09-23 14:46:11 +02:00
Philippe GRAND
0a86515efc Merge remote-tracking branch 'upstream/develop' into develop 2018-09-23 11:48:06 +02:00
TuxGasy
db223af39b Add somes hooks in bank planned entries 2018-09-22 18:44:00 +02:00
ptibogxiv
77dd516023
fix number mailing for a contact / multicompany 2018-09-22 14:45:15 +02:00
Frédéric FRANCE
da7dc72ddb
Merge branch 'develop' into patch-9 2018-09-22 10:20:02 +02:00
Philippe GRAND
3464afe391 Update comment 2018-09-21 15:12:17 +02:00
Philippe GRAND
3355004e5d Merge branch 'new_branch_21_09_2018' of github.com:grandoc/dolibarr into new_branch_21_09_2018 2018-09-21 15:07:44 +02:00
Philippe GRAND
1690ed86a7 Merge remote-tracking branch 'upstream/develop' into new_branch_21_09_2018 2018-09-21 15:06:53 +02:00
Laurent Destailleur
fab57e163e Fix phpcs 2018-09-21 14:52:06 +02:00
gauthier
7b46bedce6 NEW : hidden configuration 2018-09-21 14:35:36 +02:00
Philippe Grand
870f504633
Update doc_generic_usergroup_odt.modules.php 2018-09-21 14:34:30 +02:00
Philippe Grand
0bcec6c923
Update doc_generic_user_odt.modules.php 2018-09-21 14:33:48 +02:00
Philippe Grand
2afaccf099
Update mod_ticket_universal.php 2018-09-21 14:32:31 +02:00
Philippe GRAND
9fab0a1d45 Update comments 2018-09-21 14:16:22 +02:00
Philippe GRAND
de6fca0844 fix merging 2018-09-21 14:09:12 +02:00
Philippe GRAND
48c3a1e1bc fix merging 2018-09-21 14:06:55 +02:00
Philippe Grand
d5003c9d3c
Merge branch 'develop' into new_branch_21_09_2018 2018-09-21 13:55:04 +02:00
Frédéric FRANCE
b064b580b4
remove superfluous spaces 2018-09-21 12:19:59 +02:00
Laurent Destailleur
7ece28ffd3 Trans 2018-09-21 11:48:01 +02:00
Laurent Destailleur
3be13f0cb6 Fix css 2018-09-21 11:45:04 +02:00
Laurent Destailleur
7a422c9d24
Merge pull request #9578 from fmarcet/8.0 
FIX #9432 Assign yourself as a commercial when you don't have permission to see all thirds
 2018-09-21 11:30:38 +02:00
Laurent Destailleur
0abe05c6b7 Fix no form inside a table 2018-09-21 11:29:01 +02:00
Laurent Destailleur
e2a9bf3a83
Merge pull request #9586 from frederic34/patch-9 
correct link to setup modulebuilder
 2018-09-21 11:18:21 +02:00
Laurent Destailleur
ac8f82338e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-21 11:12:27 +02:00
Frédéric FRANCE
7434b076d8
correct link to setup modulebuilder 2018-09-21 11:12:19 +02:00
Laurent Destailleur
a078951a94 Add an help for user to avoid bad configuration 2018-09-21 11:12:08 +02:00
Ferran Marcet
d6d58b1f68 FIX #9432 2018-09-21 10:18:54 +02:00
Ferran Marcet
1a7b38f22a FIX #9432 2018-09-21 10:14:23 +02:00
Philippe Grand
239be3b58c
Merge branch 'develop' into new_branch_20_09_2018 2018-09-21 10:12:48 +02:00