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 |
|
Alexandre SPANGARO
|
02dbc11f98
|
Move Gnu.org to https
|
2019-09-23 21:55:30 +02:00 |
|
Laurent Destailleur
|
a260e7391f
|
FIX for #11232
|
2019-08-01 14:24:54 +02:00 |
|
Laurent Destailleur
|
26d4875f8f
|
Merge branch '9.0' of https://github.com/dolibarr/dolibarr into develop
|
2019-05-18 02:27:23 +02:00 |
|
Laurent Destailleur
|
6c4a4c34c4
|
Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0
|
2019-05-18 02:26:40 +02:00 |
|
atm-greg
|
644f247910
|
fix useless calculation
|
2019-05-13 12:02:46 +02:00 |
|
Frédéric FRANCE
|
9b165f6b3f
|
add visibility
|
2019-02-27 20:45:07 +01:00 |
|
Philippe GRAND
|
047ec90d78
|
update with html5 compliant code
|
2019-02-19 17:38:14 +01:00 |
|
Laurent Destailleur
|
e18bd6f986
|
Merge branch 'develop' into nospaceaftercomma
|
2019-01-30 18:27:35 +01:00 |
|
Frédéric FRANCE
|
b10558bacd
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-01-27 23:23:38 +01:00 |
|
Laurent Destailleur
|
f30a3d59ba
|
Merge branch 'develop' into toomanylines
|
2019-01-27 17:59:13 +01:00 |
|
Frédéric FRANCE
|
f0cdf300d1
|
Squiz.Functions.FunctionDeclarationArgumentSpacing
|
2019-01-27 15:20:16 +01:00 |
|
Frédéric FRANCE
|
496fa9b0fb
|
PSR2.Files.EndFileNewline.TooMany
|
2019-01-27 14:10:35 +01:00 |
|
Frédéric FRANCE
|
7ee086b402
|
PSR2 space after comma in function call
|
2019-01-27 11:55:16 +01:00 |
|
Laurent Destailleur
|
d6ee00f2e7
|
Fix constructors does not need return value
|
2018-09-16 10:22:23 +02:00 |
|
Frédéric FRANCE
|
6aee680a4f
|
PSR2 ClassDeclaration
|
2018-08-29 22:06:05 +02:00 |
|