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

68848 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
5b50b8bd40
Merge pull request #8491 from hregis/develop_multicompany 
Fix: possibility to change entity for new thirdparty
 2018-04-05 16:11:53 +02:00
Laurent Destailleur
ab27b105c0
Merge pull request #8490 from hregis/7.0_bug6 
FIX limit access of email template page to internal users
 2018-04-05 16:11:04 +02:00
Laurent Destailleur
533de639ae Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/hookmanager.class.php
 2018-04-05 13:29:27 +02:00
Laurent Destailleur
45d074c39d Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-05 13:25:59 +02:00
Laurent Destailleur
bdf7d648c9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-05 13:24:53 +02:00
Laurent Destailleur
eeb2d5a4da Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/cron/list.php
 2018-04-05 13:24:36 +02:00
Laurent Destailleur
1b1a8f7e81 Fix trigger name 2018-04-05 13:21:00 +02:00
Laurent Destailleur
2b135dc951 FIX #8488 2018-04-05 13:13:45 +02:00
Laurent Destailleur
28b00fc021
Merge pull request #8486 from hregis/develop_email 
Fix: avoid space in email address
 2018-04-05 13:12:03 +02:00
Laurent Destailleur
08ab67289b Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/societe/class/societe.class.php
 2018-04-05 13:10:11 +02:00
Regis Houssin
5914bfdf18 Fix: more complete 2018-04-05 13:00:55 +02:00
Regis Houssin
156d26ddb9 Fix: backward compatibility 2018-04-05 13:00:50 +02:00
Laurent Destailleur
9dba68de08
Merge pull request #8484 from hregis/develop_member 
FIX backward compatibility
 2018-04-05 13:00:29 +02:00
Laurent Destailleur
b210360220 More test 2018-04-05 12:59:01 +02:00
Laurent Destailleur
af6ab27b23
Merge pull request #8481 from grandoc/develop 
cleaning code
 2018-04-05 12:45:10 +02:00
Laurent Destailleur
0223d54107 FIX Support or multicompany for sheduled jobs 
FIX Use priority to define order of sheduled jobs

Conflicts:
	htdocs/cron/list.php
 2018-04-05 12:38:42 +02:00
Laurent Destailleur
0de65b7822 FIX Support or multicompany for sheduled jobs 
FIX Use priority to define order of sheduled jobs
 2018-04-05 12:36:14 +02:00
Laurent Destailleur
88b3e08b22 FIX filter/sorting on extrafield on contact list from contact tab 2018-04-05 11:34:26 +02:00
John
689b3e3b64 Fix outing invoice ligne progress 2018-04-05 11:25:11 +02:00
florian HENRY
cc0fb830b8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_mailtouser 2018-04-05 10:53:17 +02:00
John
b37a2f17bf Fix credit note update on remove from cycle action 2018-04-05 10:48:20 +02:00
John
e966d11356 Fix credit note card apparence 2018-04-05 09:46:55 +02:00
TuxGasy
e5664f9630 fix notrigger ignored on BILL_CREATE 2018-04-04 20:32:36 +02:00
Frédéric FRANCE
90957b3a72
Update mails.lang 2018-04-04 16:00:33 +02:00
Frédéric FRANCE
fd6c1f129c
Update CMailFile.class.php 2018-04-04 15:58:24 +02:00
François J
041a21e829 Add tag @since 2018-04-04 14:05:50 +02:00
John
ce24ca08ee move list of situation table and fix credit note display 2018-04-04 12:33:48 +02:00
François J
9b61272bb7 Fix CommandeFournisseur::getDispachedLines line ID & return quantity 2018-04-04 12:32:49 +02:00
ATM-Nicolas
1719b43909 FIX : Travis 2018-04-04 09:52:10 +02:00
ATM-Nicolas
b9a91c667f NEW : Add link between credit note invoice and origin 2018-04-04 09:33:59 +02:00
Marc de Lima Lucio
e5fa7cd0a9 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2018-04-04 09:26:07 +02:00
Laurent Destailleur
7c70f9ed03 Fix option STOCK_SUPPORTS_SERVICES 2018-04-03 20:23:47 +02:00
John
299859d0c4 add action to remove from cycle 2018-04-03 17:34:20 +02:00
Marc de Lima Lucio
c2d3e2a701 NEW: generalize button to create object from list, for the remaining lists 2018-04-03 15:28:12 +02:00
John
70321a8b71 add button to remove from cycle 2018-04-03 15:12:44 +02:00
Maxime Kohlhaas
0c3b92f09a Better fix 2018-04-03 14:53:57 +02:00
Maxime Kohlhaas
39eab6d88d Fix service creation, right is tested regarding the product type 2018-04-03 14:38:20 +02:00
John
b7681e7249 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_avoir_situation 2018-04-03 14:12:49 +02:00
Rui Strecht
4f9a8d5b0a img_picto must return fullpath to picto.png 2018-04-03 12:23:26 +01:00
Rui Strecht
e8a700caab Fixed issue with img_picto no showing icon in agenda assigned users 2018-04-03 12:13:40 +01:00
John
1afe567a01 Fix array parse error 2018-04-03 12:07:19 +02:00
John
d689e88b92 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_import_lines_from_linked_element 2018-04-03 11:38:12 +02:00
Laurent Destailleur
8595d7621b Fix POST mut use method POST no GET 2018-04-02 23:30:23 +02:00
Alexandre SPANGARO
2a50e9e6c4 Merge remote-tracking branch 'uptream/develop' into 8.0-a13 2018-04-02 19:54:30 +02:00
Laurent Destailleur
fba40575f7 Remove dead code 2018-04-02 16:39:48 +02:00
Rui Strecht
09f8a21773 Argument should be array 2018-04-02 15:30:19 +01:00
Rui Strecht
b39f617863 Added missing parentheses 2018-04-02 15:29:58 +01:00
Alexandre SPANGARO
dd04dae652 Update work 2018-04-02 14:03:12 +02:00
Regis Houssin
ef45983f73 Fix: just add fields if not exists 2018-04-02 10:25:15 +02:00
Regis Houssin
9f7fcdc8bf Fix: multiple avoid Warning and errors 2018-04-02 10:18:51 +02:00