Commit Graph

65809 Commits

Author SHA1 Message Date
Laurent Destailleur
ba4839fa76 FIX The menu "Line bindings" start at the fiscal start month 2018-03-27 12:22:10 +02:00
Laurent Destailleur
98b952b547 FIX Create payment of expense report 2018-03-27 12:09:34 +02:00
Laurent Destailleur
2e296b3475 remove incoterm file 2018-03-27 00:05:57 +02:00
Laurent Destailleur
b44e791c0a Work on vat reports 2018-03-26 21:39:18 +02:00
Laurent Destailleur
26e2d3c4f0 Clean permissions tables 2018-03-26 16:35:50 +02:00
Laurent Destailleur
9f11cf77df Merge ticket css in main css 2018-03-26 15:45:56 +02:00
Laurent Destailleur
e9c4ae8f01 Add type product/service in type of expense report 2018-03-26 14:52:20 +02:00
Laurent Destailleur
6efa1560b9 Fix wrapper to image barcode 2018-03-25 19:49:00 +02:00
Laurent Destailleur
b756c4a51e Upgrade to tcpdf 6.2.17 2018-03-25 19:42:34 +02:00
Laurent Destailleur
5fae930f85 Fix warnings 2018-03-25 19:22:08 +02:00
Laurent Destailleur
73273f68b3 Prepare lib to be a native class 2018-03-25 19:21:00 +02:00
Laurent Destailleur
c50b772b11 Clean duplicate code for payment page. Redirect on common page. 2018-03-25 19:15:55 +02:00
Laurent Destailleur
b2c63a1b4d Dolibarrize ticket module 2018-03-25 18:45:07 +02:00
Laurent Destailleur
8102ae6705 Work on setup for vat of product payments 2018-03-25 18:25:52 +02:00
Laurent Destailleur
8a3e6a0750 More logical setup behavior 2018-03-25 17:53:32 +02:00
Laurent Destailleur
852191010a Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/filefunc.inc.php
2018-03-25 15:29:11 +02:00
Laurent Destailleur
934d2d8881 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	htdocs/filefunc.inc.php
2018-03-25 15:27:31 +02:00
Laurent Destailleur
e7edf41e19 More complete error message 2018-03-25 15:21:32 +02:00
Laurent Destailleur
53dde8dc0c Fix confirmation email for membership payment 2018-03-25 15:00:43 +02:00
Laurent Destailleur
a5dd98701e Too verbose log 2018-03-25 13:40:22 +02:00
Laurent Destailleur
04ca623ced More tests 2018-03-25 13:12:14 +02:00
Laurent Destailleur
a1b44651e5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-24 18:28:23 +01:00
Laurent Destailleur
6ef1dbbe0f FIX auto open contract if one result found 2018-03-24 18:28:06 +01:00
Laurent Destailleur
0d563ad0ec
Merge pull request #8444 from hregis/develop_multicompany
NEW add printUserListWhere hook
2018-03-24 16:42:57 +01:00
Laurent Destailleur
c85cb7fe0a
Merge pull request #8447 from fappels/7.0_modulbuilder
Update on module builder
2018-03-24 16:41:43 +01:00
Laurent Destailleur
0a2db0d745
Merge pull request #8446 from hregis/develop_dict
Fix: Parameter must be an array or an object that implements Countable
2018-03-24 16:41:04 +01:00
Laurent Destailleur
1c581c6fff
Merge pull request #8443 from atm-florian/6.0
fix user right on modRessource,  fix security check on fourn card
2018-03-24 16:37:11 +01:00
Laurent Destailleur
d63c8356f4
Merge pull request #8437 from hregis/7.0_bug6
Fix: uniformize getEntity('intervention')
2018-03-24 16:36:27 +01:00
Laurent Destailleur
630ed04e17 FIX missing properties in last contract list 2018-03-24 13:15:00 +01:00
Laurent Destailleur
224fa1c03e Fix external links ko when substitution key are inside domain 2018-03-24 12:48:33 +01:00
Laurent Destailleur
a3c199e9e3 FIX Missing include 2018-03-24 12:48:19 +01:00
Laurent Destailleur
ab9edef3c7 Fix external links ko when substitution key are inside domain 2018-03-24 12:46:52 +01:00
Laurent Destailleur
f9ad2f7fb2 FIX Missing include 2018-03-24 12:10:04 +01:00
Laurent Destailleur
ab4f66009a Translation 2018-03-24 00:00:35 +01:00
Laurent Destailleur
c864dbd515 Save Stripe customer id when using online member subscription 2018-03-23 23:59:35 +01:00
Laurent Destailleur
c7e93a5a3b Serious enhancement in auto subscription for member module 2018-03-23 22:49:08 +01:00
Laurent Destailleur
53edb86ffb Make sending of email for member module ok with new email template archi 2018-03-23 19:35:25 +01:00
Laurent Destailleur
639d8ce9ef Fix link replacement 2018-03-23 18:11:01 +01:00
Laurent Destailleur
6e32e9961f Syn transifex 2018-03-23 17:56:35 +01:00
fappels
caa43ae2f6 Make helper methods available for derived classes.
Use-case: a module build with modulebuilder can make it's own fetch
method using the helper methods.
2018-03-23 17:35:46 +01:00
Laurent Destailleur
83b6dd4cb9 Prepare 7.0.2 2018-03-23 16:17:56 +01:00
Laurent Destailleur
a15abb2ded Update lang 2018-03-23 16:17:28 +01:00
Laurent Destailleur
c12469860a Update lang 2018-03-23 16:17:10 +01:00
Laurent Destailleur
7363ae17ee Move setup of email for module module into email templates 2018-03-23 16:09:46 +01:00
Regis Houssin
47ea5a84fe Fix: wrong var name 2018-03-23 11:11:14 +01:00
Regis Houssin
2fb0fc39a5 Fix: Parameter must be an array or an object that implements Countable 2018-03-23 11:10:04 +01:00
Regis Houssin
f330c5ad32 Fix: better compatibility 2018-03-23 10:52:10 +01:00
Regis Houssin
715852569b NEW add printUserListWhere hook 2018-03-23 10:42:36 +01:00
florian HENRY
11446fb2f7 Merge branch '6.0' of https://github.com/Dolibarr/dolibarr.git into 6.0 2018-03-22 23:26:37 +01:00
florian HENRY
46d2b4d62d fix security check on fourn card 2018-03-22 23:25:54 +01:00