lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
65,835 Commits 43 Branches 150 Tags 886 MiB
1a473998d0
Commit Graph

65835 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
1a473998d0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-27 18:01:34 +02:00
Laurent Destailleur
db70492983
Merge pull request #8458 from frederic34/patch-9 
FIX Error message not reported when sending emails
 2018-03-27 18:01:24 +02:00
Laurent Destailleur
3fa7cdf17f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-27 18:00:29 +02:00
Laurent Destailleur
20eb7015e8 Doxygen 2018-03-27 18:00:17 +02:00
Laurent Destailleur
4c9ccb163c Remove deprecated way of working. Use context array instead. 2018-03-27 17:58:24 +02:00
Laurent Destailleur
6b47df6695
Merge pull request #8454 from frederic34/patch-2 
ignore Return-Path in dkim sign with swiftmailer
 2018-03-27 17:48:24 +02:00
Laurent Destailleur
6eca679f68
Merge pull request #8453 from OPEN-DSI/fix-import-insert-foreign-key 
FIX #7581 Import INSERT foreign key
 2018-03-27 17:47:45 +02:00
Laurent Destailleur
d41908e52a
Update import_xlsx.modules.php 2018-03-27 17:46:50 +02:00
Laurent Destailleur
86c4bb23ad
Update import_csv.modules.php 2018-03-27 17:46:28 +02:00
Laurent Destailleur
de28f24570
Merge pull request #8448 from bgenere/patch-1 
FIX - Point of sale - buttons for cheque and CB are not displayed pro…
 2018-03-27 17:09:23 +02:00
Laurent Destailleur
0c449b2ff4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-27 16:56:04 +02:00
Laurent Destailleur
fb2885be45 Module DAV 2018-03-27 16:55:51 +02:00
Laurent Destailleur
0fb55fb80b Module DAV 2018-03-27 16:50:01 +02:00
Laurent Destailleur
b6a0b1ff3e Module DAV 2018-03-27 16:33:40 +02:00
Laurent Destailleur
3eee68c404 NEW Prototype of a module DAV 2018-03-27 16:18:12 +02:00
Laurent Destailleur
4740c92eb1 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-27 12:47:14 +02:00
Laurent Destailleur
56944115cb Hide a very dangerous feature. Should be useless. 2018-03-27 12:46:15 +02:00
Laurent Destailleur
dab8dbd671 FIX Binding pages must start on fiscal month not calendar month 2018-03-27 12:31:08 +02:00
Laurent Destailleur
d1e9a4719b Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/accountancy/expensereport/index.php
	htdocs/accountancy/supplier/index.php
 2018-03-27 12:27:15 +02:00
Laurent Destailleur
a3851ec32a Sync transifex 2018-03-27 12:23:39 +02:00
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
Frédéric FRANCE
77fb736ee2
Update actions_sendmails.inc.php 2018-03-27 11:17:40 +02:00
Laurent Destailleur
88939a8469 FIX Draft invoice must be excluded from report 2018-03-27 11:10:12 +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
Frédéric FRANCE
1071ec7e57
ignore Return-Path in dkim sign with swiftmailer 2018-03-26 21:36:03 +02:00
François J
e892089afd Fix Import INSERT foreign key 
Check the row referencing this foreign key exists first
instead of always trying to perform an UPDATE.
 2018-03-26 17:52:43 +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
89bf781fe6 FIX Add warning when expense report line not into range 
FIX Name of user not visible on journalizing expense report payments
FIX Only approved expense report must be journalized
 2018-03-26 14:13:40 +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
Bruno Généré
c2eb04f18d
BUG - Point of sale - buttons for cheque and CB are not displayed properly when one account is not defined 
I find out in the point of sale module that when you have an account for CB but not for check than you could use check but not CB.
It seems quite obvious when you look to the previous code that a mistake was done.
This is now fixed I expect.
The workaround for now is to define both default accounts (for check and for CB).
 2018-03-24 17:50:40 +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