Commit Graph

64661 Commits

Author SHA1 Message Date
Marc de Lima Lucio
bcb39e57fb FIX: supplier credit notes: wrong credit note filter 2018-02-20 10:08:55 +01:00
Marc de Lima Lucio
44b0d1ca0f Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm 2018-02-19 17:33:20 +01:00
Marc de Lima Lucio
a66f7b8bc8 FIX: supplier credit notes: wrong discount filters 2018-02-19 17:32:59 +01:00
Marc de Lima Lucio
57b8df4008 FIX: supplier credit notes: delete discount when deleting linked invoice/invoice line 2018-02-19 17:32:11 +01:00
Laurent Destailleur
f3114765a3 Work on website module 2018-02-19 16:46:29 +01:00
Marc de Lima Lucio
f5ad93b272 NEW: supplier credit notes: handle Excess Paid + translation 2018-02-19 15:52:07 +01:00
Laurent Destailleur
60a77a6d85 Add option to grab images into same dir or subdir 2018-02-19 14:56:37 +01:00
Laurent Destailleur
60fe1fa503 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/mails.php
2018-02-17 01:19:17 +01:00
Laurent Destailleur
ab6d0d2530 Fix errors 2018-02-17 01:16:52 +01:00
Laurent Destailleur
46c941c823 Translation 2018-02-16 23:57:35 +01:00
Laurent Destailleur
5c5d2cbefa Fix smtp warning message 2018-02-16 23:49:08 +01:00
Laurent Destailleur
9bed2ce8e2 Fix ignore file integrity check on filefunc.inc.php for deb/rpm package 2018-02-16 22:03:13 +01:00
Laurent Destailleur
b3e567c310 Fix rpm package for apache 2.4, selinux and php packages 2018-02-16 20:47:28 +01:00
Laurent Destailleur
a4b155fc91 Fix typo and 2018-02-16 20:42:40 +01:00
Laurent Destailleur
c513ffe1f7 Fix debian package 2018-02-16 18:21:18 +01:00
Laurent Destailleur
8db6b1ecc0 Fix package for debian 2018-02-16 17:19:04 +01:00
Laurent Destailleur
d233c152a7 Code comment 2018-02-16 14:18:05 +01:00
Marc de Lima Lucio
924a9c392c FIX: supplier credit notes: hide relative discounts until supported 2018-02-16 12:30:32 +01:00
Laurent Destailleur
f67f0df609 Fix preview link not visible with long file names 2018-02-16 12:11:39 +01:00
Marc de Lima Lucio
fa0c65e37e FIX: supplier credit notes: correctly handle discount split 2018-02-16 12:05:36 +01:00
Marc de Lima Lucio
7367769ec3 FIX: supplier credit notes: use correct rights in supplier invoice card 2018-02-16 11:59:51 +01:00
Marc de Lima Lucio
d2bb6a790b NEW: supplier credit notes: display supplier discounts in supplier proposal card 2018-02-16 11:45:57 +01:00
Marc de Lima Lucio
905adab517 NEW: supplier credit notes: display supplier discounts in supplier order card 2018-02-16 11:23:59 +01:00
Marc de Lima Lucio
bd486e4cab FIX: remove var_dump 2018-02-16 10:29:36 +01:00
Marc de Lima Lucio
e2b65b3755 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_supplier_credit_note 2018-02-16 09:14:53 +01:00
Laurent Destailleur
540e3d6dc5 USe common name for triggers CONTRACT_SERVICE_ACTIVATE into
LINECONTRACT_ACTIVATE and CONTRACT_SERVICE_CLOSE into LINECONTRACT_CLOSE
2018-02-16 01:19:31 +01:00
Laurent Destailleur
91c8dbcc48 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-15 19:50:04 +01:00
Laurent Destailleur
362aec3e4b NEW Add param $dolibarr_main_restrict_ip in config file to limit ips 2018-02-15 19:49:50 +01:00
Laurent Destailleur
c022b082d5
Merge pull request #8201 from BitKFu/develop
Export to PDF using LibreOffice 5 command line
2018-02-15 17:30:22 +01:00
Laurent Destailleur
03e58f86f3
Merge pull request #8199 from dolibarr95/patch-37
Fix : Bad copy/paste in var name
2018-02-15 17:28:46 +01:00
Gerhard Stephan
93965e857b fetched from dolibarr/dolibarr 2018-02-15 16:02:13 +01:00
Laurent Destailleur
4f0ba4982b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-15 15:34:35 +01:00
Laurent Destailleur
6b74c79798 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/website.lang
2018-02-15 15:34:17 +01:00
Laurent Destailleur
47713e0264 Fix bug reported by scrutinizer 2018-02-15 15:32:43 +01:00
Laurent Destailleur
8493d9f62e FIX #8163 2018-02-15 15:27:06 +01:00
Laurent Destailleur
13dd440fd4 FIX #8192 2018-02-15 14:47:08 +01:00
Gerhard Stephan
520f581481 Don't check for windows/linux, just call soffice (without the extension) will work on windows too. 2018-02-15 14:38:21 +01:00
Laurent Destailleur
7722f004c8 FIX #8153 2018-02-15 14:08:42 +01:00
Laurent Destailleur
5eee292663 FIX #8189 2018-02-15 13:40:17 +01:00
dolibarr95
634f3bc025
Bad copy/paste 2018-02-15 13:38:21 +01:00
Laurent Destailleur
825a295294 FIX #8198 2018-02-15 13:28:15 +01:00
Laurent Destailleur
d4c5468c71
Merge pull request #8197 from dolibarr95/patch-36
NEW Add phone format for a lot of countries
2018-02-15 13:24:51 +01:00
Laurent Destailleur
9965a25eaa Code comment 2018-02-15 13:23:13 +01:00
Laurent Destailleur
0172ecb425 Code comment 2018-02-15 13:21:58 +01:00
Laurent Destailleur
d547d1a9cf Suggest better change for #8196. To be tested. 2018-02-15 13:16:54 +01:00
Laurent Destailleur
f0855da0fb Fix responsive 2018-02-15 12:57:04 +01:00
dolibarr95
3ffc671052
Add phone format for several countries 2018-02-15 10:47:32 +01:00
Gerhard Stephan
51028c845d Export to PDF using LibreOffice 5 command line 2018-02-15 10:15:27 +01:00
Laurent Destailleur
a4384b1921 Fix date start/end of project are day not hours 2018-02-15 02:02:32 +01:00
Laurent Destailleur
18acff5e57 Fix avoid error when homepage not set 2018-02-15 01:29:51 +01:00