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
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
Mavyre
c30cab0ab3
Merge pull request #1 from Dolibarr/develop 
Update
 2018-05-30 20:51:04 +02:00
bgenere
67830a7d04 FIX extrafields display properly in list for Resource module 2018-05-30 17:09:24 +02:00
bgenere
89d9fe3919 FIX Issue for extra fields date display in template. 
Template is now consistent with the extrafiels_view template
 2018-05-30 17:08:01 +02:00
BENKE Charlene
0ce3b2b431
Add Hook on getNomUrl 2018-05-30 14:19:30 +02:00
florian HENRY
b996237142 fix: when agenda is filterd with "todo" event, do not display "not 
applicable" event
 2018-05-30 13:37:17 +02:00
Frédéric FRANCE
03bba4daf0
do not test *.min.css with phpcs 2018-05-30 13:30:14 +02:00
areaeuro
475297b98b
Update card.php 
Line 714 - conditional to delete thirdparty logos
$object->photo 
does not exits, and should read
$object->logo

This appears to be an oversight, as it is correct in the rest of the file
 2018-05-30 12:29:02 +02:00
Laurent Destailleur
d8d4d15b4b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-05-30 12:13:40 +02:00
Laurent Destailleur
de59892438 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2018-05-30 12:13:18 +02:00
Laurent Destailleur
0412264418 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2018-05-30 12:05:54 +02:00
Laurent Destailleur
60321aabd8 Fix regression 2018-05-30 11:59:23 +02:00
Laurent Destailleur
c1f5c6becf
Merge pull request #8877 from frederic34/longlines 
soft limit length of lines to 500 chars
 2018-05-30 11:19:29 +02:00
Laurent Destailleur
62e717acb3
Update .travis.yml 2018-05-30 11:18:47 +02:00
Laurent Destailleur
ec36f24046 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-05-30 11:17:21 +02:00
Laurent Destailleur
a6e323fae8 Fix bad usage of "for" loop 2018-05-30 11:16:06 +02:00
Laurent Destailleur
3733169120 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/compta/recap-compta.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2018-05-30 11:09:53 +02:00
Laurent Destailleur
2df2071bae Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-05-30 11:05:12 +02:00
Laurent Destailleur
02da9b6992 FIX #8893 to get formatted price as substitution vars 2018-05-30 11:04:44 +02:00
Laurent Destailleur
28646a6b50
Merge pull request #8892 from ATM-Nicolas/fix_bad_email_substitution_key 
FIX : Bad substitution key used for default send proposal email
 2018-05-30 10:57:31 +02:00
Laurent Destailleur
e8d7c54716
Merge pull request #8890 from inoveaconseil/patch-3 
Fix missing substitution
 2018-05-30 10:52:35 +02:00