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 |
|
Philippe GRAND
|
d91b1fd895
|
Update and standardize code
|
2018-08-22 11:06:34 +02:00 |
|
Philippe GRAND
|
a669830427
|
Update and standardize code
|
2018-08-22 10:37:16 +02:00 |
|
Laurent Destailleur
|
9997a6c787
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/filefunc.inc.php
|
2018-03-16 12:20:42 +01:00 |
|
Laurent Destailleur
|
96ff5b1b23
|
Update sql image file for 7.0 stable
|
2018-03-16 11:19:58 +01:00 |
|
Laurent Destailleur
|
2cd5ed65a6
|
Clean deprecated (field unit_charge in supplier price)
|
2018-02-25 14:13:09 +01:00 |
|
Laurent Destailleur
|
2dd2ab1003
|
Look and feel v6
|
2017-05-20 20:59:54 +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
|
c88e63ecc9
|
FIX #6259
|
2017-01-28 15:01:17 +01:00 |
|
Laurent Destailleur
|
133657a8c7
|
Uniformize code
|
2016-09-21 01:25:34 +02:00 |
|
Laurent Destailleur
|
af28a67803
|
Uniformize look using dol_banner
|
2016-09-19 10:43:30 +02:00 |
|
Laurent Destailleur
|
c7065cc3b8
|
Minor esthetic fixes
|
2016-06-07 13:15:38 +02:00 |
|
Laurent Destailleur
|
1652f80300
|
Memory optimizing. Save 2.3 Mb of memory for all forms that can show
margin informations. Save 300 Kb of memory for all other pages.
|
2015-06-06 15:19:25 +02:00 |
|