ptibogxiv
828da5f83c
Fix php 8 errors
2023-01-08 15:33:12 +01:00
Laurent Destailleur
f8abd0b7f6
Debug bad params
2023-01-03 14:53:55 +01:00
Frédéric France
8d33953142
add comment
2022-09-07 20:08:59 +02:00
Laurent Destailleur
fb46ece906
Fix yogosha 6347
2021-06-09 15:36:47 +02:00
Laurent Destailleur
be6bb3a756
FIX #yogosha5746 - next step (work in progress)
2021-03-30 19:12:07 +02:00
Laurent Destailleur
b929641fe1
Look and feel v14
2021-03-29 13:00:17 +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
Laurent Destailleur
15440917b1
Fix #ygosha5698
2021-03-22 11:30:18 +01:00
Frédéric FRANCE
f73c0abec1
code syntax m... directories
2021-02-26 18:26:44 +01:00
Laurent Destailleur
4d029194d3
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/ajax.lib.php
htdocs/margin/agentMargins.php
htdocs/margin/customerMargins.php
2021-02-02 13:22:23 +01:00
Laurent Destailleur
b80de4aeaf
FIX CSRF errors on margin forms
2021-02-02 13:04:41 +01:00
Alexandre SPANGARO
9b115def15
NEW: Add total in agent margin & uniformize code
2021-01-01 06:14:05 +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
Frédéric FRANCE
5a3780e062
end of dol_fiche_end
2020-10-27 18:19:31 +01:00
Frédéric FRANCE
9a470fa42d
replace deprecated
2020-10-22 22:50:03 +02:00
Laurent Destailleur
2d38644ae1
Sanitize sortfield
2020-09-18 17:13:01 +02:00
Laurent Destailleur
9a758b7edd
FIX #yogosha4483
2020-09-17 14:31:25 +02:00
Frédéric FRANCE
b41ac00b98
add new rule
2020-05-21 15:05:19 +02:00
Frédéric FRANCE
e5fc928fda
add new rule
2020-05-21 02:02:54 +02:00
Laurent Destailleur
33c5db9cc3
Prepare code for the new pagination possibility
2020-03-13 13:07:11 +01:00
Alexandre SPANGARO
354b784279
NEW: Add hook on margin list page
2020-01-24 09:57:17 +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
91e2fe9a99
Update to integer situation invoice
...
Before : Situation invoice with situation_percent < 100 => Negative and Bad margin (not proportional)
Now : Situation invoice with situation_percent < 100 => Correct and proportional.
2019-12-19 12:06:18 +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
63b9656468
Fix use of currency accuracy
2019-12-11 17:05:42 +01:00
Frédéric FRANCE
35751a80ab
100% centpercent
2019-11-05 21:24:41 +01:00
Frédéric FRANCE
b2b057e9b5
clean indent
2019-10-27 09:51:15 +01:00
Laurent Destailleur
aebae5ff83
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/margins.lang
htdocs/user/class/user.class.php
2019-10-10 10:37:17 +02:00
Laurent Destailleur
6de31f2c54
Better translation
2019-10-08 19:35:50 +02:00
Alexandre SPANGARO
02dbc11f98
Move Gnu.org to https
2019-09-23 21:55:30 +02:00
Laurent Destailleur
ef56b020e5
Merge pull request #10736 from OPEN-DSI/fix-margin-agents3
...
Fix remove "canceled" invoices in margin by user
2019-03-07 20:45:40 +01:00
Lionel VESSILLER
163faf2401
Fix remove "canceled" invoices in margin by user
2019-03-04 11:19:54 +01:00
Frédéric FRANCE
ee9d0e2208
replace html by html5 in margin and modulebuilder
2019-03-03 09:08:29 +01:00
florian HENRY
dd9896516b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
dev_importproduct_measuringunit
Conflicts:
htdocs/margin/agentMargins.php
htdocs/product/stock/movement_card.php
htdocs/projet/tasks/time.php
htdocs/resource/class/html.formresource.class.php
2019-02-13 12:52:07 +01:00
Laurent Destailleur
04e3f23476
Fix phpcs
2019-02-13 11:52:45 +01:00
Laurent Destailleur
ced386fdca
Fix phpcs
2019-02-13 11:32:00 +01:00
florian HENRY
5c059c897d
fix travis (mosty for dev no conerne by my changes)
2019-02-13 09:21:14 +01:00
Laurent Destailleur
25550959e3
Fix phpcs
2019-02-12 17:05:45 +01:00
Laurent Destailleur
e054b080a5
Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing
2019-02-12 13:33:39 +01:00
Frédéric FRANCE
580e5c42d2
GenericFunctionsFunctionCallArgumentSpacing
2019-02-09 12:00:49 +01:00
Lionel VESSILLER
70dfecaa0b
Fix calcul margin by seller and parameters send (filters)
2019-02-08 15:48:43 +01:00
Laurent Destailleur
3f01cd554b
Update agentMargins.php
2019-02-08 09:50:45 +01:00
Lionel VESSILLER
b87df18292
Fix the margin rate by seller when the margin is negative
2019-02-06 09:37:19 +01:00
Lionel VESSILLER
727213a5fd
Fix margin by users when a thirdparty have many sellers
2019-02-05 17:04:46 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
Regis Houssin
aaa9a4f47c
FIX use getEntity('invoice') instead getEntity('facture')
2018-11-15 17:27:49 +01:00
Frédéric FRANCE
4a7ea33008
replace select_date
2018-09-09 08:02:26 +02:00
Philippe GRAND
e9adc9fc8e
Standardize code
2018-08-13 11:25:48 +02:00
