2
0
forked from Wavyzz/dolibarr
Commit Graph

112 Commits

Author SHA1 Message Date
Laurent Destailleur
d97a59ac4a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	ChangeLog
	htdocs/comm/remise.php
	htdocs/core/class/html.form.class.php
	htdocs/filefunc.inc.php
	htdocs/product/list.php
	htdocs/variants/combinations.php
2020-01-10 14:25:26 +01:00
ptibogxiv
e820af4aa0 FIX: multicompany for discount 2020-01-07 13:07:36 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Laurent Destailleur
ce47de453e Fix HTML5 2019-12-12 10:31:08 +01:00
Scrutinizer Auto-Fixer
8a527631a0 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:35:02 +00:00
Frédéric FRANCE
35751a80ab 100% centpercent 2019-11-05 21:24:41 +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
8fce6e5e31 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/card.php
	htdocs/core/modules/mailings/xinputfile.modules.php
	htdocs/fourn/facture/card.php
2019-03-02 19:13:37 +01:00
Laurent Destailleur
40e923ec85 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/core/modules/modAgenda.class.php
2019-03-02 19:07:14 +01:00
Laurent Destailleur
855aaaffd8 Better fix for type of discount 2019-02-28 11:44:10 +01:00
florian HENRY
4ebf4780c2 fix relative discount for prospect and supplier 2019-02-28 09:09:06 +01:00
Frédéric FRANCE
7ee086b402 PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Philippe GRAND
bd929c2d1e update with html5 compliant code 2019-01-17 14:24:41 +01:00
Philippe GRAND
d1f100b0c9 standardize 2018-07-29 17:17:29 +02:00
Frédéric FRANCE
f24a6ed4d6 loadlangs 2018-05-26 19:03:41 +02:00
Laurent Destailleur
ee870342ef Fix navigation/translation 2018-04-06 20:22:20 +02:00
Marc de Lima Lucio
6a4a3c9e82 NEW: supplier credit notes: remove MAIN_FEATURES_LEVEL 2018-03-05 10:58:19 +01:00
Marc de Lima Lucio
059801fe03 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm 2018-03-01 10:22:21 +01:00
Laurent Destailleur
c8e6a8c014 Fix look and feel v7 2018-02-27 22:17:42 +01:00
Marc de Lima Lucio
9cf45266f5 NEW: supplier relative discounts 2018-02-27 16:30:39 +01:00
Laurent Destailleur
0873260b8a USe second parameter in GETPOST 2017-09-15 10:50:50 +02:00
Laurent Destailleur
68e333879f Fix var not sanitized 2017-05-16 13:27:32 +02:00
Laurent Destailleur
52c86cb3f5 NEW Bulk actions available on supplier orders 2017-04-09 13:12:25 +02:00
Laurent Destailleur
30c2ac37d5 Fix missing separator 2017-03-11 02:35:01 +01:00
Laurent Destailleur
e50bbb05fa Fix security bugs 2016-12-18 13:04:24 +01:00
Regis Houssin
08725003b9 Fix: add entity field in llx_societe_remise, useful when third-sharing
is used with multicompany
2016-07-07 12:43:02 +02:00
Laurent Destailleur
3bcc7b0f8f Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	htdocs/comm/remise.php
	htdocs/expedition/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/filefunc.inc.php
	htdocs/societe/price.php
2016-02-15 01:37:23 +01:00
Laurent Destailleur
c4c7ea2f22 FIX Relative discount decimals are not saved 2016-02-08 02:49:19 +01:00
philippe grand
30eb08151d [Qual] Close database handler should be after Footer 2015-12-11 14:19:38 +01:00
Laurent Destailleur
a84ec64ece The new banner tab is available on all tabs of thirdparty. 2015-10-13 13:06:32 +02:00
Raphaël Doursenaud
631ee83745 [Qual] Replaced deprecated print_fiche_titre() 2015-09-24 18:34:58 +02:00
Laurent Destailleur
6624182361 Fix form outside table 2015-08-28 00:29:46 +02:00
aspangaro
c4c69e191b Replace <center> tags 2014-11-25 20:13:43 +01:00
aspangaro
0b20369dd7 Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00
Marcos García de La Fuente
43597c1731 Migrated old error notifications to the """new""" system 2014-07-20 01:43:46 +02:00
Laurent Destailleur
8a9db28e09 Fix: Use correct name of field. 2014-06-10 08:50:49 +02:00
Laurent Destailleur
3bcb4712c0 Fix: Field must be reset after adding a new line 2014-06-10 08:49:01 +02:00
Francis Appels
1460a0b0f1 fix: remise_client history 2014-06-08 12:36:44 +02:00
Raphaël Doursenaud
f8f502d013 Removed closing php tag
http://php.net/manual/en/language.basic-syntax.phptags.php
2014-05-03 18:18:44 +02:00
Laurent Destailleur
c748f3d834 Qual: Removed useless methods
Qual: Removed deprecated vars
Qual: Free memory
2013-06-16 21:31:21 +02:00
Laurent Destailleur
8d206fdfb0 Prepare move to other licence. For the moment all answers for licence
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
2013-01-16 15:36:08 +01:00
Laurent Destailleur
df3c1ca644 Fix: Showing rate 2012-10-15 22:13:39 +02:00
Marcos García
4209898d20 Lower-cased Header function 2012-08-31 05:58:38 +02:00
Marcos García
ea119c45a2 Lower-cased all <?PHP 2012-08-22 23:27:53 +02:00
Marcos García
f3674317ec Removed parenthesis from all require and replaced with single quotes 2012-08-22 23:24:21 +02:00
Marcos García
706d79986c Removed parenthesis from all require_once and replaced with single quotes 2012-08-22 23:11:24 +02:00
Regis Houssin
8f9b9987ff Fix: Multiple directory traversal vulnerabilities with document.php 2012-02-27 17:02:56 +01:00
Regis Houssin
63d60a33fc [task #216] Move lib in core directory 2011-10-24 11:25:54 +02:00
Laurent Destailleur
605355c89c Fix: When creating invoice from other object, discount are created
automatically
2011-09-10 17:52:21 +00:00