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

61857 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
e165dce908
Merge pull request #9689 from ATM-Marc/FIX_6.0_facture_stats_situation 
FIX: invoice stats: situation invoices were not counted
 2018-10-06 12:46:25 +02:00
Marc de Lima Lucio
82651cd920 FIX: invoice stats: situation invoices were not counted 2018-10-05 12:12:04 +02:00
Laurent Destailleur
9e397206d3
Merge pull request #9668 from atm-greg/Fix_pdf_generation 
fix error 500 on pdf_generation
 2018-10-04 17:27:29 +02:00
atm-greg
583ea05567 fix missing letter... 2018-10-03 12:13:53 +02:00
Laurent Destailleur
4c8664b297
Merge pull request #9619 from ATM-Marc/FIX_6.0_extrafield_columns 
FIX: showOptionals: column mismatches
 2018-09-27 09:39:51 +02:00
Laurent Destailleur
2d88b69cf6
Merge pull request #9616 from frederic34/patch-14 
add try catch for swiftmailer
 2018-09-27 09:34:21 +02:00
Laurent Destailleur
77341470e1
Merge pull request #9608 from frederic34/patch-10 
comparaison of two boolean in rssparser.class.php
 2018-09-27 09:23:24 +02:00
Marc de Lima Lucio
af93fc7484 FIX: showOptionals: column mismatches 2018-09-26 17:19:06 +02:00
Frédéric FRANCE
1bac3a0ccf
swiftmailer is doing encodetorfc2822 2018-09-26 10:37:20 +02:00
Frédéric FRANCE
92a3faeaf7
add try catch for swiftmailer 2018-09-26 10:13:14 +02:00
Frédéric FRANCE
d15c52db3b
Update rssparser.class.php 2018-09-25 08:16:05 +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
Laurent Destailleur
a0bc26a923
Merge pull request #9476 from atm-maxime/fix_invoicelist_creditnote 
Fix invoicelist creditnote
 2018-09-21 09:56:43 +02:00
Laurent Destailleur
779d7e9689
Merge pull request #9568 from atm-gauthier/6.0_fix_langs_fr 
FIX : langs fr
 2018-09-19 15:04:18 +02:00
gauthier
d62118dca8 FIX : langs fr 2018-09-19 14:53:56 +02:00
Laurent Destailleur
a6996169d6
Merge pull request #9565 from frederic34/multicpdf 
correct typo in multicurrency doc pdf #9562
 2018-09-19 14:30:15 +02:00
Frédéric FRANCE
cdbb79a26c
correct typo in multicurrency doc pdf 2018-09-19 09:26:56 +02:00
Laurent Destailleur
5655856ca5
Merge pull request #9504 from atm-gauthier/6.0_fix_refsupplier 
FIX : wrong var name
 2018-09-13 17:55:04 +02:00
gauthier
7838b75ec9 FIX : wrong var name 2018-09-13 16:11:42 +02:00
Maxime Kohlhaas
c94689e9a9 FIX remain to pay for credit note was wrong on invoice list 2018-09-12 11:53:57 +02:00
Laurent Destailleur
f7d5172a74
Merge pull request #9410 from frederic34/patch-10 
Create index.html
 2018-09-05 14:15:22 +02:00
Laurent Destailleur
ead2a764c7
Merge pull request #9409 from frederic34/patch-9 
Create index.html
 2018-09-05 14:15:12 +02:00
Frédéric FRANCE
2015268b7e
Create index.html 2018-09-04 22:06:24 +02:00
Frédéric FRANCE
e4afd4af00
Create index.html 2018-09-04 22:05:06 +02:00
Laurent Destailleur
847189805a
Merge pull request #9404 from ATM-Marc/FIX_6.0_pdf_address 
FIX: PDF address: handle when contact thirdparty different from document thirdparty
 2018-09-04 09:57:07 +02:00
Laurent Destailleur
252335318f
Update pdf.lib.php 2018-09-04 09:57:01 +02:00
Marc de Lima Lucio
e285b42a18 FIX: PDF address: handle when contact thirdparty different from document thirdparty 2018-09-03 17:57:30 +02:00
Laurent Destailleur
e0b272941f Fix mariadb 2018-09-02 15:25:27 +02:00
Laurent Destailleur
bd3647a9d7 Prepare phpunit 6.1 compatibility 2018-09-02 14:23:52 +02:00
Laurent Destailleur
b9c95a5a5c Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2018-09-02 14:19:43 +02:00
Laurent Destailleur
5bab9d59b2 Fix var_dump 2018-09-02 14:19:23 +02:00
Laurent Destailleur
df721a5fbc Only min and max php version 2018-09-02 14:18:04 +02:00
Laurent Destailleur
37fb70d983 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2018-09-02 14:15:32 +02:00
Laurent Destailleur
02bedc49d3 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	test/phpunit/PricesTest.php
	test/phpunit/RestAPIUserTest.php
	test/phpunit/WebservicesInvoicesTest.php
 2018-09-02 14:15:17 +02:00
Laurent Destailleur
e41b55af13 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2018-09-02 14:10:28 +02:00
Laurent Destailleur
a69c3caf2c Prepare compatibility with phpunit 6.1 2018-09-02 14:10:06 +02:00
Laurent Destailleur
53caac13a9 Test phpunit 2018-09-02 13:57:51 +02:00
Laurent Destailleur
179feebd80
Merge pull request #9347 from atm-greg/fix_getLabelOfUnit 
remove useless db begin
 2018-09-01 12:34:43 +02:00
atm-greg
f8fef61075 remove useless db begin 2018-08-30 09:19:44 +02:00
Laurent Destailleur
e317b0847a Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	README.md
 2018-08-29 18:50:00 +02:00
Laurent Destailleur
7af083f1ec Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-08-29 18:49:08 +02:00
Laurent Destailleur
275b9a9960
Merge pull request #9325 from frederic34/patch-12 
Fix allow barcode with special char
 2018-08-29 18:01:15 +02:00
Laurent Destailleur
46a24ff28f
Merge pull request #9321 from atm-gauthier/6.0_fix_default_bank_on_create_propal 
FIX : $fk_account is always empty, must be $soc->fk_account
 2018-08-29 17:56:36 +02:00
Laurent Destailleur
cb24fa0f08
Merge pull request #9310 from frederic34/patch-9 
Build Badge for 6.0
 2018-08-29 17:50:04 +02:00
Frédéric FRANCE
24be0b7305
Update viewimage.php 
code may have rich content (qrcode, datamatrix,...)
 2018-08-29 13:08:52 +02:00
gauthier
61a57e619f FIX : $fk_account is always empty, must be $soc->fk_account 2018-08-28 16:54:04 +02:00
Frédéric FRANCE
53e476483c
Build Badge for 6.0 2018-08-28 09:38:24 +02:00
Laurent Destailleur
b96082a577
Merge pull request #9274 from frederic34/patch-17 
Build badge for 5.0
 2018-08-28 01:38:06 +02:00
Frédéric FRANCE
b1a3238c94
Build badge for 5.0 2018-08-21 14:22:29 +02:00