Commit Graph

1077 Commits

Author SHA1 Message Date
Frédéric FRANCE
d582f72bd9 __NEXT_MONTH __PREVIOUS_MONTH give day instead month 2018-07-22 17:27:02 +02:00
Regis Houssin
8fc2f7441c Fix: to avoid deleting line breaks 2018-06-20 09:06:16 +02:00
Laurent Destailleur
63fb82931c Update functions.lib.php 2018-06-18 10:41:11 +02:00
altatof
5d6cd381b9 Fix <br/> detection 2018-06-15 15:59:14 +02:00
Laurent Destailleur
37e4da30d0 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-04-15 11:33:27 +02:00
Juanjo Menent
bfed1b9db1 FIX: some localtaxes errors 2018-04-14 12:45:40 +02:00
arnaud
32ce42610a FIX show status on societe banner 2018-03-16 11:18:00 +01:00
alexis Algoud
cb27eb98e1 FIX natural search double quote 2018-03-07 11:42:47 +01:00
Laurent Destailleur
9f6118ed52 Code comments 2018-01-14 03:12:22 +01:00
Laurent Destailleur
c947502efa Fix typo 2018-01-13 17:22:59 +01:00
Laurent Destailleur
9fa6bfd1a5 Fix edit external user or not 2017-11-29 15:30:41 +01:00
florian HENRY
e195cf0b95 fix : return vat code for supplier price 2017-11-14 09:53:06 +01:00
Laurent Destailleur
bc9b816719 Fix deletion of files that contains __ 2017-11-06 17:54:18 +01:00
Laurent Destailleur
c4b3dc40c3 Allow : into file names 2017-10-03 10:54:51 +02:00
Laurent Destailleur
537a551bb5 Fix vat visiblity on pdf 2017-09-27 21:58:42 +02:00
Laurent Destailleur
59571b1ce1 FIX #7473 Mass update of vat rates and other bugs on localtax 2017-09-26 10:29:44 +02:00
Laurent Destailleur
cce1549f66 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
	htdocs/commande/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/fourn/card.php
	htdocs/public/members/new.php
2017-09-15 11:02:34 +02:00
Laurent Destailleur
f16d88fd53 FIX #7391 2017-09-14 13:17:31 +02:00
Laurent Destailleur
bde293af22 Fix filter on extrafield with type sellist 2017-09-07 15:34:25 +02:00
Laurent Destailleur
33e2179b65 FIX SQL injection 2017-09-06 18:17:57 +02:00
Laurent Destailleur
d26b2a694d FIX Security fixes (filter onload js, less verbose error message in
download and viewimage, show info to encourage dolibarr_main_prod=1)
2017-09-06 11:39:30 +02:00
Laurent Destailleur
991a33f7b6 Make different vat rates visible 2017-08-29 20:40:51 +02:00
Laurent Destailleur
eebaff95cf Fix pb with imagick 2017-08-29 13:41:44 +02:00
Laurent Destailleur
326d3df63f FIX select of category
FIX pb with extrafield list and key '0'

Conflicts:
	htdocs/core/class/extrafields.class.php
2017-08-24 13:28:56 +02:00
Laurent Destailleur
e25a428118 Fix compatibility with Internet Explorer 2017-08-23 12:32:28 +02:00
Laurent Destailleur
aae24c26a3 Some fixes with smartphones 2017-08-22 20:20:34 +02:00
Laurent Destailleur
71d49f1c6f Fix pb in ecm 2017-08-01 18:44:34 +02:00
Laurent Destailleur
7a69df08c5 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
	htdocs/cron/class/cronjob.class.php
2017-07-31 02:39:42 +02:00
Laurent Destailleur
7e0a165131 Fix some pb in search using phone 2017-07-26 20:33:25 +02:00
Laurent Destailleur
ab72fbffc6 Fix pb with .svg files 2017-07-25 23:02:14 +02:00
Laurent Destailleur
9043cf759b Fix clone function 2017-07-23 20:27:30 +02:00
Laurent Destailleur
25b107defb Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
	htdocs/contrat/list.php
	htdocs/fichinter/list.php
2017-07-23 19:09:00 +02:00
Laurent Destailleur
44023606c6 Fix pb in dolGetFirstLineOfText. Add PHPunit 2017-07-22 12:47:35 +02:00
Laurent Destailleur
7b2a71802b Do some TODO on modulebuilder module. 2017-07-16 13:00:35 +02:00
Laurent Destailleur
7eb4562432 Code comment 2017-07-13 15:22:07 +02:00
Regis Houssin
d63e15f0c6 Fix: missing group name with dol_banner_tab 2017-07-12 15:52:58 +02:00
Laurent Destailleur
f40afcf023 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
	htdocs/compta/facture/list.php
	htdocs/compta/paiement/class/cpaiement.class.php
	htdocs/compta/sociales/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/expensereport/card.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/product/stats/facture.php
2017-07-08 18:32:34 +02:00
Laurent Destailleur
ba3b6b6aa5 Better support of vat with code in expense report 2017-07-08 18:09:45 +02:00
Laurent Destailleur
2ea7f38d38 Fix migration of version that is not a final version 2017-07-08 12:48:17 +02:00
Laurent Destailleur
252d8da8fc Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/categories/class/categorie.class.php
	htdocs/core/class/commondocgenerator.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/filefunc.inc.php
	htdocs/societe/class/societe.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
2017-07-07 15:11:53 +02:00
Laurent Destailleur
c56ea50251 Currency symbol for peru is before value 2017-07-02 14:30:24 +02:00
Laurent Destailleur
b308cfef1d Fix dol_trunc 2017-06-30 18:30:01 +02:00
Laurent Destailleur
05318bb4ec More complete dol_string_nospecial 2017-06-28 19:02:09 +02:00
Laurent Destailleur
1a860c42ee Look and feel v6 2017-06-27 16:42:11 +02:00
Laurent Destailleur
693b2fe3b4 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/ajax/ajaxdirpreview.php
	htdocs/core/class/conf.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/tpl/objectline_create.tpl.php
2017-06-23 11:20:29 +02:00
Laurent Destailleur
45004493e0 Fix multicurrency and vat_src_code not propaged on invoice from
shipment.
2017-06-23 11:12:17 +02:00
Laurent Destailleur
014cb4b004 Fix navigation on security event list 2017-06-21 12:03:49 +02:00
Laurent Destailleur
4102403482 Look and feel v6 2017-06-21 11:37:34 +02:00
Laurent Destailleur
287e727e71 Fix detection of relative URL 2017-06-19 13:47:25 +02:00
Laurent Destailleur
86a6a83647 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/admin/tools/index.php
	htdocs/bookmarks/bookmarks.lib.php
	htdocs/compta/facture.php
	htdocs/core/tpl/passwordforgotten.tpl.php
	htdocs/fourn/ajax/getSupplierPrices.php
	htdocs/main.inc.php
	htdocs/product/stats/card.php
	htdocs/public/paypal/paymentko.php
2017-06-18 21:13:48 +02:00