Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-08 02:28:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
84,710 Commits 36 Branches 190 Tags
4b7de1e5f5cea42b5c70d38fe26d5e94adb51fda
Commit Graph

7851 Commits

Author SHA1 Message Date
Laurent Destailleur
93cece6a3a Merge pull request #12738 from mapiolca/patch-16 
#FIX Error Margin with Situation Invoice
 2019-12-23 13:43:18 +01:00
Laurent Destailleur
a92db7db39 Look and feel v11 2019-12-23 13:02:30 +01:00
Laurent Destailleur
2df9df2db0 Debug v11 2019-12-23 12:24:27 +01:00
Laurent Destailleur
d4138876af Fix alignement in validation popup 2019-12-23 11:16:40 +01:00
Regis Houssin
8321fe6ad2 FIX missing nl2br conversion 2019-12-22 09:13:34 +01:00
Laurent Destailleur
58771c7d8a Debug MRP v11 2019-12-20 17:39:42 +01:00
Pierre Ardoin
538921f479 #FIX Error Margin with Situation Invoice 
Fix an issue that show a negative margin when $line->situation_percent is not 100%

Now, the margin price take progress into account.
 2019-12-19 10:35:38 +01:00
Scrutinizer Auto-Fixer
455178ff73 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-18 14:20:36 +00:00
Laurent Destailleur
3ae87924f1 Fix no user $global $conf into $conf object. 2019-12-18 14:32:23 +01:00
Scrutinizer Auto-Fixer
404ae0c209 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-17 02:00:52 +00:00
Laurent Destailleur
d22cd5c321 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/accountancy/bookkeeping/list.php
 2019-12-16 19:09:53 +01:00
Laurent Destailleur
65abe7532c Fix error message not reported when deleting record in ledger. 2019-12-16 19:05:32 +01:00
Laurent Destailleur
1af67a4336 Merge pull request #12713 from frederic34/doxygen_warning 
doxygen
 2019-12-16 19:02:10 +01:00
Scrutinizer Auto-Fixer
c8baaa2995 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-16 12:06:25 +00:00
Laurent Destailleur
fdf4d86d81 Debug code 2019-12-16 12:38:51 +01:00
Laurent Destailleur
646587a9cf Value "None" To unbind is more visible. 2019-12-16 11:50:25 +01:00
John Botella
98bd4f3a66 Fix document module call 2019-12-16 09:44:08 +01:00
Laurent Destailleur
95fc14475c Fix show correct stripe publishable_key on payment mode page 2019-12-15 17:32:45 +01:00
Frédéric FRANCE
9e4fb8d4fe doxygen 2019-12-15 10:02:20 +01:00
Laurent Destailleur
838633d0de Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/system/filecheck.php
	htdocs/api/class/api_setup.class.php
	htdocs/compta/facture/card.php
	htdocs/compta/stats/index.php
	htdocs/core/actions_massactions.inc.php
	htdocs/install/upgrade2.php
	htdocs/loan/card.php
	htdocs/loan/document.php
	htdocs/loan/info.php
	htdocs/loan/note.php
	htdocs/loan/schedule.php
	htdocs/product/list.php
	htdocs/ticket/card.php
	htdocs/user/class/user.class.php
 2019-12-14 14:53:49 +01:00
Laurent Destailleur
5e3698b023 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/class/utils.class.php
 2019-12-14 14:44:38 +01:00
Laurent Destailleur
17b9964678 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	build/generate_filelist_xml.php
	htdocs/core/class/utils.class.php
	htdocs/core/lib/files.lib.php
 2019-12-14 14:43:14 +01:00
Laurent Destailleur
31a60ff30b Fix $db 2019-12-14 14:41:27 +01:00
Laurent Destailleur
d1daf94b81 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-12-14 14:34:14 +01:00
Laurent Destailleur
a8de7b850a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/admin/system/filecheck.php
 2019-12-14 14:33:46 +01:00
Laurent Destailleur
835d22f556 Merge branch 'develop' into doxygen_todo 2019-12-14 13:46:40 +01:00
Laurent Destailleur
744e7fc5da Merge pull request #12703 from frederic34/patch-19 
doxygen
 2019-12-14 13:42:58 +01:00
Laurent Destailleur
65bf2fa285 Merge pull request #12689 from code-chicken/develop 
Fix: calculation of virtual stock
 2019-12-14 13:40:02 +01:00
Laurent Destailleur
d38c73c90a FIX output of emails from and error on emailing pages. 2019-12-13 15:52:08 +01:00
Rüdiger Hahn
4dd3cb3469 Prevent stock amount from becoming NULL 
Set stock to 0 if NULL
 2019-12-13 07:58:36 +01:00
Frédéric FRANCE
d4dfa840d9 doxygen 2019-12-12 20:48:14 +01:00
Laurent Destailleur
a612aefab7 Fix HTML5 2019-12-12 11:11:08 +01:00
Laurent Destailleur
ce47de453e Fix HTML5 2019-12-12 10:31:08 +01:00
Frédéric FRANCE
9357bfd98e doxygen 2019-12-12 08:17:14 +01:00
Frédéric FRANCE
66805a502a doxygen 2019-12-11 22:53:57 +01:00
Frédéric FRANCE
307bad1d2a doxygen todo 2019-12-11 19:11:13 +01:00
Laurent Destailleur
c0e23c7b71 Merge pull request #12670 from frederic34/patch-7 
The variable $id seems to be never defined
 2019-12-10 05:53:46 +01:00
Frédéric FRANCE
de741f5dd0 The variable $id seems to be never defined 2019-12-09 23:22:13 +01:00
Frédéric FRANCE
a16e342af6 typo 2019-12-09 23:15:15 +01:00
Laurent Destailleur
67401d717a Merge pull request #12634 from frederic34/patch-7 
The variable $out does not seem to be defined for all execution paths
 2019-12-09 17:44:06 +01:00
Frédéric FRANCE
407fe902b4 missing $db for line 711 2019-12-09 16:42:57 +01:00
Laurent Destailleur
ae6d536d1d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/tools/dolibarr_export.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/pdf.lib.php
 2019-12-09 13:32:56 +01:00
Laurent Destailleur
94bab15528 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/pdf.lib.php
 2019-12-09 13:27:30 +01:00
Laurent Destailleur
2ca5a4378b Fix empty div when no address 
Fix deletion of MO
 2019-12-09 00:54:42 +01:00
Laurent Destailleur
9e479afff1 WIP Complete module MRP 2019-12-09 00:06:51 +01:00
Laurent Destailleur
2b5866aca2 WIP Complete module MRP 2019-12-08 23:45:06 +01:00
Laurent Destailleur
91d83c3d60 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-06 17:40:43 +01:00
Laurent Destailleur
796f34628d Debug v11 2019-12-06 17:40:22 +01:00
Scrutinizer Auto-Fixer
4debd71281 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-06 08:26:49 +00:00
Frédéric FRANCE
f101e919c8 The variable $out does not seem to be defined for all execution paths 2019-12-05 21:30:47 +01:00