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

61839 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Laurent Destailleur
009424cd67
Merge pull request #9226 from atm-greg/Fix_project_delete_tasks 
Fix project delete tasks
 2018-08-21 13:11:00 +02:00
Laurent Destailleur
91bfa4be6c
Update project.class.php 2018-08-21 13:10:20 +02:00
Laurent Destailleur
3523c2b3d2
Update project.class.php 2018-08-21 13:09:06 +02:00
Laurent Destailleur
e03d7eba8c
Merge pull request #9254 from frederic34/patch-17 
Build Badge by branch
 2018-08-21 12:48:23 +02:00
Frédéric FRANCE
2aa0956f15
Update README.md 2018-08-16 16:08:04 +02:00
Frédéric FRANCE
bb09bcece4
Update README.md 2018-08-16 16:03:56 +02:00
Laurent Destailleur
e88b68f131
Merge pull request #9246 from atm-florian/6.0 
fix : ODT project substitution
 2018-08-16 00:33:04 +02:00
florian HENRY
20309665e6 fix : ODT project substitution 2018-08-14 10:45:08 +02:00
atm-greg
ba6f7d4b0a fix infinite loop 2018-08-14 09:32:43 +02:00
Laurent Destailleur
61a5be6e2a Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-08-12 19:19:21 +02:00
Laurent Destailleur
b81b6b651f Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-08-12 19:17:26 +02:00
Laurent Destailleur
7f797668c9
Merge pull request #9186 from atm-florian/6.0 
fix : odt project and task extrafields management
 2018-08-12 18:15:02 +02:00
florian HENRY
06189f8153 Merge branch '6.0' into 6.0_fhe 2018-08-09 18:31:59 +02:00
atm-greg
3d84adbd76 fix recurcivity 2018-08-09 12:21:48 +02:00
atm-greg
4e16f64af0 Fix project::delete to delete children tasks before parent tasks 2018-08-09 12:13:06 +02:00
Laurent Destailleur
e85ec19018
Merge pull request #9093 from atm-gauthier/FIX_filters 
FIX : page must always be 0 when we search
 2018-08-02 17:48:35 +02:00
Laurent Destailleur
b5a0e14ffe
Merge pull request #9185 from atm-john/fix_situation_total_calcul 
Important: fix situation line's total
 2018-08-02 17:45:44 +02:00
Juanjo Menent
2cf51fbdf1
Merge pull request #9173 from frederic34/patch-22 
fix #8820
 2018-08-02 11:08:47 +02:00