Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
86,494 Commits 36 Branches 189 Tags
aee6fce9f85d38cfe2a05af77eea7d30a62ea1b3
Commit Graph

108 Commits

Author SHA1 Message Date
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
Philippe GRAND
a952b46d8b clean and update code 2018-06-27 12:37:31 +02:00
Frédéric FRANCE
622c394283 loadlangs 2018-05-26 21:11:25 +02:00
Frédéric FRANCE
9cd7bb3f58 loadlangs 2018-05-26 16:03:19 +02:00
Frédéric FRANCE
0a90f2d690 loadlangs 2018-05-26 15:50:03 +02:00
Laurent Destailleur
5b1f5b0f20 Fix translation done twice into field title of array 2017-08-02 13:31:53 +02:00
Laurent Destailleur
9ec7929753 Look and feel v6 2017-06-21 10:59:39 +02:00
Laurent Destailleur
ce8a024d44 Fix limit on margin pages 2017-06-21 00:34:56 +02:00
Regis Houssin
bfd6116e5b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc 2017-06-06 15:03:36 +02:00
Laurent Destailleur
02b5d9e6f7 FIX #6945 2017-06-06 10:53:53 +02:00
Regis Houssin
5c5663c5ae New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +02:00
Laurent Destailleur
39ebaec064 Replace usage of $bc[$var] with class="oddeven" 2017-04-14 11:22:48 +02:00
Laurent Destailleur
fd90bf466b Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/societe/soc.php
 2017-01-28 15:12:14 +01:00
Laurent Destailleur
2c07d2df22 Add comments 2017-01-28 15:08:46 +01:00
Laurent Destailleur
7c638feb3b Fix label of field 2017-01-28 13:13:57 +01:00
Laurent Destailleur
1add34b451 Fix multicompany 2017-01-20 21:05:20 +01:00
Laurent Destailleur
fc4aa96cd7 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/fichinter/card.php
	htdocs/fourn/commande/dispatch.php
 2017-01-20 21:02:05 +01:00
Laurent Destailleur
9ebe383beb Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-01-20 20:44:19 +01:00
arnaud
2cedcfece2 FIX bug margin calcul by user with multicompany 2017-01-20 12:01:20 +01:00
Laurent Destailleur
7dd06a1ae6 Fix margin pagination 2016-12-27 02:01:27 +01:00
Laurent Destailleur
b15535c1f1 Uniformize code 2016-10-25 02:04:46 +02:00
Laurent Destailleur
b2307f9b90 Uniformize code 2016-09-28 21:08:25 +02:00