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

5929 Commits

Author SHA1 Message Date
Laurent Destailleur
f074daae48 Fix option MAIN_MAIL_ENABLED_USER_DEST_SELECT 2018-05-22 20:17:31 +02:00
Laurent Destailleur
2a579b707a FIX javascript showempty error 
FIX Contact tab not visible when using canvas
 2018-05-22 19:43:28 +02:00
wdammak
1f43882bb7
Add liste_modeles to warehouse module 2018-05-22 01:09:52 +01:00
Laurent Destailleur
de84f0e687 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/actions_massactions.inc.php
	htdocs/filefunc.inc.php
 2018-05-21 23:35:09 +02:00
Laurent Destailleur
1b20ec05d1 Save translation 2018-05-21 19:37:47 +02:00
Laurent Destailleur
c141c3ecfd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-05-21 19:35:26 +02:00
Laurent Destailleur
05c2f206ff Fix missing lang 2018-05-21 19:35:12 +02:00
bgenere
227539d647 FIX : showOptionals function is now consistent with template 
Extrafield_view.tpl.php for date and datetime fields

The jdate function is not called when not needed.
 2018-05-21 16:55:35 +02:00
Laurent Destailleur
6d0306f75a Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2018-05-18 11:52:48 +02:00
Laurent Destailleur
492b1e7169 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-05-18 11:48:08 +02:00
Laurent Destailleur
e724cfd6a2
Merge pull request #8802 from atm-john/new_avoir_situation 
Add credit note compatibility with situation invoice.
 2018-05-18 11:34:10 +02:00
Laurent Destailleur
a279451241 Fix can use actionmsg for generic trigger 2018-05-17 17:58:29 +02:00
John
8710cf570d Add table thead and tbody for object lines 2018-05-17 16:52:16 +02:00
John
b01893d536 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_avoir_situation_pull 2018-05-16 15:29:57 +02:00
Laurent Destailleur
ad32b3098a Too verbose log 2018-05-16 10:31:44 +02:00
Laurent Destailleur
a2d485c14f Fix management of enabled property extrafields 2018-05-13 14:27:40 +02:00
Laurent Destailleur
302d9399e2 Fix search when using special char 2018-05-13 12:42:16 +02:00
Laurent Destailleur
53b5733fb4 Fix test 2018-05-12 13:40:53 +02:00
Laurent Destailleur
ee11a46a66
Merge pull request #8766 from fmarcet/develop 
NEW Add Date delivery and Availability on Propals List
 2018-05-10 12:18:27 +02:00
Laurent Destailleur
d020741173
Merge pull request #8757 from bafbes/abb7004 
New : Translate list elements in journal selection
 2018-05-10 12:15:34 +02:00
Laurent Destailleur
0bf1fe2908
Merge pull request #8753 from delcroip/patch-15 
new: log message for missing translation
 2018-05-10 11:56:56 +02:00
Laurent Destailleur
f476e3e304
Update translate.class.php 2018-05-10 11:56:49 +02:00
Laurent Destailleur
842c6168a2 FIX #8762 2018-05-10 11:50:35 +02:00
Laurent Destailleur
56b80d81dd Declare hook as addreplace hook 2018-05-10 11:39:29 +02:00
Ferran Marcet
70527e64c5 New: Add Date delivery and Availability on Propals List 2018-05-08 18:15:02 +02:00
Abbes Bahfir
fd9b6365a7 New : Translate list element in journal selection 2018-05-07 09:20:19 +01:00
delcroix Patrick
5ac2b51517
new: log message for missing traduction 
It's often difficult to find out the missing translation
 2018-05-06 17:29:30 +02:00
Laurent Destailleur
546da0ceda Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/account.php
	htdocs/core/modules/modStock.class.php
	htdocs/product/inventory/list.php
 2018-05-05 14:40:39 +02:00
Laurent Destailleur
9c68b81f59 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/accountancy/admin/account.php
	htdocs/projet/class/task.class.php
 2018-05-05 14:34:54 +02:00
TuxGasy
12440e6a7e Do not display multicurrency cols if currency of object is same as main currency 2018-05-02 11:30:35 +02:00
Laurent Destailleur
cb76d2ce0f Better logging 2018-05-01 18:58:19 +02:00
florian HENRY
b5d7206519 fix 6.0 accountancy multientity 2018-05-01 12:02:33 +02:00
Laurent Destailleur
d975dd507b
Revert "No display object line curreny if not necessary" 2018-05-01 11:17:47 +02:00
Laurent Destailleur
32ace6a8cf NEW Add hook setContentSecurityPolicy 2018-04-30 15:17:38 +02:00
Laurent Destailleur
4c12369a26 Debug module ticket 2018-04-30 10:33:36 +02:00
Laurent Destailleur
2fc2c44de4 Fix phpcs 2018-04-29 20:18:50 +02:00
Laurent Destailleur
0cdfd6800a Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-29 20:11:47 +02:00
Laurent Destailleur
82a8513aed Standardize code 2018-04-29 19:52:14 +02:00
Regis Houssin
2906358383 Fix: use "socpeople" instead "societe" 2018-04-27 10:42:10 +02:00
Laurent Destailleur
659fd46b76
Merge pull request #8653 from ATM-Marc/NEW_commonObject_array 
NEW: work on CommonObject 'array' field typeNew common object array
 2018-04-27 09:39:26 +02:00
Laurent Destailleur
36616cdd50 FIX When time is entered without hour, edit keeps this 2018-04-26 10:07:27 +02:00
Laurent Destailleur
21a18da43b We can disable the "favorites" in select combo of countries 2018-04-25 21:06:51 +02:00
Laurent Destailleur
9d070cac87 NEW Can add product in supplier order/invoice even w/o predefined price 
Add option SUPPLIER_PROPOSAL_WITH_PREDEFINED_PRICES_ONLY,
SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY and
SUPPLIER_INVOICE_WITH_PREDEFINED_PRICES_ONLY to restore restricted old
behaviour.
 2018-04-24 12:57:31 +02:00
florian HENRY
67329b8805 fix commonobject double style 2018-04-24 12:33:07 +02:00
Laurent Destailleur
fb8ad77378 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/mysql/migration/6.0.0-7.0.0.sql
 2018-04-23 23:09:53 +02:00
Laurent Destailleur
fdb3a11f34 FIX extrafields price and double were lost during a failed post. 2018-04-23 22:56:40 +02:00
Laurent Destailleur
0a5e606937 FIX extrafields price and double were lost during a failed post. 2018-04-23 22:53:57 +02:00
Laurent Destailleur
e9a2894727 Fix PSR2 2018-04-22 20:59:29 +02:00
Laurent Destailleur
32511422ab Fix PSR2 2018-04-22 20:08:29 +02:00
Philippe GRAND
410d1ee07d Merge remote-tracking branch 'upstream/develop' into new_branch_20_04_2018 2018-04-21 12:05:50 +02:00
Laurent Destailleur
cca4b1cbf5 NEW Optimize load of hooks classes (save 1-5Kb of memory) 2018-04-21 11:24:45 +02:00
Philippe GRAND
be600690cd Fix : Bad value for modulepart 2018-04-20 16:47:49 +02:00
Marc de Lima Lucio
39e890e2d7 FIX: handle non-js users 2018-04-20 16:43:27 +02:00
Marc de Lima Lucio
2bf66780cb FIX: travis + code readability 2018-04-20 16:38:52 +02:00
Marc de Lima Lucio
41a0727481 NEW: work on CommonObject 'array' field type 2018-04-20 16:38:52 +02:00
Laurent Destailleur
d0efc41983 New support of option BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD 2018-04-20 14:50:11 +02:00
Laurent Destailleur
6b90558b7a FIX File name not visible in email preview 2018-04-20 11:20:56 +02:00
Laurent Destailleur
5f43ff3609 Fix no pitco if bank account not defined 2018-04-20 08:47:53 +02:00
Laurent Destailleur
bbd1257222 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-20 01:50:08 +02:00
Laurent Destailleur
e621daa61d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-20 01:47:54 +02:00
Laurent Destailleur
7a703e149f Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-20 01:39:48 +02:00
Laurent Destailleur
c6a53ca25d Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/supplier_proposal/card.php
 2018-04-20 01:39:26 +02:00
Laurent Destailleur
c10c962d3a
Merge pull request #8624 from inoveaconseil/patch-1 
NEW add any predefined mail content
 2018-04-20 01:31:37 +02:00
Laurent Destailleur
54154343b2
Merge pull request #8643 from ATM-Marc/FIX_7.0_commonobject_default 
FIX: CommonObject: don't require 'notnull' field if 'default' set
 2018-04-20 01:28:00 +02:00
Laurent Destailleur
2f19ba11e5
Merge pull request #8637 from hregis/develop_ticket 
Fix: dolibarrize
 2018-04-20 01:22:19 +02:00
Laurent Destailleur
558bda5f27 Fix translation of extrafields 2018-04-19 17:45:00 +02:00
Regis Houssin
5b79b76685 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_ticket

Conflicts:
	htdocs/core/class/html.formticketsup.class.php
 2018-04-19 15:58:14 +02:00
Laurent Destailleur
0358e0f29f Debug ticketsup 2018-04-19 15:11:26 +02:00
Laurent Destailleur
8acc752195 Debug ticket module 2018-04-19 14:44:21 +02:00
Marc de Lima Lucio
893ce55852 FIX: commonobject: don't require notnull field if default set 2018-04-19 10:29:48 +02:00
Laurent Destailleur
41be1c3d3d Removed deprecated class (method setCookie already exists for that) 2018-04-19 10:22:08 +02:00
florian HENRY
882863ab48 fix : define in conf dir_output for suipplier_proposal modules 2018-04-18 16:21:20 +02:00
Marc de Lima Lucio
e88830820a FIX: dont print empty date in CommonObject::showOutputField 2018-04-18 11:13:18 +02:00
Regis Houssin
ff76e60c49 Fix: some bugs and warnings 2018-04-18 10:13:20 +02:00
Regis Houssin
d841abd55a Fix: missing value when reload 2018-04-18 09:37:29 +02:00
Regis Houssin
85c93c26a9 Fix: dolibarrize 2018-04-18 09:27:54 +02:00
Laurent Destailleur
bbfc4a3e17 NEW Look and feel v8 - Show Picto "+" on all links "Add record" 2018-04-18 03:26:15 +02:00
Laurent Destailleur
46d28acb44 Look and feel v8 2018-04-18 02:10:23 +02:00
Inovea Conseil
d032280a96
NEW add any predefined mail content 2018-04-17 16:03:12 +02:00
Laurent Destailleur
2135365e0a Bug new extrafields architecture 2018-04-17 14:44:55 +02:00
Laurent Destailleur
7bb8078b46 Fix translation of extrafields 2018-04-17 13:52:50 +02:00
Laurent Destailleur
1e0a660d24 More font awesome picto instead of img 2018-04-16 19:57:46 +02:00
Laurent Destailleur
106fb87d0a NEW Can sort order of files in attach tab for leave and expensereport 2018-04-16 19:25:27 +02:00
Laurent Destailleur
0d0da234b1 Lowercase NULL, TRUE, FALSE according to PSR2 2018-04-16 13:51:16 +02:00
Laurent Destailleur
e2838aa074 NEW Show also size in bytes in tooltip if visible unit is not bytes 2018-04-15 17:58:13 +02:00
Laurent Destailleur
9e50bbb9b1 standardize code 2018-04-15 16:35:18 +02:00
Philippe GRAND
0a6bcb2a39 fix typo and translation 2018-04-15 07:37:23 +02:00
Philippe GRAND
7943a19402 fix typo 2018-04-15 07:07:04 +02:00
Laurent Destailleur
a0e243a29b Clean code 2018-04-13 23:11:19 +02:00
Laurent Destailleur
3b202b2255
Merge branch 'develop' into develop_bug5 2018-04-13 22:23:14 +02:00
Laurent Destailleur
6f91b8019f Remove warnings 2018-04-13 17:54:27 +02:00
Laurent Destailleur
4251748aca Clean code 2018-04-13 16:18:33 +02:00
Laurent Destailleur
77a853e49d Fix remove warning 2018-04-13 14:53:40 +02:00
Laurent Destailleur
9f5eed0c9a Code comment 2018-04-13 14:12:31 +02:00
Laurent Destailleur
be965bdbab Clean code 2018-04-13 13:28:48 +02:00
Laurent Destailleur
b68cded9c4 Clean code 2018-04-13 13:11:07 +02:00
Laurent Destailleur
fbae4429b7 Clean code for better extrafields management 2018-04-13 12:52:23 +02:00
Regis Houssin
e6ff852226 Fix: avoid Warning: Creating default object from empty value 2018-04-13 11:20:21 +02:00
Laurent Destailleur
78fcbe9633 FIX the extrafields separator was not translated 2018-04-13 10:48:29 +02:00
Laurent Destailleur
6e288fca75
Merge pull request #8575 from all3kcis/develop-patch-16 
NEW Add files management on products lot
 2018-04-13 00:57:13 +02:00
Laurent Destailleur
ace55ba569 Debug usage of extrafields for ticket module 2018-04-12 23:17:46 +02:00
Laurent Destailleur
3cecfd02c7 NEW Mutualize code for action="update_extras" 
NEW Can use setValueFrom without user modification field
FIX Exclude separators from mandatory extrafields test
More code to use the new framework array for extrafields
Can use text condition in extrafield visibility
 2018-04-12 23:16:23 +02:00
All-3kcis
f7e58f3c73 Add files management on products lot 2018-04-12 15:10:37 +02:00
Laurent Destailleur
dd022ee423 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-12 13:31:38 +02:00
Laurent Destailleur
ea2fd67e0d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/card.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
	htdocs/core/tpl/admin_extrafields_view.tpl.php
	htdocs/langs/de_DE/admin.lang
 2018-04-12 13:31:14 +02:00
Laurent Destailleur
3df873ee06
Merge pull request #8562 from ATM-Marc/FIX_modulebuilder 
FIX: various modulebuilder-related issues
 2018-04-11 18:01:04 +02:00
Laurent Destailleur
9ccba03a17
Update html.form.class.php 2018-04-11 18:00:34 +02:00
Laurent Destailleur
afdd504e16 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/accountancy/journal/sellsjournal.php
 2018-04-11 17:58:21 +02:00
Laurent Destailleur
698f5c165a
Merge pull request #8430 from atm-florian/dev_mailtouser 
NEW : Can select from the user list into send form email (For field to and CC)
 2018-04-11 17:55:40 +02:00
Laurent Destailleur
d7da83ebc5
Merge pull request #8560 from atm-john/Fix_extrafield_list_from_table_entity 
Fix extrafield entity query filter
 2018-04-11 17:31:36 +02:00
Laurent Destailleur
e4f2e0ecbd Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-11 17:21:14 +02:00
Laurent Destailleur
590bc2948a Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/compta/bank/card.php
	htdocs/core/tpl/admin_extrafields_view.tpl.php
 2018-04-11 17:20:49 +02:00
Laurent Destailleur
c70e0c1cda FIX #8475 #8540 2018-04-11 17:14:34 +02:00
Laurent Destailleur
ca6b7205ef
Update commonobject.class.php 2018-04-11 16:27:56 +02:00
Laurent Destailleur
ab43d9d675
Merge pull request #8544 from ATM-Marc/FIX_odt_cond_reglement 
FIX: payment term doc-specific label was not used (issue #8414)
 2018-04-11 14:52:06 +02:00
Laurent Destailleur
f54113b1a1
Merge pull request #8524 from frederic34/patch-10 
FIX do not fill error with success message when using SwiftMailer
 2018-04-11 13:19:04 +02:00
Laurent Destailleur
273eadab43
Merge pull request #8547 from ATM-Marc/NEW_linked_objects_orderby 
NEW: can specify SQL 'ORDER BY' clause in fetchObjectLinked (issue #7830)
 2018-04-11 13:18:10 +02:00
Marc de Lima Lucio
c966cdbd47 FIX: selectForFormsList: entity checked even is object not multi-entity managed 2018-04-11 11:43:51 +02:00
John
96e26100f0 Add extrafield entity query filter 2018-04-11 11:27:47 +02:00
Laurent Destailleur
f181719769 Can fetch a companypaymentmode of a thirdparty 2018-04-10 18:11:08 +02:00
ATM-Nicolas
47d5b1f6fd FIX : update wrong datetime extrafield 2018-04-10 16:39:28 +02:00
Marc de Lima Lucio
7aa4d16eef NEW: can specify SQL 'ORDER BY' clause in fetchObjectLinked 2018-04-10 16:23:56 +02:00
Laurent Destailleur
0bf4381226 NEW The field "visible" on extrafield can accept expression as condition 2018-04-10 15:39:11 +02:00
Marc de Lima Lucio
1fd5dba118 FIX: payment term doc-specific label was not used 2018-04-10 15:24:57 +02:00
Laurent Destailleur
24f4d5040a Move isInEEC from common to thirdparty class. 2018-04-09 14:25:02 +02:00
John
63180f45a8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_avoir_situation 2018-04-09 09:17:26 +02:00
Frédéric FRANCE
f5b49aa93b
do not fill error with success message 2018-04-09 00:21:29 +02:00
Laurent Destailleur
259f3b3020 Add hidden option MAIN_SHOW_ALL_FILES_ON_DOCUMENT_TOOLTIP 2018-04-07 13:23:26 +02:00
Laurent Destailleur
093c367609 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2018-04-07 13:20:22 +02:00
Laurent Destailleur
5a34a22934 Code comment 2018-04-07 13:04:52 +02:00
Laurent Destailleur
85d4f7115b Better position of the substitution tooltip for emails 2018-04-06 16:16:08 +02:00
Laurent Destailleur
9ce5d02fde
Merge pull request #8517 from bafbes/master700 
define module part to include external modules menus
 2018-04-06 11:26:23 +02:00
Laurent Destailleur
151245a5e4
Update conf.class.php 2018-04-06 11:25:48 +02:00
Laurent Destailleur
658e1224d1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-05 19:53:09 +02:00
Laurent Destailleur
48ff89c63b Fix regression 2018-04-05 19:52:54 +02:00
Laurent Destailleur
2d547abaa9
Merge pull request #8498 from atm-john/New_import_lines_from_linked_element 
New import lines from linked element
 2018-04-05 18:26:47 +02:00
Laurent Destailleur
d55657951d
Merge pull request #8503 from ruistrecht-alt/FIX_pictos_in_agenda 
FIX: img_pictos for remove assigned user in agenda card
 2018-04-05 16:42:40 +02:00
bahfir abbes
16ae46e64c define module part to include external modules menus 2018-04-05 15:23:17 +01:00
Laurent Destailleur
dd934c89bf
Merge pull request #8507 from frederic34/patch-2 
Translation of error message
 2018-04-05 16:12:36 +02:00
Laurent Destailleur
533de639ae Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/hookmanager.class.php
 2018-04-05 13:29:27 +02:00
Laurent Destailleur
45d074c39d Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-05 13:25:59 +02:00
Laurent Destailleur
eeb2d5a4da Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/cron/list.php
 2018-04-05 13:24:36 +02:00
Laurent Destailleur
2b135dc951 FIX #8488 2018-04-05 13:13:45 +02:00
Regis Houssin
5914bfdf18 Fix: more complete 2018-04-05 13:00:55 +02:00
Regis Houssin
156d26ddb9 Fix: backward compatibility 2018-04-05 13:00:50 +02:00
florian HENRY
cc0fb830b8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_mailtouser 2018-04-05 10:53:17 +02:00
Frédéric FRANCE
fd6c1f129c
Update CMailFile.class.php 2018-04-04 15:58:24 +02:00
John
ce24ca08ee move list of situation table and fix credit note display 2018-04-04 12:33:48 +02:00
John
b7681e7249 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_avoir_situation 2018-04-03 14:12:49 +02:00
Rui Strecht
4f9a8d5b0a img_picto must return fullpath to picto.png 2018-04-03 12:23:26 +01:00
John
d689e88b92 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_import_lines_from_linked_element 2018-04-03 11:38:12 +02:00
Laurent Destailleur
2d3a55a6a8 Restore broken confirmation popup 2018-03-31 23:39:08 +02:00
Laurent Destailleur
d21143831c Clean code 2018-03-31 22:44:32 +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
0978c8f58b CSS 2018-03-29 16:07:49 +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
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
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
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
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
Regis Houssin
35b6cb750f Fix: move "moreHtmlRef" hook in "showrefnav" function 2018-03-27 17:36:25 +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
1071ec7e57
ignore Return-Path in dkim sign with swiftmailer 2018-03-26 21:36:03 +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
a5dd98701e Too verbose log 2018-03-25 13:40:22 +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
a3c199e9e3 FIX Missing include 2018-03-24 12:48:19 +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
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
John
88fab15c60 Change situation display 2018-03-23 17:12:09 +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
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
700c69e127 NEW Can set position of images in module tickets 
Mutualize code of method show_photo
 2018-03-22 11:46:35 +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
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
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
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
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
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
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
eb7886ecff
Update ldap.class.php 2018-03-19 12:37:53 +01:00
Regis Houssin
890d0b6685 Fix: replace ldaps:// by ssl:// 2018-03-19 12:11:59 +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
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
dc0fc73931 Code comment 2018-03-17 12:15:32 +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
Laurent Destailleur
f258d31a98 Triggers for Strips payment modes 2018-03-16 16:10:04 +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
96ff5b1b23 Update sql image file for 7.0 stable 2018-03-16 11:19:58 +01:00
Laurent Destailleur
46fb2945d4 NEW Show keyboard shortcut of nav arrow into tooltip 2018-03-15 22:02:03 +01:00
Laurent Destailleur
e1a0df263d Fix code with the new return structure of getEmailTemplate 2018-03-15 18:43:47 +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
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
Laurent Destailleur
9994b1f133 Work on stripe interface 2018-03-14 17:12:32 +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
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
944ba69cd8 Add unique key. Dolibarrize view of stripe card. 2018-03-13 17:32:49 +01:00
Laurent Destailleur
e6d8219396 Dolibarrize module ticket 2018-03-13 13:26:03 +01:00
Laurent Destailleur
4380367923 Error management 2018-03-13 12:54:53 +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
ae82d045f8 Dolibarrize module ticket 2018-03-11 23:56:17 +01:00
TuxGasy
34145ed443 Do not display multicurrency cols if currency of object is same as main currency 2018-03-11 21:58:32 +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
Laurent Destailleur
baf6fc6a8b
Merge pull request #8343 from atm-maxime/develop 
Fix mail send
 2018-03-11 18:11:37 +01:00
Maxime Kohlhaas
df185de6ae Fix mail send 2018-03-11 15:09:25 +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
jfefe
79acb79ae0 Begin integration of module « Ticketsup » 
Related to #4948
 2018-03-11 09:44:58 +01:00