Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-08 02:28:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
69,068 Commits 36 Branches 190 Tags
cefaeb583ff12ad09c836fcbf6b39d01209e901b
Commit Graph

49 Commits

Author SHA1 Message Date
Laurent Destailleur
ad7b8371da FIX Mark credit note as available for credit note in other currency 
Conflicts:
	htdocs/compta/paiement.php
	htdocs/core/class/discount.class.php
 2019-02-18 18:30:15 +01:00
Laurent Destailleur
33cd0e84d2 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
 2018-10-19 14:44:50 +02:00
Laurent Destailleur
57ad200ae5 Fix regression in creating discount 2018-10-19 14:43:10 +02:00
Laurent Destailleur
5a1a5548df Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/class/discount.class.php
	htdocs/core/lib/payments.lib.php
	htdocs/product/index.php
	htdocs/product/list.php
	htdocs/societe/class/societe.class.php
 2018-10-19 14:27:15 +02:00
gauthier
aea7299970 FIX : use discount with multicurrency 2018-10-17 15:49:08 +02:00
Laurent Destailleur
20eb7015e8 Doxygen 2018-03-27 18:00:17 +02:00
Marc de Lima Lucio
f1faf155fc FIX: supplier discounts: wrong link to source supplier invoice 2018-03-05 11:41:06 +01:00
Marc de Lima Lucio
480d756090 FIX: supplier discounts: typo 2018-03-05 11:30:18 +01:00
Marc de Lima Lucio
f5ad93b272 NEW: supplier credit notes: handle Excess Paid + translation 2018-02-19 15:52:07 +01:00
Marc de Lima Lucio
daca27b2ed NEW: supplier credit notes: split display in thirdparty discount page + fixes + refactoring 2018-02-14 18:02:40 +01:00
Marc de Lima Lucio
4f9bb33600 NEW: supplier credit notes: convert to usable absolute discount + link/unlink to supplier invoice + create supplier credit note from excess paid 2018-02-14 10:47:10 +01:00
Laurent Destailleur
4296df45af Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/projet/list.php
	htdocs/user/card.php
 2017-10-13 22:01:56 +02:00
Laurent Destailleur
558f261b60 FIX #7593 2017-10-13 01:03:33 +02:00
Laurent Destailleur
8dfa87fcf6 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-19 19:30:28 +02:00
Laurent Destailleur
f936b17d68 FIX Protection to avoid to apply credit note discount > remain to pay 2017-09-19 00:24:52 +02:00
Laurent Destailleur
5e34b121dd Add more robust php unit to detect not escaped sql. Fix not escaped sql 2017-09-15 15:41:07 +02:00
Laurent Destailleur
44405e5415 Fix #7335 #7365 Better fix 2017-09-11 15:04:29 +02:00
Laurent Destailleur
b9a9997688 Page societe/soc.php and compta/facture.php was renamed into card.php 
to match page naming conventions.
 2017-03-20 21:29:22 +01:00
Laurent Destailleur
1ef899dacc Prepare database to follow supplier discounts 2017-02-24 15:22:32 +01:00
Laurent Destailleur
afa5ef2913 NEW Introduce fields that can be computed during export in export 
profiles.
 2017-02-17 00:19:28 +01:00
Laurent Destailleur
bc8ccd8ec5 Fix bad var set 2017-01-28 13:01:10 +01:00
Gustavo Novaro
7728576f19 var to public 
Improve code style
 2016-12-17 03:49:28 -03:00
Regis Houssin
ee02ff43d7 Fix: add entity field in llx_societe_remise_except, useful when 
third-sharing is used with multicompany
 2016-07-07 12:26:30 +02:00
phf
a0cfe9aad8 New add payment with multicurrency module 2016-02-10 23:16:38 +01:00
aspangaro
d69f066735 QUAL: Traduce terms + remove <center> 2015-03-15 14:04:07 +01:00
frederic34
f4161b457b Add dol_escape_htmltag and start to adapt boxes 2015-01-22 00:23:55 +01:00
frederic34
1b0dd671b3 Add tooltip in getNomUrl link 2015-01-20 21:40:33 +01:00
frederic34
60661ae948 Add some "classfortooltip" 2015-01-09 00:07:54 +01:00
Marcos García de La Fuente
56abf1cd72 Removed duplicated SQL error logging 2014-06-13 02:28:30 +02:00
Marcos García de La Fuente
88cd5dec40 More substitutions 2014-06-13 01:42:00 +02:00
Marcos García de La Fuente
9fbd7806f0 More substitutions 2014-06-12 11:31:53 +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
Raphaël Doursenaud
258c92ab1c Qual: Avoid wrong declaration 2014-04-23 18:23:56 +02:00
Laurent Destailleur
cafa61ef7d Fix: Use correct syntax of date into sql requests (with quotes) 2014-03-15 23:12:00 +01: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
Marcos García
5a73c32f46 Migrated ClassName to __construct() function 
Changed $DB to $db
lower-cased "Class"
 2012-07-30 17:17:33 +02:00
Laurent Destailleur
ebea7f6c97 Fix: fix not initialized variables 2011-12-05 18:36:54 +01:00
Laurent Destailleur
bf9c482f8a Fix: Deposits was not included into lines but into into remain to pay 2011-11-16 18:58:11 +01:00
Laurent Destailleur
be6286c4b8 Qual: More POO. 
Qual: Doxygen
 2011-09-20 17:19:46 +00:00
Laurent Destailleur
44e4f42e86 Qual: Removed phpcodesniffer errors 2011-09-11 10:33:48 +00:00
Laurent Destailleur
605355c89c Fix: When creating invoice from other object, discount are created 
automatically
 2011-09-10 17:52:21 +00:00
Regis Houssin
2ecc03104c Fix: remove obsolete tags (in progress) 2011-08-27 15:14:31 +00:00
Laurent Destailleur
be771c9d44 Fix: Avoid errors into rpm packages 2011-07-31 23:45:11 +00:00
Laurent Destailleur
a00d389ea0 Doxygen 2011-06-19 14:35:16 +00:00
Laurent Destailleur
d3422da09e Doxygen 2011-05-11 13:18:37 +00:00
Regis Houssin
3b4ea76538 Fix: compatibility with pgsql, replace all addslashes by $this->db->escape in class 2011-02-24 18:11:12 +00:00
Laurent Destailleur
6846333ec8 New: Function dol_now('tzuser') is now supported. 2010-12-08 13:13:17 +00:00
Laurent Destailleur
750f415f2e Fix: Wrong include 2010-06-01 21:33:48 +00:00
Philippe Grand
b68a359265 according to new tree directory 2010-04-28 10:02:54 +00:00