Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
69,068 Commits 36 Branches 189 Tags
cefaeb583ff12ad09c836fcbf6b39d01209e901b
Commit Graph

69068 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
8785d69548 Do not load database handler 2018-06-05 18:21:56 +02:00
Laurent Destailleur
84471b70cf Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-06-05 18:17:04 +02:00
Laurent Destailleur
30b04c0d3d Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/lib/files.lib.php
 2018-06-05 18:16:32 +02:00
Laurent Destailleur
4c21ad4e4e FIX: dol_delete_file must work in a context without db handler loaded 
Conflicts:
	htdocs/core/lib/files.lib.php
 2018-06-05 18:12:14 +02:00
Laurent Destailleur
1671c8b6cc Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-06-05 18:06:30 +02:00
Laurent Destailleur
9c32e49bd3 FIX: dol_delete_file must work in a context without db handler loaded 2018-06-05 18:05:33 +02:00
Laurent Destailleur
f28a6e59c8 Look and feel v8 2018-06-05 16:30:16 +02:00
Philippe GRAND
82bb1c8806 clean and update code 2018-06-05 14:29:25 +02:00
gauthier
45ecb0258b FIX : entity test must be on product_fourn_price table and not product table 2018-06-05 12:41:38 +02:00
gauthier
77e7932671 FIX : sometimes amounts are identical but php find them different. 2018-06-05 11:33:58 +02:00
Laurent Destailleur
8d62c06653 css 2018-06-05 11:25:41 +02:00
Laurent Destailleur
b6955692b4 Fix autofill of password 2018-06-05 11:22:00 +02:00
Laurent Destailleur
9730138845 Code comment 2018-06-05 11:06:44 +02:00
Laurent Destailleur
7cb66e8e0c Fix reset of filters 2018-06-05 10:04:57 +02:00
Laurent Destailleur
e7f6a5112c Bad picto 2018-06-05 09:02:50 +02:00
Laurent Destailleur
7c82c74b6b Fix install check 2018-06-05 08:57:04 +02:00
Laurent Destailleur
87d073b5cd Fix conflict with external ticketsup module 2018-06-04 21:49:29 +02:00
Philippe GRAND
909fa496e5 clean and update code 2018-06-04 17:37:17 +02:00
Laurent Destailleur
7a8fac4198 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/list.php
 2018-06-04 15:14:26 +02:00
Laurent Destailleur
3368e35502 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-06-04 14:09:34 +02:00
Laurent Destailleur
de2ffa1122 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/comm/action/listactions.php
 2018-06-04 14:09:17 +02:00
Laurent Destailleur
69dd11f7c6 Fix: Must use a standard (internationnal) date format. 2018-06-04 14:05:47 +02:00
Laurent Destailleur
eca66492ce Merge pull request #8913 from aspangaro/8.0-a26 
NEW : Accountancy Add import on general ledger
 2018-06-04 14:02:34 +02:00
Laurent Destailleur
840330deea Merge pull request #8905 from atm-greg/Add_supplier_proposals_in_suppliers_linkedObjects 
Add supplier proposal in linkedObjects type select of the suppliers
 2018-06-04 13:46:36 +02:00
Laurent Destailleur
40ab046bd1 Merge pull request #8904 from Mavyre/develop 
FIX Errors on synchronize rates when accessing Dolibarr from HTTPS
 2018-06-04 13:46:03 +02:00
Laurent Destailleur
5f4932c0b0 Merge pull request #8902 from bgenere/develop 
FIX extrafield template for list and resource list with extrafields
 2018-06-04 13:44:14 +02:00
Laurent Destailleur
54023d1029 Update list.php 2018-06-04 13:42:30 +02:00
Laurent Destailleur
7eaa2011ba Merge pull request #8900 from atm-florian/6.0_fixagenda 
fix: when agenda is filterd with "todo" event, do not display "not applicable" event
 2018-06-04 13:39:23 +02:00
Laurent Destailleur
af974430f5 Merge pull request #8901 from defrance/patch-119 
Add Hook on getNomUrl
 2018-06-04 13:36:46 +02:00
Laurent Destailleur
61946446b2 Update fichinter.class.php 2018-06-04 13:36:38 +02:00
Laurent Destailleur
da44ea858c Trans 2018-06-04 13:35:30 +02:00
Laurent Destailleur
eaee252a5d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-06-04 12:56:12 +02:00
Laurent Destailleur
29ee5dffc4 Clean code 2018-06-04 12:55:55 +02:00
Laurent Destailleur
60ce5fb87e Merge pull request #8911 from fappels/develop_fix_properties_for_trigger 
FIX stock movement trigger is missing some data
 2018-06-04 12:20:47 +02:00
Laurent Destailleur
5ae25cf95b Merge pull request #8898 from frederic34/patch-10 
do not test *.min.css with phpcs
 2018-06-04 12:20:04 +02:00
Laurent Destailleur
536e8297c2 Merge pull request #8897 from areaeuro/patch-3 
FIX Delete thirdparty logo
 2018-06-04 12:19:41 +02:00
Alexandre SPANGARO
a3030e4057 Update works 2018-06-03 22:35:39 +02:00
fappels
e0f9605483 Fix add missing properties for trigger 2018-06-03 11:05:02 +02:00
Laurent Destailleur
a6104d18a9 CSS 2018-06-02 16:36:05 +02:00
Laurent Destailleur
034ce7e55d CSS 2018-06-02 10:36:22 +02:00
Laurent Destailleur
5ff3398048 Try to fix evil Google Chrome autopopulate bug 2018-06-01 18:27:17 +02:00
Laurent Destailleur
be2c49d490 Fix log 2018-06-01 17:39:07 +02:00
Laurent Destailleur
b094ae953e Better log 2018-06-01 17:20:49 +02:00
Laurent Destailleur
3f6d11cf26 Fix log 2018-06-01 16:23:42 +02:00
Laurent Destailleur
7c0afbe025 Clean code 2018-05-31 17:12:08 +02:00
atm-greg
0785029fe0 Add supplier proposal in linkedObjects type select of the suppliers 2018-05-31 10:46:50 +02:00
Laurent Destailleur
0503373e31 Avoid error on screen 2018-05-31 09:49:46 +02:00
Mavyre
6b86e1c3bb FIX Bookkeeping report wrong display 2018-05-30 21:38:57 +02:00
Mavyre
ace57859e4 Use curl to get rates from CurrecyLayer API 2018-05-30 21:14:51 +02:00
Mavyre
e59a91bdae Stopped using AJAX for the synchro 2018-05-30 21:12:28 +02:00