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

13801 Commits

Author SHA1 Message Date
Laurent Destailleur
86e496963b
Merge pull request #8081 from atm-maxime/new_salesrep 
NEW improve way of adding users/sales representative to thirdparty
 2018-03-22 14:05:44 +01:00
Laurent Destailleur
658b145ff4 Missing translation 2018-03-22 13:16:38 +01:00
Laurent Destailleur
700c69e127 NEW Can set position of images in module tickets 
Mutualize code of method show_photo
 2018-03-22 11:46:35 +01:00
Laurent Destailleur
6e52c896f2 Dolibarrize module ticket 2018-03-22 10:46:42 +01:00
florian HENRY
c8d309e599 clean 2018-03-21 23:00:33 +01:00
florian HENRY
e2e1fae5e6 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_mailtouser 2018-03-21 22:58:33 +01:00
florian HENRY
d3ae285c0c finish work 2018-03-21 22:58:17 +01:00
florian HENRY
1feb22ea9c fix user right on modRessource 2018-03-21 22:24:11 +01:00
Laurent Destailleur
7b6104de38
Merge pull request #8427 from ATM-Consulting/develop_atm 
NEW: method Form::selectArrayFilter() + use in left menu search
 2018-03-21 20:44:44 +01:00
Laurent Destailleur
10d7e7d289
Merge pull request #8425 from atm-florian/dev_scrunit 
Dev scrunit
 2018-03-21 20:40:01 +01:00
Laurent Destailleur
423bd56646
Merge pull request #8423 from grandoc/new_branch_20_03_2018 
New [*use loadLangs for translation files*]
 2018-03-21 20:39:40 +01:00
Laurent Destailleur
35938b1942 NEW Variable __ONLINE_PAYMENT_URL__ available in email templates 2018-03-21 20:06:22 +01:00
Laurent Destailleur
517301f014 Work on subscription reminder 2018-03-21 16:40:09 +01:00
Marc de Lima Lucio
744c263c6c NEW: selectArrayFilter() + use in left menu search 2018-03-21 15:08:20 +01:00
Laurent Destailleur
200fd88132 Fix output message in log rotation job 2018-03-21 13:56:24 +01:00
Laurent Destailleur
7e5c3cc807 Code comment 2018-03-21 13:30:30 +01:00
Laurent Destailleur
42b0a22df2 Use font-awsome for play icon 2018-03-21 13:16:05 +01:00
florian HENRY
dc6f4c1f4d NEW : option to send email to salaries 2018-03-21 11:48:30 +01:00
florian HENRY
d959905e4f fix scrutinizer 2018-03-21 08:35:03 +01:00
Laurent Destailleur
fc50fcd59e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-20 20:07:24 +01:00
Philippe GRAND
0d7ffefc8f New [*use loadLangs for translation files*] 2018-03-20 19:47:25 +01:00
Laurent Destailleur
11d33c8dcc
Merge pull request #8420 from hregis/7.0_bug3 
Fix: better compatibility with all hostname syntax
 2018-03-20 17:32:14 +01:00
Laurent Destailleur
a3a416aa7a Can remove comment added due to lack of test 2018-03-20 16:46:09 +01:00
Laurent Destailleur
d7ad899839 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/card.php
	htdocs/core/class/conf.class.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/holiday/list.php
 2018-03-20 14:52:27 +01:00
Laurent Destailleur
76cceb59a9 Nead perm to read all for monthly report of leave requests 2018-03-20 13:54:52 +01:00
Laurent Destailleur
67483eeb64 NEW Report a list of leave requests for a month 2018-03-20 13:42:29 +01:00
Laurent Destailleur
896a1cbc24 Fix bad var init 2018-03-20 11:27:47 +01:00
Laurent Destailleur
29775f735b Option MAIN_EXTRAFIELDS_IN_ONE_TD is now 1 2018-03-20 11:26:41 +01:00
Laurent Destailleur
8cf2d4eb45 Fix filter on holiday statut 
Fix tr/td balance for extrafields on lines
 2018-03-20 10:10:21 +01:00
Laurent Destailleur
a325bbf865 FIX Input of holiday for subordinates was ko 2018-03-19 20:46:43 +01:00
Regis Houssin
4767819b7a Fix: better compatibility with all hostname syntax 2018-03-19 17:59:23 +01:00
Laurent Destailleur
0c45760dd4 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/step5.php
	htdocs/langs/en_US/holiday.lang
	htdocs/public/payment/newpayment.php
	htdocs/public/stripe/newpayment.php
 2018-03-19 17:58:19 +01:00
Laurent Destailleur
91cc3d1b73 FIX navigation and filters on holiday list 2018-03-19 16:11:42 +01:00
Laurent Destailleur
ae17ce6f9a NEW Add a tab to specify accountant/auditor of the company 2018-03-19 12:52:09 +01:00
Laurent Destailleur
91b3ffc3da
Merge pull request #8409 from aspangaro/8.0-a10 
NEW Add a tab to specify accountant/auditor of the company
 2018-03-19 12:40:44 +01:00
Laurent Destailleur
eb7886ecff
Update ldap.class.php 2018-03-19 12:37:53 +01:00
Laurent Destailleur
1837d6a5f3 Better look of lines 2018-03-19 12:30:48 +01:00
Laurent Destailleur
12068f9cf3
Merge branch 'develop' into 8.0-a7 2018-03-19 12:18:18 +01:00
Laurent Destailleur
c3cd2ff3db
Update objectline_view.tpl.php 2018-03-19 12:13:18 +01:00
Regis Houssin
890d0b6685 Fix: replace ldaps:// by ssl:// 2018-03-19 12:11:59 +01:00
Laurent Destailleur
6f7098d22e
Update objectline_view.tpl.php 2018-03-19 12:09:38 +01:00
Laurent Destailleur
ce3975377d Link to unlink is unlink and not remove 2018-03-19 12:02:49 +01:00
Laurent Destailleur
e91ffa00eb NEW Can crop image files attached in "document" tabs of a member 2018-03-19 11:56:04 +01:00
Laurent Destailleur
f46df6d8e5 Can resize and crop images in the ticketsup module 2018-03-19 11:49:05 +01:00
Laurent Destailleur
f8ca4b1b5c NEW Add option BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD 2018-03-19 11:34:48 +01:00
Laurent Destailleur
0013e9d83b FIX Make a redirect after the remove_file action to avoid deletion done 
at next action too.
 2018-03-19 11:29:36 +01:00
Laurent Destailleur
8899b511fd FIX Make a redirect after the remove_file action to avoid deletion done 
at next action too.
 2018-03-19 11:28:55 +01:00
Laurent Destailleur
af44af0235 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-18 20:01:27 +01:00
Laurent Destailleur
51b6723b08 Dolibarrize module ticket 2018-03-18 20:01:11 +01:00
Laurent Destailleur
d4ae0395ed NEW Look and feel v8: Use a different picto for delete and unlink 2018-03-18 19:13:42 +01:00
Laurent Destailleur
09beb9186e
Merge pull request #8403 from atm-maxime/develop 
New filter on product supplier price import update
 2018-03-18 14:18:20 +01:00
Laurent Destailleur
22210446da
Merge pull request #8407 from joseplluis/develop 
FIX: add contact permission on contact box
 2018-03-18 12:19:09 +01:00
Laurent Destailleur
e3c0fcc3a0
Merge pull request #8405 from grandoc/develop 
New [*use loadLangs for translation files*]
 2018-03-18 12:17:13 +01:00
Josep Lluís
b2a4e3d023
Error in fix 2018-03-18 08:20:43 +01:00
Alexandre SPANGARO
17b98b84ad Merge remote-tracking branch 'uptream/develop' into 8.0-a10 2018-03-18 06:11:05 +01:00
Alexandre SPANGARO
93b087dbe0 NEW Add a tab to specify accountant/auditor of the company 2018-03-18 06:09:50 +01:00
Josep Lluís
bd81487f71
FIX: add contact permission on contact box 
In contact box is only checked the "societe" permission.
Contact permission should be checked too.
 2018-03-17 19:35:34 +01:00
Laurent Destailleur
cb1069cf0b Use font-awesome for the picto to move/transfer a line 2018-03-17 13:21:27 +01:00
Laurent Destailleur
dc0fc73931 Code comment 2018-03-17 12:15:32 +01:00
Laurent Destailleur
57e2240354 NEW Edit of extrafields position page on the edit form 2018-03-17 11:21:50 +01:00
Laurent Destailleur
e323084cf8 Better template 2018-03-16 19:03:16 +01:00
Laurent Destailleur
2bbf738cb8 FIX Sql escape 2018-03-16 18:20:28 +01:00
Philippe GRAND
68b1e5f8fd New [*use loadLangs for translation files*] 2018-03-16 17:40:19 +01:00
Laurent Destailleur
1a70e7a7c4 Triggers for Strips payment modes 2018-03-16 16:42:26 +01:00
Laurent Destailleur
f258d31a98 Triggers for Strips payment modes 2018-03-16 16:10:04 +01:00
Maxime Kohlhaas
3ccdb4d829 New filter on product supplier price import update 2018-03-16 14:22:46 +01:00
Laurent Destailleur
9997a6c787 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2018-03-16 12:20:42 +01:00
Laurent Destailleur
46e8692620 Escape db 2018-03-16 12:17:20 +01:00
Laurent Destailleur
96ff5b1b23 Update sql image file for 7.0 stable 2018-03-16 11:19:58 +01:00
arnaud
32ce42610a FIX show status on societe banner 2018-03-16 11:18:00 +01:00
Laurent Destailleur
ba47b6d051 NEW Add tab contact on supplier proposals 2018-03-16 10:21:53 +01:00
Laurent Destailleur
8bfac66f04 Escape db 2018-03-16 09:52:45 +01:00
Laurent Destailleur
5a397fff72 Fix scrutinizer bugs 2018-03-16 00:16:32 +01:00
Laurent Destailleur
6f95a7c2b1 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-15 23:48:14 +01:00
Laurent Destailleur
ce7da41bef Fix save setup 2018-03-15 23:47:16 +01:00
Laurent Destailleur
71c51eb789 NEW Add hook printEmail 2018-03-15 22:22:42 +01:00
Laurent Destailleur
46fb2945d4 NEW Show keyboard shortcut of nav arrow into tooltip 2018-03-15 22:02:03 +01:00
Laurent Destailleur
7f8f0c5dc1 Fix parameter silent was inverted 2018-03-15 21:48:51 +01:00
Laurent Destailleur
83962ca70b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-15 18:43:58 +01:00
Laurent Destailleur
e1a0df263d Fix code with the new return structure of getEmailTemplate 2018-03-15 18:43:47 +01:00
Philippe GRAND
e8df916770 New [*use loadLangs for translation files*] 2018-03-15 17:14:11 +01:00
Laurent Destailleur
ea3fbf63cd
Merge pull request #8390 from grandoc/new_branch_14_03_2018 
New [*use loadLangs for translation files*]
 2018-03-15 15:07:55 +01:00
Laurent Destailleur
9256faf6fb
Update pdf_merou.modules.php 2018-03-15 15:07:08 +01:00
Laurent Destailleur
c9566e9501
Merge pull request #8392 from aspangaro/8.0-a9 
NEW Add stats in salaries module
 2018-03-15 14:28:35 +01:00
Laurent Destailleur
7c62f22408 Remove doubtful code 2018-03-15 14:02:32 +01:00
Laurent Destailleur
d804764134 Standardize look and feel 2018-03-15 10:41:43 +01:00
Philippe Grand
c8e672d01a
use $outputlangs instead of $langs 2018-03-15 09:18:40 +01:00
Philippe Grand
3f0764f282
use $outputlangs instead of $langs 2018-03-15 09:17:53 +01:00
Philippe Grand
e6d2effba1
use $outputlangs instead of $langs 2018-03-15 09:15:22 +01:00
Philippe Grand
09d0dc7ba7
use $outputlangs instead of $langs 2018-03-15 09:14:09 +01:00
Philippe Grand
f6fd03a4f3
Change $langs by $outputlangs 2018-03-15 09:06:01 +01:00
Alexandre SPANGARO
9ce6ab915c Merge remote-tracking branch 'uptream/develop' into 8.0-a9 2018-03-15 06:24:51 +01:00
Alexandre SPANGARO
5eccc6bcbc NEW Add stats in salaries module 2018-03-15 06:23:20 +01:00
Laurent Destailleur
5392218806 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/translate.class.php
 2018-03-15 02:13:29 +01:00
Laurent Destailleur
c4eea1f0e0 Fix SQLi 2018-03-15 02:12:01 +01:00
Laurent Destailleur
f0f6f71161 Fix Sqli 2018-03-15 01:55:47 +01:00
Laurent Destailleur
6a70d268e0 Fix SQLi reported by op7ica 2018-03-15 01:22:32 +01:00
Laurent Destailleur
c62d68f4be Fix SQLi reported by op7ica 2018-03-15 01:21:44 +01:00
Laurent Destailleur
87bbb4ef87 Can create card from dolibarr 2018-03-15 00:40:29 +01:00
Laurent Destailleur
302fed8646 More fa image to replace png picto 2018-03-14 20:08:44 +01:00
Philippe GRAND
743a61159d use loadLangs for translation files 2018-03-14 19:34:33 +01:00
Philippe GRAND
13ce041313 use loadLangs for translation files 2018-03-14 19:26:46 +01:00
Philippe GRAND
a5dc583906 use loadLangs for translation files 2018-03-14 19:10:22 +01:00
Laurent Destailleur
9994b1f133 Work on stripe interface 2018-03-14 17:12:32 +01:00
Laurent Destailleur
b232681318 NEW Add a button to create Stripe customer from the Payment mode tab 2018-03-14 16:53:16 +01:00
Laurent Destailleur
3f7cd8b1bd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-14 13:56:41 +01:00
Laurent Destailleur
5c2a005e75 Work on generic customer payment modes 2018-03-14 13:56:21 +01:00
Laurent Destailleur
268b07bcf0 Can add/delete credit card localy 2018-03-14 11:51:13 +01:00
Laurent Destailleur
cc9a6ee6e0
Merge pull request #7428 from ruistrecht-alt/NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE 
NEW Show region in company info & Global option to show state code MAIN_SHOW_STATE_CODE
 2018-03-14 10:49:54 +01:00
Laurent Destailleur
35fbcb2c84
Update company.lib.php 2018-03-14 10:48:56 +01:00
Laurent Destailleur
da617f7d32 Can work both with remote and local payment modes 2018-03-13 22:43:50 +01:00
Laurent Destailleur
a86da671ba Remove verbose log 2018-03-13 18:13:31 +01:00
Laurent Destailleur
2566170c68 Use code of societeaccount 2018-03-13 17:47:43 +01:00
Laurent Destailleur
944ba69cd8 Add unique key. Dolibarrize view of stripe card. 2018-03-13 17:32:49 +01:00
Laurent Destailleur
9c92e09295 Fix syntax 2018-03-13 14:48:01 +01:00
Laurent Destailleur
b1ac4246a1
Merge pull request #8373 from ptibogxiv/patch-16 
ADD trigger when modify, delete thirdparty
 2018-03-13 14:20:33 +01:00
Laurent Destailleur
59b7187501
Rename interface_99_modStripe_Stripe.class.php to interface_80_modStripe_Stripe.class.php 2018-03-13 14:20:23 +01:00
Laurent Destailleur
4b7f4d29d1
Update interface_99_modStripe_Stripe.class.php 2018-03-13 14:19:26 +01:00
Laurent Destailleur
d6e8872af4
Update interface_99_modStripe_Stripe.class.php 2018-03-13 14:14:33 +01:00
Laurent Destailleur
4bd05f854c
Merge pull request #8371 from frederic34/pdfaddress 
add object in pdf_build_address source
 2018-03-13 14:04:49 +01:00
Laurent Destailleur
9f07ff0f9b Fix travis 2018-03-13 14:00:35 +01:00
Laurent Destailleur
e6dd312bd5 Debug ticket module 2018-03-13 13:56:45 +01:00
Laurent Destailleur
e6d8219396 Dolibarrize module ticket 2018-03-13 13:26:03 +01:00
ptibogxiv
3dd90a1f1a
FIX name of file 2018-03-13 13:21:36 +01:00
Laurent Destailleur
4380367923 Error management 2018-03-13 12:54:53 +01:00
ptibogxiv
3aa0bdfe5c
ADD trigger when modify, delete thirdparty 
More fix todo with new class of stripe.class.php
 2018-03-13 12:17:57 +01:00
Frédéric FRANCE
c76dce64d3
add object in pdf_build_address source 2018-03-13 12:15:03 +01:00
Laurent Destailleur
8048259733 Work on ticket module integration 2018-03-13 12:13:47 +01:00
Laurent Destailleur
cd71e49762 Picto ticket module 2018-03-13 10:42:58 +01:00
Laurent Destailleur
e6de2ab40e
Merge pull request #8362 from frederic34/patch-9 
Update CMailFile.class.php for swiftmailer
 2018-03-12 20:32:44 +01:00
Laurent Destailleur
78b0585798 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/taxes.php
 2018-03-12 19:09:57 +01:00
Laurent Destailleur
55d3e72463 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/contact/class/contact.class.php
	htdocs/societe/card.php
 2018-03-12 19:02:30 +01:00
Frédéric FRANCE
d6e98d3b05
Update CMailFile.class.php 2018-03-12 15:14:41 +01:00
Laurent Destailleur
0d1e26b02c Fix error management 2018-03-12 13:19:09 +01:00
Laurent Destailleur
591b0993af Fix PHPUnit for Ticket 2018-03-12 12:54:48 +01:00
Laurent Destailleur
98b7d4c2e2 NEW Can set the start/end date of service line in invoice templates 2018-03-12 12:27:40 +01:00
Laurent Destailleur
ae82d045f8 Dolibarrize module ticket 2018-03-11 23:56:17 +01:00
Frédéric FRANCE
683486eaf1
Update html.formticketsup.class.php 2018-03-11 21:00:39 +01:00
Laurent Destailleur
b084ca4a50 Fix 2018-03-11 19:44:19 +01:00
Regis Houssin
a09bad6d69 Fix: wrong year 2018-03-11 18:59:45 +01:00
Regis Houssin
7c3984c9db Fix: dolibarrizzzz 2018-03-11 18:54:38 +01:00
Laurent Destailleur
70490e2b4b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/ticketsup/class/actions_ticketsup.class.php
 2018-03-11 18:29:19 +01:00
Laurent Destailleur
8b6dea218b Dolibarrize module 2018-03-11 18:28:27 +01:00
Laurent Destailleur
d9b55f2275
Merge branch 'develop' into dev_ticketsup 2018-03-11 18:12:47 +01:00
Laurent Destailleur
baf6fc6a8b
Merge pull request #8343 from atm-maxime/develop 
Fix mail send
 2018-03-11 18:11:37 +01:00
Laurent Destailleur
0005b1bc48
Merge pull request #8342 from atm-florian/dev_fixscrunitiz 
fix scrunitizer
 2018-03-11 18:11:13 +01:00
Laurent Destailleur
40cf236f92
Merge branch 'develop' into ticketsup_core 2018-03-11 18:10:11 +01:00
Laurent Destailleur
d6eee30ee9
Merge pull request #8336 from defrance/patch-106 
add sql log on install debug
 2018-03-11 18:06:18 +01:00
Laurent Destailleur
dea80eba4e
Use a constant name starting with MAIN 2018-03-11 18:06:08 +01:00
jfefe
3b814ebba2 Try to fix phpunit test (br tag isuue) 2018-03-11 16:54:39 +01:00
Laurent Destailleur
7ffce2a28f Dolibarize 2018-03-11 16:48:44 +01:00
jfefe
c3fab4c54c Fix Phpunit issue 2018-03-11 16:48:26 +01:00
florian HENRY
cfdaa7c88d ticket sup make it work 2018-03-11 16:07:13 +01:00
Maxime Kohlhaas
df185de6ae Fix mail send 2018-03-11 15:09:25 +01:00
florian HENRY
6d8566a238 fix scrunitizer 2018-03-11 12:41:48 +01:00
jfefe
0f96575b41 Fix PHPCS errors with ticketsup module 2018-03-11 12:06:57 +01:00
Laurent Destailleur
0ac1d8b226 Dolibarize 2018-03-11 11:33:24 +01:00
Laurent Destailleur
e14d2f08b8 Dolibarize 2018-03-11 11:12:38 +01:00
BENKE Charlene
bfaffe6692
Changes Done 2018-03-11 10:51:05 +01:00
jfefe
79acb79ae0 Begin integration of module « Ticketsup » 
Related to #4948
 2018-03-11 09:44:58 +01:00
Laurent Destailleur
5d86b8e621
Merge pull request #8337 from atm-florian/dev_fixscrunitiz 
fix scrunitizer
 2018-03-11 02:08:35 +01:00
Laurent Destailleur
897b3f7b79 Fix setup 2018-03-11 00:31:26 +01:00
florian HENRY
888afe0e33 fix scrunitizer 2018-03-11 00:25:14 +01:00
Laurent Destailleur
64f21b8a3c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/card.php
 2018-03-11 00:10:13 +01:00
BENKE Charlene
923bad4da6
add sql log on install debug 
new global variable INSTALL_DISPLAY_SQL_LOG to display sql log on module install
 2018-03-10 23:59:34 +01:00
Maxime Kohlhaas
c008853842 Fix #8057 2018-03-10 23:05:33 +01:00
Laurent Destailleur
72bccd9c6b
Merge branch 'develop' into bug-6980 2018-03-10 22:27:07 +01:00
Alexis Algoud
74dc815bfa fix commonobject isInt for module builder capabilities 2018-03-10 19:02:06 +01:00
Laurent Destailleur
72eff36cd6
Merge pull request #8328 from atm-alexis/FIX_commonObject_isInt_linked 
Fix commonobject isInt for module builder capabilities
 2018-03-10 18:59:12 +01:00
Laurent Destailleur
b2677c35e2
Merge pull request #8317 from frederic34/swifmailer 
Add dkim signing with Swiftmailer
 2018-03-10 18:48:08 +01:00
Laurent Destailleur
e3ace1f89f Fix morecss not provided 2018-03-10 18:17:54 +01:00
Alexis Algoud
b370a3096c fix commonobject isInt for module builder capabilities 2018-03-10 14:14:31 +01:00
Laurent Destailleur
96aaeb2fd0
Merge pull request #8326 from atm-florian/dev_fixscrunitiz 
fix scrunitizer
 2018-03-10 12:57:51 +01:00
Laurent Destailleur
f6918a5d88 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-10 12:47:00 +01:00
Laurent Destailleur
d00b549f91 Remove duplicate perm 2018-03-10 12:46:45 +01:00
Laurent Destailleur
75b470b580
Update eldy.lib.php 2018-03-10 12:43:01 +01:00
Laurent Destailleur
04bcc4dd46
Update eldy.lib.php 2018-03-10 12:39:39 +01:00
florian HENRY
26686a05c2 fix scrunituzer 2018-03-10 10:38:56 +01:00
florian HENRY
63fb53159c fix scrunitizer 2018-03-10 01:12:47 +01:00
Inovea Conseil
aaf68b904e
Add mass action proposal closed 2018-03-10 00:00:23 +01:00
florian HENRY
c62904d632 Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0_fixinventory 2018-03-09 23:41:32 +01:00
Laurent Destailleur
cc7ac2a0da
Merge pull request #8313 from atm-florian/7.0_fix8241 
7.0 fix8241
 2018-03-09 22:47:43 +01:00
Laurent Destailleur
31f36f4028
Merge pull request #8312 from atm-florian/7.0_fix8232 
7.0 fix8232
 2018-03-09 22:47:10 +01:00
Frédéric FRANCE
27bf5419d6
Merge branch 'develop' into swifmailer 2018-03-09 22:44:57 +01:00
Laurent Destailleur
6ff3ac82c6
Merge pull request #8309 from ATM-Marc/NEW_syslog_file_autoclean 
NEW: syslog file autoclean
 2018-03-09 22:34:30 +01:00
Laurent Destailleur
d858426b7b
Update modSyslog.class.php 2018-03-09 22:33:39 +01:00
florian HENRY
42fed5981d bettre syntax 2018-03-09 19:16:06 +01:00
florian HENRY
02beed265e better space 2018-03-09 19:14:43 +01:00
florian HENRY
5a56e802d9 FIX #8232 2018-03-09 19:10:52 +01:00
Maxime Kohlhaas
4e222d3d92 Comment for travis 2018-03-09 19:09:16 +01:00
Maxime Kohlhaas
ded69bf57d New : link users to company like a tag 2018-03-09 18:59:06 +01:00
Marc de Lima Lucio
d6b4bc14e4 NEW: syslog file autoclean 2018-03-09 16:52:06 +01:00
florian HENRY
f0164f2689 fix type date 2018-03-09 14:25:37 +01:00
florian HENRY
1c966d4769 on going 2018-03-09 12:57:58 +01:00
Regis Houssin
3eeeaf2d2d Fix: REST API must be enabled for all entities 2018-03-09 12:54:34 +01:00
florian HENRY
f37d482331 fix warning and sql error 2018-03-09 11:37:23 +01:00
Laurent Destailleur
65aa5953f4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-08 20:36:07 +01:00
Laurent Destailleur
bf1bada435 Contact tab after main tab 2018-03-08 20:35:50 +01:00
Laurent Destailleur
1c9e7145e7
Merge pull request #8276 from ATM-Consulting/develop_atm 
NEW: supplier credit notes & discounts (absolute and relative)
 2018-03-08 20:06:37 +01:00
Laurent Destailleur
235db1f405 Enhance OAuth module to store the stripe account in llx_oauth_token 2018-03-08 19:51:18 +01:00
Laurent Destailleur
5b8006a6bb Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/public/payment/paymentok.php
	htdocs/public/paypal/paymentok.php
 2018-03-08 16:37:17 +01:00
Laurent Destailleur
af9fff4f83 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-08 16:35:12 +01:00
Laurent Destailleur
3762ed12c7 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2018-03-08 16:33:51 +01:00
Laurent Destailleur
343ca1bc77
Merge pull request #8294 from hregis/7.0_bug5 
Fix: avoid conflict between invoice and invoicenumber sharings
 2018-03-08 16:24:05 +01:00
Laurent Destailleur
47b03068ac
Merge pull request #8300 from hregis/develop_dict 
Fix: regression, restore primary key
 2018-03-08 16:22:23 +01:00
Laurent Destailleur
0b316c3980 Attach invoice on email subscription confirmation 2018-03-08 15:01:34 +01:00
Regis Houssin
861a831e24 Fix: debug 2018-03-08 11:53:46 +01:00
Regis Houssin
fd9c79fa7f Fix: use getEntity if no rowid to compare 2018-03-08 07:42:17 +01:00
Regis Houssin
93a9430e49 Fix: regression, restore primary key 2018-03-08 07:41:54 +01:00
Alexandre SPANGARO
0182b724aa Merge remote-tracking branch 'uptream/develop' into 8.0-a7 2018-03-08 06:53:54 +01:00
Alexandre SPANGARO
3f2aa6a4fb New : On invoice card, show accounting account linked 2018-03-08 06:52:31 +01:00
Laurent Destailleur
8c128a2985 Stripe has drop PHP 5.3 2018-03-07 19:28:04 +01:00
Laurent Destailleur
317a5f5b2f Fix by adding a redirect to avoid the order2billing being done twice. 2018-03-07 19:15:23 +01:00
Laurent Destailleur
c02e8e9831 Css 2018-03-07 19:13:15 +01:00
Laurent Destailleur
fe45e82e99 Fix use of table llx_c_paiement (param showempty was not used/set) 2018-03-07 19:00:38 +01:00
Marc de Lima Lucio
884b74a6bb FIX: warning when adding ECM files using old photo path 2018-03-07 17:12:59 +01:00
Laurent Destailleur
b2f6105ae2 FIX #8277 2018-03-07 15:52:58 +01:00
Regis Houssin
a0774d523d Fix: avoid conflict between invoice and invoicenumber sharings 2018-03-07 15:24:23 +01:00
Laurent Destailleur
05c1150477 Fix bad links 2018-03-07 15:13:22 +01:00
Laurent Destailleur
a597dc8b11
Merge pull request #8281 from ptibogxiv/patch-10 
NEW: add link to stripe's info in bank menu
 2018-03-07 15:09:46 +01:00
Laurent Destailleur
1419eaf15f Debug last stripe PR 2018-03-07 15:05:49 +01:00
Laurent Destailleur
64b0d1d390 Fix by adding a redirect to avoid the order2billing being done twice. 2018-03-07 14:33:29 +01:00
Laurent Destailleur
913be91ac7
Merge pull request #8279 from ptibogxiv/develop 
New add a stripeconnect mode + add webhook key
 2018-03-07 14:17:15 +01:00
Laurent Destailleur
62a339e582 Minor fix in multicurrency for supplier prices 2018-03-07 14:13:46 +01:00
Laurent Destailleur
d060cf840d
Merge branch 'develop' into develop 2018-03-07 13:19:25 +01:00
Laurent Destailleur
7e6ba51780 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/projet/tasks/comment.php
 2018-03-07 13:06:29 +01:00
Laurent Destailleur
f8d8c5c658 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-07 13:04:27 +01:00
Laurent Destailleur
004839b368 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-07 13:03:40 +01:00
Laurent Destailleur
8b9041b93e Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-03-07 13:02:18 +01:00
Laurent Destailleur
4caefbe926 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2018-03-07 12:59:52 +01:00
Marc de Lima Lucio
dd208348c4 FIX: add planned delivery to order exports 2018-03-07 12:18:08 +01:00
Laurent Destailleur
1ca5c7083a Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
 2018-03-07 11:54:48 +01:00
alexis Algoud
cb27eb98e1 FIX natural search double quote 2018-03-07 11:42:47 +01:00
florian HENRY
6cb77577a6 can use image 2018-03-07 09:03:13 +01:00
florian HENRY
bb73a715a8 Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0_fix_comment_task 2018-03-07 08:49:08 +01:00
florian HENRY
03873038d5 fix comment task 2018-03-07 08:47:34 +01:00
Laurent Destailleur
23a4a60970 Fix status of task 2018-03-06 21:51:43 +01:00
ptibogxiv
10b16187d4
NEW convert rib.php to gateway.php 2018-03-06 13:26:40 +01:00
Laurent Destailleur
45fd0cfc16 FIX Subscription events not recorded into agenda 2018-03-06 12:36:39 +01:00
Laurent Destailleur
72af963ed5 Fix triggers 2018-03-06 12:26:26 +01:00
Laurent Destailleur
1e6a55745c CSS 2018-03-06 11:54:05 +01:00
Laurent Destailleur
a086bd0137 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_linkedfiles.inc.php
	htdocs/core/class/utils.class.php
 2018-03-06 09:20:45 +01:00
Laurent Destailleur
17e012e0ac FIX Subscription not correctly log in blockedlog 2018-03-06 09:08:45 +01:00
ptibogxiv
afa8b37239
NEW: add link to stripe's info in bank menu 2018-03-05 19:45:55 +01:00
Laurent Destailleur
db65379ebc FIX Subscription not correctly log in blockedlog 2018-03-05 17:07:59 +01:00
Marc de Lima Lucio
c4950d4f0c FIX: supplier discounts: wrong source invoice ref in DOCs 2018-03-05 11:49:04 +01: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
1765b09fda Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm 2018-03-05 11:05:38 +01:00
Regis Houssin
722fbc9d29 Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0_bug5 2018-03-05 10:25:23 +01:00