Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 09:38:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
78,589 Commits 36 Branches 190 Tags
594d9e321e8c7753932ca8ee98491036a3b51ec9
Commit Graph

272 Commits

Author SHA1 Message Date
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
Pierre Ardoin
a82f996fcf 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:04:48 +01:00
Pierre Ardoin
347eae05ac 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:03:09 +01:00
Pierre Ardoin
14cf295f22 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 11:58:25 +01:00
Pierre Ardoin
063c139fee Situation Invoice Compatibility 
take progress percent into account in buying price
 2019-12-19 11:52:30 +01:00
Laurent Destailleur
6bf3af5d83 Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0 
Conflicts:
	htdocs/compta/tva/index.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/margin/productMargins.php
	htdocs/margin/tabs/productMargins.php
 2019-12-01 10:30:22 +01:00
Laurent Destailleur
1d564c2a39 Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0 
Conflicts:
	htdocs/core/class/notify.class.php
 2019-12-01 00:58:01 +01:00
Maxime Kohlhaas
9095482113 Fix margins access + menu display 2019-11-30 14:47:48 +01:00
Pierre Ardoin
d2b7961e87 Update customerMargins.php 2019-11-03 22:45:50 +01:00
Pierre Ardoin
abc7198db4 Fix Multicompany Filter 
Select only invoice in current company.
 2019-10-28 12:51:12 +01:00
Laurent Destailleur
6de31f2c54 Better translation 2019-10-08 19:35:50 +02:00
Laurent Destailleur
2867e31a63 Fix CSS 2019-07-27 01:13:39 +02:00
Laurent Destailleur
c760a5a8b9 FIX #11233 2019-05-24 12:48:44 +02:00
Laurent Destailleur
22e897b1a1 Clean and prepare code to fix a SQL injection 2019-05-21 17:22:38 +02:00
Laurent Destailleur
379f9f2d53 Fix phpcs 2019-04-02 20:36:00 +02:00
Laurent Destailleur
42fda54edf Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/card.php
	htdocs/fichinter/list.php
	htdocs/product/stock/replenish.php
 2019-04-02 19:41:58 +02:00
Laurent Destailleur
c5348be337 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-04-02 19:35:42 +02:00
Laurent Destailleur
17a61b3232 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-04-02 19:34:49 +02:00
Laurent Destailleur
cb1489e2fa Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2019-04-02 19:34:10 +02:00
atm-greg
83d7750274 FIX missing hook completeTabsHead in margins module 2019-03-27 09:33:51 +01: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
5cf8421d87 Fix remove "canceled" invoices in all reports 2019-03-05 09:56:49 +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
Laurent Destailleur
a6dde3d6bd Merge branch 'develop' into nospaceaftercomma 2019-02-03 19:27:16 +01:00
Frédéric FRANCE
03701fa091 psr2 2019-02-02 18:25:01 +01:00
Laurent Destailleur
e18bd6f986 Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
Laurent Destailleur
9fdba921b4 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/lib/functions.lib.php
 2019-01-30 16:48:33 +01:00
Pierre Ardoin
e75170137e Correction de la filtration de l'entité 
Corrige pour que la marge réalisée sur d'autres entités n'apparaisse pas sur celle sur laquelle l'utilisateur est connecté.
 2019-01-29 11:42:44 +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
Philippe GRAND
e6d5925b7a update with html5 compliant code 2019-01-19 12:52:34 +01:00
atm-quentin
013c078c8b Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_manage_multicompany_for_invoice 2019-01-16 10:52:46 +01:00
Laurent Destailleur
ca8534c850 Fix syntax error 2019-01-12 16:44:43 +01:00
mapiolca
320467d791 Update productMargins.php 2019-01-10 13:56:41 +01:00
mapiolca
fb9827694a Correction pour Multicompany 
Affiche les factures de l'entité courante plutôt que de celle qui a créé le tiers.
 2019-01-10 13:19:26 +01:00
Regis Houssin
8f4c452075 FIX replace deprecated "print_fiche_titre" with "load_fiche_titre" 
Signed-off-by: Regis Houssin <regis.houssin@inodbox.com>
 2018-12-25 08:34:26 +01:00
Laurent Destailleur
88a52aa11d Merge branch 'develop' into develop_mc 2018-12-14 15:58:52 +01:00
Maxime Kohlhaas
2e496ea83a QUAL rename facnumber by ref 2018-12-02 17:33:44 +01:00