Alexandre SPANGARO
|
a5428cc8c7
|
NEW Module Assets
|
2018-04-01 21:26:52 +02:00 |
|
Regis Houssin
|
20e80a58a8
|
Fix: limit access to internal users
|
2018-04-01 11:43:39 +02:00 |
|
Laurent Destailleur
|
2d3a55a6a8
|
Restore broken confirmation popup
|
2018-03-31 23:39:08 +02:00 |
|
Laurent Destailleur
|
927d86f27f
|
Revert "NEW: formconfirm in javascript"
This reverts commit 50790d5527.
|
2018-03-31 23:10:12 +02:00 |
|
Laurent Destailleur
|
d21143831c
|
Clean code
|
2018-03-31 22:44:32 +02:00 |
|
Laurent Destailleur
|
43f8834b28
|
Uniformize code with the new module builder framework
|
2018-03-31 18:48:27 +02:00 |
|
Laurent Destailleur
|
96c73a13f6
|
Clean code
|
2018-03-31 16:45:36 +02:00 |
|
Laurent Destailleur
|
84bb4c6ad7
|
FIX With x extrafields, request for multicompany label was done x times
|
2018-03-30 19:51:53 +02:00 |
|
Laurent Destailleur
|
99ada20f6d
|
Add picto bank
|
2018-03-29 19:08:51 +02:00 |
|
Laurent Destailleur
|
0978c8f58b
|
CSS
|
2018-03-29 16:07:49 +02:00 |
|
Laurent Destailleur
|
7c394733e4
|
Merge pull request #8445 from ATM-Consulting/develop_atm
NEW: bank reconcile: checkbox to select all bank operations
|
2018-03-29 14:49:41 +02:00 |
|
Laurent Destailleur
|
a214d0b3d7
|
Merge pull request #8461 from hregis/develop_multicompany
Fix: best visibility of choices
|
2018-03-29 13:58:30 +02:00 |
|
Laurent Destailleur
|
8881dc4518
|
Merge pull request #8464 from grandoc/new_branch_27-03-2018
New [*use loadLangs for translation files*] and update code
|
2018-03-29 13:40:02 +02:00 |
|
Laurent Destailleur
|
d6dd7f87cd
|
Merge pull request #8468 from hregis/develop_ldap
NEW Better performance with openldap
|
2018-03-29 13:37:34 +02:00 |
|
Laurent Destailleur
|
ff505ba148
|
Work on a page dedicated for external frontend (mobile, ...)
|
2018-03-29 11:34:01 +02:00 |
|
florian HENRY
|
cc7deb0add
|
Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0
|
2018-03-29 09:36:05 +02:00 |
|
florian HENRY
|
78812ef826
|
better error management
|
2018-03-29 09:35:47 +02:00 |
|
Laurent Destailleur
|
39f25c9fc2
|
Fix phpcs
|
2018-03-29 08:28:36 +02:00 |
|
Laurent Destailleur
|
1c86eb1c44
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/localtax/index.php
htdocs/compta/tva/quarter_report.php
htdocs/core/lib/tax.lib.php
|
2018-03-29 03:08:01 +02:00 |
|
Laurent Destailleur
|
125085acee
|
Fix name of method to avoid ci errors
|
2018-03-29 03:01:05 +02:00 |
|
Regis Houssin
|
6e616e1198
|
Fix: better performance for openldap
|
2018-03-28 10:06:00 +02:00 |
|
Laurent Destailleur
|
0edba4b4a7
|
Manage field showoncombobox
|
2018-03-27 23:44:49 +02:00 |
|
Laurent Destailleur
|
7a45527983
|
Generate the foreign key into key.sql file
|
2018-03-27 23:26:20 +02:00 |
|
Laurent Destailleur
|
56c8ee8978
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-03-27 23:02:12 +02:00 |
|
Laurent Destailleur
|
6f6395e309
|
Code comment
|
2018-03-27 23:01:54 +02:00 |
|
Philippe GRAND
|
5b1efc2227
|
New [*use loadLangs for translation files*] and update code
|
2018-03-27 19:30:31 +02:00 |
|
florian HENRY
|
7635f23d78
|
Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0
|
2018-03-27 18:39:56 +02:00 |
|
florian HENRY
|
af7c1d8da1
|
fix error log
|
2018-03-27 18:39:18 +02:00 |
|
Regis Houssin
|
7d7a006583
|
Fix: best visibility of choices
|
2018-03-27 18:12:42 +02:00 |
|
Laurent Destailleur
|
e28307ede4
|
Merge pull request #8449 from hregis/develop_dict
NEW add "moreHtmlRef" hook
|
2018-03-27 18:07:57 +02:00 |
|
Frédéric FRANCE
|
299c32d262
|
Update actions_sendmails.inc.php
|
2018-03-27 18:02:27 +02:00 |
|
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 |
|
Regis Houssin
|
2b8fe93fc8
|
Fix: remove unused global
|
2018-03-27 17:40:17 +02:00 |
|
Regis Houssin
|
35b6cb750f
|
Fix: move "moreHtmlRef" hook in "showrefnav" function
|
2018-03-27 17:36:25 +02:00 |
|
Laurent Destailleur
|
3eee68c404
|
NEW Prototype of a module DAV
|
2018-03-27 16:18:12 +02:00 |
|
Laurent Destailleur
|
51cd793d80
|
Fix log and duplicate vat_by_date function
|
2018-03-27 14:37:29 +02:00 |
|
Laurent Destailleur
|
930512d9a2
|
FIX Add a test to avoid to reset binding by error.
|
2018-03-27 13:08:16 +02:00 |
|
Frédéric FRANCE
|
77fb736ee2
|
Update actions_sendmails.inc.php
|
2018-03-27 11:17:40 +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
|
9f11cf77df
|
Merge ticket css in main css
|
2018-03-26 15:45:56 +02:00 |
|
Laurent Destailleur
|
c50b772b11
|
Clean duplicate code for payment page. Redirect on common page.
|
2018-03-25 19:15:55 +02:00 |
|
florian HENRY
|
ffbeb17ec2
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_mailtouser
|
2018-03-25 17:19:27 +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
|
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 |
|
Regis Houssin
|
180f2a0336
|
Fix: multi_dir compatibility
|
2018-03-25 12:56:43 +02:00 |
|
Regis Houssin
|
d5ed29c567
|
NEW add "moreHtmlRef" hook
|
2018-03-25 12:13:29 +02:00 |
|
Laurent Destailleur
|
6ef1dbbe0f
|
FIX auto open contract if one result found
|
2018-03-24 18:28:06 +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
|
d63c8356f4
|
Merge pull request #8437 from hregis/7.0_bug6
Fix: uniformize getEntity('intervention')
|
2018-03-24 16:36:27 +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
|
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 |
|
Marc de Lima Lucio
|
50790d5527
|
NEW: formconfirm in javascript
|
2018-03-23 16:54:33 +01:00 |
|
Laurent Destailleur
|
7363ae17ee
|
Move setup of email for module module into email templates
|
2018-03-23 16:09:46 +01:00 |
|
Laurent Destailleur
|
171ad5dce2
|
Enhance code for template invoices
|
2018-03-22 21:42:19 +01:00 |
|
Regis Houssin
|
9cf66e53f6
|
Fix: wrong module name
|
2018-03-22 16:39:47 +01:00 |
|
Laurent Destailleur
|
9980a5fbd0
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
|
2018-03-22 14:08:43 +01:00 |
|
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 |
|