Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-09 11:08:34 +01:00
Code Issues Packages Projects Releases Wiki Activity
68,347 Commits 36 Branches 190 Tags
b8c88a214449d5129fd4c479249cfa7c2373d10d
Commit Graph

59608 Commits

Author SHA1 Message Date
Laurent Destailleur
4ba057528f Fix permissionss 2018-09-20 19:37:28 +02:00
Laurent Destailleur
b421c29ea7 FIX #9510 2018-09-20 19:20:15 +02:00
Laurent Destailleur
df395847d3 FIX #9567 2018-09-20 19:14:32 +02:00
Laurent Destailleur
9fc08c45cf Merge pull request #9575 from atm-maxime/new_phpunit_loan 
NEW PHPUnitTest on Loan class #3163
 2018-09-20 19:00:26 +02:00
Ferran Marcet
4597cd44e5 FIX #9432 2018-09-20 17:52:44 +02:00
Laurent Destailleur
e0dfab4c71 FIX The max size for upload file was not corectly shown 2018-09-20 16:21:36 +02:00
Maxime Kohlhaas
75104999d3 NEW PHPUnitTest on Loan class #3163 2018-09-20 15:04:00 +02:00
Laurent Destailleur
55e3d97842 Trans 2018-09-19 17:56:51 +02:00
Laurent Destailleur
824b572bd0 FIX Amount when using mutlicurrency on PDF 
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0

Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
 2018-09-19 15:03:24 +02:00
Laurent Destailleur
9b190d2cbc Merge pull request #9201 from atm-quentin/FIX_select_element 
FIX exclude element of the select
 2018-09-19 14:55:31 +02:00
gauthier
d62118dca8 FIX : langs fr 2018-09-19 14:53:56 +02:00
Laurent Destailleur
dc7c27b162 Release 8.0.2 2018-09-19 14:53:39 +02:00
Laurent Destailleur
02617bd799 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-09-19 14:53:07 +02:00
Laurent Destailleur
2b67da3f34 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
 2018-09-19 14:52:43 +02:00
Frédéric FRANCE
1d43c6bc3a call to deprecated add_object_linked was present two times 2018-09-19 10:57:59 +02:00
Frédéric FRANCE
cdbb79a26c correct typo in multicurrency doc pdf 2018-09-19 09:26:56 +02:00
Laurent Destailleur
85180b117c Fix warnings 2018-09-18 23:48:02 +02:00
Laurent Destailleur
c56b02c1c4 Fix warning 2018-09-18 23:47:55 +02:00
Laurent Destailleur
79b248fc67 FIX warning picto when next run date passed 2018-09-18 23:27:26 +02:00
Laurent Destailleur
014da6c22c Fix translation 2018-09-18 18:11:07 +02:00
Laurent Destailleur
99d214abd5 Fix family of module Payment of employee salaries 2018-09-18 16:38:51 +02:00
Laurent Destailleur
4580ed0b09 Fix bad link 2018-09-18 15:31:25 +02:00
Laurent Destailleur
85bed00474 Fix default fields 2018-09-18 11:50:04 +02:00
Laurent Destailleur
2d8eb034e3 FIX Maxi debug to allow to load chart of account with multicompany 2018-09-17 21:02:07 +02:00
Laurent Destailleur
1e36aba35f Trans 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2018-09-17 16:42:44 +02:00
Laurent Destailleur
3fc3cc4688 Fix missing email in popup 2018-09-17 14:17:10 +02:00
Laurent Destailleur
f3ce7cb5a5 Quick hack to provide help to fix pb of undesirable files 2018-09-17 10:40:42 +02:00
Laurent Destailleur
f3f18bf8cb Fix sql 2018-09-17 02:23:11 +02:00
Laurent Destailleur
055a0b2859 Merge branch '8.0' of github.com:Dolibarr/dolibarr into 8.0 2018-09-16 13:29:13 +02:00
Laurent Destailleur
79b15b81f2 Fix list of tasks on time consumed 2018-09-16 13:28:37 +02:00
Laurent Destailleur
cc4fbfc3ef Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2018-09-16 12:54:39 +02:00
Laurent Destailleur
d06785e91a Fix responsive 2018-09-16 12:48:36 +02:00
Laurent Destailleur
74a9c680df FIX "Other ..." link so the "Back to" link works. 2018-09-16 12:27:56 +02:00
Laurent Destailleur
4151ca49eb Fix position of menu 2018-09-16 12:15:33 +02:00
Laurent Destailleur
a0bcf999c5 FIX #9043 2018-09-16 09:45:33 +02:00
Laurent Destailleur
a6d4185d6b FIX #9043 2018-09-16 09:44:52 +02:00
Laurent Destailleur
55e7989552 FIX #9043 2018-09-16 09:42:30 +02:00
Laurent Destailleur
2c8064967b Code comment 2018-09-16 09:31:06 +02:00
Laurent Destailleur
272944983c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-09-16 09:27:54 +02:00
Laurent Destailleur
34b75828d3 Work on fix for #9043 2018-09-16 09:27:36 +02:00
Laurent Destailleur
ecfbe0a568 Merge pull request #9499 from tarrsalah/fix-show-default-vat-rate 
FIX #9497
 2018-09-15 17:14:05 +02:00
Laurent Destailleur
56b0a5f1ed FIX Mixing tickets of different thirdparties 2018-09-14 13:07:27 +02:00
Laurent Destailleur
16ed582124 Add comment 2018-09-14 01:45:03 +02:00
gauthier
7838b75ec9 FIX : wrong var name 2018-09-13 16:11:42 +02:00
gauthier
b68523b9c1 FIX : According to french law, if seller is in France and buyer isn't in UE and isn't a company, TVA used = TVA product 2018-09-13 14:37:12 +02:00
tarrsalah
08453a5337 FIX #9497 
Extract $defaultcode and $defaulttxt from the value returned by
get_default_tva function .
 2018-09-13 11:04:11 +01:00
Laurent Destailleur
c5e30b61c0 Fix translation 2018-09-12 21:25:14 +02:00
Laurent Destailleur
3dca02d25b Fix translation 2018-09-12 21:07:34 +02:00
Laurent Destailleur
b7eeaa952c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-09-12 19:41:02 +02:00
Laurent Destailleur
72f359fdc7 Revert "add capture option in payment function" 
This reverts commit 849b7154a7.
 2018-09-12 19:40:43 +02:00