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

16063 Commits

Author SHA1 Message Date
Laurent Destailleur
ca726e6c94 FIX Error generating ODT when option to use contact on doc on 2018-10-31 15:31:22 +01:00
Laurent Destailleur
0ca5da055f Debug v9 2018-10-31 15:04:01 +01:00
Laurent Destailleur
693570c48b Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/modules/modSociete.class.php
 2018-10-31 11:50:29 +01:00
Laurent Destailleur
866729cd21 FIX bad link in notification 2018-10-30 22:32:42 +01:00
Laurent Destailleur
c764d7f8d5 Fix remove var_dump 2018-10-30 21:34:17 +01:00
Regis Houssin
9589f69574 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_email

Conflicts:
	htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
 2018-10-30 18:29:28 +01:00
Marc de Lima Lucio
2fbc305683 FIX: task time screen: last fix was overkill 2018-10-30 16:00:56 +01:00
Laurent Destailleur
a3e49f021d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-30 15:32:25 +01:00
Laurent Destailleur
2c3cd7a668 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modSyslog.class.php
 2018-10-30 15:32:09 +01:00
Laurent Destailleur
b9078c6d58 Fix phpcs 2018-10-30 15:30:04 +01:00
Laurent Destailleur
68804cf8a5
Merge pull request #9890 from atm-maxime/fix_import_societe_alias 
FIX missing name alias field in societe import/export #9091
 2018-10-30 15:00:34 +01:00
Laurent Destailleur
0c77f6c3c5
Merge pull request #9918 from bafbes/abb80041 
Fix: To be possibly intercepted : call create, update and delete of the object instead of commonobject
 2018-10-30 14:52:23 +01:00
Laurent Destailleur
c9d00848e6
Merge pull request #9914 from frederic34/patch-27 
make play and playdisable equals
 2018-10-30 14:49:54 +01:00
Laurent Destailleur
2c8b7a4a3d
Merge pull request #9905 from atm-maxime/fix_currency_change 
Fix changing currency in a doc was recalculating amounts in company currency #9801
 2018-10-30 14:48:46 +01:00
Laurent Destailleur
4a71374cf7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-30 14:48:09 +01:00
Laurent Destailleur
68f6ebd0ff Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/core/lib/security.lib.php
	htdocs/modulebuilder/template/myobject_card.php
 2018-10-30 14:47:39 +01:00
Laurent Destailleur
afe61579e8 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-10-30 14:29:26 +01:00
Laurent Destailleur
b0ef8680ff Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-10-30 14:28:25 +01:00
Laurent Destailleur
7a268d8d9f Clean code 2018-10-30 14:27:14 +01:00
Laurent Destailleur
81c70898bf
Merge pull request #9884 from hregis/develop_bug 
FIX $forceentity is not used, replace by $currentobject if needed
 2018-10-30 14:16:29 +01:00
Laurent Destailleur
d309f22e55 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-30 13:54:25 +01:00
Laurent Destailleur
d4fd55c4cf FIX #9907 2018-10-30 13:54:11 +01:00
Laurent Destailleur
ca6d15a3eb
Merge pull request #9820 from laudeco/hotfix/9640_member_email 
FIX the member e-mail on resign and validation.
 2018-10-30 12:41:34 +01:00
Laurent Destailleur
9bb1572e63
Update functions.lib.php 2018-10-30 12:41:06 +01:00
Marc de Lima Lucio
8911d72be8 FIX: task time screen: prevent users with access to all project from assigning to tasks they're not allowed to do 2018-10-30 12:28:04 +01:00
Laurent Destailleur
bddd658ba6
Merge pull request #9885 from frederic34/patch-15 
code comment html form class
 2018-10-30 12:27:19 +01:00
Laurent Destailleur
4ef0d2ce82
Merge branch 'develop' into 8.0_dict 2018-10-30 12:26:37 +01:00
Laurent Destailleur
2ced09e8ab
Merge pull request #9888 from aljawaid/patch-3 
FIX: Expense Report Ref Not Showing in PDF File Properties
 2018-10-30 12:20:12 +01:00
Laurent Destailleur
f88b922d9d
Merge pull request #9908 from frederic34/patch-26 
Update box_graph_product_distribution.php
 2018-10-30 12:19:45 +01:00
Laurent Destailleur
5935a420a8
Merge pull request #9886 from frederic34/catchblockempty 
fill empty catch with log
 2018-10-30 12:16:41 +01:00
Abbes Bahfir
7f7df8d001 Fix: To be possibly intercepted : create, update and delete of the object instead of commonobject must be called 2018-10-30 09:03:33 +01:00
Frédéric FRANCE
450a837393
make play and playdisable equals 2018-10-29 18:50:15 +01:00
Laurent Destailleur
0266db7aa8 FIX deletion on draft is allowed if we are allwoed to create 2018-10-29 18:19:40 +01:00
Laurent Destailleur
27d82d0e8e FIX Delete of draft invoice 2018-10-29 14:41:00 +01:00
Regis Houssin
977a88363e FIX missing multidir_output for supplier modules 2018-10-29 12:50:40 +01:00
Regis Houssin
6e2d62bea6 FIX wrong entity id 2018-10-29 12:30:36 +01:00
Laurent Destailleur
0500f54237 Email collector 2018-10-29 11:29:08 +01:00
Laurent Destailleur
7785cae9aa Code comment 2018-10-29 03:46:45 +01:00
Laurent Destailleur
fcfb9746a8 Fix trackid when email sent from mass actions 2018-10-29 03:42:02 +01:00
Laurent Destailleur
08862fb482 Log success of emails 2018-10-29 03:25:21 +01:00
Laurent Destailleur
b4600fdc06 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formmail.class.php
	htdocs/core/js/timesheet.js
 2018-10-29 02:31:05 +01:00
Laurent Destailleur
04f80f0925 FIX Do not show check box if not applicable 2018-10-29 02:27:51 +01:00
Laurent Destailleur
553e984465 FIX Selection of addmaindocfile is lost on error 2018-10-29 02:14:41 +01:00
Laurent Destailleur
244c7f8dc3 FIX thirdparty property of object not loaded when only one record 2018-10-29 02:14:36 +01:00
Laurent Destailleur
6e3822345c Fix use setup of template for attached files in mass actions 2018-10-29 02:14:31 +01:00
Laurent Destailleur
770f8c3f3b FIX Selection of addmaindocfile is lost on error 2018-10-29 02:11:33 +01:00
Laurent Destailleur
dbb2168b83 FIX thirdparty property of object not loaded when only one record 2018-10-29 02:02:43 +01:00
Laurent Destailleur
f8a49edf78 Fix use setup of template for attached files in mass actions 2018-10-29 00:55:55 +01:00
Frédéric FRANCE
9b3fc6527c
Update box_graph_product_distribution.php 2018-10-28 23:50:13 +01:00
Maxime Kohlhaas
b68b8fe412 Fix changing currency in a doc was recalculating amounts in company currency #9801 2018-10-28 11:02:51 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Regis Houssin
fdde88cbe6 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_bug 2018-10-27 11:01:06 +02:00
Maxime Kohlhaas
abb343d37e Fix missing name alias field in societe import/export #9091 2018-10-27 09:42:08 +02:00
IJ
71c64c0944
FIX: Expense Report Ref Not Showing in PDF File Properties 
The generated pdf title field in the pdf file document properties was blank.  This fixes that.
 2018-10-27 01:57:07 +01:00
Frédéric FRANCE
b80d2fa12d
fill empty catch with log 2018-10-26 21:09:46 +02:00
Frédéric FRANCE
47ac420133
code comment html form class 2018-10-26 20:12:46 +02:00
Laurent Destailleur
d3893b8b95 Debug v9 2018-10-26 19:00:24 +02:00
Regis Houssin
866a7df510 FIX $forceentity is not used, replace by $currentobject if needed 2018-10-26 18:23:48 +02:00
Laurent Destailleur
087b68948d Fix: do not use point for graph with too many points. 2018-10-26 17:32:32 +02:00
De Coninck Laurent
d347cf3a85 set a message 2018-10-26 16:18:27 +02:00
Laurent Destailleur
4955ae03e8
Merge pull request #9867 from atm-john/develop_jflot 
FIX hover stability and modernize style
 2018-10-26 15:33:47 +02:00
Laurent Destailleur
0e464ea4f5
Merge pull request #9866 from frederic34/emptylines 
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
 2018-10-26 15:31:24 +02:00
Laurent Destailleur
d28c9ddea5
Merge pull request #9872 from laudeco/feature/improvement_module_picto 
improve img_picto by returning ASAP
 2018-10-26 15:20:40 +02:00
Laurent Destailleur
e875aee2c5
Merge pull request #9868 from atm-ph/fix_develop_php_warnings_in_js 
Fix PHP warnings printed in javascript
 2018-10-26 15:19:21 +02:00
Laurent Destailleur
ed0393dfa8
Merge pull request #9875 from atm-john/Fix_title 
FIX title
 2018-10-26 15:14:44 +02:00
Laurent Destailleur
35421d135a FIX Total of timespent 
Conflicts:
	htdocs/core/js/timesheet.js
 2018-10-26 15:04:02 +02:00
Laurent Destailleur
20d7c8bb8c FIX Total of timespent 2018-10-26 15:01:50 +02:00
Laurent Destailleur
5d249d71ca Fix menu at wrong place 2018-10-26 14:38:26 +02:00
atm-john
8a9b9f1736 Fix title 2018-10-25 21:53:48 +02:00
Laurent Destailleur
8b601bd7fd Fix numbering of holidays 2018-10-25 18:50:53 +02:00
De Coninck Laurent
70cd68ebef improve img_picto by returning ASAP 
We do not need an else each time some times, return is good enough. I also remove some line of comments since it's only code in it. We have GIT to find the code back we do not need to put it in comment ;-).
 2018-10-25 18:21:00 +02:00
Laurent Destailleur
9ccdd10a81 FIXx format (html/text) of emails sent on leave request module 2018-10-25 13:19:56 +02:00
Laurent Destailleur
25a374bd9a NEW Notification module support expense report+holiday validation and 
approval event.
 2018-10-25 12:45:13 +02:00
Marc de Lima Lucio
16c35035c1 FIX: pdf typhon: order reference duplicate 2018-10-25 12:07:40 +02:00
atm-ph
f41e7e05e1 Fix PHP warnings printed in javascript 2018-10-25 12:01:17 +02:00
atm-john
d0dc8b2a9c Add points to lines charts and remove shadow to improve performances 2018-10-25 00:24:25 +02:00
atm-john
b5c47f16e6 Fix hover stability and modernize style 2018-10-24 23:25:40 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Laurent Destailleur
277655b911 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-24 13:31:31 +02:00
Laurent Destailleur
6edaf3a422
Merge branch 'develop' into patch-9 2018-10-24 12:24:00 +02:00
Laurent Destailleur
c2c4366c62 Removed duplicate translation 2018-10-24 11:38:16 +02:00
Laurent Destailleur
aa0bcc6878 Fix phpcs 2018-10-24 11:15:14 +02:00
John BOTELLA
fccea99e23 FIX translation in select unit form 2018-10-24 10:23:27 +02:00
Frédéric FRANCE
2bc208675f
Update pdf_cyan.modules.php 2018-10-24 09:06:54 +02:00
Frédéric FRANCE
d9d346aab2
Update pdf_sponge.modules.php 2018-10-24 08:22:17 +02:00
Frédéric FRANCE
4747e93e39
Update pdf_eratosthene.modules.php 2018-10-24 08:18:21 +02:00
Laurent Destailleur
eaab953ba2 Renamed mouvement.php into movement_list.php to follow dev rules 2018-10-24 03:50:18 +02:00
Laurent Destailleur
65a39269d9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/class/commondocgenerator.class.php
 2018-10-24 03:39:33 +02:00
Laurent Destailleur
047d130081 Fix phpcs 2018-10-24 03:38:12 +02:00
Laurent Destailleur
01adaf253c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/class/account.class.php
	htdocs/product/list.php
 2018-10-24 03:35:44 +02:00
Laurent Destailleur
f0dc2df526 Fix code comment 2018-10-24 03:30:06 +02:00
Laurent Destailleur
0f48cc1d0f
Merge branch 'develop' into fixpdf 2018-10-24 03:01:52 +02:00
Laurent Destailleur
f8316abfc0 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/compta/bank/class/account.class.php
	htdocs/theme/md/style.css.php
 2018-10-24 02:58:29 +02:00
Laurent Destailleur
612e3a9805 Merge branch '9.0_accountancy' of https://github.com/aspangaro/dolibarr 
into aspangaro-9.0_accountancy

# Conflicts:
#	htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
#	htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
#	htdocs/accountancy/class/lettering.class.php
 2018-10-24 02:54:57 +02:00
Laurent Destailleur
919c4fc5bc Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/theme/md/style.css.php
 2018-10-24 02:40:57 +02:00
Laurent Destailleur
4060dd5377
Merge pull request #9826 from frederic34/patch-9 
Update ajax.lib.php
 2018-10-24 02:29:20 +02:00
Laurent Destailleur
ddd267f4c3 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-10-24 02:21:53 +02:00
Laurent Destailleur
4b4d422126
Merge pull request #9835 from frederic34/patch-20 
Update ajaxdirtree.php
 2018-10-24 02:21:19 +02:00
Laurent Destailleur
83dacf6290
Merge pull request #9845 from frederic34/patch-22 
remove deprecated form_confirm
 2018-10-24 02:06:54 +02:00
Laurent Destailleur
f10cb76597 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-24 02:00:56 +02:00
Laurent Destailleur
ae44c4c7f5 Disable duplicate feature with emailing module and field "unsubscribe 
requested"
 2018-10-24 02:00:43 +02:00
Laurent Destailleur
03b93781a0
Merge pull request #9848 from bafbes/abb80038 
New : parameter for getnomurl in field specification
 2018-10-24 01:53:19 +02:00
Laurent Destailleur
d5285ca359
Update commonobject.class.php 2018-10-24 01:53:07 +02:00
Laurent Destailleur
f8ea9e7099
Merge pull request #9857 from atm-john/add_combo_seach_by_fourn_ref 
NEW hidden conf to search product by supplier ref
 2018-10-24 01:48:17 +02:00
Laurent Destailleur
914e4f0501
Merge pull request #9855 from atm-john/Fix_printer 
FIX/ADD missing print button for delivery form
 2018-10-24 01:46:20 +02:00
Laurent Destailleur
c6cfb977bb
Merge pull request #9852 from atm-john/fix_develop_travis 
Fix travis messages
 2018-10-24 01:45:12 +02:00
Laurent Destailleur
54b0fa1057
Merge pull request #9846 from bafbes/abb80037 
Fix:empty value instead of 0 for empty links
 2018-10-24 01:43:37 +02:00
atm-john
82f40fb4b9 NEW hidden conf to search by supplier ref 2018-10-23 23:21:30 +02:00
atm-john
0fe2c63bc0 FIX missing print button for delivery form 2018-10-23 22:11:39 +02:00
John BOTELLA
d9965d1986 Fix travis messages 2018-10-23 17:18:30 +02:00
Laurent Destailleur
e0b20c2632 Add holiday for India 2018-10-23 12:49:48 +02:00
Abbes Bahfir
7e7473e7df New : parameter for getnomurl in field dpecification 2018-10-23 01:25:38 +01:00
Abbes Bahfir
5bac6a92e6 Fix:empty value instead of 0 for empty links 2018-10-23 00:03:34 +01:00
Frédéric FRANCE
90b85c1106
Update html.form.class.php 2018-10-22 22:23:43 +02:00
Frédéric FRANCE
e49f2bc562
Update document_actions_post_headers.tpl.php 2018-10-22 22:20:26 +02:00
Frédéric FRANCE
4aec343b24
Update html.form.class.php 2018-10-22 22:13:54 +02:00
Frédéric FRANCE
570ee200d8
Merge remote-tracking branch 'upstream/develop' into fixpdf 2018-10-22 20:19:28 +02:00
Laurent Destailleur
f65df9e541 NEW Add option PDF_DISABLE_MYCOMPANY_LOGO to disable logo on PDF 2018-10-22 20:06:03 +02:00
Laurent Destailleur
bf46a35a31 Fix size of key for extrafield of type select 2018-10-22 19:05:04 +02:00
ATM-Nicolas
cf28e4e442 FIX : Variable name 2018-10-22 15:19:33 +02:00
Alexandre SPANGARO
3f79580b19 Merge remote-tracking branch 'upstream/develop' into 9.0_accountancy 2018-10-22 06:33:34 +02:00
Laurent Destailleur
4e6b21881f Fix bug reported by scrutinizer 2018-10-21 12:14:20 +02:00
Laurent Destailleur
868caa4991 Missing ref_customer in popup 2018-10-21 12:05:31 +02:00
Laurent Destailleur
f6b3bc3bdb Fix thirdparty popup 2018-10-21 12:03:22 +02:00
Laurent Destailleur
fa99ea1f0f Fix thirdparty popup 2018-10-21 11:55:25 +02:00
Laurent Destailleur
d38c68e54f Remove unexpected char 2018-10-21 11:10:04 +02:00
Frédéric FRANCE
f169ec9259
Update ajaxdirtree.php 2018-10-21 10:37:49 +02:00
Alexandre SPANGARO
d3856d9289 Merge remote-tracking branch 'upstream/develop' into 9.0_accountancy 2018-10-20 06:35:39 +02:00
Frédéric FRANCE
f322c73dd7
Update ajax.lib.php 2018-10-19 22:52:18 +02:00
Frédéric FRANCE
042118fe38
fix it 2018-10-19 18:35:16 +02:00
Frédéric FRANCE
c811d5a371
fix new pdf 2018-10-19 18:20:06 +02:00
Laurent Destailleur
fecb6e49c6
Merge pull request #9014 from atm-john/NEW_PDF_DOCUMENT_COLUMN_new_files 
Experimental new pdf documents  using new column system
 2018-10-19 15:51:54 +02:00
Laurent Destailleur
897a2b09a7 Removed scrutinizer warning 2018-10-19 15:02:54 +02:00
Laurent Destailleur
e4b5cc154e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-19 14:46:32 +02:00
Laurent Destailleur
33cd0e84d2 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
 2018-10-19 14:44:50 +02:00
Laurent Destailleur
57ad200ae5 Fix regression in creating discount 2018-10-19 14:43:10 +02:00
Laurent Destailleur
4e82a6da46 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-19 14:29:32 +02:00
Laurent Destailleur
6a6a8ae14b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-19 14:29:22 +02:00
Laurent Destailleur
91745491ff Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-10-19 14:27:37 +02:00
Laurent Destailleur
5a1a5548df Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/class/discount.class.php
	htdocs/core/lib/payments.lib.php
	htdocs/product/index.php
	htdocs/product/list.php
	htdocs/societe/class/societe.class.php
 2018-10-19 14:27:15 +02:00
Laurent Destailleur
47abbd3eb2 Fix bad merge 2018-10-19 14:23:36 +02:00
Laurent Destailleur
36ae81c749 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-10-19 14:17:20 +02:00
Laurent Destailleur
de4ead2558 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/accountancy/class/accountancycategory.class.php
	htdocs/core/actions_massactions.inc.php
	htdocs/product/reassort.php
 2018-10-19 14:16:53 +02:00
Laurent Destailleur
b6cb16a457
Merge pull request #9783 from frederic34/patch-18 
Update menubase.class.php
 2018-10-19 13:44:11 +02:00
Laurent Destailleur
762d82f2fe Move declaration into common 2018-10-19 13:38:05 +02:00
Laurent Destailleur
c13e555d5f
Merge pull request #9811 from frederic34/patch-24 
use strict comparaison
 2018-10-19 13:17:24 +02:00
Laurent Destailleur
8af16609ca
Merge pull request #9779 from frederic34/patch-15 
Update html.formmail.class.php
 2018-10-19 13:02:15 +02:00
Laurent Destailleur
324f59ecc9
Merge pull request #9778 from frederic34/patch-9 
add errors def to form class
 2018-10-19 13:01:31 +02:00
Laurent Destailleur
c4e67de5c9
Merge pull request #9814 from Mavyre/patch-2 
Fixed all resources displaying on add in projects, events...
 2018-10-19 12:57:07 +02:00
Laurent Destailleur
44e0bc9aed
Merge pull request #9812 from frederic34/docodt 
add log and comment
 2018-10-19 12:53:54 +02:00
Laurent Destailleur
696023c1aa NEW Enhancement in the generic file manager 2018-10-19 12:47:59 +02:00
Laurent Destailleur
985ab1efda FIX delete of a file in file_manager return to same dir 2018-10-19 10:59:34 +02:00
Mavyre
32a3779d23
Fixed all ressources displaying 2018-10-18 22:08:23 +02:00
Frédéric FRANCE
6c85fbbc30
add log and comment 2018-10-18 21:47:10 +02:00
Frédéric FRANCE
b0e24e2b8d
use strict comparaison 2018-10-18 21:24:06 +02:00
Laurent Destailleur
d4bc53660b Code comment and debug filemanager 2018-10-18 21:22:30 +02:00
Frédéric FRANCE
0f7b1a04d9
Merge remote-tracking branch 'upstream/develop' into patch-15 2018-10-18 20:42:52 +02:00
Frédéric FRANCE
3437943609
Merge remote-tracking branch 'upstream/develop' into patch-9 2018-10-18 20:41:36 +02:00
Frédéric FRANCE
300f80e914
Merge remote-tracking branch 'upstream/develop' into patch-18 2018-10-18 20:39:45 +02:00
Laurent Destailleur
52840478c0 Clean code 2018-10-17 21:11:07 +02:00
gauthier
aea7299970 FIX : use discount with multicurrency 2018-10-17 15:49:08 +02:00
Laurent Destailleur
a66256a799 FIX Hover on the filemanager 2018-10-17 13:22:52 +02:00
Alexandre SPANGARO
e614d33aa4 Merge remote-tracking branch 'upstream/develop' into 9.0_accountancy 2018-10-17 05:57:22 +02:00
Frédéric FRANCE
70b6c502da
Update menubase.class.php 2018-10-16 23:36:00 +02:00
Frédéric FRANCE
cf1819ea0e
Update html.formmail.class.php 2018-10-16 22:27:34 +02:00
Alexandre SPANGARO
a5ebcff2ee Fix lettering function 2018-10-16 22:27:34 +02:00
Frédéric FRANCE
2d542d028f
Update html.formmail.class.php 2018-10-16 22:22:57 +02:00
Frédéric FRANCE
4e14c2817c
add errors def to form class 2018-10-16 22:09:11 +02:00
Laurent Destailleur
550a66d338
Merge pull request #9772 from ptibogxiv/patch-76 
NEW move ticket dictionary in API /setup
 2018-10-16 21:39:30 +02:00
Laurent Destailleur
f07096ea3a
Merge pull request #9760 from frederic34/patch-19 
add errors def in htmlformsms
 2018-10-16 20:01:41 +02:00
Laurent Destailleur
575038d3a3
Merge pull request #9769 from atm-ph/fix_7.0_list_duplicate_extrafield_value 
Fix list from 'Contacts/Addresses' on company may show duplicate valu…
 2018-10-16 19:36:37 +02:00
Laurent Destailleur
97429aeb7a
Merge pull request #9721 from grandoc/new_branch_10_10_2018 
Standardize and update code
 2018-10-16 19:30:19 +02:00
Laurent Destailleur
605a7896cf
Merge pull request #9744 from atm-maxime/fix_numbering_supplier_credit_note 
Fix numbering of supplier credit notes (issue #9624)
 2018-10-16 19:17:47 +02:00
Laurent Destailleur
2c1e8d6535 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/expedition/class/expeditionbatch.class.php
	htdocs/public/payment/newpayment.php
	htdocs/stripe/config.php
 2018-10-16 18:47:11 +02:00
atm-ph
72dd182b1f Fix list from 'Contacts/Addresses' on company may show duplicate value for extrafields 2018-10-16 18:22:43 +02:00
Philippe GRAND
729ff0b9bb Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018 2018-10-16 14:20:11 +02:00
Laurent Destailleur
70366e9d91 Missing translation 2018-10-16 03:31:33 +02:00
Laurent Destailleur
35f9371343 Fix missing es translation string 2018-10-16 03:30:17 +02:00
Laurent Destailleur
12cb60040b Fix multilang 2018-10-16 01:52:22 +02:00
Laurent Destailleur
c8607a74bf Load websitepage 2018-10-16 01:39:04 +02:00
Laurent Destailleur
568197656f Fix canonical of home 2018-10-15 21:43:01 +02:00
Laurent Destailleur
c246ef38c0 Fix canonical 2018-10-15 21:42:43 +02:00
Frédéric FRANCE
9133d97e33
add errors def in htmlformsms 2018-10-15 21:40:27 +02:00
Laurent Destailleur
96ddebad4a Set canonical tag 2018-10-15 17:48:39 +02:00
Laurent Destailleur
970c581bc9 css 2018-10-15 16:40:07 +02:00
Laurent Destailleur
6d4d8a0342 Dolibarize data privacy policy module 2018-10-15 14:05:54 +02:00
Laurent Destailleur
5d9b770511 phpcs 2018-10-15 13:32:09 +02:00
atm-greg
06477b40a0 modify parenting before task deletion 2018-10-15 12:34:14 +02:00
Laurent Destailleur
ab807ada07 Work on translation 2018-10-14 23:26:57 +02:00
Laurent Destailleur
ac143b28ae Work on multilang 2018-10-14 20:54:28 +02:00
Laurent Destailleur
45860b2494 Work on multilang 2018-10-14 20:04:25 +02:00
Laurent Destailleur
b0569de166 Work on multilang support 2018-10-14 18:44:29 +02:00
Maxime Kohlhaas
c66823d72f Fix numbering of supplier credit notes (issue #9624) 2018-10-14 17:07:38 +02:00
Laurent Destailleur
fabc11191d
Merge pull request #9739 from frederic34/patch-11 
fix size of $head when replacing by hook
 2018-10-14 16:27:14 +02:00
Frédéric FRANCE
65c69c4564
fix standard prepare_head 2018-10-14 10:57:27 +02:00
Frédéric FRANCE
787658ac98
reduce complexity of payments.lib.php 2018-10-14 10:56:03 +02:00
Frédéric FRANCE
70a98743e8
Update functions.lib.php 2018-10-14 10:48:06 +02:00
Frédéric FRANCE
1f1a614b47
Update import.lib.php 2018-10-14 10:21:06 +02:00
Laurent Destailleur
532e05c42e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	ChangeLog
	htdocs/filefunc.inc.php
 2018-10-13 14:29:51 +02:00
Laurent Destailleur
1e58b837f0 css 2018-10-13 14:11:44 +02:00
Philippe GRAND
effd11e1f9 translation 2018-10-13 12:42:01 +02:00
Philippe GRAND
94ea438881 Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018 2018-10-13 12:40:28 +02:00
Laurent Destailleur
e5cc4ae61b Code comment 2018-10-13 12:00:59 +02:00
Philippe GRAND
30630ff368 fix typo 2018-10-13 11:58:19 +02:00
Philippe GRAND
d8b62f0808 Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018 2018-10-13 09:49:23 +02:00
Frédéric FRANCE
0f8ac57c85
remove var_dump 2018-10-12 22:34:23 +02:00
atm-ph
e2748953c3 Fix print extrafield date in list 2018-10-12 22:31:47 +02:00
Laurent Destailleur
1e635cff1b Fix new stripe API 2018-10-12 21:00:33 +02:00
Philippe GRAND
bdb09a7f43 Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018 2018-10-12 19:26:00 +02:00
Laurent Destailleur
6a363fd1ab API Stripe 2018-09-24 2018-10-12 19:26:00 +02:00
Laurent Destailleur
f332dc1cef
Merge branch 'develop' into patch-40 2018-10-12 19:15:43 +02:00
Philippe GRAND
995e9b4f55 Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018 2018-10-12 12:16:57 +02:00
Laurent Destailleur
ded5c4c3dd Social network module 2018-10-12 11:02:03 +02:00
atm-ph
4b32c8e100 Fix extrafield contact typed as date isn't show in the list from 'contact/address' tab of company 2018-10-11 14:24:55 +02:00
Laurent Destailleur
88ff7241f5 FIX Quick hack to solve pb of bad definition of public holidays 2018-10-11 13:12:36 +02:00
Laurent Destailleur
e1e1599a6d FIX shared link ko on proposals 2018-10-11 11:59:14 +02:00
Laurent Destailleur
ced4038443 FIX qty not visible for a lot when making shipment on a dedicated stock 2018-10-11 11:56:52 +02:00
Philippe GRAND
f13c38e117 Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018 2018-10-11 09:14:40 +02:00
Laurent Destailleur
2b33e2a9c5 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-10 10:52:58 +02:00
Laurent Destailleur
40f89d138f Fix height of confirm popup 2018-10-10 10:52:29 +02:00
Philippe GRAND
90cb6150c4 Standardize and update code 2018-10-10 09:16:01 +02:00
Philippe GRAND
69379dc2bb Standardize and update code 2018-10-10 09:12:25 +02:00
Laurent Destailleur
8f4b74733c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
 2018-10-10 01:51:54 +02:00
Laurent Destailleur
b73a2a24ef FIX Tooltip on invoice widget 2018-10-10 01:16:53 +02:00
Laurent Destailleur
2539f0047f FIX Sending of reminder for expired subscriptions 2018-10-09 23:10:39 +02:00
Laurent Destailleur
1d04ce2185 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2018-10-09 17:07:32 +02:00
Laurent Destailleur
01c32525df Merge 2018-10-09 17:06:08 +02:00
Laurent Destailleur
5d2f34dc1e
Merge pull request #9715 from inoveaconseil/datapolicies 
Dolibarization DataPolicies
 2018-10-09 16:03:14 +02:00
Laurent Destailleur
dfe9c05d2f Merge menu entry for tags/categories as submenu of element. 2018-10-09 15:26:15 +02:00
Laurent Destailleur
0938ac4afa Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/user/list.php
 2018-10-09 14:54:18 +02:00
Laurent Destailleur
3c8b365c3e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-09 14:53:39 +02:00
Laurent Destailleur
387d9d685a Update auguria menu 2018-10-09 14:52:53 +02:00
Laurent Destailleur
dd0cbabc91 Fix translation 2018-10-09 14:44:13 +02:00
Laurent Destailleur
9bea9edfd7 FIX Menu to show/edit Users categories was missing 2018-10-09 14:41:21 +02:00
Inovea Conseil
768ab66d1f Datapolicies 2018-10-09 14:40:15 +02:00
Philippe GRAND
bba6669f03 Merge remote-tracking branch 'upstream/develop' into new_branch_05_10_2018 2018-10-09 08:47:26 +02:00
Laurent Destailleur
1c74dcc270 NEW Can filter on EEC, not EEC, etc... in binding step of accountancy 2018-10-09 01:47:37 +02:00
Laurent Destailleur
6ded9e843d NEW The binding step in accountancy has a country filter like a combo 2018-10-09 01:03:46 +02:00
Laurent Destailleur
0c7b7ed7f4 FIX Required extrafield value numeric should accept '0' 2018-10-08 14:26:18 +02:00
Laurent Destailleur
7be9b6d94e Fix translation of source of proposals 2018-10-08 14:04:22 +02:00
Laurent Destailleur
08ca85e995 Fix type 2018-10-08 02:19:32 +02:00
Laurent Destailleur
df7f218d01 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-07 21:47:32 +02:00
Laurent Destailleur
d4b6429ccd Fix regression into backup feature 2018-10-07 21:45:20 +02:00
Laurent Destailleur
476aab9bae Same order than top menu 2018-10-06 21:00:26 +02:00
Laurent Destailleur
a0ba01321b Fix phpcs 2018-10-06 12:50:32 +02:00
Laurent Destailleur
ccc6dea85c
Merge pull request #9686 from frederic34/patch-11 
PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
 2018-10-06 12:46:54 +02:00
Laurent Destailleur
f742b0f55b
Merge pull request #9685 from frederic34/patch-9 
PSR2.Classes.ClassDeclaration.CloseBraceAfterBody
 2018-10-06 12:39:30 +02:00
Philippe GRAND
61daff6cb6 Standardize code 2018-10-06 12:34:51 +02:00
Philippe GRAND
83db36f9b2 Standardize code 2018-10-06 12:11:48 +02:00
Philippe GRAND
5583211246 Merge remote-tracking branch 'upstream/develop' into new_branch_05_10_2018 2018-10-06 12:00:24 +02:00
Laurent Destailleur
e24117e75b Fix position of modules is string on 2 digits 2018-10-06 11:57:53 +02:00
Philippe GRAND
fc4fea6f02 Merge remote-tracking branch 'upstream/develop' into new_branch_05_10_2018 2018-10-06 11:50:25 +02:00
Laurent Destailleur
d1dde0ffac Include rgpd module with name DataPolicies 2018-10-06 02:51:47 +02:00
Philippe GRAND
94df8d297d Standardize code 2018-10-05 15:44:57 +02:00
Philippe GRAND
c7c3780400 clean code 2018-10-05 15:34:32 +02:00
Laurent Destailleur
5437c2ae85 Fix popup on img_picto 2018-10-05 14:32:19 +02:00
Laurent Destailleur
4e84ed0e80 FIX Symbol of currency in substitution variables 2018-10-05 13:59:46 +02:00
Laurent Destailleur
d1ad5dd4f1 FIX Symbol of currency in substitution variables 2018-10-05 13:58:38 +02:00
florian HENRY
cba4676032 Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0_fix9161 2018-10-05 10:36:03 +02:00
florian HENRY
68c99d01a7 OMG!!!! var_dump.... 2018-10-05 10:35:32 +02:00
Frédéric FRANCE
2fc54ccf66
PEAR.NamingConventions.ValidFunctionName.NotCamelCaps 2018-10-04 20:23:58 +02:00
Frédéric FRANCE
48a063eca4
PSR2.Classes.ClassDeclaration.CloseBraceAfterBody 2018-10-04 20:18:24 +02:00
Laurent Destailleur
29cafc78d0
Merge pull request #9634 from grandoc/new_branch_29_09_2018 
add some significant info within notification mail
 2018-10-04 19:31:31 +02:00
Laurent Destailleur
4fad28d360
Update notify.class.php 2018-10-04 19:30:45 +02:00
Laurent Destailleur
2232bd3944
Update notify.class.php 2018-10-04 19:30:03 +02:00
Laurent Destailleur
6fcb45cf40 Rename page various_payment/index.php into list.php (coding rule) 2018-10-04 19:10:39 +02:00
Laurent Destailleur
3e36612a52 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-04 19:07:51 +02:00
Laurent Destailleur
5b350a0322 Use short label 2018-10-04 19:07:38 +02:00
Laurent Destailleur
20f45db6b8
Merge pull request #9677 from grandoc/new_branch_04_10_2018 
Standardize and update code
 2018-10-04 18:33:24 +02:00
Laurent Destailleur
ac86eac508
Merge pull request #9675 from atm-ph/fix_7.0_dom_error 
Fix minor error in dom
 2018-10-04 18:32:52 +02:00
Laurent Destailleur
ebba33635b Close #9674 by keeping old code present (this help for transition tests) 2018-10-04 18:20:57 +02:00
Laurent Destailleur
31916c94f0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-04 17:57:20 +02:00
Laurent Destailleur
b3b2305651 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/core/lib/pdf.lib.php
 2018-10-04 17:56:56 +02:00
Laurent Destailleur
13759ea146 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/class/facture.class.php
 2018-10-04 17:53:40 +02:00
Laurent Destailleur
3060647212 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2018-10-04 17:50:19 +02:00
Laurent Destailleur
8690d65479 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2018-10-04 17:47:22 +02:00
Laurent Destailleur
1c735ea6d5
Merge pull request #9673 from atm-florian/dev_resource 
NEW : add event tab on resource card
 2018-10-04 17:45:01 +02:00
Laurent Destailleur
2aca9cb394
Update company.lib.php 2018-10-04 17:44:47 +02:00
Laurent Destailleur
34f1691302
Merge pull request #9655 from frederic34/patch-11 
group same condition into one in html.formprojet.class.php
 2018-10-04 17:15:15 +02:00
Laurent Destailleur
111d589474 NEW Can mix offset before and after with rules for due date of invoices 2018-10-04 16:06:26 +02:00
Laurent Destailleur
75c968b4ae FIX Backup of database without mysqladmin available from cron. 2018-10-04 13:10:48 +02:00
florian HENRY
e95921eb93 better test 2018-10-04 09:47:04 +02:00
florian HENRY
7f4f27ebfe indent 2018-10-04 09:45:12 +02:00
florian HENRY
292dab192b FIX : #9161 2018-10-04 09:42:11 +02:00
Philippe GRAND
8bee69277d Standardize and update code 2018-10-04 09:33:30 +02:00
Philippe GRAND
d2ec703b51 Standardize and update code 2018-10-04 09:24:57 +02:00
atm-ph
2acd69033c Fix minor error in dom 2018-10-03 22:48:29 +02:00
florian HENRY
d09bbe4690 NEW : add event tab on resource card 2018-10-03 21:13:02 +02:00
Laurent Destailleur
378013b863 Better select language component 2018-10-03 20:58:45 +02:00
Laurent Destailleur
402175bb49 Work on multilang 2018-10-03 19:53:33 +02:00
Laurent Destailleur
fd859d3162 Add a component to select lang into a web site 2018-10-03 18:40:54 +02:00
Laurent Destailleur
2cd843acec Fix separator too long 2018-10-03 16:02:42 +02:00
atm-greg
583ea05567 fix missing letter... 2018-10-03 12:13:53 +02:00
gauthier
587766b39b FIX : wrong function name 2018-10-03 10:38:47 +02:00
Laurent Destailleur
e83149a344 Fix deletion of credit card when no Oauth set 2018-10-02 22:35:51 +02:00
Laurent Destailleur
76f5d53840 Fix deletion of credit card when no Oauth set 2018-10-02 22:34:41 +02:00
Frédéric FRANCE
e8cf59e6f6
Update html.formprojet.class.php 2018-10-01 21:03:33 +02:00
Laurent Destailleur
771922f427 Use 2 distinct left menu entries for leads and projects 2018-10-01 18:56:47 +02:00
Philippe GRAND
c22b80831d fix regression 2018-10-01 17:14:28 +02:00
Philippe GRAND
0aae40f8aa fix when there is no project 2018-10-01 17:05:52 +02:00
Philippe GRAND
b32a9cc50e fix if no project linked 2018-10-01 09:13:02 +02:00
Laurent Destailleur
15780f71b4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-01 03:22:20 +02:00
Laurent Destailleur
873f43db94 Uniformize interface for tickets 2018-10-01 03:19:21 +02:00
Laurent Destailleur
1dfbb22bf8
Merge branch 'develop' into new_branch_13_09_2018 2018-10-01 02:20:16 +02:00
Laurent Destailleur
fdd6c8d6bf
Merge pull request #9648 from frederic34/patch-18 
simplify mod_codeclient_monkey.php
 2018-10-01 01:21:08 +02:00
Laurent Destailleur
77dad1b32b
Merge pull request #9647 from frederic34/patch-17 
indentation fix in commonobject class
 2018-10-01 01:20:17 +02:00
Laurent Destailleur
ae62204a79
Merge pull request #9628 from grandoc/new_branch_28_09_2018 
Standardize and update code
 2018-10-01 01:04:36 +02:00
Laurent Destailleur
5f897eb7ee Clean code 2018-10-01 00:40:02 +02:00
Laurent Destailleur
adc36e7d63 Clean code 2018-10-01 00:20:47 +02:00
Frédéric FRANCE
c8ddf18558
Update mod_codeclient_monkey.php 2018-09-30 23:02:52 +02:00
Frédéric FRANCE
2af15ee932
Update commonobject.class.php 2018-09-30 17:59:04 +02:00
Philippe Grand
8acddb5bab
Update notify.class.php 2018-09-29 18:43:50 +02:00
Philippe Grand
9a2fd7defe
Update notify.class.php 2018-09-29 18:41:31 +02:00
Philippe GRAND
8ef9a301b3 add some significant info within notification mail 2018-09-29 14:51:52 +02:00
Laurent Destailleur
aaa5efc77e Clean Take pos module 2018-09-28 22:06:04 +02:00
Laurent Destailleur
492b9c1a03 Fix phpcs 2018-09-28 18:03:53 +02:00
Laurent Destailleur
f667270d4d Add option to not load all object and fix so linkedObjectsIds has same 
content than linkedObjects
 2018-09-28 17:38:29 +02:00
Laurent Destailleur
e2f450aa8c Fix regession losing description. 
Rename updateligne into updateline.
 2018-09-28 16:15:17 +02:00
Philippe GRAND
61ad84d6e1 Fix Travis Error:The closing brace for the class must go on the next line after the body 2018-09-28 15:19:45 +02:00
Philippe GRAND
15ff9f8917 Standardize and update code 2018-09-28 14:44:47 +02:00
Laurent Destailleur
47da95fbbf Fix dependency of module 2018-09-28 13:50:37 +02:00
Laurent Destailleur
f990719daa Add experimental module TakePOS 2018-09-28 13:31:41 +02:00
Laurent Destailleur
224896a4dc Code comments 2018-09-28 10:52:15 +02:00
Laurent Destailleur
c5a68d2462 Clean code 2018-09-28 10:51:55 +02:00
Laurent Destailleur
a88dcfd1e4 Fix phpcs 2018-09-28 02:24:11 +02:00
Laurent Destailleur
851fd4cc18 NEW Can set the default focus of each page. 
NEW Can set if a field is mandatory on form level.
 2018-09-28 00:52:15 +02:00
Laurent Destailleur
a623d80830 Work on mandatory form fields 2018-09-27 16:38:18 +02:00
Laurent Destailleur
e252a5f046 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-27 12:55:45 +02:00
Laurent Destailleur
62b31df069 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/rssparser.class.php
	htdocs/langs/en_US/boxes.lang
 2018-09-27 12:55:25 +02:00
Laurent Destailleur
575c63f87d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/CMailFile.class.php
 2018-09-27 12:52:10 +02:00
Laurent Destailleur
6e7fd15e1e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-09-27 12:48:08 +02:00
Laurent Destailleur
291d477f65 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2018-09-27 12:47:48 +02:00
Laurent Destailleur
7b86776f6b Introduce option MAIN_INCLUDE_ZERO_VAT_IN_REPORTS to solve a regression 
on feature to report vat by rate when rate is zero
 2018-09-27 12:42:52 +02:00
Laurent Destailleur
60c74a6255
Merge pull request #9582 from grandoc/new_branch_21_09_2018 
Standardize and update code from New branch 21 09 2018
 2018-09-27 10:07:15 +02:00
Laurent Destailleur
26d20d0b76
Merge pull request #8729 from atm-quentin/NEW_rights_ignoring_min_price 
NEW Advanced permission to ignore price min
 2018-09-27 09:57:49 +02:00
Philippe Grand
031b3b44c5
Merge branch 'develop' into new_branch_13_09_2018 2018-09-27 09:42:58 +02:00
Laurent Destailleur
4c8664b297
Merge pull request #9619 from ATM-Marc/FIX_6.0_extrafield_columns 
FIX: showOptionals: column mismatches
 2018-09-27 09:39:51 +02:00
Laurent Destailleur
2d88b69cf6
Merge pull request #9616 from frederic34/patch-14 
add try catch for swiftmailer
 2018-09-27 09:34:21 +02:00
Laurent Destailleur
9630c7b5c7
Merge pull request #9614 from grandoc/new_branch_25_09_2018 
Add some code comment
 2018-09-27 09:31:19 +02:00
Philippe Grand
b7304e3d82
Merge branch 'develop' into new_branch_21_09_2018 2018-09-27 09:29:26 +02:00
Laurent Destailleur
e72dc26532
Merge pull request #9603 from atm-john/Fix_situation_invoice_selection 
FIX previous situation invoice selection
 2018-09-27 09:20:24 +02:00
Laurent Destailleur
b8ae88cf26
Merge pull request #9602 from grandoc/new_branch_24_09_2018 
Standardize and update code
 2018-09-27 09:19:59 +02:00
Laurent Destailleur
7e58662c6f
Merge branch 'develop' into patch-9 2018-09-27 09:18:42 +02:00
Laurent Destailleur
6f92c230aa
Merge pull request #9600 from grandoc/new_branch_23_09_2018 
Translated comment
 2018-09-27 09:17:53 +02:00
Laurent Destailleur
29893daf6f
Merge pull request #9599 from zeenlym/forgotten_passlink 
NEW Change forgotten password link in general parameters
 2018-09-27 09:17:28 +02:00
Laurent Destailleur
2b8ccc0c81 FIX Link template invoice to contract 2018-09-27 01:53:12 +02:00
Laurent Destailleur
9123329800 FIX Link template invoice to contract 2018-09-26 23:44:27 +02:00
Marc de Lima Lucio
af93fc7484 FIX: showOptionals: column mismatches 2018-09-26 17:19:06 +02:00
Laurent Destailleur
79ade6a1af Work on website 2018-09-26 15:20:37 +02:00
Frédéric FRANCE
1bac3a0ccf
swiftmailer is doing encodetorfc2822 2018-09-26 10:37:20 +02:00
Frédéric FRANCE
92a3faeaf7
add try catch for swiftmailer 2018-09-26 10:13:14 +02:00
Laurent Destailleur
f2d53e80e5 Optimize performance of cron that rotate logs 2018-09-26 01:45:24 +02:00
Philippe GRAND
746d73b8e6 Add some code comment 2018-09-25 17:26:57 +02:00
Laurent Destailleur
eff1d1c89e Work on website module 2018-09-25 16:35:59 +02:00
Frédéric FRANCE
a9f7bdead6
fix Option MAIN_DISABLE_NOTES_TAB #9611 2018-09-25 15:22:08 +02:00
Laurent Destailleur
e6be047178 Work on new management for website module 2018-09-25 15:00:37 +02:00
Laurent Destailleur
515acbfee2 FIX Bad position of hook formattachOptions call 2018-09-25 11:46:42 +02:00
Laurent Destailleur
ba3ca550ce Fix date in text for substitution. Removed not used translation keys. 2018-09-25 11:36:40 +02:00
Frédéric FRANCE
d15c52db3b
Update rssparser.class.php 2018-09-25 08:16:05 +02:00
Laurent Destailleur
f04b8eea6d Work on website module 2018-09-24 19:21:21 +02:00
Laurent Destailleur
ea517da85c Work on filemanager for websites 2018-09-24 15:14:32 +02:00
Laurent Destailleur
eeda176ed6 FIX Bad position of hook formattachOptions call 2018-09-24 15:13:18 +02:00
Philippe GRAND
d7df74656e Standardize and update code 2018-09-24 12:03:49 +02:00
Philippe GRAND
ac31b79d9d Standardize and update code 2018-09-24 11:58:01 +02:00
Philippe GRAND
1f2493f361 Standardize and update code 2018-09-24 11:45:34 +02:00
Frédéric FRANCE
86072ad1d7
remove superfluous space 2018-09-24 10:43:57 +02:00
Laurent Destailleur
ad6895aa2e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-24 10:23:09 +02:00
Laurent Destailleur
57e359cd40 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/langs/fr_FR/agenda.lang
 2018-09-24 10:18:13 +02:00
John BOTELLA
ceccd5a510 Fix prev situation invoice selection 2018-09-24 10:16:28 +02:00
Philippe GRAND
2799bd175d Translated comment 2018-09-23 21:35:43 +02:00
Yanis LISIMA
753089a99d NEW Change forgotten password link in general parameters 
In some cases, user password are managed by external systems (ex: LDAP).
The new parameter MAIN_PASSWORD_FORGOTLINK will send users to true forgotten password link.
 2018-09-23 21:26:07 +02:00
Laurent Destailleur
9ddc1770e8
Merge pull request #9501 from atm-gauthier/7.0_fix_tva_if_buyer_hors_cee_and_particulier 
FIX : According to french law, if seller is in France and buyer isn't…
 2018-09-23 15:41:33 +02:00
Laurent Destailleur
1569770855
Rename hidden conf into MAIN_USE_VAT_OF_PRODUCT_FOR_INDIVIDUAL_CUSTOMER_OUT_OF_EEC 2018-09-23 15:41:22 +02:00
Laurent Destailleur
e277670a70
Merge pull request #9573 from grandoc/new_branch_20_09_2018 
Standardize and update code from New branch 20 09 2018
 2018-09-23 15:35:42 +02:00
Philippe GRAND
0a86515efc Merge remote-tracking branch 'upstream/develop' into develop 2018-09-23 11:48:06 +02:00
Philippe GRAND
3464afe391 Update comment 2018-09-21 15:12:17 +02:00
gauthier
7b46bedce6 NEW : hidden configuration 2018-09-21 14:35:36 +02:00
Philippe Grand
870f504633
Update doc_generic_usergroup_odt.modules.php 2018-09-21 14:34:30 +02:00
Philippe Grand
0bcec6c923
Update doc_generic_user_odt.modules.php 2018-09-21 14:33:48 +02:00
Philippe Grand
2afaccf099
Update mod_ticket_universal.php 2018-09-21 14:32:31 +02:00
Philippe GRAND
9fab0a1d45 Update comments 2018-09-21 14:16:22 +02:00
Philippe GRAND
de6fca0844 fix merging 2018-09-21 14:09:12 +02:00
Philippe GRAND
48c3a1e1bc fix merging 2018-09-21 14:06:55 +02:00
Philippe Grand
d5003c9d3c
Merge branch 'develop' into new_branch_21_09_2018 2018-09-21 13:55:04 +02:00
Laurent Destailleur
7ece28ffd3 Trans 2018-09-21 11:48:01 +02:00
Laurent Destailleur
3be13f0cb6 Fix css 2018-09-21 11:45:04 +02:00
Frédéric FRANCE
7434b076d8
correct link to setup modulebuilder 2018-09-21 11:12:19 +02:00
Philippe Grand
239be3b58c
Merge branch 'develop' into new_branch_20_09_2018 2018-09-21 10:12:48 +02:00
Laurent Destailleur
8cfe5d7252
Merge pull request #9569 from grandoc/new_branch_19_09_2018 
Missing translation
 2018-09-21 09:50:18 +02:00
Laurent Destailleur
f7392871dd
Merge pull request #9579 from frederic34/patch-9 
remove warning Line exceeds 500 characters
 2018-09-21 09:40:28 +02:00
Philippe GRAND
bde8d8ae0e Comment and typo 2018-09-21 09:32:50 +02:00
Philippe GRAND
f59ac8dda5 Merge remote-tracking branch 'origin/new_branch_20_09_2018' into new_branch_21_09_2018 2018-09-21 09:07:17 +02:00
Philippe GRAND
e8b7ad0fb5 Standardize and update code 2018-09-21 08:49:05 +02:00
Laurent Destailleur
160e97616b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-20 23:43:51 +02:00
Laurent Destailleur
5bd538fb2c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/modules/modStripe.class.php
	htdocs/filefunc.inc.php
	htdocs/projet/element.php
 2018-09-20 23:43:34 +02:00
Frédéric FRANCE
042555e716
remove warning Line exceeds 500 characters 2018-09-20 20:44:17 +02:00
Laurent Destailleur
5a0ffb68d7
Merge pull request #9576 from atm-john/FIX_attribute_closing 
FIX attribute closing
 2018-09-20 20:34:57 +02:00
Laurent Destailleur
b05954fb1e
Merge pull request #9061 from delcroip/comptafiles 
NEW: Page to check if the operations/itemw created between two dates have attached item(s) and possibility to download all attachements
 2018-09-20 19:45:46 +02:00
Laurent Destailleur
4ba057528f Fix permissionss 2018-09-20 19:37:28 +02:00
Laurent Destailleur
36b8958c59 Move Stripe menu transactions and charges from develop to experimental 2018-09-20 19:35:13 +02:00
Laurent Destailleur
df395847d3 FIX #9567 2018-09-20 19:14:32 +02:00
Philippe GRAND
67bbead7c1 Standardize and update code 2018-09-20 17:46:39 +02:00
Philippe GRAND
e1a03c49cf Standardize and update code 2018-09-20 17:19:42 +02:00
Philippe GRAND
85ff212498 Standardize and update code 2018-09-20 17:11:29 +02:00
Philippe GRAND
e64fbd9522 Standardize and update code 2018-09-20 17:02:32 +02:00
Philippe GRAND
8225e039d9 Standardize and update code 2018-09-20 16:58:34 +02:00
Philippe GRAND
43edc64e7f Merge remote-tracking branch 'upstream/develop' into new_branch_20_09_2018 2018-09-20 16:57:10 +02:00
Laurent Destailleur
e0dfab4c71 FIX The max size for upload file was not corectly shown 2018-09-20 16:21:36 +02:00
Laurent Destailleur
c6470d49b0 FIX The max size for upload file was not corectly shown 2018-09-20 16:21:08 +02:00
John BOTELLA
b59b0b0cc3 FIX attribute closing 2018-09-20 16:13:22 +02:00
Philippe GRAND
2adfdab771 Standardize and update code 2018-09-20 15:14:59 +02:00
Philippe GRAND
92a484dcd9 Standardize and update code 2018-09-20 15:07:43 +02:00
Philippe GRAND
7eda9c846c Standardize and update code 2018-09-20 15:01:03 +02:00
Philippe GRAND
b7a4311802 Standardize and update code 2018-09-20 14:56:40 +02:00
Philippe GRAND
b1fa12e1e3 Standardize and update code 2018-09-20 14:51:09 +02:00
Philippe GRAND
49fe6d3b79 Standardize and update code 2018-09-20 14:43:54 +02:00
Philippe GRAND
7c92157636 Standardize and update code 2018-09-20 14:25:53 +02:00
Philippe GRAND
7903a64c36 Standardize and update code 2018-09-20 14:23:09 +02:00
Philippe GRAND
11f254cd14 Standardize and update code 2018-09-20 14:19:52 +02:00
Philippe GRAND
cf8e12ced2 Standardize and update code 2018-09-20 14:15:39 +02:00
Philippe GRAND
12b56d17ba Standardize and update code 2018-09-20 14:11:59 +02:00
Philippe GRAND
0b4a0ac667 Standardize and update code 2018-09-20 14:09:25 +02:00
Philippe GRAND
4bd0af7a88 Standardize and update code 2018-09-20 14:05:57 +02:00
Philippe GRAND
bb0a830b78 Standardize and update code 2018-09-20 13:56:18 +02:00
Philippe GRAND
c0dc4f3a48 Standardize and update code 2018-09-20 13:52:57 +02:00
Philippe GRAND
7b50935e49 Standardize and update code 2018-09-20 13:44:45 +02:00
Philippe GRAND
a14c520910 Standardize and update code 2018-09-20 13:41:26 +02:00
Philippe GRAND
88bf2dee64 Standardize and update code 2018-09-20 13:36:00 +02:00
Philippe GRAND
7ffcc2e63f Standardize and update code 2018-09-20 13:32:41 +02:00
Philippe GRAND
cbda62b1ca Standardize and update code 2018-09-20 12:30:38 +02:00
Philippe GRAND
803505b6b7 Standardize and update code 2018-09-20 12:27:06 +02:00
Philippe GRAND
d091f5e16f Standardize and update code 2018-09-20 12:21:49 +02:00
Philippe GRAND
50073fe98d Standardize and update code 2018-09-20 12:16:31 +02:00
Philippe GRAND
bd87b1381d Standardize and update code 2018-09-20 12:14:30 +02:00
Philippe GRAND
d2d40ef0a3 Standardize and update code 2018-09-20 12:12:37 +02:00
Philippe GRAND
4b51227ca9 Standardize and update code 2018-09-20 12:10:13 +02:00
Philippe GRAND
5979db7733 Standardize and update code 2018-09-20 12:07:23 +02:00
Philippe GRAND
32beccc3be Standardize and update code 2018-09-20 12:02:23 +02:00
Philippe GRAND
67147582af Standardize and update code 2018-09-20 12:00:10 +02:00
Philippe GRAND
89b942ac9a Standardize and update code 2018-09-20 11:34:18 +02:00
Philippe GRAND
d5a3411fbc Standardize and update code 2018-09-20 11:28:54 +02:00
Philippe GRAND
08325d40ce Standardize and update code 2018-09-20 11:18:02 +02:00
Philippe GRAND
0222ea7e8c Standardize and update code 2018-09-20 09:19:17 +02:00
Philippe GRAND
1adc4bad9e Standardize and update code 2018-09-20 09:17:25 +02:00
Philippe GRAND
46d7385c54 Standardize and update code 2018-09-20 09:13:49 +02:00
Philippe GRAND
9b3dba4a56 Standardize and update code 2018-09-20 09:04:30 +02:00
Philippe GRAND
06ad6e7196 Standardize and update code 2018-09-20 09:04:12 +02:00
Philippe GRAND
9a487169c8 Standardize and update code 2018-09-20 09:03:52 +02:00
Philippe GRAND
ad84340bf5 Standardize and update code 2018-09-20 09:03:26 +02:00
Laurent Destailleur
d4ffc5e088 css 2018-09-20 00:48:00 +02:00
Philippe GRAND
52533a0210 Standardize and update code 2018-09-19 16:43:37 +02:00
Philippe GRAND
7f59328eb7 Merge remote-tracking branch 'upstream/develop' into new_branch_19_09_2018 2018-09-19 16:43:01 +02:00
Laurent Destailleur
12b449fe49 It's easier to select fields to show on list 2018-09-19 16:41:33 +02:00
Philippe GRAND
bd3ba04e24 Standardize and update code 2018-09-19 16:36:08 +02:00
Philippe GRAND
57fc8cf06f Standardize and update code 2018-09-19 16:31:36 +02:00
Philippe GRAND
30e426e487 Standardize and update code 2018-09-19 16:21:52 +02:00
Laurent Destailleur
ee788b543e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-19 15:06:42 +02:00
Laurent Destailleur
1d47569651 Brighter gradient 2018-09-19 15:06:14 +02:00
Laurent Destailleur
824b572bd0 FIX Amount when using mutlicurrency on PDF 
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0

Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
 2018-09-19 15:03:24 +02:00
Laurent Destailleur
2b67da3f34 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
 2018-09-19 14:52:43 +02:00
Laurent Destailleur
2643b6e1dd
Merge pull request #9558 from grandoc/new_branch_18_09_2018 
Standardize and update code
 2018-09-19 14:26:28 +02:00
Frédéric FRANCE
cdbb79a26c
correct typo in multicurrency doc pdf 2018-09-19 09:26:56 +02:00
Laurent Destailleur
2ec02afa8b Fix nb of module 2018-09-19 01:14:55 +02:00
Philippe GRAND
4536993fdc Standardize and update code 2018-09-18 17:34:01 +02:00
Philippe GRAND
c3db591d7b Standardize and update code 2018-09-18 17:31:01 +02:00
Philippe GRAND
73d161833a Standardize and update code 2018-09-18 17:26:20 +02:00
Philippe GRAND
d021a3d5af Standardize and update code 2018-09-18 17:24:10 +02:00
Philippe GRAND
30601accc3 Standardize and update code 2018-09-18 17:15:06 +02:00
Philippe GRAND
f28f3d12c2 Standardize and update code 2018-09-18 17:10:47 +02:00
Philippe GRAND
ac3efe1d5b Standardize and update code 2018-09-18 17:06:25 +02:00
Philippe GRAND
ad6ecc6231 Standardize and update code 2018-09-18 16:49:20 +02:00
Philippe GRAND
71d8356f6a Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_branch_18_09_2018 2018-09-18 16:48:32 +02:00
Philippe GRAND
b4692f0812 fix merge 2018-09-18 16:45:06 +02:00
Laurent Destailleur
99d214abd5 Fix family of module Payment of employee salaries 2018-09-18 16:38:51 +02:00
Philippe GRAND
c3bbe70e2d fix merge 2018-09-18 16:38:14 +02:00
Laurent Destailleur
4580ed0b09 Fix bad link 2018-09-18 15:31:25 +02:00
Laurent Destailleur
b67392b016 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-18 15:18:16 +02:00
Laurent Destailleur
52b6dd16da Standardize code 2018-09-18 15:18:07 +02:00
Laurent Destailleur
61f5a2e899
Merge pull request #9533 from frederic34/trimParameters 
trimParameters function
 2018-09-18 15:04:32 +02:00
Laurent Destailleur
1c13fbb122
Merge pull request #9532 from frederic34/patch-17 
reduce complexity of commoninvoice class
 2018-09-18 15:03:25 +02:00
Laurent Destailleur
1a31071a5e
Merge pull request #9527 from frederic34/patch-11 
clean datepicker
 2018-09-18 15:00:52 +02:00
Laurent Destailleur
dcc1c855fb
Merge pull request #9542 from frederic34/patch-24 
reduce complexity of company lib
 2018-09-18 14:58:17 +02:00
Laurent Destailleur
fa61ebeb9d
Merge pull request #9547 from grandoc/new_branch_17_09_2018 
Standardize and update code
 2018-09-18 14:57:50 +02:00
Laurent Destailleur
e07ce644e8 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/admin.lib.php
	htdocs/langs/en_US/admin.lang
 2018-09-18 11:49:35 +02:00
Philippe GRAND
ad061f4e13 Standardize and update code 2018-09-18 11:14:21 +02:00
Philippe GRAND
c08f443f0a Standardize and update code 2018-09-18 11:09:56 +02:00
Philippe GRAND
72f906683f Standardize and update code 2018-09-18 11:02:18 +02:00
Laurent Destailleur
2d8eb034e3 FIX Maxi debug to allow to load chart of account with multicompany 2018-09-17 21:02:07 +02:00
Philippe GRAND
d1a27b33fb Standardize and update code 2018-09-17 17:28:05 +02:00
Philippe GRAND
b06516180b Standardize and update code 2018-09-17 15:06:41 +02:00
Laurent Destailleur
3fc3cc4688 Fix missing email in popup 2018-09-17 14:17:10 +02:00
Philippe GRAND
cd796bf682 Standardize and update code 2018-09-17 12:29:21 +02:00
Philippe GRAND
484b36c5aa Standardize and update code 2018-09-17 09:31:32 +02:00
Laurent Destailleur
0bf540b3c1 Fix regression in edition of date 2018-09-17 09:17:11 +02:00
Laurent Destailleur
797de131a6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-17 02:26:15 +02:00
Laurent Destailleur
f3f18bf8cb Fix sql 2018-09-17 02:23:11 +02:00
Frédéric FRANCE
aec1f779ff
reduce complexity of company lib 2018-09-16 21:40:28 +02:00
Frédéric FRANCE
b950043618
trimParameters 2018-09-16 15:16:08 +02:00
Laurent Destailleur
eeb919dcda Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-16 14:24:13 +02:00
Frédéric FRANCE
f9441d3249
Update commoninvoice.class.php 2018-09-16 14:07:11 +02:00
Laurent Destailleur
055a0b2859 Merge branch '8.0' of github.com:Dolibarr/dolibarr into 8.0 2018-09-16 13:29:13 +02:00
Laurent Destailleur
79b15b81f2 Fix list of tasks on time consumed 2018-09-16 13:28:37 +02:00
Laurent Destailleur
ab0f842db6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-16 12:55:44 +02:00
Laurent Destailleur
cc4fbfc3ef Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2018-09-16 12:54:39 +02:00
Laurent Destailleur
d06785e91a Fix responsive 2018-09-16 12:48:36 +02:00
Laurent Destailleur
4151ca49eb Fix position of menu 2018-09-16 12:15:33 +02:00
Frédéric FRANCE
2f633857af
clean datepicker 2018-09-16 11:26:39 +02:00
Laurent Destailleur
10c6bc44ca Fix scrutinizer 2018-09-16 10:28:41 +02:00
Laurent Destailleur
d6ee00f2e7 Fix constructors does not need return value 2018-09-16 10:22:23 +02:00
Laurent Destailleur
e90a60d4ee Remove warnings 2018-09-16 10:09:19 +02:00
Laurent Destailleur
eebd329c7c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/core/modules/modAgenda.class.php
	htdocs/core/modules/modFacture.class.php
	htdocs/langs/en_US/admin.lang
	htdocs/langs/en_US/main.lang
	htdocs/stripe/transaction.php
 2018-09-16 09:50:13 +02:00
Laurent Destailleur
55e7989552 FIX #9043 2018-09-16 09:42:30 +02:00
Laurent Destailleur
2c8064967b Code comment 2018-09-16 09:31:06 +02:00
Laurent Destailleur
272944983c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-09-16 09:27:54 +02:00
Laurent Destailleur
34b75828d3 Work on fix for #9043 2018-09-16 09:27:36 +02:00
Laurent Destailleur
6ba2127377
Merge pull request #9516 from grandoc/new_branch_15_09_2018 
New branch 15 09 2018
 2018-09-15 23:59:10 +02:00
Philippe Grand
1d82825afa
Update html.formsms.class.php 2018-09-15 21:34:55 +02:00
Laurent Destailleur
69dcdcbe75
Merge pull request #9509 from grandoc/new_branch_14_09_2018 
Standardize and update code
 2018-09-15 17:30:14 +02:00
Laurent Destailleur
75f3dd94c6
Merge pull request #9506 from frederic34/printing 
printing remove no camelcaps function
 2018-09-15 17:29:21 +02:00
Laurent Destailleur
ecfbe0a568
Merge pull request #9499 from tarrsalah/fix-show-default-vat-rate 
FIX #9497
 2018-09-15 17:14:05 +02:00
Laurent Destailleur
76cdbc8bf1
Merge branch 'develop' into testsqlAndScript 2018-09-15 17:01:23 +02:00
Laurent Destailleur
bbfe4462dc NEW Add lib for multiselect with checkboxes 
NEW Can select several prospect level in thirdparty filter.
Remove old multiselect lib that was not used by core.
 2018-09-15 13:31:25 +02:00
Philippe GRAND
5c3a24a00c Standardize and update code 2018-09-15 11:51:21 +02:00
Philippe GRAND
5910e1ddf8 Standardize and update code 2018-09-15 11:15:59 +02:00
Philippe GRAND
7deccb3215 Standardize and update code 2018-09-15 11:06:35 +02:00
Philippe GRAND
0654b7b0ef Standardize and update code 2018-09-15 10:49:40 +02:00
Philippe GRAND
73c26a2d04 Standardize and update code 2018-09-15 10:47:50 +02:00
Philippe GRAND
fa1521d948 Standardize and update code 2018-09-14 15:09:23 +02:00
Philippe GRAND
ca9b1f155f Standardize and update code 2018-09-14 14:05:19 +02:00
Philippe GRAND
33d9e24bd6 Standardize and update code 2018-09-14 11:58:49 +02:00
Philippe GRAND
18f4755a90 Standardize and update code 2018-09-14 10:20:21 +02:00
John BOTELLA
d1321e5a7b change new PDF version 2018-09-14 09:54:39 +02:00
John BOTELLA
ec23cd0da4 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_PDF_DOCUMENT_COLUMN_new_files 2018-09-14 09:54:14 +02:00
John BOTELLA
477acb2e4c change new PDF version 2018-09-14 09:48:15 +02:00
Philippe Grand
51ba970eaf
Update html.formsms.class.php 2018-09-14 09:33:16 +02:00
Laurent Destailleur
16ed582124 Add comment 2018-09-14 01:45:03 +02:00
Laurent Destailleur
78e983a1f5 CSS v9 2018-09-13 16:39:50 +02:00
Philippe GRAND
3da762a59d Standardize and update code 2018-09-13 15:06:06 +02:00
gauthier
b68523b9c1 FIX : According to french law, if seller is in France and buyer isn't in UE and isn't a company, TVA used = TVA product 2018-09-13 14:37:12 +02:00
tarrsalah
08453a5337 FIX #9497 
Extract $defaultcode and $defaulttxt from the value returned by
get_default_tva function .
 2018-09-13 11:04:11 +01:00
Frédéric FRANCE
5862a5e2ee
printing remove no camelcaps function 2018-09-13 11:13:32 +02:00
Philippe GRAND
be3468241f Standardize and update code 2018-09-13 10:55:05 +02:00
Philippe GRAND
ffad80eef6 Standardize and update code 2018-09-13 09:45:07 +02:00
Laurent Destailleur
ca85356b45
Merge pull request #9427 from frederic34/patch-6 
deprecate Form::select_date
 2018-09-12 22:07:23 +02:00
Laurent Destailleur
b4264ee0a0 Use font awesome for sort image 2018-09-12 21:57:32 +02:00
Frédéric FRANCE
987fdbe73c
Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-12 21:29:41 +02:00
Laurent Destailleur
c5e30b61c0 Fix translation 2018-09-12 21:25:14 +02:00
Laurent Destailleur
963d5eeddf
Merge pull request #9387 from frederic34/camelCaps2 
start changing phpcs:ignore
 2018-09-12 21:14:34 +02:00
Laurent Destailleur
b1d9846969
Merge pull request #9486 from grandoc/new_branch_12_09_2018 
New branch 12 09 2018
 2018-09-12 21:13:32 +02:00
Laurent Destailleur
9d9e2bc3e3
Merge pull request #9405 from fmarcet/develop 
NEW: Highlight lines on lists when they are checked
 2018-09-12 20:50:42 +02:00
Frédéric FRANCE
ce76a2e714
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-12 20:21:35 +02:00
Philippe GRAND
06cde1c35f Standardize and update code 2018-09-12 19:32:30 +02:00
Philippe GRAND
04017367f9 Standardize and update code 2018-09-12 19:24:45 +02:00
Laurent Destailleur
163bc55e4a
Merge pull request #9468 from jmarsac/numericextrafields9464 
Convert localized numeric extrafields value before inserting/updating
 2018-09-12 19:06:43 +02:00
Laurent Destailleur
7d726f9734
Merge pull request #9457 from frederic34/selectbarcodetype 
Selectbarcodetype
 2018-09-12 19:02:41 +02:00
ias-ceo
fece67b629 use correct resultset 2018-09-12 19:00:19 +02:00
Laurent Destailleur
cb174c3d1a
Merge pull request #9455 from IAS-SYSTEMS-CSC/develop 
Fix : use correct resultset
 2018-09-12 18:59:45 +02:00
Frédéric FRANCE
3e71f4e6b0
Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-12 18:36:49 +02:00
Frédéric FRANCE
998b67fa98
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-12 18:32:15 +02:00
Laurent Destailleur
358bc7ab1b
Merge pull request #9454 from frederic34/patch-16 
Update dolreceiptprinter.class.php
 2018-09-12 18:28:10 +02:00
Laurent Destailleur
58ba1c3496
Merge pull request #9451 from hregis/7.0_price 
FIX better compatibility with multicompany
 2018-09-12 18:27:50 +02:00
Laurent Destailleur
ad54159c85
Merge pull request #9485 from frederic34/patch-9 
remove superfluous space
 2018-09-12 18:25:17 +02:00
Laurent Destailleur
de8496773d
Merge pull request #9441 from grandoc/new_branch_09_09_2018 
New branch 09 09 2018
 2018-09-12 18:24:34 +02:00
Frédéric FRANCE
6c17edd1d1
remove superfluous space 2018-09-12 18:23:58 +02:00
Laurent Destailleur
64d99dd302
Merge pull request #9459 from frederic34/patch-18 
Completely comment unused code
 2018-09-12 18:21:51 +02:00
Laurent Destailleur
81f4bae159
Merge pull request #9461 from grandoc/new_branch_11_09_2018 
New branch 11 09 2018
 2018-09-12 18:15:03 +02:00
Laurent Destailleur
f5074f4962 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-12 18:12:17 +02:00
Laurent Destailleur
b341cb9245 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/core/tpl/objectline_view.tpl.php
 2018-09-12 18:11:51 +02:00
Laurent Destailleur
10becd2046
Merge pull request #9483 from ptibogxiv/patch-54 
New donation module
 2018-09-12 17:34:21 +02:00
Laurent Destailleur
bdcbc71ce9
Merge pull request #9443 from frederic34/patch-10 
Completely comment unused code
 2018-09-12 17:28:29 +02:00
Philippe GRAND
b8df44167a Standardize and update code 2018-09-12 15:09:12 +02:00
Laurent Destailleur
729d03862f Fix warning 2018-09-12 15:02:59 +02:00
Philippe GRAND
69bf43f851 Merge remote-tracking branch 'upstream/develop' into new_branch_11_09_2018 2018-09-12 14:48:50 +02:00
Laurent Destailleur
fcabe67e4b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-12 13:30:28 +02:00
Laurent Destailleur
53da80a79f FIX Missing translation in predefined email to membership renewal 2018-09-12 12:55:10 +02:00
Laurent Destailleur
af2e19eba8 Replace skype module with social networks module to support more fields 2018-09-12 10:55:45 +02:00
Philippe GRAND
c51a0ef901 Standardize and update code 2018-09-12 10:10:07 +02:00
Jean-Marie Arsac
345c24990e Correction of variable name 2018-09-11 20:51:54 +02:00
atm-ph
40c79cb7cd Fix classname liencolht to linecolht 2018-09-11 17:56:11 +02:00
Philippe GRAND
05772f5327 Standardize and update code 2018-09-11 17:30:43 +02:00
Jean-Marie Arsac
2f2dff8155 Convert localized numeric extrafields value before inserting 
- add 'double' case in insertExtraFields and updateExtraFields to to convert localized value using price2num()
 2018-09-11 14:57:31 +02:00
Philippe GRAND
b4cbb0561d Standardize and update code 2018-09-11 10:36:39 +02:00
Frédéric FRANCE
2995208e5b
Completely comment unused code 2018-09-11 00:36:44 +02:00
Frédéric FRANCE
a36f41728f
deprecate formbarcode:form_barcode_type 2018-09-10 23:58:57 +02:00
Frédéric FRANCE
312a606345
deprecate formbarcode:select_barcode_type 2018-09-10 23:50:48 +02:00
Laurent Destailleur
016bc6851b Fix generation of tpl 2018-09-10 23:37:51 +02:00
Laurent Destailleur
b0be1ddadb Fix files generated 2018-09-10 23:20:31 +02:00
Laurent Destailleur
d2c6c7ddff Fix import 2018-09-10 22:58:34 +02:00
Laurent Destailleur
d011204624 Fix switch of extrafields between all and only one entity 2018-09-10 17:36:46 +02:00
ias-ceo
b4691df8d9 use correct resultset 2018-09-10 17:29:29 +02:00
Frédéric FRANCE
2589b23464
Update dolreceiptprinter.class.php 2018-09-10 17:25:35 +02:00
Regis Houssin
43ac51b44c FIX remove debug 2018-09-10 10:11:07 +02:00
Regis Houssin
8699866062 FIX better compatibility with multicompany 2018-09-10 10:08:04 +02:00
Laurent Destailleur
47cfda6734 Webiste 2018-09-10 09:09:51 +02:00
Frédéric FRANCE
b7179fd500
fix phpcs 2018-09-09 14:47:33 +02:00
Laurent Destailleur
5719a38ea7 Work on website module. Support now links to company logos. 2018-09-09 14:05:23 +02:00
Frédéric FRANCE
7e0b1055db
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-09 13:36:53 +02:00
Frédéric FRANCE
f02b2f0239
Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-09 13:35:58 +02:00
Laurent Destailleur
700e3b9748 Standardize code for modulepart=mycompany like others modulepart. 2018-09-09 12:53:30 +02:00
Philippe GRAND
b40fe8e4c9 Standardize and update code 2018-09-09 12:07:14 +02:00
Laurent Destailleur
d9eeb43118 FIX translation no visible for access forbidden 2018-09-09 11:59:38 +02:00
Frédéric FRANCE
a558c3bdac
replace select_date 2018-09-09 11:25:59 +02:00
Frédéric FRANCE
8249756726
replace select_date 2018-09-09 10:40:00 +02:00
Frédéric FRANCE
a3fa13994b
replace select_date 2018-09-09 09:36:12 +02:00
Laurent Destailleur
c2b3b0ce7b Fix syntax error 2018-09-08 18:28:21 +02:00
Laurent Destailleur
4017a96aef Debug website 2018-09-08 14:30:27 +02:00
Laurent Destailleur
ba71648c2d Code comment 2018-09-08 14:10:29 +02:00
Frédéric FRANCE
ac8f568604
replace select_date by selectDate 2018-09-08 12:47:27 +02:00
Frédéric FRANCE
cb97a29fc0
introduce seletDate 2018-09-08 12:00:11 +02:00
Frédéric FRANCE
2b62c4ca8f
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-08 10:50:27 +02:00
Laurent Destailleur
f0dafb7ae2
Merge pull request #9414 from grandoc/new_branch_03_09_2018 
Standardize and update code
 2018-09-07 19:40:14 +02:00
Laurent Destailleur
86cf289f14
Merge pull request #9430 from grandoc/new_branch_07_09_2018 
New branch 07 09 2018
 2018-09-07 19:38:57 +02:00
Laurent Destailleur
33f71be6ef Fix gradient ok for webview 2018-09-07 19:03:53 +02:00
Philippe GRAND
af37b08da3 Merge remote-tracking branch 'upstream/develop' into new_branch_07_09_2018 2018-09-07 14:48:43 +02:00
Laurent Destailleur
0ef17fe581 FIX Problems with permissions of module to record payment of salaries 2018-09-07 13:32:56 +02:00
Laurent Destailleur
e5058a251d Use colored gradient background on login page 2018-09-07 12:27:08 +02:00
Frédéric FRANCE
ab4ae0f7bb
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-06 21:28:30 +02:00
Frédéric FRANCE
70ba223788
move phpcs:ignore 2018-09-06 21:27:18 +02:00
Philippe GRAND
97c740f510 Merge branch 'develop' of github.com:grandoc/dolibarr into develop 2018-09-06 19:28:10 +02:00
Philippe GRAND
e9c2a475bc fix merge 2018-09-06 19:27:28 +02:00
Frédéric FRANCE
cbf4a20a13
move phpcs:ignore 2018-09-06 19:03:09 +02:00
Frédéric FRANCE
3ecf788438
move phpcs:ignore 2018-09-06 18:29:01 +02:00
Philippe GRAND
3c06527a7b Merge remote-tracking branch 'upstream/develop' into new_branch_03_09_2018 2018-09-06 09:50:12 +02:00
Laurent Destailleur
b25a0ca672 Fix no need of thumb when upload image for email 2018-09-05 23:25:17 +02:00
Laurent Destailleur
f7c87a9ad3 Clean cron init 2018-09-05 22:46:08 +02:00
Frédéric FRANCE
4cbfa2073a
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-05 21:02:16 +02:00
Laurent Destailleur
2a471df828 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-05 20:42:55 +02:00
Laurent Destailleur
ed31eec5ee Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-09-05 20:40:19 +02:00
Laurent Destailleur
dfea391c88 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2018-09-05 20:39:38 +02:00
Frédéric FRANCE
85df267a5b
move phpcs:ignore 2018-09-05 20:36:44 +02:00
Laurent Destailleur
4ac67e6409 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-05 20:31:10 +02:00
Frédéric FRANCE
4e619dd0ed
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-05 18:51:21 +02:00
Frédéric FRANCE
f7c3ca9d20
move phpcs:ignore 2018-09-05 18:49:06 +02:00
ptibogxiv
b630a97215
add payment link on admin gateway 2018-09-05 17:41:37 +02:00
ptibogxiv
6e209b550b
add payment link for donation 2018-09-05 17:40:26 +02:00
Laurent Destailleur
cb89942bfb Add option capture on input file for photo 2018-09-05 16:03:10 +02:00
Laurent Destailleur
3650dc3ec9 FIX #8452 2018-09-05 15:25:47 +02:00
Philippe GRAND
11d75573be Standardize and update code 2018-09-05 12:21:13 +02:00
Frédéric FRANCE
ecc6c118a6
move phpcs:ignore 2018-09-04 23:26:37 +02:00
Frédéric FRANCE
7799774ca1
move phpcs:ignore 2018-09-04 22:52:55 +02:00
Frédéric FRANCE
3847df1de6
move phpcs:ignore 2018-09-04 21:53:53 +02:00
Laurent Destailleur
ab8155f170 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/card.php
	htdocs/filefunc.inc.php
 2018-09-04 21:35:43 +02:00
Frédéric FRANCE
c6cef85ccd
move phpcs:ignore 2018-09-04 21:16:17 +02:00
Frédéric FRANCE
65b74ad30f
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-04 20:48:35 +02:00
Frédéric FRANCE
fd6281b364
move phpcs:ignore 2018-09-04 20:00:09 +02:00
Philippe Grand
c32c67ca57
Merge branch 'develop' into develop 2018-09-04 16:58:59 +02:00
Philippe GRAND
50a26aaf16 fix merge 2018-09-04 14:33:34 +02:00
Philippe GRAND
42565e722e Standardize and update code 2018-09-04 13:37:00 +02:00
Philippe GRAND
0492492df1 fix merge 2018-09-04 12:30:06 +02:00
Ferran Marcet
b658626e21 NEW: Highlight lines on lists when they are checked 2018-09-04 11:54:13 +02:00
Laurent Destailleur
f2ec94e9fd FIX #9353 Bug: html error - div inside span on graphs 2018-09-04 11:13:54 +02:00
Laurent Destailleur
c59b0f95e6 FIX #9403 2018-09-04 10:10:47 +02:00
Laurent Destailleur
252335318f
Update pdf.lib.php 2018-09-04 09:57:01 +02:00
Frédéric FRANCE
1ae1afe843
move phpcs:ignore 2018-09-04 08:09:48 +02:00
Frédéric FRANCE
d08b68e8ed
move phpcs:ignore 2018-09-03 20:38:52 +02:00
Frédéric FRANCE
7288335c6d
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-03 19:01:11 +02:00
Frédéric FRANCE
5f4a922c1d
move phpcs:ignore 2018-09-03 19:00:37 +02:00
Marc de Lima Lucio
e285b42a18 FIX: PDF address: handle when contact thirdparty different from document thirdparty 2018-09-03 17:57:30 +02:00
Laurent Destailleur
540999faa5 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/lib/company.lib.php
 2018-09-03 14:06:51 +02:00
Laurent Destailleur
6641a05744 Fix missing class 2018-09-03 11:59:19 +02:00
Philippe GRAND
4fba7cdf45 fix : Class Contact not found in htdocs/core/lib/company.lib.php on line 1496 2018-09-03 09:45:06 +02:00
Philippe GRAND
7a0c19485e fix merge 2018-09-03 09:34:08 +02:00
Regis Houssin
912c05774b FIX remove deprecated triggers USER_LOG* 2018-09-03 09:30:36 +02:00
Frédéric FRANCE
e4946cc8eb
move phpcs:ignore 2018-09-03 00:03:17 +02:00
Frédéric FRANCE
9c3352d2de
move phpcs:ignore 2018-09-02 23:44:53 +02:00
Frédéric FRANCE
489074af5c
move phpcs:ignore 2018-09-02 23:25:10 +02:00
Frédéric FRANCE
47e73bfd8e
move phpcs:ignore 2018-09-02 23:01:14 +02:00
Frédéric FRANCE
2a9ef8dc05
move phpcs:ignore 2018-09-02 22:05:19 +02:00
Frédéric FRANCE
b05c175a78
Merge remote-tracking branch 'upstream/develop' into testsqlAndScript 2018-09-02 19:00:43 +02:00
Frédéric FRANCE
e13a8ec572
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-02 18:19:45 +02:00
Laurent Destailleur
a68f5cad77 Fix syntax error 2018-09-02 17:18:19 +02:00
Laurent Destailleur
887a40cf1d Remove TODO 2018-09-02 16:46:01 +02:00
Laurent Destailleur
0bf850c1ea Fix phpcs 2018-09-02 16:26:00 +02:00
Laurent Destailleur
3baaa2e975 Fix syntax error 2018-09-02 16:18:08 +02:00
Laurent Destailleur
ddd6ac296c Fix missing class 2018-09-02 16:09:40 +02:00
Laurent Destailleur
5488bfe1fe
Merge pull request #9018 from all3kcis/patch-10 
Enable auto update PDF on update note
 2018-09-02 16:01:22 +02:00
Laurent Destailleur
dda0c5699e
Update actions_setnotes.inc.php 2018-09-02 15:59:09 +02:00
Laurent Destailleur
e661eff329 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-02 15:48:43 +02:00
Laurent Destailleur
3d3edb19d8 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.travis.yml
	htdocs/langs/en_US/commercial.lang
 2018-09-02 15:48:26 +02:00
Laurent Destailleur
76d6affb27 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	.travis.yml
 2018-09-02 15:46:09 +02:00
Laurent Destailleur
b34731afb4
Merge pull request #9385 from frederic34/patch-15 
Update html_cerfafr.modules.php
 2018-09-02 15:38:19 +02:00
Laurent Destailleur
91809de1c3
Merge pull request #9383 from frederic34/patch-13 
Update doc_generic_user_odt.modules.php
 2018-09-02 15:35:54 +02:00
Frédéric FRANCE
04c1a7d4af
move phpcs:ignore 2018-09-02 13:38:11 +02:00
Philippe GRAND
3de16a145e Standardize and update code 2018-09-02 11:08:41 +02:00
Frédéric FRANCE
b60f7db60a
move phpcs:ignore 2018-09-02 10:43:34 +02:00
Frédéric FRANCE
e98b8e5e25
move phpcs:ignore 2018-09-02 09:27:59 +02:00
Philippe GRAND
5cd9557318 Standardize and Update code 2018-09-01 23:12:20 +02:00
Philippe GRAND
ae2df6be11 Standardize and Update code 2018-09-01 23:04:46 +02:00
Philippe GRAND
7b0d3c32ab Standardize and Update code 2018-09-01 22:55:10 +02:00
Philippe GRAND
5d273960dc fix conflict 2018-09-01 22:40:38 +02:00
Frédéric FRANCE
ab9bf78ecf
replace test_sql_and_script_inject 2018-09-01 17:42:16 +02:00
Frédéric FRANCE
49a1e33fc9
Update html_cerfafr.modules.php 2018-09-01 16:23:30 +02:00
Laurent Destailleur
c8912d6a4f
Merge pull request #9242 from frederic34/camelCaps 
mark non camelCaps function
 2018-09-01 15:37:56 +02:00
Frédéric FRANCE
ae52b737b3
Update doc_generic_user_odt.modules.php 2018-09-01 15:29:41 +02:00
Philippe GRAND
f77dd2ebc7 Standardize and update code 2018-09-01 15:13:59 +02:00
Laurent Destailleur
2301ecf1dc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-01 14:51:20 +02:00
Philippe GRAND
8d7dfaf98c Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2018-09-01 14:49:42 +02:00
Laurent Destailleur
fe7a0c894f
Merge pull request #9368 from atm-ph/fix_7.0_search_company_by_code 
Fix search company by code
 2018-09-01 14:42:32 +02:00
Laurent Destailleur
945e925399
Update html.form.class.php 2018-09-01 14:41:44 +02:00
Laurent Destailleur
e4e1bf5a1a
Merge pull request #9361 from frederic34/patch-19 
Update discount.class.php
 2018-09-01 14:30:16 +02:00
Philippe GRAND
17e349eba2 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2018-09-01 14:27:53 +02:00
Laurent Destailleur
359eebbbec Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-01 14:26:48 +02:00
Laurent Destailleur
08bc81a7ab
Merge pull request #9370 from joseplluis/patch-5 
NEW optional param to show a specific extrafield
 2018-09-01 14:24:23 +02:00
Laurent Destailleur
bc71aef7b4 Code comment 2018-09-01 14:24:02 +02:00
Laurent Destailleur
5b6a44434c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-01 14:17:15 +02:00
Laurent Destailleur
bcee0ef0ae Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/dispatch.php
	htdocs/societe/class/societe.class.php
	htdocs/stripe/config.php
 2018-09-01 14:16:57 +02:00
Philippe GRAND
bd473059ae precise label comment 2018-09-01 14:13:05 +02:00
Laurent Destailleur
26cff9e11f Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/langs/en_US/blockedlog.lang
	htdocs/stripe/config.php
 2018-09-01 14:13:01 +02:00
Philippe GRAND
7b47c79bc3 precise label comment 2018-09-01 14:06:58 +02:00
Frédéric FRANCE
10200374ef
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 14:06:23 +02:00
Philippe GRAND
b59d49d3b3 Merge remote-tracking branch 'upstream/develop' into develop 2018-09-01 13:58:33 +02:00
Frédéric FRANCE
57fb3dc2f4
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 13:52:51 +02:00
Laurent Destailleur
b6f4b1dff7
Merge pull request #9363 from frederic34/patch-21 
Update modSociete.class.php
 2018-09-01 13:31:23 +02:00
Laurent Destailleur
06355f7f08
Merge pull request #9362 from frederic34/patch-20 
Update ldap.class.php
 2018-09-01 13:28:32 +02:00
Laurent Destailleur
dee9442720 Fix regression 2018-09-01 13:12:09 +02:00
Philippe GRAND
d8e6492e93 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2018-09-01 13:07:30 +02:00
Laurent Destailleur
5604f3b0c3
Merge pull request #9376 from frederic34/functionCommentMissing 
function Comment Missing
 2018-09-01 12:59:32 +02:00
Philippe GRAND
0e5d4206c9 Merge remote-tracking branch 'upstream/develop' into develop 2018-09-01 12:47:34 +02:00
Josep Lluís
bfaf7ae473 Fix: undefined rights_class on modules 
When a module has the permission variable rights_class undefined, on unactivate the module are deleted all rows in cronjobs and menu tables with module=''.
 2018-09-01 12:44:16 +02:00
Josep Lluís
79ee31df5c Fix: undefined rights_class on modules 
When a module has the permission variable rights_class undefined, on unactivate the module are deleted all rows in cronjobs and menu tables with module=''.
 2018-09-01 12:43:02 +02:00
Laurent Destailleur
8bd231adb0
Merge pull request #9357 from joseplluis/patch-3 
FIX undefined rights_class on modules may lose setup when module disabled
 2018-09-01 12:42:22 +02:00
Philippe GRAND
1944ef0dc3 conflict resolution 2018-09-01 12:38:22 +02:00
Laurent Destailleur
b89202572e
Merge pull request #9342 from ptibogxiv/patch-51 
fix multicompany and footer ticket public page
 2018-09-01 12:33:55 +02:00
Laurent Destailleur
b863b5176d
Merge pull request #9322 from grandoc/new_branch_29_08_2018 
New branch 29 08 2018
 2018-09-01 12:11:01 +02:00
Laurent Destailleur
482ddd548a
Merge pull request #9332 from frederic34/functionClosingBrace 
PSR2 FunctionClosingBrace
 2018-09-01 12:06:08 +02:00
Frédéric FRANCE
9454f897ef
doxygen fix 2018-09-01 09:40:50 +02:00
Frédéric FRANCE
3b2e7732c2
function Comment Missing 2018-08-31 22:49:11 +02:00
Frédéric FRANCE
c2e49c82f8
function Comment Missing 2018-08-31 22:34:02 +02:00
Frédéric FRANCE
b015d05f07
function Comment Missing 2018-08-31 22:25:11 +02:00
Frédéric FRANCE
e47059fa36
function Comment Missing 2018-08-31 22:14:09 +02:00
Frédéric FRANCE
5d27318e3b
function Comment Missing 2018-08-31 22:03:12 +02:00
Frédéric FRANCE
df6eccc5dd
function Comment Missing 2018-08-31 22:01:13 +02:00
Frédéric FRANCE
ebcf43ec73
function Comment Missing 2018-08-31 21:39:23 +02:00
Philippe GRAND
3a8bde227b Standardize and update code 2018-08-31 19:26:08 +02:00
Philippe GRAND
edaa575435 Standardize and update code 2018-08-31 18:36:15 +02:00
Philippe GRAND
70ae8c6081 Standardize and update code 2018-08-31 18:27:16 +02:00
Philippe GRAND
9e880d3e72 Standardize and update code 2018-08-31 17:55:31 +02:00
Josep Lluís
78c0aa437f
NEW optional param to show a specific extrafield 
Using params in showOptionals you can show only a specific extrafield in a personalized form or canvas.
For example: print $object->showOptionals($extrafields, 'view', array('onlykey'=>'myfield_5'));
 2018-08-31 17:16:27 +02:00
Philippe GRAND
a62a5ab636 Merge remote-tracking branch 'upstream/develop' into develop 2018-08-31 17:00:46 +02:00
Laurent Destailleur
b08971b03b FIX vat rate code not return by get_product_vat_for_country 2018-08-31 14:52:34 +02:00
atm-ph
102b698c76 Fix search company by code 2018-08-31 11:38:45 +02:00
Frédéric FRANCE
2eade6ea68
Update modSociete.class.php 2018-08-30 23:22:06 +02:00
Frédéric FRANCE
26c0244dbb
Update ldap.class.php 2018-08-30 23:13:16 +02:00
Frédéric FRANCE
4ad5201a16
Update discount.class.php 2018-08-30 23:10:09 +02:00
Laurent Destailleur
8dc208c961 Fix missing legal ids in source address 2018-08-30 19:19:43 +02:00
Josep Lluís
d70e548f94
Fix: undefined rights_class on modules 
When a module has the permission variable rights_class undefined, on unactivate the module are deleted all rows in cronjobs and menu tables with module=''.
 2018-08-30 18:12:02 +02:00
Laurent Destailleur
151d84405a FIX trans on null object 2018-08-30 17:01:49 +02:00
Laurent Destailleur
d14bd829fb FIX trans on null object 2018-08-30 17:01:22 +02:00
Philippe Grand
b3c84ac3bc
Merge branch 'develop' into new_branch_29_08_2018 2018-08-30 12:09:40 +02:00
Philippe GRAND
2e66c65650 WTF... 2018-08-30 12:03:20 +02:00