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

15389 Commits

Author SHA1 Message Date
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