Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
127,913 Commits 36 Branches 189 Tags
58ba3e31fadd6b7a39e41a6481c2fbeb51cfdbc0
Commit Graph

77 Commits

Author SHA1 Message Date
Laurent Destailleur
54e6de0d7f Fix with php-cs-fixer 2023-12-04 12:04:36 +01:00
Laurent Destailleur
b69059af76 Fix warning 2023-11-27 12:24:18 +01:00
Laurent Destailleur
de96af8543 Fix warning php8.2 2023-11-27 11:24:19 +01:00
Laurent Destailleur
1f38e54e78 Clean code 2023-10-15 15:32:35 +02:00
Dev2a
fcd4c4e429 Fix: Change access to $conf->global to function getDolGlobal (automatique) 2023-10-08 23:19:49 +02:00
Laurent Destailleur
8cc3d2358b NEW Remove hardcoded code for OVH sms. Generic method is ok now. 2023-08-26 12:02:19 +02:00
Laurent Destailleur
c6cb29381e Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-05-11 19:09:19 +02:00
Laurent Destailleur
afe64323d2 FIX Margin calculation for credit notes on margin reports 2023-05-10 23:55:50 +02:00
Laurent Destailleur
b7c242c210 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-03-17 20:54:18 +01:00
Laurent Destailleur
e394ee0144 Fix regression 2023-03-17 16:29:40 +01:00
Jyhere
99d0f5c5d2 FIX : fatal error when margin enable (missing check on element), fix User::hasRight() when checking a margin right 2023-03-17 16:26:21 +01:00
Jyhere
78cf8dd8eb FIX : fatal error when margin enable (missing check on element), fix User::hasRight() when checking a margin right 2023-03-17 11:42:06 +01:00
Laurent Destailleur
9e68d98b4e Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-03-15 14:24:59 +01:00
Laurent Destailleur
befdd967f7 Fix margin calculation on credit not when price is 0 2023-03-15 13:49:28 +01:00
Laurent Destailleur
fdcce8d263 Add nonce on javascript tags 2023-02-18 15:10:05 +01:00
Laurent Destailleur
aed0896e98 Debug v17 2022-12-06 14:04:17 +01:00
Frédéric FRANCE
555f17f846 fix warning 2022-10-14 10:33:34 +02:00
Laurent Destailleur
532bfe3f92 Warning 2022-10-10 23:18:13 +02:00
Frédéric France
582f6b196e use isModEnabled 2022-08-23 20:02:37 +02:00
Frédéric France
4bef0f5745 use isModEnabled 2022-08-23 20:01:34 +02:00
Gauthier PC portable 024
b971efb062 FIX : marginInfos array should be used by reference to allow to update it with a hook without draw again margin table 2021-12-14 12:25:43 +01:00
Florian HENRY
d48df1d2c3 new: add hook for displayMarginInfos 2021-11-18 10:50:03 +01:00
Frédéric FRANCE
9bd31d2b85 fix warnings 2021-10-23 07:13:08 +02:00
Laurent Destailleur
15da97f1da Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/accountancy/journal/expensereportsjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/compta/facture/card.php
	htdocs/product/price.php
 2021-08-24 15:05:14 +02:00
Laurent Destailleur
591059847e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/product/price.php
 2021-08-24 15:00:35 +02:00
Alexandre SPANGARO
f88abb9a6f Add parenthesis 2021-08-15 07:32:46 +02:00
Alexandre SPANGARO
ca6dd8850a FIX: Manage credit note on situation invoice for calculate margin 2021-07-29 15:24:08 +02:00
Laurent Destailleur
eeba9e4d50 Code comment 2021-03-24 21:58:06 +01:00
Laurent Destailleur
21a9779fe2 FIX inconsistency in margin recording with option "Force to sale price" 2021-03-24 21:49:45 +01:00
Frédéric FRANCE
554e449e40 code syntax core directory 2021-02-23 22:03:23 +01:00
Scrutinizer Auto-Fixer
ab25e047c0 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 17:51:30 +00:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 13:32:18 +00:00
Laurent Destailleur
216b3c885d Fix escaping 2020-09-20 01:30:36 +02:00
Laurent Destailleur
d75e1e5771 Fix #yogosha4525 2020-09-18 16:10:11 +02:00
Frédéric FRANCE
b41ac00b98 add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
ee6fadd0d5 add new rule 2020-05-21 01:41:27 +02:00
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-10 08:59:32 +00:00
Laurent Destailleur
486bb5cd0b Removed useless include 2020-01-15 13:24:23 +01:00
Guillaume Matheron
ffa88ad11f Merge remote-tracking branch 'upstream/develop' into develop 2020-01-05 14:51:03 +01:00
Laurent Destailleur
38de69f5a9 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/comm/action/list.php
	htdocs/compta/bank/releve.php
	htdocs/compta/salaries/card.php
	htdocs/core/actions_addupdatedelete.inc.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/boxes.lang
	htdocs/langs/en_US/main.lang
	htdocs/product/class/product.class.php
	htdocs/product/reassort.php
	htdocs/product/stock/product.php
	htdocs/projet/element.php
 2020-01-04 14:20:25 +01:00
Guillaume Matheron
4f65f8d095 Fixed bug (missing include) in formmargin.class.php, affecting display of propal 2020-01-02 14:13:26 +01:00
Laurent Destailleur
4c6c8e172f Merge pull request #12784 from Dolibarr/revert-12751-v10-fix-html-form-margin-class 
Revert "FIX class Facture undefined in displaying margin information"
 2019-12-31 17:33:21 +01:00
Laurent Destailleur
08d0d63a04 FIX #12760 #12763 #12755 #12765 #12751 2019-12-31 17:30:27 +01:00
Laurent Destailleur
5cc0d26eae Revert "FIX class Facture undefined in displaying margin information" 2019-12-31 17:26:02 +01:00
Laurent Destailleur
6e90e81be1 Merge pull request #12751 from OPEN-DSI/v10-fix-html-form-margin-class 
FIX class Facture undefined in displaying margin information
 2019-12-30 22:00:28 +01:00
Marc de Lima Lucio
c8dfc3d9fc FIX: error 500 when getting margin info for objects other than invoices 2019-12-24 16:09:29 +01:00
VESSILLER
720146c45f FIX class Facture undefined in displaying margin information 2019-12-23 15:37:12 +01:00
Laurent Destailleur
9a08a6bf6d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/categories/traduction.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contact/card.php
	htdocs/core/modules/modSociete.class.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/langs/en_US/products.lang
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
	htdocs/margin/productMargins.php
	htdocs/margin/tabs/productMargins.php
	htdocs/margin/tabs/thirdpartyMargins.php
 2019-12-23 14:13:26 +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
Frédéric FRANCE
e93aaa2a75 replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00